diff options
| author | rillig <rillig@pkgsrc.org> | 2006-10-05 02:59:54 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2006-10-05 02:59:54 +0000 |
| commit | 5305a8ebc55a04a3ab65d6f464e13ec667c3eab1 (patch) | |
| tree | 06a6b245c0215c0d3be2ec4d32a668b892b8bd3c | |
| parent | ecd4e9d40bfcec2f562d3b2a7476479591427ac4 (diff) | |
| download | pkgsrc-5305a8ebc55a04a3ab65d6f464e13ec667c3eab1.tar.gz | |
Replaced "test -f" with "ls". That way, broken symbolic links are also
replaced with the pkgsrc versions of libtool, config.guess and others.
| -rw-r--r-- | mk/configure/config-override.mk | 4 | ||||
| -rw-r--r-- | mk/configure/libtool-override.mk | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/mk/configure/config-override.mk b/mk/configure/config-override.mk index 6047a2b9c31..e5975a088dd 100644 --- a/mk/configure/config-override.mk +++ b/mk/configure/config-override.mk @@ -1,4 +1,4 @@ -# $NetBSD: config-override.mk,v 1.2 2006/07/06 13:25:57 jlam Exp $ +# $NetBSD: config-override.mk,v 1.3 2006/10/05 02:59:54 rillig Exp $ ###################################################################### ### config-{guess,sub,rpath}-override (PRIVATE) @@ -42,7 +42,7 @@ config-${_sub_}-override: depth=0; pattern=config.${_sub_}; \ while ${TEST} $$depth -le ${OVERRIDE_DIRDEPTH.config-${_sub_}}; do \ for file in $$pattern; do \ - ${TEST} -f "$$file" || continue; \ + ${LS} "$$file" 1>/dev/null 2>&1 || continue; \ ${_SCRIPT.${.TARGET}}; \ done; \ depth=`${EXPR} $$depth + 1`; pattern="*/$$pattern"; \ diff --git a/mk/configure/libtool-override.mk b/mk/configure/libtool-override.mk index 79608f2e358..58684f7c658 100644 --- a/mk/configure/libtool-override.mk +++ b/mk/configure/libtool-override.mk @@ -1,4 +1,4 @@ -# $NetBSD: libtool-override.mk,v 1.6 2006/07/19 22:07:13 jlam Exp $ +# $NetBSD: libtool-override.mk,v 1.7 2006/10/05 02:59:54 rillig Exp $ ###################################################################### ### {libtool,shlibtool}-override (PRIVATE) @@ -43,7 +43,7 @@ libtool-override: depth=0; pattern=libtool; \ while ${TEST} $$depth -le ${OVERRIDE_DIRDEPTH.libtool}; do \ for file in $$pattern; do \ - ${TEST} -f "$$file" || continue; \ + ${LS} "$$file" 1>/dev/null 2>&1 || continue; \ ${_SCRIPT.${.TARGET}}; \ done; \ depth=`${EXPR} $$depth + 1`; pattern="*/$$pattern"; \ |