diff options
Diffstat (limited to 'mk/install/bin-install.mk')
| -rw-r--r-- | mk/install/bin-install.mk | 6 |
1 files changed, 3 insertions, 3 deletions
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 |