diff options
| author | jlam <jlam@pkgsrc.org> | 2006-07-07 21:24:27 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2006-07-07 21:24:27 +0000 |
| commit | 356f5e8af5cd19e6a2a6e9b8be45b4a5bbf60a64 (patch) | |
| tree | e3a14bcdd4dd231263dc051a36761d879732de89 /mk/patch | |
| parent | 5980ce7bc529287f0cd63cf1260c5d8f0f090f1e (diff) | |
| download | pkgsrc-356f5e8af5cd19e6a2a6e9b8be45b4a5bbf60a64.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/patch')
| -rw-r--r-- | mk/patch/patch.mk | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/mk/patch/patch.mk b/mk/patch/patch.mk index e6e0b3e4589..c4e0984732b 100644 --- a/mk/patch/patch.mk +++ b/mk/patch/patch.mk @@ -1,4 +1,4 @@ -# $NetBSD: patch.mk,v 1.7 2006/07/06 22:29:53 jlam Exp $ +# $NetBSD: patch.mk,v 1.8 2006/07/07 21:24:29 jlam Exp $ # # The following variables may be set in a package Makefile and control # how pkgsrc patches are applied. @@ -44,7 +44,7 @@ # _PATCH_APPLIED_FILE= ${WRKDIR}/.patch -_PATCH_COOKIE= ${WRKDIR}/.patch_done +_COOKIE.patch= ${WRKDIR}/.patch_done ###################################################################### ### patch (PUBLIC) @@ -55,12 +55,12 @@ _PATCH_COOKIE= ${WRKDIR}/.patch_done _PATCH_TARGETS+= check-vulnerable _PATCH_TARGETS+= extract _PATCH_TARGETS+= acquire-patch-lock -_PATCH_TARGETS+= ${_PATCH_COOKIE} +_PATCH_TARGETS+= ${_COOKIE.patch} _PATCH_TARGETS+= release-patch-lock .PHONY: patch .if !target(patch) -. if exists(${_PATCH_COOKIE}) +. if exists(${_COOKIE.patch}) patch: @${DO_NADA} . else @@ -72,11 +72,11 @@ patch: ${_PATCH_TARGETS} acquire-patch-lock: acquire-lock release-patch-lock: release-lock -.if exists(${_PATCH_COOKIE}) -${_PATCH_COOKIE}: +.if exists(${_COOKIE.patch}) +${_COOKIE.patch}: @${DO_NADA} .else -${_PATCH_COOKIE}: real-patch +${_COOKIE.patch}: real-patch .endif ###################################################################### @@ -108,12 +108,12 @@ patch-message: ### .PHONY: patch-cookie patch-cookie: - ${_PKG_SILENT}${_PKG_DEBUG}${TEST} ! -f ${_PATCH_COOKIE} || ${FALSE} + ${_PKG_SILENT}${_PKG_DEBUG}${TEST} ! -f ${_COOKIE.patch} || ${FALSE} ${_PKG_SILENT}${_PKG_DEBUG} \ if ${TEST} -f ${_PATCH_APPLIED_FILE:Q}; then \ - ${MV} -f ${_PATCH_APPLIED_FILE:Q} ${_PATCH_COOKIE:Q}; \ + ${MV} -f ${_PATCH_APPLIED_FILE:Q} ${_COOKIE.patch:Q}; \ else \ - ${TOUCH} ${TOUCH_FLAGS} ${_PATCH_COOKIE:Q}; \ + ${TOUCH} ${TOUCH_FLAGS} ${_COOKIE.patch:Q}; \ fi ###################################################################### |