summaryrefslogtreecommitdiff
path: root/mk/build
diff options
context:
space:
mode:
authorjlam <jlam>2006-07-06 22:29:52 +0000
committerjlam <jlam>2006-07-06 22:29:52 +0000
commitdc7af346aac47e74017fb3747b3d76a04373d244 (patch)
tree86e01d40e2b6fbd8f12d013ad3e7e680b240efb2 /mk/build
parent90ab95f190c275a87ab8fd05386d77758eba31e3 (diff)
downloadpkgsrc-dc7af346aac47e74017fb3747b3d76a04373d244.tar.gz
The cookie files are indirectly made using *-cookie targets, so verify
that they are never being created more than once by inserting a check into the *-cookie targets.
Diffstat (limited to 'mk/build')
-rw-r--r--mk/build/bsd.build.mk3
-rw-r--r--mk/build/test.mk3
2 files changed, 4 insertions, 2 deletions
diff --git a/mk/build/bsd.build.mk b/mk/build/bsd.build.mk
index 66a648f6faf..18521ce8a6e 100644
--- a/mk/build/bsd.build.mk
+++ b/mk/build/bsd.build.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.build.mk,v 1.4 2006/07/06 17:22:13 jlam Exp $
+# $NetBSD: bsd.build.mk,v 1.5 2006/07/06 22:29:52 jlam Exp $
#
# This Makefile fragment is included by bsd.pkg.mk and provides all
# variables and targets related to building sources for a package.
@@ -42,5 +42,6 @@ build: configure build-cookie pkginstall
###
.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}
diff --git a/mk/build/test.mk b/mk/build/test.mk
index e085fb4030c..3d9e50a6e94 100644
--- a/mk/build/test.mk
+++ b/mk/build/test.mk
@@ -1,4 +1,4 @@
-# $NetBSD: test.mk,v 1.3 2006/07/06 17:39:36 jlam Exp $
+# $NetBSD: test.mk,v 1.4 2006/07/06 22:29:52 jlam Exp $
#
# TEST_DIRS is the list of directories in which to perform the build
# process. If the directories are relative paths, then they
@@ -126,5 +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}