diff options
| author | jlam <jlam@pkgsrc.org> | 2006-03-15 16:20:11 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2006-03-15 16:20:11 +0000 |
| commit | 47283bca00e37d3f8fe97a2a7d515ba8cafe1b29 (patch) | |
| tree | 83c4e5001e87182f4b48e1036082836a09fd6b0a /mk/install | |
| parent | ce8c6b5c7ad3bcd97d97f6abc68430d710f251f9 (diff) | |
| download | pkgsrc-47283bca00e37d3f8fe97a2a7d515ba8cafe1b29.tar.gz | |
Always run the pkginstall framework targets to generate the
INSTALL/DEINSTALL and rc.d scripts, regardless of whether NO_BUILD is
defined or not.
We do this by renaming the main "build" target to "_build", and creating
a new "build" target that has "_build" and "pkginstall" as dependencies.
This allows the "build" and "install" targets to be consecutive, so
no changes in behavior are visible to the user.
Because the pkginstall targets are no longer run within the protection
of the locks during the build phase, we need to manage locking within
a new "pkginstall" target.
Diffstat (limited to 'mk/install')
| -rw-r--r-- | mk/install/bsd.pkginstall.mk | 28 |
1 files changed, 25 insertions, 3 deletions
diff --git a/mk/install/bsd.pkginstall.mk b/mk/install/bsd.pkginstall.mk index 55ce5233250..ee00123a236 100644 --- a/mk/install/bsd.pkginstall.mk +++ b/mk/install/bsd.pkginstall.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkginstall.mk,v 1.41 2006/03/15 04:52:57 jlam Exp $ +# $NetBSD: bsd.pkginstall.mk,v 1.42 2006/03/15 16:20:12 jlam Exp $ # # This Makefile fragment is included by bsd.pkg.mk and implements the # common INSTALL/DEINSTALL scripts framework. To use the pkginstall @@ -725,7 +725,6 @@ _DEINSTALL_FILE_DFLT= ${_PKGINSTALL_DIR}/DEINSTALL.default _INSTALL_FILE_DFLT= ${_PKGINSTALL_DIR}/INSTALL.default .PHONY: generate-install-scripts -post-build: generate-install-scripts generate-install-scripts: \ ${_DEINSTALL_FILE} ${_INSTALL_FILE} \ ${_DEINSTALL_FILE_DFLT} ${_INSTALL_FILE_DFLT} @@ -818,7 +817,6 @@ post-install-script: # doesn't occur. .PHONY: generate-rcd-scripts -post-build: generate-rcd-scripts generate-rcd-scripts: # do nothing .PHONY: install-rcd-scripts @@ -849,3 +847,27 @@ install-rcd-${_script_}: ${RCD_SCRIPT_WRK.${_script_}} . endif . endif .endfor + +_PKGINSTALL_COOKIE= ${WRKDIR}/.pkginstall_done + +_PKGINSTALL_TARGETS+= _build +_PKGINSTALL_TARGETS+= acquire-pkginstall-lock +_PKGINSTALL_TARGETS+= ${_PKGINSTALL_COOKIE} +_PKGINSTALL_TARGETS+= release-pkginstall-lock + +.ORDER: ${_PKGINSTALL_TARGETS} + +.PHONY: pkginstall +pkginstall: ${_PKGINSTALL_TARGETS} + +.PHONY: acquire-pkginstall-lock release-pkginstall-lock +acquire-pkginstall-lock: + ${_ACQUIRE_LOCK} +release-pkginstall-lock: + ${_RELEASE_LOCK} + +.PHONY: do-pkginstall +do-pkginstall: generate-rcd-scripts generate-install-scripts + +${_PKGINSTALL_COOKIE}: do-pkginstall + ${_PKG_SILENT}${_PKG_DEBUG} ${TOUCH} ${TOUCH_FLAGS} ${.TARGET} |