diff options
| author | rillig <rillig@pkgsrc.org> | 2009-03-17 22:13:36 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2009-03-17 22:13:36 +0000 |
| commit | b1bf3ebab8403b377b3bebfbae35a5ac2bd645fa (patch) | |
| tree | c5bfefb9f4e5413721bf7ce328e51684838cf5bd /mk/tools | |
| parent | 25c04e4c1e4627af915fef22b0028873ca53e571 (diff) | |
| download | pkgsrc-b1bf3ebab8403b377b3bebfbae35a5ac2bd645fa.tar.gz | |
Replaced _PKG_SILENT and _PKG_DEBUG with RUN.
Diffstat (limited to 'mk/tools')
| -rw-r--r-- | mk/tools/autoconf.mk | 4 | ||||
| -rw-r--r-- | mk/tools/bsd.tools.mk | 8 | ||||
| -rw-r--r-- | mk/tools/create.mk | 9 | ||||
| -rw-r--r-- | mk/tools/intltool.mk | 4 |
4 files changed, 12 insertions, 13 deletions
diff --git a/mk/tools/autoconf.mk b/mk/tools/autoconf.mk index c33f86d9eaf..60f33ddc236 100644 --- a/mk/tools/autoconf.mk +++ b/mk/tools/autoconf.mk @@ -1,4 +1,4 @@ -# $NetBSD: autoconf.mk,v 1.14 2006/12/15 13:15:07 martti Exp $ +# $NetBSD: autoconf.mk,v 1.15 2009/03/17 22:13:36 rillig Exp $ # # Copyright (c) 2005 The NetBSD Foundation, Inc. # All rights reserved. @@ -206,7 +206,7 @@ LIBTOOL_M4_OVERRIDE?= libtool.m4 */libtool.m4 */*/libtool.m4 .PHONY: tools-libtool-m4-override tools-libtool-m4-override: .for _pattern_ in ${LIBTOOL_M4_OVERRIDE} - ${_PKG_SILENT}${_PKG_DEBUG} \ + ${RUN} \ cd ${WRKSRC}; \ for cfile in ${_pattern_:S/libtool.m4$/configure/}; do \ if ${TEST} -f "$$cfile"; then \ diff --git a/mk/tools/bsd.tools.mk b/mk/tools/bsd.tools.mk index eaae98cd9e9..d82e26b261d 100644 --- a/mk/tools/bsd.tools.mk +++ b/mk/tools/bsd.tools.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.tools.mk,v 1.49 2008/01/04 01:46:27 rillig Exp $ +# $NetBSD: bsd.tools.mk,v 1.50 2009/03/17 22:13:36 rillig Exp $ # # Copyright (c) 2005, 2006 The NetBSD Foundation, Inc. # All rights reserved. @@ -118,9 +118,9 @@ tools-message: ### .PHONY: tools-cookie tools-cookie: - ${_PKG_SILENT}${_PKG_DEBUG}${TEST} ! -f ${_COOKIE.tools} || ${FALSE} - ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${_COOKIE.tools:H} - ${_PKG_SILENT}${_PKG_DEBUG}${ECHO} ${USE_TOOLS:Q} > ${_COOKIE.tools} + ${RUN} ${TEST} ! -f ${_COOKIE.tools} || ${FALSE} + ${RUN} ${MKDIR} ${_COOKIE.tools:H} + ${RUN} ${ECHO} ${USE_TOOLS:Q} > ${_COOKIE.tools} ###################################################################### ### override-tools (PRIVATE) diff --git a/mk/tools/create.mk b/mk/tools/create.mk index e4796b87aaf..cccfa736e0d 100644 --- a/mk/tools/create.mk +++ b/mk/tools/create.mk @@ -1,4 +1,4 @@ -# $NetBSD: create.mk,v 1.3 2008/02/13 09:11:01 rillig Exp $ +# $NetBSD: create.mk,v 1.4 2009/03/17 22:13:36 rillig Exp $ # # Copyright (c) 2005, 2006 The NetBSD Foundation, Inc. # All rights reserved. @@ -148,9 +148,8 @@ TOOLS_SCRIPT_DFLT.${_t_}= \ override-tools: ${TOOLS_CMD.${_t_}} ${TOOLS_CMD.${_t_}}: - ${_PKG_SILENT}${_PKG_DEBUG}${TEST} -d ${.TARGET:H:Q} || \ - ${MKDIR} ${.TARGET:H:Q} - ${_PKG_SILENT}${_PKG_DEBUG} \ + ${RUN} ${TEST} -d ${.TARGET:H:Q} || ${MKDIR} ${.TARGET:H:Q} + ${RUN} \ if ${TEST} -n ${TOOLS_SCRIPT.${_t_}:Q}""; then \ create=wrapper; \ script=${TOOLS_SCRIPT.${_t_}:Q}; \ @@ -183,7 +182,7 @@ ${TOOLS_CMD.${_t_}}: ;; \ esac . for _a_ in ${TOOLS_ALIASES.${_t_}} - ${_PKG_SILENT}${_PKG_DEBUG} \ + ${RUN} \ ${TEST} ${.TARGET:Q} = ${.TARGET:H:Q}/${_a_} || \ ${LN} -fs ${.TARGET:T:Q} ${.TARGET:H:Q}/${_a_} . endfor diff --git a/mk/tools/intltool.mk b/mk/tools/intltool.mk index 7b8fb1cd653..5a3352465d6 100644 --- a/mk/tools/intltool.mk +++ b/mk/tools/intltool.mk @@ -1,4 +1,4 @@ -# $NetBSD: intltool.mk,v 1.4 2008/12/05 08:25:15 wiz Exp $ +# $NetBSD: intltool.mk,v 1.5 2009/03/17 22:13:36 rillig Exp $ # # Copyright (c) 2006 The NetBSD Foundation, Inc. # All rights reserved. @@ -84,7 +84,7 @@ override-message-intltool: .PHONY: override-intltool-${_t_} override-intltool: override-intltool-${_t_} override-intltool-${_t_}: - ${_PKG_SILENT}${_PKG_DEBUG}set -e; \ + ${RUN} \ cd ${WRKSRC}; for f in ${_t_} */${_t_} */*/${_t_}; do \ if ${TEST} -f "$$f"; then \ ${RM} -f $$f; \ |