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/flavor | |
| 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/flavor')
| -rw-r--r-- | mk/flavor/pkg/depends.mk | 4 | ||||
| -rw-r--r-- | mk/flavor/pkg/utility.mk | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/mk/flavor/pkg/depends.mk b/mk/flavor/pkg/depends.mk index 34e1094e819..fc7bc5c9ffb 100644 --- a/mk/flavor/pkg/depends.mk +++ b/mk/flavor/pkg/depends.mk @@ -1,4 +1,4 @@ -# $NetBSD: depends.mk,v 1.11 2006/07/19 16:01:41 jlam Exp $ +# $NetBSD: depends.mk,v 1.12 2006/07/27 21:46:46 jlam Exp $ _DEPENDS_FILE= ${WRKDIR}/.depends _REDUCE_DEPENDS_CMD= ${SETENV} CAT=${CAT:Q} \ @@ -110,7 +110,7 @@ _DEPENDS_INSTALL_CMD= \ exit 1; \ fi; \ cd $$dir; \ - ${SETENV} _PKGSRC_DEPS=", ${PKGNAME}${_PKGSRC_DEPS}" PKGNAME_REQD="$$pattern" ${MAKE} ${MAKEFLAGS} _AUTOMATIC=yes $$target; \ + ${SETENV} ${PKGSRC_MAKE_ENV} _PKGSRC_DEPS=", ${PKGNAME}${_PKGSRC_DEPS}" PKGNAME_REQD="$$pattern" ${MAKE} ${MAKEFLAGS} _AUTOMATIC=yes $$target; \ pkg=`${_PKG_BEST_EXISTS} "$$pattern" || ${TRUE}`; \ case "$$pkg" in \ "") ${ERROR_MSG} "[depends.mk] A package matching \`\`$$pattern'' should"; \ diff --git a/mk/flavor/pkg/utility.mk b/mk/flavor/pkg/utility.mk index 35131b91c6a..983fae2e047 100644 --- a/mk/flavor/pkg/utility.mk +++ b/mk/flavor/pkg/utility.mk @@ -1,4 +1,4 @@ -# $NetBSD: utility.mk,v 1.1 2006/06/03 23:11:42 jlam Exp $ +# $NetBSD: utility.mk,v 1.2 2006/07/27 21:46:46 jlam Exp $ ###################################################################### ### @@ -50,9 +50,9 @@ show-installed-depends: show-needs-update: .if !empty(DEPENDS) ${_PKG_SILENT}${_PKG_DEBUG} \ - for i in `${MAKE} show-all-depends-dirs`; do \ + for i in `${RECURSIVE_MAKE} show-all-depends-dirs`; do \ cd ${PKGSRCDIR}/$$i; \ - eval `${MAKE} show-vars-eval VARS='PKGNAME:want PKGWILDCARD:wild'`; \ + eval `${RECURSIVE_MAKE} show-vars-eval VARS='PKGNAME:want PKGWILDCARD:wild'`; \ have=`${_PKG_BEST_EXISTS} "$$wild" || ${TRUE}`; \ if [ -z "$$have" ]; then \ ${ECHO} "$$i => (none) => needs install of $$want"; \ |