diff options
| author | jlam <jlam> | 2006-06-10 03:23:46 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2006-06-10 03:23:46 +0000 |
| commit | 8b62c69fb33cdbe4e13d4db2e23f5897ec096878 (patch) | |
| tree | f0fc471d8eecf887485878045a67def79905b33d /mk | |
| parent | 753b76b8af7aaea684cab90f7bbab5c5bea5b027 (diff) | |
| download | pkgsrc-8b62c69fb33cdbe4e13d4db2e23f5897ec096878.tar.gz | |
Restore missing ${SETENV} ${BUILD_ENV} that was dropped during the initial
package system flavors commit.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/install/install.mk | 4 | ||||
| -rw-r--r-- | mk/package/package.mk | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/mk/install/install.mk b/mk/install/install.mk index 960794e69a9..53fa6c985a0 100644 --- a/mk/install/install.mk +++ b/mk/install/install.mk @@ -1,4 +1,4 @@ -# $NetBSD: install.mk,v 1.6 2006/06/09 13:59:08 jlam Exp $ +# $NetBSD: install.mk,v 1.7 2006/06/10 03:23:46 jlam Exp $ ###################################################################### ### install (PUBLIC) @@ -22,7 +22,7 @@ release-install-lock: release-lock .if !exists(${_INSTALL_COOKIE}) ${_INSTALL_COOKIE}: install-check-interactive - ${_PKG_SILENT}${_PKG_DEBUG}cd ${.CURDIR} && ${MAKE} ${MAKEFLAGS} real-install PKG_PHASE=install + ${_PKG_SILENT}${_PKG_DEBUG}cd ${.CURDIR} && ${SETENV} ${BUILD_ENV} ${MAKE} ${MAKEFLAGS} real-install PKG_PHASE=install .else ${_INSTALL_COOKIE}: @${DO_NADA} diff --git a/mk/package/package.mk b/mk/package/package.mk index ce02184721b..7bee1207ca5 100644 --- a/mk/package/package.mk +++ b/mk/package/package.mk @@ -1,4 +1,4 @@ -# $NetBSD: package.mk,v 1.6 2006/06/09 13:59:08 jlam Exp $ +# $NetBSD: package.mk,v 1.7 2006/06/10 03:23:46 jlam Exp $ _PACKAGE_COOKIE= ${WRKDIR}/.package_done @@ -24,7 +24,7 @@ release-package-lock: release-lock .if !exists(${_PACKAGE_COOKIE}) ${_PACKAGE_COOKIE}: - ${_PKG_SILENT}${_PKG_DEBUG}cd ${.CURDIR} && ${MAKE} ${MAKEFLAGS} real-package PKG_PHASE=package + ${_PKG_SILENT}${_PKG_DEBUG}cd ${.CURDIR} && ${SETENV} ${BUILD_ENV} ${MAKE} ${MAKEFLAGS} real-package PKG_PHASE=package .else ${_PACKAGE_COOKIE}: @${DO_NADA} |