summaryrefslogtreecommitdiff
path: root/mk/configure
diff options
context:
space:
mode:
authorrillig <rillig>2007-03-07 01:27:27 +0000
committerrillig <rillig>2007-03-07 01:27:27 +0000
commitb881d29e76133685e25cfe3c2331a0ea53eeb851 (patch)
tree453d6e4f8a5be80469613b0f54f9185a4659f252 /mk/configure
parent86338d15be1cedcf558690d87dd38ef9dd65f657 (diff)
downloadpkgsrc-b881d29e76133685e25cfe3c2331a0ea53eeb851.tar.gz
Renamed the configure-cookie target to _configure-cookie.
Diffstat (limited to 'mk/configure')
-rw-r--r--mk/configure/bsd.configure.mk19
-rw-r--r--mk/configure/configure.mk4
2 files changed, 9 insertions, 14 deletions
diff --git a/mk/configure/bsd.configure.mk b/mk/configure/bsd.configure.mk
index 2a592bdea93..0a6f6604dbc 100644
--- a/mk/configure/bsd.configure.mk
+++ b/mk/configure/bsd.configure.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.configure.mk,v 1.9 2006/07/27 13:47:29 jlam Exp $
+# $NetBSD: bsd.configure.mk,v 1.10 2007/03/07 01:27:28 rillig Exp $
#
# This Makefile fragment is included by bsd.pkg.mk and provides all
# variables and targets related to configuring packages for building.
@@ -27,19 +27,14 @@ _COOKIE.configure= ${WRKDIR}/.configure_done
configure:
@${DO_NADA}
. elif defined(_PKGSRC_BARRIER)
-configure: wrapper configure-cookie
+configure: wrapper _configure-cookie
. else
configure: barrier
. endif
.endif
-######################################################################
-### configure-cookie (PRIVATE)
-######################################################################
-### configure-cookie creates the "configure" cookie file.
-###
-.PHONY: configure-cookie
-configure-cookie:
- ${_PKG_SILENT}${_PKG_DEBUG}${TEST} ! -f ${_COOKIE.configure} || ${FALSE}
- ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${_COOKIE.configure:H}
- ${_PKG_SILENT}${_PKG_DEBUG}${ECHO} ${PKGNAME} > ${_COOKIE.configure}
+# Creates the "configure" cookie file.
+_configure-cookie: .PHONY
+ ${RUN} [ ! -f ${_COOKIE.configure} ] # XXX: What's the purpose of this assertion?
+ ${RUN} ${MKDIR} ${_COOKIE.configure:H}
+ ${RUN} ${ECHO} ${PKGNAME} > ${_COOKIE.configure}
diff --git a/mk/configure/configure.mk b/mk/configure/configure.mk
index 2a91885a128..806d4a0feb9 100644
--- a/mk/configure/configure.mk
+++ b/mk/configure/configure.mk
@@ -1,4 +1,4 @@
-# $NetBSD: configure.mk,v 1.14 2007/01/08 02:26:03 rillig Exp $
+# $NetBSD: configure.mk,v 1.15 2007/03/07 01:27:27 rillig Exp $
#
# CONFIGURE_SCRIPT is the path to the script to run in order to
# configure the software for building. If the path is relative,
@@ -105,7 +105,7 @@ _REAL_CONFIGURE_TARGETS+= do-configure-pre-hook
_REAL_CONFIGURE_TARGETS+= do-configure
_REAL_CONFIGURE_TARGETS+= do-configure-post-hook
_REAL_CONFIGURE_TARGETS+= post-configure
-_REAL_CONFIGURE_TARGETS+= configure-cookie
+_REAL_CONFIGURE_TARGETS+= _configure-cookie
_REAL_CONFIGURE_TARGETS+= error-check
.PHONY: real-configure