diff options
| author | rillig <rillig@pkgsrc.org> | 2008-01-18 10:41:05 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2008-01-18 10:41:05 +0000 |
| commit | 494c8050fe10e41660a5162fa2732a15aa39ebbd (patch) | |
| tree | d8f7345564022bc97c0eb9569c828ee286086c72 | |
| parent | 141c060e62e2f1f92157f02662e3ba137d7cc7a4 (diff) | |
| download | pkgsrc-494c8050fe10e41660a5162fa2732a15aa39ebbd.tar.gz | |
Replaced _PKG_SILENT and _PKG_DEBUG with RUN.
| -rw-r--r-- | mk/subst.mk | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/mk/subst.mk b/mk/subst.mk index 18d4c9b7917..b1052aa1545 100644 --- a/mk/subst.mk +++ b/mk/subst.mk @@ -1,4 +1,4 @@ -# $NetBSD: subst.mk,v 1.48 2007/11/19 23:38:03 rillig Exp $ +# $NetBSD: subst.mk,v 1.49 2008/01/18 10:41:05 rillig Exp $ # # This Makefile fragment implements a general text replacement facility. # Package makefiles define a ``class'', for each of which a particular @@ -101,11 +101,9 @@ subst-${_class_}: ${_SUBST_COOKIE.${_class_}} ${_SUBST_COOKIE.${_class_}}: . if defined(SUBST_MESSAGE.${_class_}) - ${_PKG_SILENT}${_PKG_DEBUG} \ - ${ECHO_SUBST_MSG} ${SUBST_MESSAGE.${_class_}:Q} + ${RUN} ${ECHO_SUBST_MSG} ${SUBST_MESSAGE.${_class_}:Q} . endif - ${_PKG_SILENT}${_PKG_DEBUG} set -e; \ - cd ${WRKSRC:Q}; \ + ${RUN} cd ${WRKSRC:Q}; \ files=${SUBST_FILES.${_class_}:Q}; \ for file in $$files; do \ case $$file in /*) ;; *) file="./$$file";; esac; \ @@ -131,6 +129,5 @@ ${_SUBST_COOKIE.${_class_}}: ${WARNING_MSG} "[subst.mk:${_class_}] Ignoring non-text file \"$$file\"."; \ fi; \ done - ${_PKG_SILENT}${_PKG_DEBUG} set -e; \ - ${TOUCH} ${TOUCH_FLAGS} ${.TARGET:Q} + ${RUN} ${TOUCH} ${TOUCH_FLAGS} ${.TARGET:Q} .endfor |