diff options
| -rw-r--r-- | mk/install/bin-install.mk | 9 | ||||
| -rw-r--r-- | mk/install/bsd.install.mk | 8 |
2 files changed, 7 insertions, 10 deletions
diff --git a/mk/install/bin-install.mk b/mk/install/bin-install.mk index 39dade064ac..4bdff295a0d 100644 --- a/mk/install/bin-install.mk +++ b/mk/install/bin-install.mk @@ -1,4 +1,4 @@ -# $NetBSD: bin-install.mk,v 1.7 2006/11/21 13:54:26 joerg Exp $ +# $NetBSD: bin-install.mk,v 1.8 2007/03/09 03:15:33 rillig Exp $ # # This file provides the following targets: @@ -70,11 +70,8 @@ locked-su-do-bin-install: fi do-bin-install-from-source: - ${_PKG_SILENT}${_PKG_DEBUG} set -e; \ - if ${PKG_INFO} -qe ${PKGNAME}; then \ - : "Nothing to do"; \ - else \ + ${RUN} ${PKG_INFO} -qe ${PKGNAME} || { \ ${STEP_MSG} "No binary package found for ${PKGNAME}; installing from source."; \ ${RECURSIVE_MAKE} ${MAKEFLAGS} DEPENDS_TARGET=${DEPENDS_TARGET:Q} package-install \ && ${RECURSIVE_MAKE} ${MAKEFLAGS} clean; \ - fi + } diff --git a/mk/install/bsd.install.mk b/mk/install/bsd.install.mk index 23b39f2a28d..9ee2ef0f33e 100644 --- a/mk/install/bsd.install.mk +++ b/mk/install/bsd.install.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.install.mk,v 1.9 2006/07/22 16:31:35 jlam Exp $ +# $NetBSD: bsd.install.mk,v 1.10 2007/03/09 03:15:33 rillig Exp $ # # This Makefile fragment is included by bsd.pkg.mk and provides all # variables and targets related to installing packages. @@ -43,6 +43,6 @@ install: barrier ### .PHONY: install-cookie install-cookie: - ${_PKG_SILENT}${_PKG_DEBUG}${TEST} ! -f ${_COOKIE.install} || ${FALSE} - ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${_COOKIE.install:H} - ${_PKG_SILENT}${_PKG_DEBUG}${ECHO} ${PKGNAME} > ${_COOKIE.install} + ${RUN} [ ! -f ${_COOKIE.install} ] + ${RUN} ${MKDIR} ${_COOKIE.install:H} + ${RUN} ${ECHO} ${PKGNAME} > ${_COOKIE.install} |