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/depends | |
| 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/depends')
| -rw-r--r-- | mk/depends/bsd.depends.mk | 4 | ||||
| -rw-r--r-- | mk/depends/depends.mk | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/mk/depends/bsd.depends.mk b/mk/depends/bsd.depends.mk index 098d2524100..19a200d7d1e 100644 --- a/mk/depends/bsd.depends.mk +++ b/mk/depends/bsd.depends.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.depends.mk,v 1.29 2019/05/04 11:45:14 leot Exp $ +# $NetBSD: bsd.depends.mk,v 1.30 2019/05/07 19:36:44 rillig Exp $ # # This Makefile fragment is included by bsd.pkg.mk and provides all # variables and targets related to dependencies. @@ -72,7 +72,7 @@ DEPENDS_TARGET= reinstall .if ${SKIP_DEPENDS:M[Nn][Oo]} != "" . include "depends.mk" .elif !target(depends) -. if exists(${_COOKIE.depends}) +. if exists(${_COOKIE.depends}) && !${_CLEANING} depends: @${DO_NADA} . else diff --git a/mk/depends/depends.mk b/mk/depends/depends.mk index d503c2209e2..03e1f601002 100644 --- a/mk/depends/depends.mk +++ b/mk/depends/depends.mk @@ -1,4 +1,4 @@ -# $NetBSD: depends.mk,v 1.18 2014/01/14 12:28:47 cheusov Exp $ +# $NetBSD: depends.mk,v 1.19 2019/05/07 19:36:44 rillig Exp $ ###################################################################### ### depends (PUBLIC) @@ -12,7 +12,7 @@ _DEPENDS_TARGETS+= release-depends-lock .PHONY: depends .if !target(depends) -. if exists(${_COOKIE.depends}) +. if exists(${_COOKIE.depends}) && !${_CLEANING} depends: @${DO_NADA} . else @@ -24,7 +24,7 @@ depends: ${_DEPENDS_TARGETS} acquire-depends-lock: acquire-lock release-depends-lock: release-lock -.if exists(${_COOKIE.depends}) +.if exists(${_COOKIE.depends}) && !${_CLEANING} ${_COOKIE.depends}: @${DO_NADA} .else |