From e69a8e6b9a2ec1fe26f4213b89531a5debabf312 Mon Sep 17 00:00:00 2001
From: rillig <rillig@pkgsrc.org>
Date: Tue, 7 May 2019 19:36:43 +0000
Subject: 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.
---
 mk/tools/bsd.tools.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'mk/tools')

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
-- 
cgit v1.2.3