diff --git a/mk/bsd.pkg.barrier.mk b/mk/bsd.pkg.barrier.mk index 02fde5712c67..bafb4f99d908 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 diff --git a/mk/bsd.pkg.clean.mk b/mk/bsd.pkg.clean.mk index 738061172feb..7c9e30665a03 100644 --- a/mk/bsd.pkg.clean.mk +++ b/mk/bsd.pkg.clean.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.clean.mk,v 1.5 2006/07/20 15:42:04 jlam Exp $ +# $NetBSD: bsd.pkg.clean.mk,v 1.6 2006/07/27 21:46:45 jlam Exp $ # # This Makefile fragment is included to bsd.pkg.mk and defines the # relevant variables and targets for the "clean" phase. @@ -33,7 +33,7 @@ clean-depends: ${_DEPENDS_WALK_CMD} ${PKGPATH} | \ while read dir; do \ cd ${.CURDIR}/../../$$dir && \ - ${MAKE} ${MAKEFLAGS} CLEANDEPENDS=no clean; \ + ${RECURSIVE_MAKE} ${MAKEFLAGS} CLEANDEPENDS=no clean; \ done .PHONY: pre-clean diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 88b612992b6e..96075aa84510 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 diff --git a/mk/bsd.pkg.readme.mk b/mk/bsd.pkg.readme.mk index ebacafa94717..48d09c36d4e5 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 diff --git a/mk/bsd.pkg.subdir.mk b/mk/bsd.pkg.subdir.mk index 1ce141b4a172..6fced25f361c 100644 --- a/mk/bsd.pkg.subdir.mk +++ b/mk/bsd.pkg.subdir.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.subdir.mk,v 1.64 2006/05/29 14:26:33 joerg Exp $ +# $NetBSD: bsd.pkg.subdir.mk,v 1.65 2006/07/27 21:46:45 jlam Exp $ # Derived from: FreeBSD Id: bsd.port.subdir.mk,v 1.19 1997/03/09 23:10:56 wosch Exp # from: @(#)bsd.subdir.mk 5.9 (Berkeley) 2/1/91 # @@ -71,7 +71,7 @@ _SUBDIRUSE: .USE if [ "$$OK" = "" ]; then \ cd ${.CURDIR}/$${edir}; \ ${ECHO_MSG} "===> ${_THISDIR_}$${edir}"; \ - ${MAKE} ${MAKEFLAGS} "_THISDIR_=${_THISDIR_}$${edir}/" \ + ${RECURSIVE_MAKE} ${MAKEFLAGS} "_THISDIR_=${_THISDIR_}$${edir}/" \ ${.TARGET:realinstall=install} || true; \ fi; \ done @@ -82,7 +82,7 @@ ${SUBDIR}:: else \ cd ${.CURDIR}/${.TARGET}; \ fi; \ - ${MAKE} ${MAKEFLAGS} all + ${RECURSIVE_MAKE} ${MAKEFLAGS} all .for __target in all fetch package extract configure build clean \ cleandir distclean depend describe reinstall tags checksum \ @@ -116,12 +116,12 @@ readmes: readme _SUBDIRUSE .if !target(readme) readme: - @${MAKE} ${MAKEFLAGS} README.html _README_TYPE_FLAG=--ftp _README_TYPE=$@ + @${RECURSIVE_MAKE} ${MAKEFLAGS} README.html _README_TYPE_FLAG=--ftp _README_TYPE=$@ .endif .if !target(cdrom-readme) cdrom-readme: - @${MAKE} ${MAKEFLAGS} README.html _README_TYPE_FLAG=--cdrom README_TYPE=$@ + @${RECURSIVE_MAKE} ${MAKEFLAGS} README.html _README_TYPE_FLAG=--cdrom README_TYPE=$@ .endif .if defined(PKGSRCTOP) @@ -139,9 +139,9 @@ README.html: .PRECIOUS .for entry in ${SUBDIR} .if defined(PKGSRCTOP) @${ECHO} '