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

diff --git a/mk/build/bsd.build.mk b/mk/build/bsd.build.mk
index 4e0b601cda0..7942c347faa 100644
--- a/mk/build/bsd.build.mk
+++ b/mk/build/bsd.build.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.build.mk,v 1.6 2006/07/07 13:06:45 seb Exp $
+# $NetBSD: bsd.build.mk,v 1.7 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 building sources for a package.
@@ -13,8 +13,8 @@
 #    pre-test,  do-test,  post-test
 #
 
-_BUILD_COOKIE=	${WRKDIR}/.build_done
-_TEST_COOKIE=	${WRKDIR}/.test_done
+_COOKIE.build=	${WRKDIR}/.build_done
+_COOKIE.test=	${WRKDIR}/.test_done
 
 ######################################################################
 ### build (PUBLIC)
@@ -25,10 +25,10 @@ _TEST_COOKIE=	${WRKDIR}/.test_done
 .if !defined(NO_BUILD)
 .  include "${PKGSRCDIR}/mk/build/build.mk"
 .elif !target(build)
-.  if exists(${_BUILD_COOKIE})
+.  if exists(${_COOKIE.build})
 build:
 	@${DO_NADA}
-.  elif exists(${_BARRIER_COOKIE})
+.  elif exists(${_COOKIE.barrier})
 build: configure build-cookie pkginstall
 .  else
 build: barrier
@@ -44,6 +44,6 @@ build: barrier
 ###
 .PHONY: build-cookie
 build-cookie:
-	${_PKG_SILENT}${_PKG_DEBUG}${TEST} ! -f ${_BUILD_COOKIE} || ${FALSE}
-	${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${_BUILD_COOKIE:H}
-	${_PKG_SILENT}${_PKG_DEBUG}${ECHO} ${PKGNAME} > ${_BUILD_COOKIE}
+	${_PKG_SILENT}${_PKG_DEBUG}${TEST} ! -f ${_COOKIE.build} || ${FALSE}
+	${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${_COOKIE.build:H}
+	${_PKG_SILENT}${_PKG_DEBUG}${ECHO} ${PKGNAME} > ${_COOKIE.build}
diff --git a/mk/build/build.mk b/mk/build/build.mk
index a9747acb12b..ebab48b20fa 100644
--- a/mk/build/build.mk
+++ b/mk/build/build.mk
@@ -1,4 +1,4 @@
-# $NetBSD: build.mk,v 1.3 2006/07/05 22:21:02 jlam Exp $
+# $NetBSD: build.mk,v 1.4 2006/07/07 21:24:28 jlam Exp $
 #
 # BUILD_MAKE_FLAGS is the list of arguments that is passed to the make
 #	process.
@@ -17,16 +17,16 @@ BUILD_TARGET?=		all
 _BUILD_TARGETS+=	check-vulnerable
 _BUILD_TARGETS+=	configure
 _BUILD_TARGETS+=	acquire-build-lock
-_BUILD_TARGETS+=	${_BUILD_COOKIE}
+_BUILD_TARGETS+=	${_COOKIE.build}
 _BUILD_TARGETS+=	release-build-lock
 _BUILD_TARGETS+=	pkginstall
 
 .PHONY: build
 .if !target(build)
-.  if exists(${_BUILD_COOKIE})
+.  if exists(${_COOKIE.build})
 build:
 	@${DO_NADA}
-.  elif exists(${_BARRIER_COOKIE})
+.  elif exists(${_COOKIE.barrier})
 build: ${_BUILD_TARGETS}
 .  else
 build: barrier
@@ -37,11 +37,11 @@ build: barrier
 acquire-build-lock: acquire-lock
 release-build-lock: release-lock
 
-.if exists(${_BUILD_COOKIE})
-${_BUILD_COOKIE}:
+.if exists(${_COOKIE.build})
+${_COOKIE.build}:
 	@${DO_NADA}
 .else
-${_BUILD_COOKIE}: real-build
+${_COOKIE.build}: real-build
 .endif
 
 ######################################################################
diff --git a/mk/build/test.mk b/mk/build/test.mk
index 3d9e50a6e94..d0476e9b7d5 100644
--- a/mk/build/test.mk
+++ b/mk/build/test.mk
@@ -1,4 +1,4 @@
-# $NetBSD: test.mk,v 1.4 2006/07/06 22:29:52 jlam Exp $
+# $NetBSD: test.mk,v 1.5 2006/07/07 21:24:28 jlam Exp $
 #
 # TEST_DIRS is the list of directories in which to perform the build
 #	process.  If the directories are relative paths, then they
@@ -22,15 +22,15 @@ TEST_MAKE_FLAGS?=	${MAKE_FLAGS}
 _TEST_TARGETS+=	check-vulnerable
 _TEST_TARGETS+=	build
 _TEST_TARGETS+=	acquire-test-lock
-_TEST_TARGETS+=	${_TEST_COOKIE}
+_TEST_TARGETS+=	${_COOKIE.test}
 _TEST_TARGETS+=	release-test-lock
 
 .PHONY: test
 .if !target(test)
-.  if exists(${_TEST_COOKIE})
+.  if exists(${_COOKIE.test})
 test:
 	@${DO_NADA}
-.  elif exists(${_BARRIER_COOKIE})
+.  elif exists(${_COOKIE.barrier})
 test: ${_TEST_TARGETS}
 .  else
 test: barrier
@@ -41,11 +41,11 @@ test: barrier
 acquire-test-lock: acquire-lock
 release-test-lock: release-lock
 
-.if exists(${_TEST_COOKIE})
-${_TEST_COOKIE}:
+.if exists(${_COOKIE.test})
+${_COOKIE.test}:
 	@${DO_NADA}
 .else
-${_TEST_COOKIE}: real-test
+${_COOKIE.test}: real-test
 .endif
 
 ######################################################################
@@ -126,6 +126,6 @@ post-test:
 ###
 .PHONY: test-cookie
 test-cookie:
-	${_PKG_SILENT}${_PKG_DEBUG}${TEST} ! -f ${_TEST_COOKIE} || ${FALSE}
-	${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${_TEST_COOKIE:H}
-	${_PKG_SILENT}${_PKG_DEBUG}${ECHO} ${PKGNAME} > ${_TEST_COOKIE}
+	${_PKG_SILENT}${_PKG_DEBUG}${TEST} ! -f ${_COOKIE.test} || ${FALSE}
+	${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${_COOKIE.test:H}
+	${_PKG_SILENT}${_PKG_DEBUG}${ECHO} ${PKGNAME} > ${_COOKIE.test}