diff options
| author | jlam <jlam@pkgsrc.org> | 2004-01-13 00:40:25 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2004-01-13 00:40:25 +0000 |
| commit | 7b4a5ce71eb6794119fa14772675eb33a8f1fd85 (patch) | |
| tree | 16c9262dcbedc68487fcc23de4f86f75bad59115 /mk | |
| parent | 37142700d1196137091dc5b40a7495f08987d9e6 (diff) | |
| download | pkgsrc-7b4a5ce71eb6794119fa14772675eb33a8f1fd85.tar.gz | |
Differentiate between MAKE_FLAGS passed to the build, test and install
targets by using BUILD_MAKE_FLAGS, TEST_MAKE_FLAGS, and INSTALL_MAKE_FLAGS
in the respective targets. All of the new variables default to
${MAKE_FLAGS} to preserve the current behaviour.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index dd4b79ef317..99d5377b38d 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1343 2004/01/12 10:08:37 grant Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1344 2004/01/13 00:40:25 jlam Exp $ # # This file is in the public domain. # @@ -2403,27 +2403,29 @@ post-configure: ${_CONFIGURE_POSTREQ} # Build -BUILD_DIRS?= ${WRKSRC} +BUILD_DIRS?= ${WRKSRC} +BUILD_MAKE_FLAGS?= ${MAKE_FLAGS} .PHONY: do-build .if !target(do-build) do-build: . for DIR in ${BUILD_DIRS} - ${_PKG_SILENT}${_PKG_DEBUG}${_ULIMIT_CMD}cd ${DIR} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} -f ${MAKEFILE} ${ALL_TARGET} + ${_PKG_SILENT}${_PKG_DEBUG}${_ULIMIT_CMD}cd ${DIR} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${BUILD_MAKE_FLAGS} -f ${MAKEFILE} ${ALL_TARGET} . endfor .endif #Test -TEST_DIRS?= ${BUILD_DIRS} -TEST_ENV+= ${MAKE_ENV} +TEST_DIRS?= ${BUILD_DIRS} +TEST_ENV+= ${MAKE_ENV} +TEST_MAKE_FLAGS?= ${MAKE_FLAGS} .PHONY: do-test .if !target(do-test) do-test: . if defined(TEST_TARGET) && !empty(TEST_TARGET) . for DIR in ${TEST_DIRS} - ${_PKG_SILENT}${_PKG_DEBUG}${_ULIMIT_CMD}cd ${DIR} && ${SETENV} ${TEST_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} -f ${MAKEFILE} ${TEST_TARGET} + ${_PKG_SILENT}${_PKG_DEBUG}${_ULIMIT_CMD}cd ${DIR} && ${SETENV} ${TEST_ENV} ${MAKE_PROGRAM} ${TEST_MAKE_FLAGS} -f ${MAKEFILE} ${TEST_TARGET} . endfor . else @${DO_NADA} @@ -2432,13 +2434,14 @@ do-test: # Install -INSTALL_DIRS?= ${BUILD_DIRS} +INSTALL_DIRS?= ${BUILD_DIRS} +INSTALL_MAKE_FLAGS?= ${MAKE_FLAGS} .PHONY: do-install .if !target(do-install) do-install: . for DIR in ${INSTALL_DIRS} - ${_PKG_SILENT}${_PKG_DEBUG}${_ULIMIT_CMD}cd ${DIR} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} -f ${MAKEFILE} ${INSTALL_TARGET} + ${_PKG_SILENT}${_PKG_DEBUG}${_ULIMIT_CMD}cd ${DIR} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${INSTALL_MAKE_FLAGS} -f ${MAKEFILE} ${INSTALL_TARGET} . endfor .endif |