diff options
| author | abs <abs> | 2011-09-08 20:17:15 +0000 |
|---|---|---|
| committer | abs <abs> | 2011-09-08 20:17:15 +0000 |
| commit | 96b66bcc95d02afbe94f65ca172b1749f365e140 (patch) | |
| tree | 562e841d2aad3c3bded8284d931962beaa26901d /mk/configure | |
| parent | e2266b0e71bac10478221839031fd5977c4b7718 (diff) | |
| download | pkgsrc-96b66bcc95d02afbe94f65ca172b1749f365e140.tar.gz | |
Introduce PKGSRC_SETENV, defaulting to SETENV. Can be set to ${SETENV} -i
to santise environment
Diffstat (limited to 'mk/configure')
| -rw-r--r-- | mk/configure/configure.mk | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/mk/configure/configure.mk b/mk/configure/configure.mk index f0297ec5871..ee73c1187ae 100644 --- a/mk/configure/configure.mk +++ b/mk/configure/configure.mk @@ -1,4 +1,4 @@ -# $NetBSD: configure.mk,v 1.23 2008/02/07 21:36:13 rillig Exp $ +# $NetBSD: configure.mk,v 1.24 2011/09/08 20:17:15 abs Exp $ # # = Package-settable variables = # @@ -205,7 +205,7 @@ do-configure-script: .for _dir_ in ${CONFIGURE_DIRS} ${RUN}${_ULIMIT_CMD} \ cd ${WRKSRC} && cd ${_dir_} && \ - ${SETENV} ${_CONFIGURE_SCRIPT_ENV} \ + ${PKGSRC_SETENV} ${_CONFIGURE_SCRIPT_ENV} \ ${CONFIG_SHELL} ${CONFIG_SHELL_FLAGS} \ ${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS} .endfor @@ -224,7 +224,7 @@ do-configure-imake: .for _dir_ in ${CONFIGURE_DIRS} ${RUN} \ cd ${WRKSRC} && cd ${_dir_} && \ - ${SETENV} ${_CONFIGURE_IMAKE_ENV} ${XMKMF} + ${PKGSRC_SETENV} ${_CONFIGURE_IMAKE_ENV} ${XMKMF} .endfor ###################################################################### @@ -242,7 +242,7 @@ do-configure-cmake: .for _dir_ in ${CONFIGURE_DIRS} ${RUN}${_ULIMIT_CMD} \ cd ${WRKSRC} && cd ${_dir_} && \ - ${SETENV} ${_CONFIGURE_CMAKE_ENV} \ + ${PKGSRC_SETENV} ${_CONFIGURE_CMAKE_ENV} \ cmake ${CMAKE_ARGS} ${CMAKE_ARG_PATH} .endfor @@ -280,5 +280,5 @@ post-configure: # configure-help: .for d in ${CONFIGURE_DIRS} - ${RUN} cd ${WRKSRC} && cd ${d} && ${SETENV} ${_CONFIGURE_SCRIPT_ENV} ${CONFIG_SHELL} ${CONFIGURE_SCRIPT} --help + ${RUN} cd ${WRKSRC} && cd ${d} && ${PKGSRC_SETENV} ${_CONFIGURE_SCRIPT_ENV} ${CONFIG_SHELL} ${CONFIGURE_SCRIPT} --help .endfor |