diff options
| author | rillig <rillig> | 2006-11-05 12:40:01 +0000 |
|---|---|---|
| committer | rillig <rillig> | 2006-11-05 12:40:01 +0000 |
| commit | 8caf5f012760be5a86a37dd9d46e79d2626aaa91 (patch) | |
| tree | c875f14df69b2f0b4016c81986ce9a3db0d9c768 /mk | |
| parent | 995c31a7424d9b05ce9b8340e24ccf139d3f6d29 (diff) | |
| download | pkgsrc-8caf5f012760be5a86a37dd9d46e79d2626aaa91.tar.gz | |
Normalized the way test(1) is used. Since I have no idea whether ${TEST}
or [] is better, I have used [ to keep the code shorter. Noticed by wiz.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/configure/config-override.mk | 8 | ||||
| -rw-r--r-- | mk/configure/libtool-override.mk | 10 |
2 files changed, 9 insertions, 9 deletions
diff --git a/mk/configure/config-override.mk b/mk/configure/config-override.mk index 0f86819404a..d3f4dee31ae 100644 --- a/mk/configure/config-override.mk +++ b/mk/configure/config-override.mk @@ -1,4 +1,4 @@ -# $NetBSD: config-override.mk,v 1.4 2006/11/05 07:41:06 rillig Exp $ +# $NetBSD: config-override.mk,v 1.5 2006/11/05 12:40:01 rillig Exp $ ###################################################################### ### config-{guess,sub,rpath}-override (PRIVATE) @@ -33,16 +33,16 @@ config-${_sub_}-override: ${_PKG_SILENT}${_PKG_DEBUG}set -e; \ cd ${WRKSRC}; \ for file in ${${_OVERRIDE_VAR.${_sub_}}}; do \ - ${TEST} -f "$$file" || ${TEST} -h "$$file" || continue; \ + [ -f "$$file" ] || [ -h "$$file" ] || continue; \ ${_SCRIPT.${.TARGET}}; \ done . else ${_PKG_SILENT}${_PKG_DEBUG}set -e; \ cd ${WRKSRC}; \ depth=0; pattern=config.${_sub_}; \ - while ${TEST} $$depth -le ${OVERRIDE_DIRDEPTH.config-${_sub_}}; do \ + while [ $$depth -le ${OVERRIDE_DIRDEPTH.config-${_sub_}} ]; do \ for file in $$pattern; do \ - test -f "$$file" || test -h "$$file" || continue; \ + [ -f "$$file" ] || [ -h "$$file" ] || 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 32401e0e957..8696673938b 100644 --- a/mk/configure/libtool-override.mk +++ b/mk/configure/libtool-override.mk @@ -1,4 +1,4 @@ -# $NetBSD: libtool-override.mk,v 1.8 2006/11/05 07:41:06 rillig Exp $ +# $NetBSD: libtool-override.mk,v 1.9 2006/11/05 12:40:01 rillig Exp $ ###################################################################### ### {libtool,shlibtool}-override (PRIVATE) @@ -32,7 +32,7 @@ libtool-override: ${_PKG_SILENT}${_PKG_DEBUG}set -e; \ cd ${WRKSRC}; \ set -- dummy ${LIBTOOL_OVERRIDE}; shift; \ - while ${TEST} $$# -gt 0; do \ + while [ $$# -gt 0 ]; do \ file="$$1"; shift; \ [ -f "$$file" ] || [ -h "$$file" ] || continue; \ ${_SCRIPT.${.TARGET}}; \ @@ -41,7 +41,7 @@ libtool-override: ${_PKG_SILENT}${_PKG_DEBUG}set -e; \ cd ${WRKSRC}; \ depth=0; pattern=libtool; \ - while ${TEST} $$depth -le ${OVERRIDE_DIRDEPTH.libtool}; do \ + while [ $$depth -le ${OVERRIDE_DIRDEPTH.libtool} ]; do \ for file in $$pattern; do \ [ -f "$$file" ] || [ -h "$$file" ] || continue; \ ${_SCRIPT.${.TARGET}}; \ @@ -57,7 +57,7 @@ shlibtool-override: ${_PKG_SILENT}${_PKG_DEBUG}set -e; \ cd ${WRKSRC}; \ set -- dummy ${SHLIBTOOL_OVERRIDE}; shift; \ - while ${TEST} $$# -gt 0; do \ + while [ $$# -gt 0 ]; do \ file="$$1"; shift; \ [ -f "$$file" ] || [ -h "$$file" ] || continue; \ ${_SCRIPT.${.TARGET}}; \ @@ -66,7 +66,7 @@ shlibtool-override: ${_PKG_SILENT}${_PKG_DEBUG}set -e; \ cd ${WRKSRC}; \ depth=0; pattern=libtool; \ - while ${TEST} $$depth -le ${OVERRIDE_DIRDEPTH.shlibtool}; do \ + while [ $$depth -le ${OVERRIDE_DIRDEPTH.shlibtool} ]; do \ for file in $$pattern; do \ [ -f "$$file" ] || [ -h "$$file" ] || continue; \ ${_SCRIPT.${.TARGET}}; \ |