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/install | |
| 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/install')
| -rw-r--r-- | mk/install/bsd.install.mk | 4 | ||||
| -rw-r--r-- | mk/install/install.mk | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/mk/install/bsd.install.mk b/mk/install/bsd.install.mk index f71e9fd0f02..82f1db6e3d4 100644 --- a/mk/install/bsd.install.mk +++ b/mk/install/bsd.install.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.install.mk,v 1.16 2016/04/10 15:58:02 joerg Exp $ +# $NetBSD: bsd.install.mk,v 1.17 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 installing packages. @@ -38,7 +38,7 @@ install: package-install .if !defined(NO_INSTALL) . include "install.mk" .else -. if exists(${_COOKIE.install}) +. if exists(${_COOKIE.install}) && !${_CLEANING} stage-install: @${DO_NADA} . elif defined(_PKGSRC_BARRIER) diff --git a/mk/install/install.mk b/mk/install/install.mk index a1c5590587c..a2dad290519 100644 --- a/mk/install/install.mk +++ b/mk/install/install.mk @@ -1,4 +1,4 @@ -# $NetBSD: install.mk,v 1.75 2018/11/12 14:22:58 jperkin Exp $ +# $NetBSD: install.mk,v 1.76 2019/05/07 19:36:44 rillig Exp $ # # This file provides the code for the "install" phase. # @@ -77,7 +77,7 @@ _INSTALL_TARGETS+= release-install-lock .PHONY: stage-install .if !target(stage-install) -. if exists(${_COOKIE.install}) +. if exists(${_COOKIE.install}) && !${_CLEANING} stage-install: @${DO_NADA} . elif defined(_PKGSRC_BARRIER) @@ -91,7 +91,7 @@ stage-install: barrier acquire-install-lock: acquire-lock release-install-lock: release-lock -.if exists(${_COOKIE.install}) +.if exists(${_COOKIE.install}) && !${_CLEANING} ${_COOKIE.install}: @${DO_NADA} .else |