pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/mk Rename PATH_ENV to BUILD_ENV, which better expresse...
details: https://anonhg.NetBSD.org/pkgsrc/rev/63cb95cacb01
branches: trunk
changeset: 469272:63cb95cacb01
user: jlam <jlam%pkgsrc.org@localhost>
date: Sat Feb 21 12:29:23 2004 +0000
description:
Rename PATH_ENV to BUILD_ENV, which better expresses what it's for.
BUILD_ENV is used to set the environment for the sub-make processes that
are invoked for each phase after and including buildlink.
diffstat:
mk/bsd.pkg.mk | 21 ++++++++++++---------
1 files changed, 12 insertions(+), 9 deletions(-)
diffs (69 lines):
diff -r 87476416326b -r 63cb95cacb01 mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk Sat Feb 21 10:37:27 2004 +0000
+++ b/mk/bsd.pkg.mk Sat Feb 21 12:29:23 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.mk,v 1.1410 2004/02/18 13:32:38 jlam Exp $
+# $NetBSD: bsd.pkg.mk,v 1.1411 2004/02/21 12:29:23 jlam Exp $
#
# This file is in the public domain.
#
@@ -1378,8 +1378,11 @@
. endif
.endfor
-PATH_ENV+= PATH=${PATH:Q}
-PATH_ENV+= _PREPENDED_TO_PATH=${_PREPENDED_TO_PATH:Q}
+# Add these bits to the environment use when invoking the sub-make
+# processes for build-related phases.
+#
+BUILD_ENV+= PATH=${PATH:Q}
+BUILD_ENV+= _PREPENDED_TO_PATH=${_PREPENDED_TO_PATH:Q}
.MAIN: all
@@ -3223,7 +3226,7 @@
${_PKG_SILENT}${_PKG_DEBUG}cd ${.CURDIR} && ${MAKE} ${MAKEFLAGS} real-tools PKG_PHASE=tools
${BUILDLINK_COOKIE}:
- ${_PKG_SILENT}${_PKG_DEBUG}cd ${.CURDIR} && ${SETENV} ${PATH_ENV} ${MAKE} ${MAKEFLAGS} real-buildlink PKG_PHASE=buildlink
+ ${_PKG_SILENT}${_PKG_DEBUG}cd ${.CURDIR} && ${SETENV} ${BUILD_ENV} ${MAKE} ${MAKEFLAGS} real-buildlink PKG_PHASE=buildlink
${CONFIGURE_COOKIE}:
.if ${INTERACTIVE_STAGE:Mconfigure} == "configure" && defined(BATCH)
@@ -3232,7 +3235,7 @@
@${TOUCH} ${INTERACTIVE_COOKIE}
@${FALSE}
.else
- ${_PKG_SILENT}${_PKG_DEBUG}cd ${.CURDIR} && ${SETENV} ${PATH_ENV} ${MAKE} ${MAKEFLAGS} real-configure PKG_PHASE=configure
+ ${_PKG_SILENT}${_PKG_DEBUG}cd ${.CURDIR} && ${SETENV} ${BUILD_ENV} ${MAKE} ${MAKEFLAGS} real-configure PKG_PHASE=configure
.endif
${BUILD_COOKIE}:
@@ -3242,11 +3245,11 @@
@${TOUCH} ${INTERACTIVE_COOKIE}
@${FALSE}
.else
- ${_PKG_SILENT}${_PKG_DEBUG}cd ${.CURDIR} && ${SETENV} ${PATH_ENV} ${MAKE} ${MAKEFLAGS} real-build PKG_PHASE=build
+ ${_PKG_SILENT}${_PKG_DEBUG}cd ${.CURDIR} && ${SETENV} ${BUILD_ENV} ${MAKE} ${MAKEFLAGS} real-build PKG_PHASE=build
.endif
${TEST_COOKIE}:
- ${_PKG_SILENT}${_PKG_DEBUG}cd ${.CURDIR} && ${SETENV} ${PATH_ENV} ${MAKE} ${MAKEFLAGS} real-test PKG_PHASE=test
+ ${_PKG_SILENT}${_PKG_DEBUG}cd ${.CURDIR} && ${SETENV} ${BUILD_ENV} ${MAKE} ${MAKEFLAGS} real-test PKG_PHASE=test
${INSTALL_COOKIE}:
.if ${INTERACTIVE_STAGE:Minstall} == "install" && defined(BATCH)
@@ -3255,11 +3258,11 @@
@${TOUCH} ${INTERACTIVE_COOKIE}
@${FALSE}
.else
- ${_PKG_SILENT}${_PKG_DEBUG}cd ${.CURDIR} && ${SETENV} ${PATH_ENV} ${MAKE} ${MAKEFLAGS} real-install PKG_PHASE=install
+ ${_PKG_SILENT}${_PKG_DEBUG}cd ${.CURDIR} && ${SETENV} ${BUILD_ENV} ${MAKE} ${MAKEFLAGS} real-install PKG_PHASE=install
.endif
${PACKAGE_COOKIE}:
- ${_PKG_SILENT}${_PKG_DEBUG}cd ${.CURDIR} && ${SETENV} ${PATH_ENV} ${MAKE} ${MAKEFLAGS} real-package PKG_PHASE=package
+ ${_PKG_SILENT}${_PKG_DEBUG}cd ${.CURDIR} && ${SETENV} ${BUILD_ENV} ${MAKE} ${MAKEFLAGS} real-package PKG_PHASE=package
.PHONY: extract-message patch-message tools-message buildlink-message
.PHONY: configure-message build-message test-message
Home |
Main Index |
Thread Index |
Old Index