summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authortv <tv>2004-09-27 19:37:36 +0000
committertv <tv>2004-09-27 19:37:36 +0000
commit777fab0da62b489c3e4d2ff4614ee78a5284d326 (patch)
treefff1c6035f5d05802f77b929dd57bdb4e7acac02 /mk
parent4f5287d4179c02a741b1f4e4e3db60b8d4bfadbf (diff)
downloadpkgsrc-777fab0da62b489c3e4d2ff4614ee78a5284d326.tar.gz
Per jlam's suggestion, remove the libtoolize conditional altogether. Some
packages install libtool archives without using USE_LIBTOOL.
Diffstat (limited to 'mk')
-rw-r--r--mk/bsd.pkg.mk8
1 files changed, 1 insertions, 7 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index 458d85a646d..cd710e81002 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.mk,v 1.1502 2004/09/27 14:44:31 tv Exp $
+# $NetBSD: bsd.pkg.mk,v 1.1503 2004/09/27 19:37:36 tv Exp $
#
# This file is in the public domain.
#
@@ -4491,7 +4491,6 @@ _PRINT_PLIST_DIRS_CMD= \
${FIND} ${PREFIX}/. -xdev -newer ${EXTRACT_COOKIE} -type d -print
_PRINT_LA_LIBNAMES= ${.CURDIR}/../../mk/scripts/print-la-libnames
-.if defined(USE_LIBTOOL)
_PRINT_PLIST_LIBTOOLIZE_FILTER?= \
( \
if ${TEST} -d ${WRKDIR}; then \
@@ -4516,9 +4515,6 @@ _PRINT_PLIST_LIBTOOLIZE_FILTER?= \
fi; \
${RM} -f "$$fileslist" "$$libslist"; \
)
-.else
-_PRINT_PLIST_LIBTOOLIZE_FILTER?= ${CAT}
-.endif
.PHONY: print-PLIST
.if !target(print-PLIST)
@@ -4959,12 +4955,10 @@ BEGIN { \
.if ${PLIST_TYPE} == "dynamic"
_PLIST_AWK_LIBTOOL?= # empty
.else
-. if defined(USE_LIBTOOL)
_PLIST_AWK_LIBTOOL?= \
/\.la$$/ { \
system("cd ${PREFIX} && ${SH} ${_PRINT_LA_LIBNAMES} " $$0) \
}
-. endif
.endif
# _PLIST_AWK_SCRIPT hold the complete awk script for plist target.