[pkgsrc/trunk]: pkgsrc/mk Don't pass PREPEND_PATH via MAKEFLAGS as that overr...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/96162f379e10
branches:  trunk
changeset: 467834:96162f379e10
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Sat Feb 07 02:56:14 2004 +0000

description:
Don't pass PREPEND_PATH via MAKEFLAGS as that overrides whatever value
that we're trying to compute for PREPEND_PATH.  Instead, pass it through
the environment.

diffstat:

 mk/bsd.pkg.mk |  19 ++++++++++---------
 1 files changed, 10 insertions(+), 9 deletions(-)

diffs (74 lines):

diff -r 5a8dbdfc96d0 -r 96162f379e10 mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk     Sat Feb 07 01:22:35 2004 +0000
+++ b/mk/bsd.pkg.mk     Sat Feb 07 02:56:14 2004 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.pkg.mk,v 1.1376 2004/02/06 18:45:02 jlam Exp $
+#      $NetBSD: bsd.pkg.mk,v 1.1377 2004/02/07 02:56:14 jlam Exp $
 #
 # This file is in the public domain.
 #
@@ -1322,7 +1322,7 @@
 # Initialize a variable used by Makefiles to check whether to prepend
 # to the PATH.
 #
-PREPEND_PATH=  # empty
+PREPEND_PATH?= # empty
 
 # Get the proper dependencies and set the PATH to use the compiler
 # named in PKGSRC_COMPILER.
@@ -1342,7 +1342,8 @@
 
 .include "../../mk/tools.mk"
 
-MAKEFLAGS+=    PREPEND_PATH=${PREPEND_PATH:Q}
+PATH_ENV+=     PATH=${PATH:Q}
+PATH_ENV+=     PREPEND_PATH=${PREPEND_PATH:Q}
 
 .MAIN: all
 
@@ -3149,7 +3150,7 @@
        ${_PKG_SILENT}${_PKG_DEBUG}cd ${.CURDIR} && ${MAKE} ${MAKEFLAGS} real-tools PKG_PHASE=tools
 
 ${BUILDLINK_COOKIE}:
-       ${_PKG_SILENT}${_PKG_DEBUG}cd ${.CURDIR} && ${SETENV} PATH=${PATH} ${MAKE} ${MAKEFLAGS} real-buildlink PKG_PHASE=buildlink
+       ${_PKG_SILENT}${_PKG_DEBUG}cd ${.CURDIR} && ${SETENV} ${PATH_ENV} ${MAKE} ${MAKEFLAGS} real-buildlink PKG_PHASE=buildlink
 
 ${CONFIGURE_COOKIE}:
 .if ${INTERACTIVE_STAGE:Mconfigure} == "configure" && defined(BATCH)
@@ -3158,7 +3159,7 @@
        @${TOUCH} ${INTERACTIVE_COOKIE}
        @${FALSE}
 .else
-       ${_PKG_SILENT}${_PKG_DEBUG}cd ${.CURDIR} && ${SETENV} PATH=${PATH} ${MAKE} ${MAKEFLAGS} real-configure PKG_PHASE=configure
+       ${_PKG_SILENT}${_PKG_DEBUG}cd ${.CURDIR} && ${SETENV} ${PATH_ENV} ${MAKE} ${MAKEFLAGS} real-configure PKG_PHASE=configure
 .endif
 
 ${BUILD_COOKIE}:
@@ -3168,11 +3169,11 @@
        @${TOUCH} ${INTERACTIVE_COOKIE}
        @${FALSE}
 .else
-       ${_PKG_SILENT}${_PKG_DEBUG}cd ${.CURDIR} && ${SETENV} PATH=${PATH} ${MAKE} ${MAKEFLAGS} real-build PKG_PHASE=build
+       ${_PKG_SILENT}${_PKG_DEBUG}cd ${.CURDIR} && ${SETENV} ${PATH_ENV} ${MAKE} ${MAKEFLAGS} real-build PKG_PHASE=build
 .endif
 
 ${TEST_COOKIE}:
-       ${_PKG_SILENT}${_PKG_DEBUG}cd ${.CURDIR} && ${SETENV} PATH=${PATH} ${MAKE} ${MAKEFLAGS} real-test PKG_PHASE=test
+       ${_PKG_SILENT}${_PKG_DEBUG}cd ${.CURDIR} && ${SETENV} ${PATH_ENV} ${MAKE} ${MAKEFLAGS} real-test PKG_PHASE=test
 
 ${INSTALL_COOKIE}:
 .if ${INTERACTIVE_STAGE:Minstall} == "install" && defined(BATCH)
@@ -3181,11 +3182,11 @@
        @${TOUCH} ${INTERACTIVE_COOKIE}
        @${FALSE}
 .else
-       ${_PKG_SILENT}${_PKG_DEBUG}cd ${.CURDIR} && ${SETENV} PATH=${PATH} ${MAKE} ${MAKEFLAGS} real-install PKG_PHASE=install
+       ${_PKG_SILENT}${_PKG_DEBUG}cd ${.CURDIR} && ${SETENV} ${PATH_ENV} ${MAKE} ${MAKEFLAGS} real-install PKG_PHASE=install
 .endif
 
 ${PACKAGE_COOKIE}:
-       ${_PKG_SILENT}${_PKG_DEBUG}cd ${.CURDIR} && ${SETENV} PATH=${PATH} ${MAKE} ${MAKEFLAGS} real-package PKG_PHASE=package
+       ${_PKG_SILENT}${_PKG_DEBUG}cd ${.CURDIR} && ${SETENV} ${PATH_ENV} ${MAKE} ${MAKEFLAGS} real-package PKG_PHASE=package
 
 .PHONY: extract-message patch-message tools-message buildlink-message
 .PHONY: configure-message build-message test-message