diff options
| author | rillig <rillig@pkgsrc.org> | 2008-02-07 21:36:13 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2008-02-07 21:36:13 +0000 |
| commit | 66736dde432e2cdb365944402f721936c08348de (patch) | |
| tree | 973e3df0794e543a4054e86e507ec10f4c40a685 /mk/build | |
| parent | a91164cb4327396d3c1376e523193cbfffe8a613 (diff) | |
| download | pkgsrc-66736dde432e2cdb365944402f721936c08348de.tar.gz | |
Replaced _PKG_SILENT and _PKG_DEBUG with RUN.
Diffstat (limited to 'mk/build')
| -rw-r--r-- | mk/build/bsd.build.mk | 8 | ||||
| -rw-r--r-- | mk/build/build.mk | 6 | ||||
| -rw-r--r-- | mk/build/test.mk | 10 |
3 files changed, 12 insertions, 12 deletions
diff --git a/mk/build/bsd.build.mk b/mk/build/bsd.build.mk index c45c4689844..7a647a5ae4a 100644 --- a/mk/build/bsd.build.mk +++ b/mk/build/bsd.build.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.build.mk,v 1.10 2008/01/04 01:46:26 rillig Exp $ +# $NetBSD: bsd.build.mk,v 1.11 2008/02/07 21:36:13 rillig Exp $ # # This Makefile fragment is included by bsd.pkg.mk and provides all # variables and targets related to building sources for a package. @@ -51,6 +51,6 @@ build: barrier ### .PHONY: build-cookie build-cookie: - ${_PKG_SILENT}${_PKG_DEBUG}${TEST} ! -f ${_COOKIE.build} || ${FALSE} - ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${_COOKIE.build:H} - ${_PKG_SILENT}${_PKG_DEBUG}${ECHO} ${PKGNAME} > ${_COOKIE.build} + ${RUN}${TEST} ! -f ${_COOKIE.build} || ${FALSE} + ${RUN}${MKDIR} ${_COOKIE.build:H} + ${RUN}${ECHO} ${PKGNAME} > ${_COOKIE.build} diff --git a/mk/build/build.mk b/mk/build/build.mk index 5ec43257f52..37f0cd14d62 100644 --- a/mk/build/build.mk +++ b/mk/build/build.mk @@ -1,4 +1,4 @@ -# $NetBSD: build.mk,v 1.15 2007/12/01 11:11:54 rillig Exp $ +# $NetBSD: build.mk,v 1.16 2008/02/07 21:36:13 rillig Exp $ # # This file defines what happens in the build phase, excluding the # self-test, which is defined in test.mk. @@ -141,7 +141,7 @@ build-check-interactive: .if !target(do-build) do-build: . for _dir_ in ${BUILD_DIRS} - ${_PKG_SILENT}${_PKG_DEBUG}${_ULIMIT_CMD} \ + ${RUN}${_ULIMIT_CMD} \ cd ${WRKSRC} && cd ${_dir_} && \ ${BUILD_MAKE_CMD} ${BUILD_TARGET} . endfor @@ -161,7 +161,7 @@ BUILD_ENV_SHELL?= ${SH} .if defined(_PKGSRC_BARRIER) build-env: .PHONY configure @${STEP_MSG} "Entering the build environment for ${PKGNAME}" - ${_PKG_SILENT}${_PKG_DEBUG} \ + ${RUN} \ cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${BUILD_ENV_SHELL} .else build-env: barrier diff --git a/mk/build/test.mk b/mk/build/test.mk index a0f31ea7396..be98b5ec3c2 100644 --- a/mk/build/test.mk +++ b/mk/build/test.mk @@ -1,4 +1,4 @@ -# $NetBSD: test.mk,v 1.13 2007/12/01 11:11:54 rillig Exp $ +# $NetBSD: test.mk,v 1.14 2008/02/07 21:36:13 rillig Exp $ # # After the "build" phase, many packages provide some sort of self-test # that can be run on the not-yet installed package. To enable these @@ -129,7 +129,7 @@ test-check-interactive: . if defined(TEST_TARGET) && !empty(TEST_TARGET) do-test: . for _dir_ in ${TEST_DIRS} - ${_PKG_SILENT}${_PKG_DEBUG}${_ULIMIT_CMD} \ + ${RUN}${_ULIMIT_CMD} \ cd ${WRKSRC} && cd ${_dir_} && \ ${TEST_MAKE_CMD} ${TEST_TARGET} . endfor @@ -156,6 +156,6 @@ post-test: ### .PHONY: test-cookie test-cookie: - ${_PKG_SILENT}${_PKG_DEBUG}${TEST} ! -f ${_COOKIE.test} || ${FALSE} - ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${_COOKIE.test:H} - ${_PKG_SILENT}${_PKG_DEBUG}${ECHO} ${PKGNAME} > ${_COOKIE.test} + ${RUN}${TEST} ! -f ${_COOKIE.test} || ${FALSE} + ${RUN}${MKDIR} ${_COOKIE.test:H} + ${RUN}${ECHO} ${PKGNAME} > ${_COOKIE.test} |