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>

9 files changed, 27 insertions, 34 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
diff --git a/usr/src/cmd/make/lib/mksh/Makefile b/usr/src/cmd/make/lib/mksh/Makefile
index de2fc14199..257b3e8f18 100644
--- a/usr/src/cmd/make/lib/mksh/Makefile
+++ b/usr/src/cmd/make/lib/mksh/Makefile
@@ -26,7 +26,7 @@ include $(SRC)/lib/Makefile.lib
 include ../../Makefile.com
 
 POFILE = libmksh.po
-POFILES = $(OBJECTS:%.o=%.po)
+MSGFILES = $(OBJECTS:%.o=%.cc)
 
 LIBS = $(LIBRARY)
 SRCDIR = ../
@@ -42,11 +42,9 @@ all: $(LIBS)
 
 install: all
 
-$(POFILE): $(POFILES)
-	$(CAT) $(POFILES) > $@
+$(POFILE): pofile_MSGFILES
 
-_msg: $(MSGDOMAIN) $(POFILE)
-	$(RM) $(MSGDOMAIN)/$(POFILE)
-	$(CP) $(POFILE) $(MSGDOMAIN)
+_msg: $(MSGDOMAINPOFILE)
 
 include $(SRC)/lib/Makefile.targ
+include $(SRC)/Makefile.msg.targ
diff --git a/usr/src/cmd/ptools/Makefile b/usr/src/cmd/ptools/Makefile
index aec951e44b..24c3bb90c5 100644
--- a/usr/src/cmd/ptools/Makefile
+++ b/usr/src/cmd/ptools/Makefile
@@ -96,10 +96,12 @@ $(LEGACY_SUBDIRS): FRC
 # Combine all messages files into a single file and copy it to
 # MSGDOMAIN directory
 #
-_msg: ${POFILES}
+_msg: $(MSGDOMAIN) $(POFILES)
 	$(RM) $(POFILE)
 	$(CAT) $(POFILES) > $(POFILE)
 	$(RM)  $(MSGDOMAIN)/$(POFILE)
 	$(CP) $(POFILE) $(MSGDOMAIN)
 
 FRC:
+
+include $(SRC)/Makefile.msg.targ
diff --git a/usr/src/cmd/troff/Makefile b/usr/src/cmd/troff/Makefile
index ffff76cd96..20dcb6abba 100644
--- a/usr/src/cmd/troff/Makefile
+++ b/usr/src/cmd/troff/Makefile
@@ -20,12 +20,8 @@
 # CDDL HEADER END
 #
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 # Copyright (c) 1989 by Sun Microsystems, Inc.
 #
-# cmd/troff/Makefile
-#
 
 include ../Makefile.cmd
 
@@ -47,11 +43,11 @@ POFILES= $(SUBDIRS:%=%/%.po)
 POFILE= troff.po
 
 
-.KEEP_STATE :
+.KEEP_STATE:
 
-all :		$(SUBDIRS)
+all:		$(SUBDIRS)
 
-install clean lint strip :	$(SUBDIRS)
+install clean lint strip:	$(SUBDIRS)
 
 clobber: $(SUBDIRS) local_clobber
 
@@ -60,14 +56,16 @@ local_clobber:
 
 $(POFILE):      $(SUBDIRS) $(POFILES2)
 	cat     $(POFILES) $(POFILES2)  >       $@
-	 
-_msg:   $(SUBDIRS)
+
+_msg:   $(MSGDOMAIN) $(SUBDIRS)
 	  $(RM)	$(POFILE)
 	  cat    $(POFILES)      > $(POFILE)
 	  $(RM) $(MSGDOMAIN)/$(POFILE)
 	  cp $(POFILE) $(MSGDOMAIN)
 
-$(SUBDIRS) :	FRC
-		@cd $@; pwd; $(MAKE) $(TARGET)
+$(SUBDIRS):	FRC
+	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
+
+include $(SRC)/Makefile.msg.targ
diff --git a/usr/src/lib/cfgadm_plugins/scsi/Makefile b/usr/src/lib/cfgadm_plugins/scsi/Makefile
index b4abc1bf76..d614a17db9 100644
--- a/usr/src/lib/cfgadm_plugins/scsi/Makefile
+++ b/usr/src/lib/cfgadm_plugins/scsi/Makefile
@@ -71,3 +71,5 @@ $(POFILES):
 	$(RM) messages.po
 
 FRC:
+
+include $(SRC)/Makefile.msg.targ
diff --git a/usr/src/lib/libcurses/Makefile b/usr/src/lib/libcurses/Makefile
index 594a2c7ba7..df434327f4 100644
--- a/usr/src/lib/libcurses/Makefile
+++ b/usr/src/lib/libcurses/Makefile
@@ -134,3 +134,4 @@ generic.po:
 FRC:
 
 include ../Makefile.targ
+include $(SRC)/Makefile.msg.targ
diff --git a/usr/src/lib/libslp/Makefile b/usr/src/lib/libslp/Makefile
index 2d7e391c32..8bc2c392a7 100644
--- a/usr/src/lib/libslp/Makefile
+++ b/usr/src/lib/libslp/Makefile
@@ -75,3 +75,5 @@ $(SUBDIRS):	FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
+
+include $(SRC)/Makefile.msg.targ
diff --git a/usr/src/lib/libsmedia/plugins/Makefile.plugin b/usr/src/lib/libsmedia/plugins/Makefile.plugin
index 331d8bfc9e..6f3ac8ab63 100644
--- a/usr/src/lib/libsmedia/plugins/Makefile.plugin
+++ b/usr/src/lib/libsmedia/plugins/Makefile.plugin
@@ -62,3 +62,5 @@ $(POFILE) : $(POFILE_SRCS)
 	$(SED) -e '/^domain/d' messages.po > $@
 	$(RM) messages.po
 
+
+include $(SRC)/Makefile.msg.targ
diff --git a/usr/src/lib/libsmedia/plugins/blkdev/Makefile b/usr/src/lib/libsmedia/plugins/blkdev/Makefile
index 9ccef361bf..6ac0f363f5 100644
--- a/usr/src/lib/libsmedia/plugins/blkdev/Makefile
+++ b/usr/src/lib/libsmedia/plugins/blkdev/Makefile
@@ -21,9 +21,9 @@
 #
 # Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
 #
-#
-# lib/libsmedia/plugins/bd/Makefile
 
 include		../../../Makefile.lib
 include		Makefile.targ
 include		../Makefile.plugin
+
+include $(SRC)/Makefile.msg.targ