diff options
| author | rillig <rillig@pkgsrc.org> | 2019-05-07 19:36:43 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2019-05-07 19:36:43 +0000 |
| commit | e69a8e6b9a2ec1fe26f4213b89531a5debabf312 (patch) | |
| tree | dd6c3ae5f569aa6abe76820becfd3a45899a0f05 /mk/extract | |
| parent | 0e83f609c5e5acb21481227c510239f9ad2cbe2c (diff) | |
| download | pkgsrc-e69a8e6b9a2ec1fe26f4213b89531a5debabf312.tar.gz | |
mk: allow "bmake clean depends" as shortcut
When "bmake clean depends" was called for a package where the various
cookie files already existed, these would enable different rules than a
clean package directory.
Since "bmake clean" deletes all the cookie files before "bmake depends"
starts, in these combined command lines the cookie files must be treated
as absent.
Diffstat (limited to 'mk/extract')
| -rw-r--r-- | mk/extract/extract.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mk/extract/extract.mk b/mk/extract/extract.mk index f23b7efaae0..fd94ad9071f 100644 --- a/mk/extract/extract.mk +++ b/mk/extract/extract.mk @@ -1,4 +1,4 @@ -# $NetBSD: extract.mk,v 1.37 2014/03/02 09:45:42 obache Exp $ +# $NetBSD: extract.mk,v 1.38 2019/05/07 19:36:44 rillig Exp $ # # The following variables may be set by the package Makefile and # specify how extraction happens: @@ -71,7 +71,7 @@ _EXTRACT_TARGETS+= release-extract-lock .PHONY: extract .if !target(extract) -. if exists(${_COOKIE.extract}) +. if exists(${_COOKIE.extract}) && !${_CLEANING} extract: @${DO_NADA} . elif defined(_PKGSRC_BARRIER) @@ -85,7 +85,7 @@ extract: barrier acquire-extract-lock: acquire-lock release-extract-lock: release-lock -.if exists(${_COOKIE.extract}) +.if exists(${_COOKIE.extract}) && !${_CLEANING} ${_COOKIE.extract}: @${DO_NADA} .else |