summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorwiz <wiz>2001-01-25 10:43:21 +0000
committerwiz <wiz>2001-01-25 10:43:21 +0000
commit89da0ae87af07c9c8fec6a67fbcab1196d872939 (patch)
tree3cda65c78b14029d0d920a1b5773ad1aa1eb3cc2 /mk
parent3cdc4a015ac7e6875d2625a3cb5966472058ba49 (diff)
downloadpkgsrc-89da0ae87af07c9c8fec6a67fbcab1196d872939.tar.gz
Remove OVERRIDE_LIBTOOL code per discussion on packages.
(There's no package that's not happy enough with OVERRIDE_LTCONFIG.)
Diffstat (limited to 'mk')
-rw-r--r--mk/bsd.pkg.mk12
1 files changed, 2 insertions, 10 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index 7465f62b972..3a11e85d6a9 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.mk,v 1.648 2001/01/22 22:43:10 dmcmahill Exp $
+# $NetBSD: bsd.pkg.mk,v 1.649 2001/01/25 10:43:21 wiz Exp $
#
# This file is in the public domain.
#
@@ -1504,7 +1504,7 @@ do-configure:
.endfor
.endif
-.if defined(USE_LIBTOOL) && defined(LTCONFIG_OVERRIDE) && !defined(LIBTOOL_OVERRIDE)
+.if defined(USE_LIBTOOL) && defined(LTCONFIG_OVERRIDE)
.for ltconfig in ${LTCONFIG_OVERRIDE}
${_PKG_SILENT}${_PKG_DEBUG}\
if [ -f ${ltconfig} ]; then \
@@ -1533,14 +1533,6 @@ do-configure:
.if defined(USE_IMAKE)
${_PKG_SILENT}${_PKG_DEBUG}cd ${WRKSRC} && ${SETENV} ${SCRIPTS_ENV} XPROJECTROOT=${X11BASE} ${XMKMF}
.endif
-.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}; \
- ${LN} -s ${LIBTOOL} ${libtool}; \
- fi
-.endfor
-.endif
.endif
# Build