[pkgsrc/trunk]: pkgsrc/mk/install Only acquire the localbase lock after acqui...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/9ef3d993b64b
branches:  trunk
changeset: 517353:9ef3d993b64b
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Wed Aug 09 15:25:49 2006 +0000

description:
Only acquire the localbase lock after acquiring root privileges.  This
fixes "make install" using just-in-time su-to-root.

diffstat:

 mk/install/install.mk |  12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diffs (47 lines):

diff -r e4ebcb16638c -r 9ef3d993b64b mk/install/install.mk
--- a/mk/install/install.mk     Wed Aug 09 14:43:19 2006 +0000
+++ b/mk/install/install.mk     Wed Aug 09 15:25:49 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: install.mk,v 1.16 2006/08/04 20:52:27 rillig Exp $
+# $NetBSD: install.mk,v 1.17 2006/08/09 15:25:49 jlam Exp $
 
 ######################################################################
 ### install (PUBLIC)
@@ -25,8 +25,8 @@
 .endif
 
 .PHONY: acquire-install-lock release-install-lock
-acquire-install-lock: acquire-lock acquire-localbase-lock
-release-install-lock: release-lock release-localbase-lock
+acquire-install-lock: acquire-lock
+release-install-lock: release-lock
 
 .if exists(${_COOKIE.install})
 ${_COOKIE.install}:
@@ -110,6 +110,10 @@
 ### The targets below are run with elevated privileges.
 ######################################################################
 
+.PHONY: acquire-install-localbase-lock release-install-localbase-lock
+acquire-install-localbase-lock: acquire-localbase-lock
+release-install-localbase-lock: release-localbase-lock
+
 ######################################################################
 ### install-all, su-install-all (PRIVATE)
 ######################################################################
@@ -117,6 +121,7 @@
 ### the built software, register the software installation, and run
 ### some sanity checks.
 ###
+_INSTALL_ALL_TARGETS+=         acquire-install-localbase-lock
 .if !defined(NO_PKG_REGISTER) && !defined(FORCE_PKG_REGISTER)
 _INSTALL_ALL_TARGETS+=         install-check-conflicts
 _INSTALL_ALL_TARGETS+=         install-check-installed
@@ -141,6 +146,7 @@
 _INSTALL_ALL_TARGETS+=         register-pkg
 .endif
 _INSTALL_ALL_TARGETS+=         privileged-install-hook
+_INSTALL_ALL_TARGETS+=         release-install-localbase-lock
 _INSTALL_ALL_TARGETS+=         error-check
 
 .if empty(CHECK_SHLIBS:M[nN][oO])