From 4ae596fd3e00d179adcfcbcc14c6950205801269 Mon Sep 17 00:00:00 2001
From: abs <abs>
Date: Thu, 8 Sep 2011 20:17:15 +0000
Subject: Introduce PKGSRC_SETENV, defaulting to SETENV. Can be set to
 ${SETENV} -i to santise environment

---
 mk/install/bin-install.mk | 6 +++---
 mk/install/install.mk     | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'mk/install')

diff --git a/mk/install/bin-install.mk b/mk/install/bin-install.mk
index 655964c2e0e..b2c487b4e97 100644
--- a/mk/install/bin-install.mk
+++ b/mk/install/bin-install.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bin-install.mk,v 1.20 2011/02/07 10:33:27 wiz Exp $
+# $NetBSD: bin-install.mk,v 1.21 2011/09/08 20:17:16 abs Exp $
 #
 
 # This file provides the following targets:
@@ -89,7 +89,7 @@ locked-su-do-bin-install:
 .if !empty(USE_CROSS_COMPILE:M[yY][eE][sS])
 	${RUN} ${_BIN_INSTALL_PREPARE_CMD}				\
 	${STEP_MSG} "Installing ${PKGNAME} from $$pkg_path";		\
-	if ${SETENV} PKG_PATH="$$pkg_path" ${PKG_ADD} -m ${MACHINE_ARCH} -I -p ${_CROSS_DESTDIR}${PREFIX} ${_BIN_INSTALL_FLAGS} ${PKGNAME_REQD:Q}${PKG_SUFX}; then \
+	if ${PKGSRC_SETENV} PKG_PATH="$$pkg_path" ${PKG_ADD} -m ${MACHINE_ARCH} -I -p ${_CROSS_DESTDIR}${PREFIX} ${_BIN_INSTALL_FLAGS} ${PKGNAME_REQD:Q}${PKG_SUFX}; then \
 		${ECHO} "Fixing recorded cwd...";			\
 		${SED} -e 's|@cwd ${_CROSS_DESTDIR}|@cwd |' ${_PKG_DBDIR}/${PKGNAME:Q}/+CONTENTS > ${_PKG_DBDIR}/${PKGNAME:Q}/+CONTENTS.tmp; \
 		${MV} ${_PKG_DBDIR}/${PKGNAME:Q}/+CONTENTS.tmp ${_PKG_DBDIR}/${PKGNAME:Q}/+CONTENTS; \
@@ -99,7 +99,7 @@ locked-su-do-bin-install:
 	${RUN} ${_BIN_INSTALL_PREPARE_CMD}				\
 	pkgpattern=${PKGNAME_REQD:Q};					\
 	${STEP_MSG} "Installing $$pkgpattern from $$pkg_path";		\
-	if ${SETENV} PKG_PATH="$$pkg_path" ${PKG_ADD} ${_BIN_INSTALL_FLAGS} "$$pkgpattern"; then \
+	if ${PKGSRC_SETENV} PKG_PATH="$$pkg_path" ${PKG_ADD} ${_BIN_INSTALL_FLAGS} "$$pkgpattern"; then \
 		installed=`${PKG_INFO} -e "$$pkgpattern"`;		\
 		${ECHO} "$$installed successfully installed.";		\
 	fi
diff --git a/mk/install/install.mk b/mk/install/install.mk
index 92afb330ef0..4a38dc2047b 100644
--- a/mk/install/install.mk
+++ b/mk/install/install.mk
@@ -1,4 +1,4 @@
-# $NetBSD: install.mk,v 1.61 2011/03/21 08:55:12 obache Exp $
+# $NetBSD: install.mk,v 1.62 2011/09/08 20:17:16 abs Exp $
 #
 # This file provides the code for the "install" phase.
 #
@@ -322,7 +322,7 @@ do-install:
 .  for _dir_ in ${INSTALL_DIRS}
 	${RUN} ${_ULIMIT_CMD}						\
 	cd ${WRKSRC} && cd ${_dir_} &&					\
-	${SETENV} ${INSTALL_ENV} ${MAKE_ENV} 				\
+	${PKGSRC_SETENV} ${INSTALL_ENV} ${MAKE_ENV} 			\
 		${MAKE_PROGRAM} ${MAKE_FLAGS} ${INSTALL_MAKE_FLAGS}	\
 			-f ${MAKE_FILE} ${INSTALL_TARGET}
 .  endfor
@@ -370,7 +370,7 @@ _PLIST_REGEXP.man=	\
 	^([^/]*/)+(man[1-9ln]/[^/]*\.[1-9ln]|cat[1-9ln]/[^/]*\.[0-9])(\.gz)?$$
 
 _DOC_COMPRESS=								\
-	${SETENV} PATH=${PATH:Q}					\
+	${PKGSRC_SETENV} PATH=${PATH:Q}					\
 		MANZ=${_MANZ}						\
 		PKG_VERBOSE=${PKG_VERBOSE}				\
 		TEST=${TOOLS_TEST:Q}					\
-- 
cgit v1.2.3