diff options
| author | jlam <jlam@pkgsrc.org> | 2006-03-17 18:22:30 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2006-03-17 18:22:30 +0000 |
| commit | 8679fd0ed33a6dc42157ef9a5ed0e3c0cc06da23 (patch) | |
| tree | a23dea32845017bf24bb9c722e6ec56b5a0f02b0 /mk | |
| parent | 5610f157cc5e65065569d6e55c8fffb6cea6df39 (diff) | |
| download | pkgsrc-8679fd0ed33a6dc42157ef9a5ed0e3c0cc06da23.tar.gz | |
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 (limited to 'mk')
| -rw-r--r-- | mk/install/bsd.pkginstall.mk | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/mk/install/bsd.pkginstall.mk b/mk/install/bsd.pkginstall.mk index ee00123a236..ff3fd15f928 100644 --- a/mk/install/bsd.pkginstall.mk +++ b/mk/install/bsd.pkginstall.mk @@ -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 @@ acquire-pkginstall-lock: 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 |