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.readme.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.readme.mk')
-rw-r--r-- | mk/bsd.pkg.readme.mk | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/mk/bsd.pkg.readme.mk b/mk/bsd.pkg.readme.mk index ebacafa9471..48d09c36d4e 100644 --- a/mk/bsd.pkg.readme.mk +++ b/mk/bsd.pkg.readme.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.readme.mk,v 1.2 2006/07/15 20:08:33 rillig Exp $ +# $NetBSD: bsd.pkg.readme.mk,v 1.3 2006/07/27 21:46:45 jlam Exp $ # # This Makefile fragment is included by bsd.pkg.mk and encapsulates the # code to produce README.html files in each package directory. @@ -73,7 +73,7 @@ run-depends-list: ${ECHO} "$$pkg"; \ else \ if cd $$dir 2>/dev/null; then \ - ${MAKE} ${MAKEFLAGS} package-name PACKAGE_NAME_TYPE=${PACKAGE_NAME_TYPE}; \ + ${RECURSIVE_MAKE} ${MAKEFLAGS} package-name PACKAGE_NAME_TYPE=${PACKAGE_NAME_TYPE}; \ else \ ${ECHO_MSG} "Warning: \"$$dir\" non-existent -- @pkgdep registration incomplete" >&2; \ fi; \ @@ -84,10 +84,10 @@ run-depends-list: .PHONY: build-depends-list .if !target(build-depends-list) build-depends-list: - @for dir in `${MAKE} ${MAKEFLAGS} show-all-depends-dirs-excl`; \ + @for dir in `${RECURSIVE_MAKE} ${MAKEFLAGS} show-all-depends-dirs-excl`; \ do \ (cd ../../$$dir && \ - ${MAKE} ${MAKEFLAGS} package-name) \ + ${RECURSIVE_MAKE} ${MAKEFLAGS} package-name) \ done .endif @@ -170,11 +170,11 @@ describe: ${ECHO_N} "|${MAINTAINER}|${CATEGORIES}|"; \ case "A${BUILD_DEPENDS}B${DEPENDS}C" in \ ABC) ;; \ - *) cd ${.CURDIR} && ${ECHO_N} `${MAKE} ${MAKEFLAGS} build-depends-list | ${SORT} -u`;; \ + *) cd ${.CURDIR} && ${ECHO_N} `${RECURSIVE_MAKE} ${MAKEFLAGS} build-depends-list | ${SORT} -u`;; \ esac; \ ${ECHO_N} "|"; \ if [ "${DEPENDS}" != "" ]; then \ - cd ${.CURDIR} && ${ECHO_N} `${MAKE} ${MAKEFLAGS} run-depends-list | ${SORT} -u`; \ + cd ${.CURDIR} && ${ECHO_N} `${RECURSIVE_MAKE} ${MAKEFLAGS} run-depends-list | ${SORT} -u`; \ fi; \ ${ECHO_N} "|"; \ if [ "${ONLY_FOR_PLATFORM}" = "" ]; then \ @@ -203,7 +203,7 @@ FTP_PKG_URL_HOST?= ftp://ftp.NetBSD.org FTP_PKG_URL_DIR?= /pub/pkgsrc/packages readme: - @cd ${.CURDIR} && ${MAKE} ${MAKEFLAGS} README.html PKG_URL=${FTP_PKG_URL_HOST}${FTP_PKG_URL_DIR} + @cd ${.CURDIR} && ${RECURSIVE_MAKE} ${MAKEFLAGS} README.html PKG_URL=${FTP_PKG_URL_HOST}${FTP_PKG_URL_DIR} .endif # This target is used to generate README.html files, very like "readme" @@ -214,7 +214,7 @@ CDROM_PKG_URL_HOST?= file://localhost CDROM_PKG_URL_DIR?= /usr/pkgsrc/packages cdrom-readme: - @cd ${.CURDIR} && ${MAKE} ${MAKEFLAGS} README.html PKG_URL=${CDROM_PKG_URL_HOST}${CDROM_PKG_URL_DIR} + @cd ${.CURDIR} && ${RECURSIVE_MAKE} ${MAKEFLAGS} README.html PKG_URL=${CDROM_PKG_URL_HOST}${CDROM_PKG_URL_DIR} .endif README_NAME= ${TEMPLATES}/README.pkg @@ -251,7 +251,7 @@ show-vulnerabilities-html: # the target used to generate the README.html file. .PHONY: README.html README.html: .PRECIOUS - @${SETENV} AWK=${AWK} BMAKE=${MAKE} ../../mk/scripts/mkdatabase -f $@.tmp1 + @${RECURSIVE_MAKE} ../../mk/scripts/mkdatabase -f $@.tmp1 @if ${TEST} -d ${PACKAGES}; then \ cd ${PACKAGES}; \ case `${PWD_CMD}` in \ @@ -289,7 +289,7 @@ README.html: .PRECIOUS print-build-depends-list: . if !empty(BUILD_DEPENDS) || !empty(DEPENDS) @${ECHO_N} 'This package requires package(s) "' - @${ECHO_N} `${MAKE} ${MAKEFLAGS} build-depends-list | ${SORT} -u` + @${ECHO_N} `${RECURSIVE_MAKE} ${MAKEFLAGS} build-depends-list | ${SORT} -u` @${ECHO} '" to build.' . endif .endif @@ -299,7 +299,7 @@ print-build-depends-list: print-run-depends-list: . if !empty(DEPENDS) @${ECHO_N} 'This package requires package(s) "' - @${ECHO_N} `${MAKE} ${MAKEFLAGS} run-depends-list | ${SORT} -u` + @${ECHO_N} `${RECURSIVE_MAKE} ${MAKEFLAGS} run-depends-list | ${SORT} -u` @${ECHO} '" to run.' . endif .endif |