diff options
| author | jlam <jlam> | 2006-07-07 21:24:27 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2006-07-07 21:24:27 +0000 |
| commit | 57f16a3d7ce42bc36f6fe57dc39e38b8978d616b (patch) | |
| tree | e3a14bcdd4dd231263dc051a36761d879732de89 /mk/package | |
| parent | 3c6bef5d02e41913ff3094bcb99715d9fccf09fd (diff) | |
| download | pkgsrc-57f16a3d7ce42bc36f6fe57dc39e38b8978d616b.tar.gz | |
Rename <phase>_COOKIE variables to _COOKIE.<phase>. These are private
variables so there are no user-visible changes. This change just makes
it a little easier to write for loops.
Diffstat (limited to 'mk/package')
| -rw-r--r-- | mk/package/bsd.package.mk | 10 | ||||
| -rw-r--r-- | mk/package/package.mk | 20 |
2 files changed, 15 insertions, 15 deletions
diff --git a/mk/package/bsd.package.mk b/mk/package/bsd.package.mk index 1c89941f234..16257ac4daf 100644 --- a/mk/package/bsd.package.mk +++ b/mk/package/bsd.package.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.package.mk,v 1.5 2006/07/07 13:39:52 jlam Exp $ +# $NetBSD: bsd.package.mk,v 1.6 2006/07/07 21:24:28 jlam Exp $ # # This Makefile fragment is included by bsd.pkg.mk and provides all # variables and targets related to binary packages. @@ -8,7 +8,7 @@ # package, repackage # -_PACKAGE_COOKIE= ${WRKDIR}/.package_done +_COOKIE.package= ${WRKDIR}/.package_done ###################################################################### ### package (PUBLIC) @@ -19,10 +19,10 @@ _PACKAGE_COOKIE= ${WRKDIR}/.package_done .if !defined(NO_PACKAGE) . include "${PKGSRCDIR}/mk/package/package.mk" .elif !target(package) -. if exists(${_PACKAGE_COOKIE}) +. if exists(${_COOKIE.package}) package: @${DO_NADA} -. elif exists(${_BARRIER_COOKIE}) +. elif exists(${_COOKIE.barrier}) package: install . if defined(SKIP_SILENT) @${DO_NADA} @@ -51,4 +51,4 @@ repackage: package-clean package ### phase so that the "package" target may be re-invoked. ### package-clean: - ${_PKG_SILENT}${_PKG_DEBUG}${RM} -f ${_PACKAGE_COOKIE} + ${_PKG_SILENT}${_PKG_DEBUG}${RM} -f ${_COOKIE.package} diff --git a/mk/package/package.mk b/mk/package/package.mk index 36af5ef3deb..7098dec3184 100644 --- a/mk/package/package.mk +++ b/mk/package/package.mk @@ -1,4 +1,4 @@ -# $NetBSD: package.mk,v 1.13 2006/07/06 22:29:53 jlam Exp $ +# $NetBSD: package.mk,v 1.14 2006/07/07 21:24:28 jlam Exp $ ###################################################################### ### package (PUBLIC) @@ -13,15 +13,15 @@ _PACKAGE_TARGETS+= replace _PACKAGE_TARGETS+= install .endif _PACKAGE_TARGETS+= acquire-package-lock -_PACKAGE_TARGETS+= ${_PACKAGE_COOKIE} +_PACKAGE_TARGETS+= ${_COOKIE.package} _PACKAGE_TARGETS+= release-package-lock .PHONY: package .if !target(package) -. if exists(${_PACKAGE_COOKIE}) +. if exists(${_COOKIE.package}) package: @${DO_NADA} -. elif exists(${_BARRIER_COOKIE}) +. elif exists(${_COOKIE.barrier}) package: ${_PACKAGE_TARGETS} . else package: barrier @@ -32,11 +32,11 @@ package: barrier acquire-package-lock: acquire-lock release-package-lock: release-lock -.if exists(${_PACKAGE_COOKIE}) -${_PACKAGE_COOKIE}: +.if exists(${_COOKIE.package}) +${_COOKIE.package}: @${DO_NADA} .else -${_PACKAGE_COOKIE}: real-package +${_COOKIE.package}: real-package .endif ###################################################################### @@ -63,9 +63,9 @@ package-message: ### .PHONY: package-cookie package-cookie: - ${_PKG_SILENT}${_PKG_DEBUG}${TEST} ! -f ${_PACKAGE_COOKIE} || ${FALSE} - ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${_PACKAGE_COOKIE:H} - ${_PKG_SILENT}${_PKG_DEBUG}${ECHO} ${PKGNAME} > ${_PACKAGE_COOKIE} + ${_PKG_SILENT}${_PKG_DEBUG}${TEST} ! -f ${_COOKIE.package} || ${FALSE} + ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${_COOKIE.package:H} + ${_PKG_SILENT}${_PKG_DEBUG}${ECHO} ${PKGNAME} > ${_COOKIE.package} ###################################################################### ### The targets below are run with elevated privileges. |