summaryrefslogtreecommitdiff
path: root/usr/src/tools/Makefile
diff options
context:
space:
mode:
authorJerry Jelinek <jerry.jelinek@joyent.com>2017-08-23 11:59:26 +0000
committerJerry Jelinek <jerry.jelinek@joyent.com>2017-08-23 11:59:26 +0000
commit32f7a454cbff48d0fb528462482747732b9731e1 (patch)
tree44e011b2a2f246cbf464b2a058eb258a7f3d92a3 /usr/src/tools/Makefile
parentfc1b3c825992bc27440652673e53f8552575f46a (diff)
parentf52b16c60da4b4c350471d7fc68089d796cc082f (diff)
downloadillumos-joyent-32f7a454cbff48d0fb528462482747732b9731e1.tar.gz
[illumos-gate merge]
commit f52b16c60da4b4c350471d7fc68089d796cc082f 8578 sync fnmatch(3C) with upstream commit 89d58ee09d14e0fcdb6f3e8b43197b24ba7a0036 8523 Fix "clobber" in a few Makefiles
Diffstat (limited to 'usr/src/tools/Makefile')
-rw-r--r--usr/src/tools/Makefile7
1 files changed, 6 insertions, 1 deletions
diff --git a/usr/src/tools/Makefile b/usr/src/tools/Makefile
index 5dd1b3e049..6835fc146a 100644
--- a/usr/src/tools/Makefile
+++ b/usr/src/tools/Makefile
@@ -23,6 +23,7 @@
# Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
# Copyright 2014 Garrett D'Amore <garrett@damore.org>
# Copyright 2016 Toomas Soome <tsoome@me.com>
+# Copyright (c) 2016, Chris Fraire <cfraire@me.com>.
#
include ../Makefile.master
@@ -129,6 +130,10 @@ DOROOTDIRS= $(ROOTDIRS)
clobber:= DOROOTDIRS=
clean:= DOROOTDIRS=
+DOROOTONBLDLIBPY= $(ROOTONBLDLIBPY)
+clobber:= DOROOTONBLDLIBPY=
+clean:= DOROOTONBLDLIBPY=
+
all install: $(SUBDIRS)
clean: $(SUBDIRS)
@@ -144,7 +149,7 @@ _msg: $(MSGSUBDIRS)
$(SUBDIRS) $(CLOSED_SUBDIRS): $(BOOT_SUBDIRS)
-$(BOOT_SUBDIRS) $(SUBDIRS): $$(DOROOTDIRS) $(ROOTONBLDLIBPY) FRC
+$(BOOT_SUBDIRS) $(SUBDIRS): $$(DOROOTDIRS) $$(DOROOTONBLDLIBPY) FRC
@cd $@; pwd; $(MAKE) $(TARGET)
$(ROOTDIRS):