diff options
| author | jlam <jlam> | 2006-07-27 21:46:45 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2006-07-27 21:46:45 +0000 |
| commit | 86dd146d0461e886469ca2f12d908f4e232b927b (patch) | |
| tree | cfcc9913180425eb49a1e2c5c65e2e2044d9a6ef /mk/bsd.pkg.mk | |
| parent | 199b6a67be8ce2a265b080a371a1ea27e462767c (diff) | |
| download | pkgsrc-86dd146d0461e886469ca2f12d908f4e232b927b.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.mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 88b612992b6..96075aa8451 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1877 2006/07/27 13:47:29 jlam Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1878 2006/07/27 21:46:45 jlam Exp $ # # This file is in the public domain. # @@ -25,11 +25,6 @@ .MAIN: all -# If MAKECONF is defined, then pass it down to all recursive make -# processes invoked by pkgsrc. -# -PKGSRC_MAKE_ENV+= ${MAKECONF:DMAKECONF=${MAKECONF:Q}} - .include "../../mk/bsd.prefs.mk" .include "${PKGSRCDIR}/mk/flavor/bsd.flavor-vars.mk" @@ -825,9 +820,9 @@ su-bin-install: else \ ${SHCOMMENT} Cycle through some FTP server here ;\ ${ECHO_MSG} "Installing from source" ; \ - ${MAKE} ${MAKEFLAGS} package \ + ${RECURSIVE_MAKE} ${MAKEFLAGS} package \ DEPENDS_TARGET=${DEPENDS_TARGET:Q} && \ - ${MAKE} ${MAKEFLAGS} clean ; \ + ${RECURSIVE_MAKE} ${MAKEFLAGS} clean ; \ fi .PHONY: bin-install |