summaryrefslogtreecommitdiff
path: root/mk/tools
diff options
context:
space:
mode:
authorrillig <rillig@pkgsrc.org>2019-05-07 19:36:43 +0000
committerrillig <rillig@pkgsrc.org>2019-05-07 19:36:43 +0000
commite69a8e6b9a2ec1fe26f4213b89531a5debabf312 (patch)
treedd6c3ae5f569aa6abe76820becfd3a45899a0f05 /mk/tools
parent0e83f609c5e5acb21481227c510239f9ad2cbe2c (diff)
downloadpkgsrc-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/tools')
-rw-r--r--mk/tools/bsd.tools.mk6
1 files changed, 3 insertions, 3 deletions
diff --git a/mk/tools/bsd.tools.mk b/mk/tools/bsd.tools.mk
index 258318e109b..b5be4df1a0e 100644
--- a/mk/tools/bsd.tools.mk
+++ b/mk/tools/bsd.tools.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.tools.mk,v 1.58 2019/03/22 16:17:50 rillig Exp $
+# $NetBSD: bsd.tools.mk,v 1.59 2019/05/07 19:36:44 rillig Exp $
#
# Copyright (c) 2005, 2006 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -62,7 +62,7 @@ _TOOLS_TARGETS+= release-tools-lock
.PHONY: tools
.if !target(tools)
-. if exists(${_COOKIE.tools})
+. if exists(${_COOKIE.tools}) && !${_CLEANING}
tools:
@${DO_NADA}
. elif defined(_PKGSRC_BARRIER)
@@ -76,7 +76,7 @@ tools: barrier
acquire-tools-lock: acquire-lock
release-tools-lock: release-lock
-.if exists(${_COOKIE.tools})
+.if exists(${_COOKIE.tools}) && !${_CLEANING}
${_COOKIE.tools}:
@${DO_NADA}
.else