diff options
| -rw-r--r-- | mk/install/bin-install.mk | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/mk/install/bin-install.mk b/mk/install/bin-install.mk index b9ebc1ca02c..bd6d2b53e81 100644 --- a/mk/install/bin-install.mk +++ b/mk/install/bin-install.mk @@ -1,4 +1,4 @@ -# $NetBSD: bin-install.mk,v 1.12 2007/08/23 08:59:24 joerg Exp $ +# $NetBSD: bin-install.mk,v 1.13 2007/09/19 13:26:19 rillig Exp $ # # This file provides the following targets: @@ -94,15 +94,18 @@ locked-su-do-bin-install: for i in ${BINPKG_SITES}; do \ pkgpath="$$pkgpath;$$i/All"; \ done; \ - ${STEP_MSG} "Installing ${PKGNAME} from $$pkgpath"; \ - if ${SETENV} PKG_PATH="$$pkgpath" ${PKG_ADD} ${_BIN_INSTALL_FLAGS} ${PKGNAME_REQD:U${PKGNAME}:Q}; then \ - ${ECHO} "`${PKG_INFO} -e ${PKGNAME_REQD:U${PKGNAME}:Q}` successfully installed."; \ + pkgpattern=${PKGNAME_REQD:U${PKGNAME}:Q}; \ + ${STEP_MSG} "Installing $$pkgpattern from $$pkgpath"; \ + if ${SETENV} PKG_PATH="$$pkgpath" ${PKG_ADD} ${_BIN_INSTALL_FLAGS} "$$pkgpattern"; then \ + installed=`${PKG_INFO} -e "$$pkgpattern"`; \ + ${ECHO} "$$installed successfully installed."; \ fi .endif do-bin-install-from-source: - ${RUN} ${PKG_INFO} -qe ${PKGNAME} || { \ - ${STEP_MSG} "No binary package found for ${PKGNAME}; installing from source."; \ + ${RUN} pkgpattern=${PKGNAME_REQD:U${PKGNAME}:Q}; \ + ${PKG_INFO} -qe "$$pkgpattern" || { \ + ${STEP_MSG} "No binary package found for $$pkgpattern; installing from source."; \ ${RECURSIVE_MAKE} ${MAKEFLAGS} DEPENDS_TARGET=${DEPENDS_TARGET:Q} package-install \ && ${RECURSIVE_MAKE} ${MAKEFLAGS} clean; \ } |