diff options
| author | jlam <jlam> | 2006-07-27 21:46:45 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2006-07-27 21:46:45 +0000 |
| commit | f89a3436b57e2482238b9f00c6a434e3ae20219d (patch) | |
| tree | cfcc9913180425eb49a1e2c5c65e2e2044d9a6ef /mk/bsd.prefs.mk | |
| parent | 0c57bfcc65d8ca05584e623895355d06ad6a3161 (diff) | |
| download | pkgsrc-f89a3436b57e2482238b9f00c6a434e3ae20219d.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.prefs.mk')
| -rw-r--r-- | mk/bsd.prefs.mk | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk index 287c57a2db6..acb805f47e0 100644 --- a/mk/bsd.prefs.mk +++ b/mk/bsd.prefs.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.prefs.mk,v 1.230 2006/07/17 18:07:06 wiz Exp $ +# $NetBSD: bsd.prefs.mk,v 1.231 2006/07/27 21:46:45 jlam Exp $ # # Make file, included to get the site preferences, if any. Should # only be included by package Makefiles before any .if defined() @@ -527,4 +527,10 @@ PREPEND_PATH+= ${USE_X11:D${X11BASE}/bin} ${LOCALBASE}/bin # Make variable definitions cache .include "${PKGSRCDIR}/mk/bsd.makevars.mk" +# If MAKECONF is defined, then pass it down to all recursive make +# processes invoked by pkgsrc. +# +PKGSRC_MAKE_ENV+= ${MAKECONF:DMAKECONF=${MAKECONF:Q}} +RECURSIVE_MAKE= ${SETENV} ${PKGSRC_MAKE_ENV} ${MAKE} + .endif # BSD_PKG_MK |