diff options
| author | jlam <jlam> | 2002-09-20 21:24:48 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2002-09-20 21:24:48 +0000 |
| commit | 6099fbe6a2a4d11ed31eaef9ad14590158b3d7df (patch) | |
| tree | 0091be8650edfd5466e00c920a5938c876bf50ef /databases/unixodbc | |
| parent | d051e5755936ac4a33731f0081a3e4daba918529 (diff) | |
| download | pkgsrc-6099fbe6a2a4d11ed31eaef9ad14590158b3d7df.tar.gz | |
buildlink1 -> buildlink2
Diffstat (limited to 'databases/unixodbc')
| -rw-r--r-- | databases/unixodbc/Makefile | 5 | ||||
| -rw-r--r-- | databases/unixodbc/Makefile.common | 11 |
2 files changed, 8 insertions, 8 deletions
diff --git a/databases/unixodbc/Makefile b/databases/unixodbc/Makefile index f6ad5c16ed6..3c1ee8a0e3b 100644 --- a/databases/unixodbc/Makefile +++ b/databases/unixodbc/Makefile @@ -1,11 +1,10 @@ -# $NetBSD: Makefile,v 1.7 2002/08/25 19:22:12 jlam Exp $ +# $NetBSD: Makefile,v 1.8 2002/09/20 21:26:30 jlam Exp $ PKGNAME= unixodbc-${ODBC_BASE_VERS} PKGREVISION= 1 COMMENT= ODBC 2.x/3.x driver manager CONFLICTS+= iodbc-[0-9]* -USE_BUILDLINK_ONLY= YES .include "../../databases/unixodbc/Makefile.common" @@ -30,6 +29,6 @@ post-install: ${INSTALL_DATA_DIR} ${EGDIR} ${INSTALL_DATA} ${WRKDIR}/odbcinst.ini ${EGDIR}/odbcinst.ini -.include "../../devel/readline/buildlink.mk" +.include "../../devel/readline/buildlink2.mk" .include "../../mk/bsd.pkg.install.mk" .include "../../mk/bsd.pkg.mk" diff --git a/databases/unixodbc/Makefile.common b/databases/unixodbc/Makefile.common index 98ac647daf4..3cee36531fb 100644 --- a/databases/unixodbc/Makefile.common +++ b/databases/unixodbc/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.7 2002/08/25 19:22:13 jlam Exp $ +# $NetBSD: Makefile.common,v 1.8 2002/09/20 21:26:30 jlam Exp $ DISTNAME= unixODBC-${ODBC_DIST_VERS} CATEGORIES= databases @@ -15,6 +15,7 @@ HOMEPAGE?= http://www.unixodbc.org/ ODBC_DIST_VERS= 2.0.11 ODBC_BASE_VERS= ${ODBC_DIST_VERS} +USE_BUILDLINK2= YES USE_LIBTOOL= YES LIBTOOL_OVERRIDE= ${WRKSRC}/libtool @@ -30,7 +31,7 @@ PTHREAD_OPTS+= require # libfl.a isn't needed. # MAKE_FLAGS+= LIBLTDL="-lltdl" -MAKE_FLAGS+= INCLTDL="-I${BUILDLINK_DIR}/include" +MAKE_FLAGS+= INCLTDL="-I${BUILDLINK_PREFIX.ltdl}/include" MAKE_FLAGS+= LEXLIB="" MAKE_ENV+= AM_MAKEFLAGS="${MAKE_FLAGS}" @@ -57,10 +58,10 @@ fix-ltdl-and-lexlib: ${MV} -f $${file}.fixed $${file}; \ done -.include "../../devel/libtool/buildlink.mk" -.include "../../mk/pthread.buildlink.mk" +.include "../../devel/libtool/buildlink2.mk" +.include "../../mk/pthread.buildlink2.mk" .if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} == "pth") CONFIGURE_ARGS+= --enable-gnuthreads -CONFIGURE_ARGS+= --with-pth=${BUILDLINK_DIR} +CONFIGURE_ARGS+= --with-pth=${PTHREADBASE} .endif |