[pkgsrc/trunk]: pkgsrc/mk/install Ensure that we invoke a brand new make when...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4ea64f6a3fc8
branches:  trunk
changeset: 509890:4ea64f6a3fc8
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Fri Mar 17 18:22:30 2006 +0000

description:
Ensure that we invoke a brand new make when creating the INSTALL/DEINSTALL
and rc.d scripts so that we source the latest makevars.mk file and
get the latest set of cached variables.  This fixes problems where
BUILDLINK_PREFIX.* wasn't being expanded correctly when substituting
into an INSTALL script.

diffstat:

 mk/install/bsd.pkginstall.mk |  11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diffs (23 lines):

diff -r 1dd97cb04ed7 -r 4ea64f6a3fc8 mk/install/bsd.pkginstall.mk
--- a/mk/install/bsd.pkginstall.mk      Fri Mar 17 17:46:30 2006 +0000
+++ b/mk/install/bsd.pkginstall.mk      Fri Mar 17 18:22:30 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkginstall.mk,v 1.42 2006/03/15 16:20:12 jlam Exp $
+# $NetBSD: bsd.pkginstall.mk,v 1.43 2006/03/17 18:22:30 jlam Exp $
 #
 # This Makefile fragment is included by bsd.pkg.mk and implements the
 # common INSTALL/DEINSTALL scripts framework.  To use the pkginstall
@@ -866,8 +866,9 @@
 release-pkginstall-lock:
        ${_RELEASE_LOCK}
 
-.PHONY: do-pkginstall
-do-pkginstall: generate-rcd-scripts generate-install-scripts
+.PHONY: real-pkginstall
+real-pkginstall: generate-rcd-scripts generate-install-scripts
+       ${_PKG_SILENT}${_PKG_DEBUG}${TOUCH} ${TOUCH_FLAGS} ${_PKGINSTALL_COOKIE}
 
-${_PKGINSTALL_COOKIE}: do-pkginstall
-       ${_PKG_SILENT}${_PKG_DEBUG} ${TOUCH} ${TOUCH_FLAGS} ${.TARGET}
+${_PKGINSTALL_COOKIE}:
+       ${_PKG_SILENT}${_PKG_DEBUG}cd ${.CURDIR} && ${MAKE} ${MAKEFLAGS} real-pkginstall PKG_PHASE=build