diff options
| author | jlam <jlam@pkgsrc.org> | 2006-07-07 14:06:57 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2006-07-07 14:06:57 +0000 |
| commit | 1cd6b0743c7041da5b857377b8a644203607eb6e (patch) | |
| tree | 333ac1e2c8a80be4b21073ffd25462e21061c28b | |
| parent | bf9607f39eedafbedb37b3ede0f11e8ce80bb339 (diff) | |
| download | pkgsrc-1cd6b0743c7041da5b857377b8a644203607eb6e.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.mk | 3 |
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 |