diff options
| author | jlam <jlam> | 2006-07-07 21:24:27 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2006-07-07 21:24:27 +0000 |
| commit | 79e05428bc94d216a3fe1157d3667de366dfb0d8 (patch) | |
| tree | e3a14bcdd4dd231263dc051a36761d879732de89 /mk/configure | |
| parent | 037b6f50618226a0d2ee1a8bf472bc340a269d5f (diff) | |
| download | pkgsrc-79e05428bc94d216a3fe1157d3667de366dfb0d8.tar.gz | |
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.
Diffstat (limited to 'mk/configure')
| -rw-r--r-- | mk/configure/bsd.configure.mk | 14 | ||||
| -rw-r--r-- | mk/configure/configure.mk | 14 |
2 files changed, 14 insertions, 14 deletions
diff --git a/mk/configure/bsd.configure.mk b/mk/configure/bsd.configure.mk index 46da9d1bcff..ce752d3aefb 100644 --- a/mk/configure/bsd.configure.mk +++ b/mk/configure/bsd.configure.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.configure.mk,v 1.5 2006/07/07 13:39:52 jlam Exp $ +# $NetBSD: bsd.configure.mk,v 1.6 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 configuring packages for building. @@ -12,7 +12,7 @@ # pre-configure, do-configure, post-configure # -_CONFIGURE_COOKIE= ${WRKDIR}/.configure_done +_COOKIE.configure= ${WRKDIR}/.configure_done ###################################################################### ### configure (PUBLIC) @@ -23,10 +23,10 @@ _CONFIGURE_COOKIE= ${WRKDIR}/.configure_done .if !defined(NO_CONFIGURE) . include "${PKGSRCDIR}/mk/configure/configure.mk" .elif !target(configure) -. if exists(${_CONFIGURE_COOKIE}) +. if exists(${_COOKIE.configure}) configure: @${DO_NADA} -. elif exists(${_BARRIER_COOKIE}) +. elif exists(${_COOKIE.barrier}) configure: wrapper configure-cookie . else configure: barrier @@ -40,6 +40,6 @@ configure: barrier ### .PHONY: configure-cookie configure-cookie: - ${_PKG_SILENT}${_PKG_DEBUG}${TEST} ! -f ${_CONFIGURE_COOKIE} || ${FALSE} - ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${_CONFIGURE_COOKIE:H} - ${_PKG_SILENT}${_PKG_DEBUG}${ECHO} ${PKGNAME} > ${_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} diff --git a/mk/configure/configure.mk b/mk/configure/configure.mk index c416d02d08e..bc3d99128d9 100644 --- a/mk/configure/configure.mk +++ b/mk/configure/configure.mk @@ -1,4 +1,4 @@ -# $NetBSD: configure.mk,v 1.3 2006/07/05 22:21:02 jlam Exp $ +# $NetBSD: configure.mk,v 1.4 2006/07/07 21:24:28 jlam Exp $ # # CONFIGURE_SCRIPT is the path to the script to run in order to # configure the software for building. If the path is relative, @@ -43,15 +43,15 @@ BUILD_DEFS+= CONFIGURE_ENV CONFIGURE_ARGS _CONFIGURE_TARGETS+= check-vulnerable _CONFIGURE_TARGETS+= wrapper _CONFIGURE_TARGETS+= acquire-configure-lock -_CONFIGURE_TARGETS+= ${_CONFIGURE_COOKIE} +_CONFIGURE_TARGETS+= ${_COOKIE.configure} _CONFIGURE_TARGETS+= release-configure-lock .PHONY: configure .if !target(configure) -. if exists(${_CONFIGURE_COOKIE}) +. if exists(${_COOKIE.configure}) configure: @${DO_NADA} -. elif exists(${_BARRIER_COOKIE}) +. elif exists(${_COOKIE.barrier}) configure: ${_CONFIGURE_TARGETS} . else configure: barrier @@ -62,11 +62,11 @@ configure: barrier acquire-configure-lock: acquire-lock release-configure-lock: release-lock -.if exists(${_CONFIGURE_COOKIE}) -${_CONFIGURE_COOKIE}: +.if exists(${_COOKIE.configure}) +${_COOKIE.configure}: @${DO_NADA} .else -${_CONFIGURE_COOKIE}: real-configure +${_COOKIE.configure}: real-configure .endif ###################################################################### |