diff options
| author | jlam <jlam@pkgsrc.org> | 2017-08-19 00:30:19 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2017-08-19 00:30:19 +0000 |
| commit | e84b175bbfdcc5a1a2c90387037522ca0438ccce (patch) | |
| tree | 3f52803601b2d4e3e9aa4a4c7597c3078edf3a4a /mk/install | |
| parent | fa9974cd53bd64047e5e6bd9234b4b0d4144d09d (diff) | |
| download | pkgsrc-e84b175bbfdcc5a1a2c90387037522ca0438ccce.tar.gz | |
Run pkg_add(1) and pkg_delete(1) using ${SETENV} ${PKGTOOLS_ENV}.
PKGTOOLS_ENV allows for passing environment variables to the
package install and deinstall scripts.
Diffstat (limited to 'mk/install')
| -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 643a2dccf42..05eda1e6b9a 100644 --- a/mk/install/bin-install.mk +++ b/mk/install/bin-install.mk @@ -1,4 +1,4 @@ -# $NetBSD: bin-install.mk,v 1.25 2016/06/16 18:28:45 mspo Exp $ +# $NetBSD: bin-install.mk,v 1.26 2017/08/19 00:30:19 jlam Exp $ # # This file provides the following targets: @@ -93,7 +93,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 ${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 \ + if ${PKGSRC_SETENV} PKG_PATH="$$pkg_path" ${PKGTOOLS_ENV} ${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; \ @@ -103,7 +103,7 @@ locked-su-do-bin-install: ${RUN} ${_BIN_INSTALL_PREPARE_CMD} \ pkgpattern=${PKGNAME_REQD:Q}; \ ${STEP_MSG} "Installing $$pkgpattern from $$pkg_path"; \ - if ${PKGSRC_SETENV} PKG_PATH="$$pkg_path" ${PKG_ADD} ${_BIN_INSTALL_FLAGS} "$$pkgpattern"; then \ + if ${PKGSRC_SETENV} PKG_PATH="$$pkg_path" ${PKGTOOLS_ENV} ${PKG_ADD} ${_BIN_INSTALL_FLAGS} "$$pkgpattern"; then \ installed=`${PKG_INFO} -e "$$pkgpattern"`; \ ${ECHO} "$$installed successfully installed."; \ fi |