diff options
| author | jlam <jlam@pkgsrc.org> | 2006-07-05 09:08:35 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2006-07-05 09:08:35 +0000 |
| commit | 990d0b53771974e8526315776af82fd9b4961c14 (patch) | |
| tree | 266445424a702f9333f761cfa65f977c42683645 /mk/install | |
| parent | e3b97d774b9eb87dcd011ba0aeca7f60d35eeb86 (diff) | |
| download | pkgsrc-990d0b53771974e8526315776af82fd9b4961c14.tar.gz | |
Make the check-vulnerable target more self-sufficient, by moving some
of the logic from fetch/fetch.mk into flavor/pkg/check.mk, so that
check-vulnerable can be used as a source target.
Make check-vulnerable a source target for every phase of the build
workflow, which ensures that it is always run if the user starts a
new phase from the command line.
Fix the cookie-generation targets so that they don't append, only
overwrite to the cookie file. This works around potential problems
due to recursive makes.
Move the cookie checks so that they surround the corresponding phase
target. The presence of the cookie should now inform the make process
to avoid doing any processing of phases that occur before the phase
corresponding to the cookie.
Diffstat (limited to 'mk/install')
| -rw-r--r-- | mk/install/bsd.install.mk | 4 | ||||
| -rw-r--r-- | mk/install/install.mk | 13 |
2 files changed, 9 insertions, 8 deletions
diff --git a/mk/install/bsd.install.mk b/mk/install/bsd.install.mk index cf665e82bf2..09a68bedb96 100644 --- a/mk/install/bsd.install.mk +++ b/mk/install/bsd.install.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.install.mk,v 1.3 2006/06/06 00:25:26 jlam Exp $ +# $NetBSD: bsd.install.mk,v 1.4 2006/07/05 09:08:35 jlam Exp $ # # This Makefile fragment is included by bsd.pkg.mk and provides all # variables and targets related to installing packages. @@ -38,4 +38,4 @@ install: ${_PKGSRC_BUILD_TARGETS} install-cookie ### .PHONY: install-cookie install-cookie: - ${_PKG_SILENT}${_PKG_DEBUG}${ECHO} ${PKGNAME} >> ${_INSTALL_COOKIE} + ${_PKG_SILENT}${_PKG_DEBUG}${ECHO} ${PKGNAME} > ${_INSTALL_COOKIE} diff --git a/mk/install/install.mk b/mk/install/install.mk index cee95885263..43f2350a034 100644 --- a/mk/install/install.mk +++ b/mk/install/install.mk @@ -1,4 +1,4 @@ -# $NetBSD: install.mk,v 1.8 2006/06/14 07:51:47 jlam Exp $ +# $NetBSD: install.mk,v 1.9 2006/07/05 09:08:35 jlam Exp $ ###################################################################### ### install (PUBLIC) @@ -6,6 +6,7 @@ ### install is a public target to install the package. It will ### acquire elevated privileges just-in-time. ### +_INSTALL_TARGETS+= check-vulnerable _INSTALL_TARGETS+= ${_PKGSRC_BUILD_TARGETS} _INSTALL_TARGETS+= acquire-install-lock _INSTALL_TARGETS+= ${_INSTALL_COOKIE} @@ -13,20 +14,20 @@ _INSTALL_TARGETS+= release-install-lock .PHONY: install .if !target(install) +. if !exists(${_INSTALL_COOKIE}) install: ${_INSTALL_TARGETS} +. else +install: + @${DO_NADA} +. endif .endif .PHONY: acquire-install-lock release-install-lock acquire-install-lock: acquire-lock release-install-lock: release-lock -.if !exists(${_INSTALL_COOKIE}) ${_INSTALL_COOKIE}: install-check-interactive ${_PKG_SILENT}${_PKG_DEBUG}cd ${.CURDIR} && ${SETENV} ${BUILD_ENV} ${MAKE} ${MAKEFLAGS} real-install PKG_PHASE=install -.else -${_INSTALL_COOKIE}: - @${DO_NADA} -.endif ###################################################################### ### real-install (PRIVATE) |