summaryrefslogtreecommitdiff
path: root/usr/src/Makefile
diff options
context:
space:
mode:
authorRichard Lowe <richlowe@richlowe.net>2021-02-20 22:22:15 -0600
committerRichard Lowe <richlowe@richlowe.net>2021-02-26 11:39:19 -0600
commit3a51e5c06fdc66b1c3883ded28372f6ae8e9cedb (patch)
tree34a74edf6f98916f955cfab48c490e4a0f813e65 /usr/src/Makefile
parentcd93bdd351ff6db57bb306f3135a27aff71919d0 (diff)
downloadillumos-joyent-3a51e5c06fdc66b1c3883ded28372f6ae8e9cedb.tar.gz
13573 stop working around broken _msg makefiles and fix them
Reviewed by: Toomas Soome <tsoome@me.com> Reviewed by: Yuri Pankov <yuripv@yuripv.dev> Approved by: Gordon Ross <gordon.w.ross@gmail.com>
Diffstat (limited to 'usr/src/Makefile')
-rw-r--r--usr/src/Makefile16
1 files changed, 2 insertions, 14 deletions
diff --git a/usr/src/Makefile b/usr/src/Makefile
index 0a0a42676b..219e80372d 100644
--- a/usr/src/Makefile
+++ b/usr/src/Makefile
@@ -74,16 +74,6 @@ CHKMFSTSUBDIRS= cmd
CHKMANSUBDIRS = man
MSGSUBDIRS= cmd ucbcmd lib data
-DOMAINS= \
- SUNW_OST_ADMIN \
- SUNW_OST_NETRPC \
- SUNW_OST_OSCMD \
- SUNW_OST_OSLIB \
- SUNW_OST_UCBCMD \
- SUNW_OST_ZONEINFO
-
-MSGDDIRS= $(DOMAINS:%=$(MSGROOT)/%)
-MSGDIRS= $(MSGROOT) $(MSGDDIRS) $(MSGROOT)/LC_TIME
all := TARGET= all
install := TARGET= install
@@ -126,7 +116,7 @@ install1: mapfiles closedbins sgs
install2: install1 .WAIT $(SUBDIRS)
-_msg: _msgdirs rootdirs FRC
+_msg: rootdirs FRC
@for m in $(MSGSUBDIRS); do \
cd $$m; pwd; $(MAKE) _msg; cd ..; \
done
@@ -212,9 +202,7 @@ bldtools:
rootdirs: $(ROOTDIRS)
$(INS) -d -m 775 $(ROOT)/var/mail/:saved
-_msgdirs: $(MSGDIRS)
-
-$(ROOTDIRS) $(MSGDIRS):
+$(ROOTDIRS):
$(INS.dir)
userheaders: FRC