summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjlam <jlam>2006-07-07 14:06:57 +0000
committerjlam <jlam>2006-07-07 14:06:57 +0000
commit497d078b4b464ee568b60da1711b9ea4c284d364 (patch)
tree333ac1e2c8a80be4b21073ffd25462e21061c28b
parent1c44fe622f3d6837a18c50688aaba9f562a9d261 (diff)
downloadpkgsrc-497d078b4b464ee568b60da1711b9ea4c284d364.tar.gz
Add missing "rm" statement that was causing the libtool wrapper to be
overwritten in the case where LTCONFIG_OVERRIDE was defined. As a side note, after analyzing the way that the original code in bsd.pkg.mk worked, I think we can nuke LTCONFIG_OVERRIDE completely, but we'll need a bulk build to verify this. The original code always replaced the libtool scripts because LIBTOOL_OVERRIDE is always defined in bsd.pkg.use.mk, so LTCONFIG_OVERRIDE essentially had no effect.
-rw-r--r--mk/configure/libtool-override.mk3
1 files changed, 2 insertions, 1 deletions
diff --git a/mk/configure/libtool-override.mk b/mk/configure/libtool-override.mk
index 36b79685da2..24fd23646c0 100644
--- a/mk/configure/libtool-override.mk
+++ b/mk/configure/libtool-override.mk
@@ -1,4 +1,4 @@
-# $NetBSD: libtool-override.mk,v 1.1 2006/07/05 06:09:15 jlam Exp $
+# $NetBSD: libtool-override.mk,v 1.2 2006/07/07 14:06:57 jlam Exp $
######################################################################
### {ltconfig,libtool,shlibtool}-override (PRIVATE)
@@ -53,6 +53,7 @@ _OVERRIDE_PATH.shlibtool= ${_SHLIBTOOL}
.for _script_ in libtool shlibtool
_SCRIPT.${_script_}-override= \
+ ${RM} -f $$file; \
${ECHO} "\#!"${TOOLS_SH:Q} > $$file; \
${ECHO} "exec" ${_OVERRIDE_PATH.${_script_}:Q} '"$$@"' >> $$file; \
${CHMOD} +x $$file