[pkgsrc/trunk]: pkgsrc/mk Differentiate between MAKE_FLAGS passed to the buil...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ce6f8b8d3268
branches:  trunk
changeset: 466195:ce6f8b8d3268
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Tue Jan 13 00:40:25 2004 +0000

description:
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:

 mk/bsd.pkg.mk |  19 +++++++++++--------
 1 files changed, 11 insertions(+), 8 deletions(-)

diffs (61 lines):

diff -r 56e503280162 -r ce6f8b8d3268 mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk     Tue Jan 13 00:21:35 2004 +0000
+++ b/mk/bsd.pkg.mk     Tue Jan 13 00:40:25 2004 +0000
@@ -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 @@
 
 # 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 @@
 
 # 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