From 90e9a023bcc1bf7651481fa59b82093e993184f1 Mon Sep 17 00:00:00 2001 From: Lauri Tirkkonen Date: Tue, 3 Oct 2017 22:44:04 +0300 Subject: [PATCH] dmake: do not recurse into usr/src/pkg ...except for clean/clobber. stage-licenses was essentially being made twice, once by dmake recursing into pkg and once in nightly when creating packages. --- usr/src/Makefile | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/usr/src/Makefile b/usr/src/Makefile index 35ebc17a39..7d636ede7f 100644 --- a/usr/src/Makefile +++ b/usr/src/Makefile @@ -95,7 +95,7 @@ check := TARGET= check # cd pkg and do a 'make install' # -all: mapfiles sgs .WAIT $(SUBDIRS) pkg +all: mapfiles sgs .WAIT $(SUBDIRS) # # The _msg build is a two-step process. First, the _msg dependency @@ -105,16 +105,10 @@ all: mapfiles sgs .WAIT $(SUBDIRS) pkg # they were staged in $(ROOT)/catalog, and the results placed into the # proto area. # -# The stage-licenses target causes the license files needed for -# packaging to be pulled from $(SRC) and staged in $(ROOT)/licenses. -# -install: install1 install2 _msg stage-licenses +install: install1 install2 _msg @cd msg; pwd; $(MAKE) _msg @rm -rf "$(ROOT)/catalog" -stage-licenses: install2 - @cd pkg; pwd; $(MAKE) stage-licenses - install1: mapfiles sgs install2: install1 $(SUBDIRS) -- 2.11.4.GIT