diff options
| author | jlam <jlam@pkgsrc.org> | 2006-07-27 21:46:45 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2006-07-27 21:46:45 +0000 |
| commit | c489860d62f36ac71be788965942d2b47c524285 (patch) | |
| tree | cfcc9913180425eb49a1e2c5c65e2e2044d9a6ef /mk/bsd.pkg.barrier.mk | |
| parent | 03cba20b8ec45d3d8d940b36f652373bc8900e7c (diff) | |
| download | pkgsrc-c489860d62f36ac71be788965942d2b47c524285.tar.gz | |
Whenever we invoke a recursive make, we need to ensure that the proper
environment ${PKGSRC_MAKE_ENV} is also passed along. Create a
convenience variable RECURSIVE_MAKE that does exactly this and that
can be used in place of MAKE when invoking make recursively.
Use RECURSIVE_MAKE everywhere in pkgsrc/mk that we invoke make
recursively.
Diffstat (limited to 'mk/bsd.pkg.barrier.mk')
| -rw-r--r-- | mk/bsd.pkg.barrier.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mk/bsd.pkg.barrier.mk b/mk/bsd.pkg.barrier.mk index 02fde5712c6..bafb4f99d90 100644 --- a/mk/bsd.pkg.barrier.mk +++ b/mk/bsd.pkg.barrier.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.barrier.mk,v 1.10 2006/07/25 18:04:25 jlam Exp $ +# $NetBSD: bsd.pkg.barrier.mk,v 1.11 2006/07/27 21:46:45 jlam Exp $ _COOKIE.barrier= ${WRKDIR}/.barrier_cookie @@ -57,7 +57,7 @@ barrier: ${_BARRIER_PRE_TARGETS} ${_COOKIE.barrier} . if defined(PKG_VERBOSE) @${PHASE_MSG} "Invoking \`\`"${_BARRIER_CMDLINE_TARGETS:Q}"'' after barrier for ${PKGNAME}" . endif - ${_PKG_SILENT}${_PKG_DEBUG}cd ${.CURDIR} && ${SETENV} ${PKGSRC_MAKE_ENV} ${MAKE} ${MAKEFLAGS} _PKGSRC_BARRIER=yes ALLOW_VULNERABLE_PACKAGES= ${_BARRIER_CMDLINE_TARGETS} + ${_PKG_SILENT}${_PKG_DEBUG}cd ${.CURDIR} && ${RECURSIVE_MAKE} ${MAKEFLAGS} _PKGSRC_BARRIER=yes ALLOW_VULNERABLE_PACKAGES= ${_BARRIER_CMDLINE_TARGETS} . if defined(PKG_VERBOSE) @${PHASE_MSG} "Leaving \`\`"${_BARRIER_CMDLINE_TARGETS:Q}"'' after barrier for ${PKGNAME}" . endif |