diff options
| author | abs <abs@pkgsrc.org> | 2011-09-08 20:17:15 +0000 |
|---|---|---|
| committer | abs <abs@pkgsrc.org> | 2011-09-08 20:17:15 +0000 |
| commit | 1ad19bede674339968de3b62189eabb21ed3f511 (patch) | |
| tree | 562e841d2aad3c3bded8284d931962beaa26901d /mk/bsd.utils.mk | |
| parent | 8a210d224e39e7014f50e5719fbed8aaf7880958 (diff) | |
| download | pkgsrc-1ad19bede674339968de3b62189eabb21ed3f511.tar.gz | |
Introduce PKGSRC_SETENV, defaulting to SETENV. Can be set to ${SETENV} -i
to santise environment
Diffstat (limited to 'mk/bsd.utils.mk')
| -rw-r--r-- | mk/bsd.utils.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mk/bsd.utils.mk b/mk/bsd.utils.mk index 261c6caec5e..0b509d4273b 100644 --- a/mk/bsd.utils.mk +++ b/mk/bsd.utils.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.utils.mk,v 1.8 2006/07/27 22:01:28 jlam Exp $ +# $NetBSD: bsd.utils.mk,v 1.9 2011/09/08 20:17:15 abs Exp $ # # This Makefile fragment is included by bsd.pkg.mk and defines utility # and otherwise miscellaneous variables and targets. @@ -21,7 +21,7 @@ _ALL_DEPENDS+= ${DEPENDS} # ${PKGSRCDIR} and also verifies that they exist within pkgsrc. # _PKG_PATHS_CMD= \ - ${SETENV} ECHO=${TOOLS_ECHO:Q} PKGSRCDIR=${PKGSRCDIR:Q} \ + ${PKGSRC_SETENV} ECHO=${TOOLS_ECHO:Q} PKGSRCDIR=${PKGSRCDIR:Q} \ PWD_CMD=${TOOLS_PWD_CMD:Q} TEST=${TOOLS_TEST:Q} \ ${SH} ${.CURDIR}/../../mk/scripts/pkg_path @@ -34,7 +34,7 @@ show-depends-dirs show-depends-pkgpaths: # _DEPENDS_WALK_MAKEFLAGS?= ${MAKEFLAGS} _DEPENDS_WALK_CMD= \ - ${SETENV} ECHO=${TOOLS_ECHO:Q} MAKE=${MAKE:Q} \ + ${PKGSRC_SETENV} ECHO=${TOOLS_ECHO:Q} MAKE=${MAKE:Q} \ MAKEFLAGS=${_DEPENDS_WALK_MAKEFLAGS:Q} \ PKGSRCDIR=${PKGSRCDIR:Q} TEST=${TOOLS_TEST:Q} \ ${AWK} -f ${.CURDIR}/../../mk/scripts/depends-depth-first.awk -- |