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, 15 insertions, 15 deletions

diff --git a/mk/depends/bsd.depends-vars.mk b/mk/depends/bsd.depends-vars.mk
index ab180031278..464869112b5 100644
--- a/mk/depends/bsd.depends-vars.mk
+++ b/mk/depends/bsd.depends-vars.mk
@@ -1,8 +1,8 @@
-# $NetBSD: bsd.depends-vars.mk,v 1.2 2006/06/06 15:28:52 jlam Exp $
+# $NetBSD: bsd.depends-vars.mk,v 1.3 2006/07/07 21:24:28 jlam Exp $
 #
 # This Makefile fragment is included separately by bsd.pkg.mk and
 # defines some variables which must be defined earlier than where
 # bsd.depends.mk is included.
 #
 
-_DEPENDS_COOKIE=	${WRKDIR}/.depends_done
+_COOKIE.depends=	${WRKDIR}/.depends_done
diff --git a/mk/depends/bsd.depends.mk b/mk/depends/bsd.depends.mk
index ab3e3d0b358..453d939e29a 100644
--- a/mk/depends/bsd.depends.mk
+++ b/mk/depends/bsd.depends.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.depends.mk,v 1.7 2006/07/06 22:29:52 jlam Exp $
+# $NetBSD: bsd.depends.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 dependencies.
@@ -37,7 +37,7 @@ DEPENDS_TARGET=		reinstall
 .if !defined(NO_DEPENDS)
 .  include "${PKGSRCDIR}/mk/depends/depends.mk"
 .elif !target(depends)
-.  if exists(${_DEPENDS_COOKIE})
+.  if exists(${_COOKIE.depends})
 depends:
 	@${DO_NADA}
 .  else
@@ -64,9 +64,9 @@ install-depends: depends depends-clean
 ### target so that "depends" may be re-invoked.
 ###
 depends-clean:
-	${_PKG_SILENT}${_PKG_DEBUG}${RM} -f ${_DEPENDS_COOKIE}
+	${_PKG_SILENT}${_PKG_DEBUG}${RM} -f ${_COOKIE.depends}
 	${_PKG_SILENT}${_PKG_DEBUG}					\
-	${RMDIR} -p ${_DEPENDS_COOKIE:H} 2>/dev/null || ${TRUE}
+	${RMDIR} -p ${_COOKIE.depends:H} 2>/dev/null || ${TRUE}
 
 ######################################################################
 ### depends-cookie (PRIVATE, override)
@@ -77,8 +77,8 @@ depends-clean:
 .PHONY: depends-cookie
 .if !target(depends-cookie)
 depends-cookie:
-	${_PKG_SILENT}${_PKG_DEBUG}${TEST} ! -f ${_DEPENDS_COOKIE} || ${FALSE}
-	${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${_DEPENDS_COOKIE:H}
-	${_PKG_SILENT}${_PKG_DEBUG}${TOUCH} ${TOUCH_ARGS} ${_DEPENDS_COOKIE}
+	${_PKG_SILENT}${_PKG_DEBUG}${TEST} ! -f ${_COOKIE.depends} || ${FALSE}
+	${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${_COOKIE.depends:H}
+	${_PKG_SILENT}${_PKG_DEBUG}${TOUCH} ${TOUCH_ARGS} ${_COOKIE.depends}
 .endif
 
diff --git a/mk/depends/depends.mk b/mk/depends/depends.mk
index 354b7c49c5c..2b423feb0b2 100644
--- a/mk/depends/depends.mk
+++ b/mk/depends/depends.mk
@@ -1,4 +1,4 @@
-# $NetBSD: depends.mk,v 1.9 2006/07/05 22:21:02 jlam Exp $
+# $NetBSD: depends.mk,v 1.10 2006/07/07 21:24:28 jlam Exp $
 
 ######################################################################
 ### depends (PUBLIC)
@@ -7,12 +7,12 @@
 ### the package.
 ###
 _DEPENDS_TARGETS+=	acquire-depends-lock
-_DEPENDS_TARGETS+=	${_DEPENDS_COOKIE}
+_DEPENDS_TARGETS+=	${_COOKIE.depends}
 _DEPENDS_TARGETS+=	release-depends-lock
 
 .PHONY: depends
 .if !target(depends)
-.  if exists(${_DEPENDS_COOKIE})
+.  if exists(${_COOKIE.depends})
 depends:
 	@${DO_NADA}
 .  else
@@ -24,11 +24,11 @@ depends: ${_DEPENDS_TARGETS}
 acquire-depends-lock: acquire-lock
 release-depends-lock: release-lock
 
-.if exists(${_DEPENDS_COOKIE})
-${_DEPENDS_COOKIE}:
+.if exists(${_COOKIE.depends})
+${_COOKIE.depends}:
 	@${DO_NADA}
 .else
-${_DEPENDS_COOKIE}: real-depends
+${_COOKIE.depends}: real-depends
 .endif
 
 ######################################################################