diff options
author | agc <agc> | 1999-04-01 07:29:14 +0000 |
---|---|---|
committer | agc <agc> | 1999-04-01 07:29:14 +0000 |
commit | 0678c5bbdac7142f590bcc5d78b3ff984620c831 (patch) | |
tree | 1b8e2d82fd2fbdea66dbf5b3641fb3f0d56e0792 /mk/bsd.pkg.mk | |
parent | 634d8a26eea6d0d93dbd1a4ee4f8f83fdf6732b9 (diff) | |
download | pkgsrc-0678c5bbdac7142f590bcc5d78b3ff984620c831.tar.gz |
Provide an acceptable default for PRE_ROOT_CMD - pointed out by Tim
Rightnour, and suggested by Hubert Feyrer.
Also print the "Installing" message in the correct place.
Diffstat (limited to 'mk/bsd.pkg.mk')
-rw-r--r-- | mk/bsd.pkg.mk | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index c4fef90b2d3..127344237ef 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.238 1999/03/31 10:59:44 agc Exp $ +# $NetBSD: bsd.pkg.mk,v 1.239 1999/04/01 07:29:14 agc Exp $ # # This file is in the public domain. # @@ -1462,13 +1462,14 @@ real-configure: _PORT_USE real-build: _PORT_USE @${ECHO_MSG} "===> Building for ${PKGNAME}" real-install: pkg-su-install - @${ECHO_MSG} "===> Installing for ${PKGNAME}" real-package: _PORT_USE # sudo or priv are acceptable substitutes SU_CMD?= ${SU} - root -c +PRE_ROOT_CMD?= ${TRUE} pkg-su-install: + @${ECHO_MSG} "===> Installing for ${PKGNAME}" ${_PKG_SILENT}${_PKG_DEBUG} \ if [ `${ID} -u` = 0 ]; then \ ${MAKE} ${.MAKEFLAGS} root-install; \ @@ -1482,7 +1483,7 @@ pkg-su-install: if [ "X${FORCE_PKG_REGISTER}" != X"" ]; then \ force="FORCE_PKG_REGISTER=1"; \ fi; \ - if [ "X${PRE_ROOT_CMD}" != "X" ]; then \ + if [ "X${PRE_ROOT_CMD}" != "X${TRUE}" ]; then \ ${ECHO} "*** WARNING *** Running: ${PRE_ROOT_CMD}"; \ ${PRE_ROOT_CMD}; \ fi; \ |