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.

3 files changed, 19 insertions, 19 deletions

diff --git a/mk/install/bsd.install.mk b/mk/install/bsd.install.mk
index 00aaa557fe1..1b9e5172cb4 100644
--- a/mk/install/bsd.install.mk
+++ b/mk/install/bsd.install.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.install.mk,v 1.7 2006/07/07 13:39:52 jlam Exp $
+# $NetBSD: bsd.install.mk,v 1.8 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 installing packages.
@@ -12,7 +12,7 @@
 #    pre-install, do-install, post-install
 #
 
-_INSTALL_COOKIE=	${WRKDIR}/.install_done
+_COOKIE.install=	${WRKDIR}/.install_done
 
 ######################################################################
 ### install (PUBLIC)
@@ -23,10 +23,10 @@ _INSTALL_COOKIE=	${WRKDIR}/.install_done
 .if !defined(NO_INSTALL)
 .  include "${PKGSRCDIR}/mk/install/install.mk"
 .elif !target(install)
-.  if exists(${_INSTALL_COOKIE})
+.  if exists(${_COOKIE.install})
 install:
 	@${DO_NADA}
-.  elif exists(${_BARRIER_COOKIE})
+.  elif exists(${_COOKIE.barrier})
 install: ${_PKGSRC_BUILD_TARGETS} install-cookie
 .  else
 install: barrier
@@ -43,6 +43,6 @@ install: barrier
 ###
 .PHONY: install-cookie
 install-cookie:
-	${_PKG_SILENT}${_PKG_DEBUG}${TEST} ! -f ${_INSTALL_COOKIE} || ${FALSE}
-	${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${_INSTALL_COOKIE:H}
-	${_PKG_SILENT}${_PKG_DEBUG}${ECHO} ${PKGNAME} > ${_INSTALL_COOKIE}
+	${_PKG_SILENT}${_PKG_DEBUG}${TEST} ! -f ${_COOKIE.install} || ${FALSE}
+	${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${_COOKIE.install:H}
+	${_PKG_SILENT}${_PKG_DEBUG}${ECHO} ${PKGNAME} > ${_COOKIE.install}
diff --git a/mk/install/install.mk b/mk/install/install.mk
index bc952a1d7b2..7dc9c43d527 100644
--- a/mk/install/install.mk
+++ b/mk/install/install.mk
@@ -1,4 +1,4 @@
-# $NetBSD: install.mk,v 1.10 2006/07/05 22:21:02 jlam Exp $
+# $NetBSD: install.mk,v 1.11 2006/07/07 21:24:28 jlam Exp $
 
 ######################################################################
 ### install (PUBLIC)
@@ -9,15 +9,15 @@
 _INSTALL_TARGETS+=	check-vulnerable
 _INSTALL_TARGETS+=	${_PKGSRC_BUILD_TARGETS}
 _INSTALL_TARGETS+=	acquire-install-lock
-_INSTALL_TARGETS+=	${_INSTALL_COOKIE}
+_INSTALL_TARGETS+=	${_COOKIE.install}
 _INSTALL_TARGETS+=	release-install-lock
 
 .PHONY: install
 .if !target(install)
-.  if exists(${_INSTALL_COOKIE})
+.  if exists(${_COOKIE.install})
 install:
 	@${DO_NADA}
-.  elif exists(${_BARRIER_COOKIE})
+.  elif exists(${_COOKIE.barrier})
 install: ${_INSTALL_TARGETS}
 .  else
 install: barrier
@@ -28,11 +28,11 @@ install: barrier
 acquire-install-lock: acquire-lock
 release-install-lock: release-lock
 
-.if exists(${_INSTALL_COOKIE})
-${_INSTALL_COOKIE}:
+.if exists(${_COOKIE.install})
+${_COOKIE.install}:
 	@${DO_NADA}
 .else
-${_INSTALL_COOKIE}: real-install
+${_COOKIE.install}: real-install
 .endif
 
 ######################################################################
@@ -93,9 +93,9 @@ unprivileged-install-hook:
 ### This is a check against stale work directories.
 ###
 .PHONY: install-check-version
-install-check-version: ${_EXTRACT_COOKIE}
+install-check-version: ${_COOKIE.extract}
 	${_PKG_SILENT}${_PKG_DEBUG}					\
-	extractname=`${CAT} ${_EXTRACT_COOKIE}`;			\
+	extractname=`${CAT} ${_COOKIE.extract}`;			\
 	pkgname=${PKGNAME};						\
 	case "$$extractname" in						\
 	"")	${WARNING_MSG} "${WRKDIR} may contain an older version of ${PKGBASE}" ;; \
@@ -325,4 +325,4 @@ privileged-install-hook:
 ### later phases so that the "install" target may be re-invoked.
 ###
 install-clean: package-clean check-clean
-	${_PKG_SILENT}${_PKG_DEBUG}${RM} -f ${PLIST} ${_INSTALL_COOKIE}
+	${_PKG_SILENT}${_PKG_DEBUG}${RM} -f ${PLIST} ${_COOKIE.install}
diff --git a/mk/install/replace.mk b/mk/install/replace.mk
index a529bff3456..d2ed28f9f38 100644
--- a/mk/install/replace.mk
+++ b/mk/install/replace.mk
@@ -1,4 +1,4 @@
-# $NetBSD: replace.mk,v 1.5 2006/07/05 22:21:02 jlam Exp $
+# $NetBSD: replace.mk,v 1.6 2006/07/07 21:24:28 jlam Exp $
 
 ######################################################################
 ### replace (PUBLIC)
@@ -12,7 +12,7 @@ _REPLACE_TARGETS+=	unprivileged-install-hook
 
 .PHONY: replace su-replace
 .if !target(replace)
-.  if exists(${_BARRIER_COOKIE})
+.  if exists(${_COOKIE.barrier})
 replace: ${_REPLACE_TARGETS} su-target
 .  else
 replace: barrier