diff options
| author | tron <tron> | 1999-07-17 19:26:44 +0000 |
|---|---|---|
| committer | tron <tron> | 1999-07-17 19:26:44 +0000 |
| commit | b7c377d884626f8587d0394138b3adb9908ea35f (patch) | |
| tree | e5a7d17e5cc3a2450cc0413f1452647fc308c580 | |
| parent | 835ce36f1c682924f6ec1356c021806f2eccc347 (diff) | |
| download | pkgsrc-b7c377d884626f8587d0394138b3adb9908ea35f.tar.gz | |
Update "pkglibtool" to version 1.2p2. This version makes sure that you
don't use an a.out "pkglibtool" on an ELF system and vice versa.
| -rw-r--r-- | mk/bsd.pkg.mk | 4 | ||||
| -rw-r--r-- | pkgtools/pkglibtool/Makefile | 9 |
2 files changed, 7 insertions, 6 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index d95e2252b34..23a26600c65 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.298 1999/07/14 19:34:06 hubertf Exp $ +# $NetBSD: bsd.pkg.mk,v 1.299 1999/07/17 19:26:44 tron Exp $ # # This file is in the public domain. # @@ -118,7 +118,7 @@ BUILD_DEPENDS+= ${PREFIX}/include/Xm/Xm.h:${PKGSRCDIR}/x11/lesstif .endif .if defined(USE_LIBTOOL) -LIBTOOL= ${LOCALBASE}/bin/pkglibtool-1.2p1 +LIBTOOL= ${LOCALBASE}/bin/pkglibtool-${OBJECT_FMT}-1.2p2 BUILD_DEPENDS+= ${LIBTOOL}:${PKGSRCDIR}/pkgtools/pkglibtool CONFIGURE_ENV+= LIBTOOL="${LIBTOOL} ${LIBTOOL_FLAGS}" MAKE_ENV+= LIBTOOL="${LIBTOOL} ${LIBTOOL_FLAGS}" diff --git a/pkgtools/pkglibtool/Makefile b/pkgtools/pkglibtool/Makefile index 8815f597089..dea5344774f 100644 --- a/pkgtools/pkglibtool/Makefile +++ b/pkgtools/pkglibtool/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.9 1999/05/20 20:09:51 tron Exp $ +# $NetBSD: Makefile,v 1.10 1999/07/17 19:26:45 tron Exp $ # DISTNAME= libtool-1.2 -PKGNAME= pkglibtool-1.2p1 +PKGNAME= pkglibtool-1.2p2 CATEGORIES= pkgtools devel MASTER_SITES= ${MASTER_SITE_GNU:=libtool/} @@ -14,10 +14,11 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-shared .endif +BINARY= ${PKGNAME:S/-/-${OBJECT_FMT}-/} PLIST_SRC= ${WRKDIR}/PLIST do-install: - ${INSTALL_SCRIPT} ${WRKSRC}/libtool ${PREFIX}/bin/${PKGNAME} - @${ECHO} >${PLIST_SRC} bin/${PKGNAME} + ${INSTALL_SCRIPT} ${WRKSRC}/libtool ${PREFIX}/bin/${BINARY} + @${ECHO} >${PLIST_SRC} bin/${BINARY} .include "../../mk/bsd.pkg.mk" |