diff options
| -rw-r--r-- | databases/mysql/Makefile | 4 | ||||
| -rw-r--r-- | editors/pico/Makefile | 8 | ||||
| -rw-r--r-- | security/rsaref/Makefile | 6 | ||||
| -rw-r--r-- | x11/qt/Makefile | 7 |
4 files changed, 11 insertions, 14 deletions
diff --git a/databases/mysql/Makefile b/databases/mysql/Makefile index 2122f494ac8..e4c9489e3ba 100644 --- a/databases/mysql/Makefile +++ b/databases/mysql/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 1998/08/20 15:16:44 tsarna Exp $ +# $NetBSD: Makefile,v 1.10 1998/09/01 14:29:28 agc Exp $ # # note: if updated, update shlib version number in patch-aa @@ -10,8 +10,6 @@ MASTER_SITES= ftp://ftp.digex.net/pub/database/mysql/Downloads/MySQL-3.21/ \ MAINTAINER= tsarna@netbsd.org HOMEPAGE= http://www.tcx.se/ -BUILD_DEPENDS= ${PREFIX}/bin/libtool:../../devel/libtool - CONFLICTS= mysql-3.21.31 mysql-3.21.32a NO_CDROM= "Restrictive license." diff --git a/editors/pico/Makefile b/editors/pico/Makefile index 94cd3fec229..305893272c8 100644 --- a/editors/pico/Makefile +++ b/editors/pico/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 1998/08/20 16:09:27 agc Exp $ +# $NetBSD: Makefile,v 1.11 1998/09/01 14:29:28 agc Exp $ # DISTNAME= pine4.02 @@ -14,12 +14,12 @@ USE_LIBTOOL= yes CONFLICTS= pico-2.9 pine-3.96 pico-3.0 do-build: - cd ${WRKSRC} && ./build neb CC="${PREFIX}/bin/libtool ${CC}" PREFIX=${PREFIX} + cd ${WRKSRC} && ./build neb CC="${LIBTOOL} ${CC}" PREFIX=${PREFIX} do-install: - ${PREFIX}/bin/libtool --mode=install ${INSTALL_DATA} \ + ${LIBTOOL} --mode=install ${INSTALL_DATA} \ ${WRKSRC}/pico/libpico.la ${PREFIX}/lib/ - ${PREFIX}/bin/libtool --mode=install ${INSTALL_PROGRAM} \ + ${LIBTOOL} --mode=install ${INSTALL_PROGRAM} \ ${WRKSRC}/pico/pico ${WRKSRC}/pico/pilot ${PREFIX}/bin/ ${INSTALL_MAN} ${WRKSRC}/doc/pico.1 ${PREFIX}/man/man1/ ${INSTALL_MAN} ${WRKSRC}/doc/pilot.1 ${PREFIX}/man/man1/ diff --git a/security/rsaref/Makefile b/security/rsaref/Makefile index 657b8a4eda2..52889fe3354 100644 --- a/security/rsaref/Makefile +++ b/security/rsaref/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 1998/08/20 15:17:24 tsarna Exp $ +# $NetBSD: Makefile,v 1.10 1998/09/01 14:29:28 agc Exp $ # DISTNAME= rsaref20 @@ -12,7 +12,7 @@ EXTRACT_SUFX= .tar.Z MAINTAINER= tv@netbsd.org HOMEPAGE= http://www.rsa.com/rsalabs/newfaq/q174.html -BUILD_DEPENDS= ${PREFIX}/bin/libtool:../../devel/libtool +USE_LIBTOOL= yes RESTRICTED= "Cryptographic source usable only within the USA" MIRROR_DISTFILE= no @@ -45,7 +45,7 @@ do-configure: do-install: ${MKDIR} ${PREFIX}/include/rsaref ${PREFIX}/share/doc/rsaref cd ${WRKSRC} && \ - ${PREFIX}/bin/libtool --mode=install ${INSTALL_DATA} \ + ${LIBTOOL} --mode=install ${INSTALL_DATA} \ librsaref.la ${PREFIX}/lib cd ${WRKDIR}/source && \ ${INSTALL_DATA} des.h global.h md2.h md5.h rsa.h rsaref.h \ diff --git a/x11/qt/Makefile b/x11/qt/Makefile index 6d6eb434672..48917466ce9 100644 --- a/x11/qt/Makefile +++ b/x11/qt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 1998/08/20 15:17:35 tsarna Exp $ +# $NetBSD: Makefile,v 1.18 1998/09/01 14:29:28 agc Exp $ # FreeBSD Id: Makefile,v 1.14 1997/10/30 05:15:19 jkh Exp # @@ -13,9 +13,8 @@ HOMEPAGE= http://www.troll.no/products/qt.html CONFLICTS= qt-1.33 -BUILD_DEPENDS= ${LOCALBASE}/bin/libtool:../../devel/libtool - USE_X11= yes +USE_LIBTOOL= yes MAKE_ENV= QTDIR=${WRKSRC} ALL_TARGET= src @@ -25,7 +24,7 @@ do-configure: do-install: ${INSTALL_PROGRAM} ${WRKSRC}/bin/moc ${PREFIX}/bin/ - @${LOCALBASE}/bin/libtool ${INSTALL_DATA} ${WRKSRC}/src/libqt.la ${PREFIX}/lib/ + @${LIBTOOL} ${INSTALL_DATA} ${WRKSRC}/src/libqt.la ${PREFIX}/lib/ ${INSTALL_DATA_DIR} ${PREFIX}/include/qt ${INSTALL_DATA} ${WRKSRC}/include/* ${PREFIX}/include/qt/ ${INSTALL_MAN} ${WRKSRC}/man/man1/* ${PREFIX}/man/man1/ |