diff options
| author | wiz <wiz@pkgsrc.org> | 2000-08-17 14:13:56 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2000-08-17 14:13:56 +0000 |
| commit | 07beafddf0991327747d06ae67d8c8859e684788 (patch) | |
| tree | 3abf2551491d1c971e3b4145ac3f98314c0467d4 /mk/bsd.pkg.mk | |
| parent | a12c40c0053f78404933a63253139574b8b64107 (diff) | |
| download | pkgsrc-07beafddf0991327747d06ae67d8c8859e684788.tar.gz | |
USE_PKGLIBTOOL is no more
Diffstat (limited to 'mk/bsd.pkg.mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 88dc75f6274..b97aeab110d 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.543 2000/08/17 01:42:03 hubertf Exp $ +# $NetBSD: bsd.pkg.mk,v 1.544 2000/08/17 14:13:56 wiz Exp $ # # This file is in the public domain. # @@ -190,17 +190,9 @@ LIBTOOL= ${LOCALBASE}/bin/libtool .if make(install-run-depends) DEPENDS+= libtool>1.3.5nb3:../../devel/libtool .endif -.elif defined(USE_PKGLIBTOOL) -.if ${OPSYS} == "NetBSD" || ${OPSYS} == "SunOS" -LIBTOOL= ${LOCALBASE}/bin/pkglibtool-${OBJECT_FMT}-1.2p2 -BUILD_DEPENDS+= ${LIBTOOL}:../../pkgtools/pkglibtool -.else -LIBTOOL= ${LOCALBASE}/bin/libtool -BUILD_DEPENDS+= ${LIBTOOL}:../../devel/libtool -.endif .endif -.if defined(USE_LIBTOOL) || defined(USE_PKGLIBTOOL) +.if defined(USE_LIBTOOL) CONFIGURE_ENV+= LIBTOOL="${LIBTOOL} ${LIBTOOL_FLAGS}" MAKE_ENV+= LIBTOOL="${LIBTOOL} ${LIBTOOL_FLAGS}" .endif @@ -1370,7 +1362,7 @@ do-configure: .endfor .endif -.if (defined(USE_LIBTOOL) || defined(USE_PKGLIBTOOL)) && defined(LTCONFIG_OVERRIDE) && !defined(LIBTOOL_OVERRIDE) +.if defined(USE_LIBTOOL) && defined(LTCONFIG_OVERRIDE) && !defined(LIBTOOL_OVERRIDE) .for ltconfig in ${LTCONFIG_OVERRIDE} ${_PKG_SILENT}${_PKG_DEBUG}\ if [ -f ${ltconfig} ]; then \ @@ -1398,7 +1390,7 @@ do-configure: .if defined(USE_IMAKE) ${_PKG_SILENT}${_PKG_DEBUG}cd ${WRKSRC} && ${SETENV} ${SCRIPTS_ENV} XPROJECTROOT=${X11BASE} ${XMKMF} .endif -.if (defined(USE_LIBTOOL) || defined(USE_PKGLIBTOOL)) && defined(LIBTOOL_OVERRIDE) && !defined(LTCONFIG_OVERRIDE) +.if defined(USE_LIBTOOL) && defined(LIBTOOL_OVERRIDE) && !defined(LTCONFIG_OVERRIDE) .for libtool in ${LIBTOOL_OVERRIDE} ${_PKG_SILENT}${_PKG_DEBUG}if [ -f ${libtool} ]; then \ ${RM} -f ${libtool}; \ |