6883291 native brand msgs not generated

5 files changed, 21 insertions, 19 deletions

diff --git a/usr/src/lib/brand/Makefile b/usr/src/lib/brand/Makefile
index a45d3e1e68..2346fd770b 100644
--- a/usr/src/lib/brand/Makefile
+++ b/usr/src/lib/brand/Makefile
@@ -35,7 +35,7 @@ i386_SUBDIRS= lx
 i386_MSGSUBDIRS= lx
 
 SUBDIRS= sn1 native $($(MACH)_SUBDIRS)
-MSGSUBDIRS= $($(MACH)_MSGSUBDIRS)
+MSGSUBDIRS= native $($(MACH)_MSGSUBDIRS)
 
 all :=		TARGET= all
 install :=	TARGET= install
diff --git a/usr/src/lib/brand/native/Makefile b/usr/src/lib/brand/native/Makefile
index edf14afe10..296d8b78c3 100644
--- a/usr/src/lib/brand/native/Makefile
+++ b/usr/src/lib/brand/native/Makefile
@@ -20,11 +20,9 @@
 #
 
 #
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 SUBDIRS=	zone
 
@@ -33,10 +31,11 @@ clean :=        TARGET= clean
 clobber :=      TARGET= clobber
 install :=      TARGET= install
 lint :=         TARGET= lint
+_msg :=		TARGET= _msg
 
 .KEEP_STATE:
 
-all install clean clobber lint: $(SUBDIRS)
+all install clean clobber lint _msg: $(SUBDIRS)
 
 $(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
diff --git a/usr/src/lib/brand/native/zone/Makefile b/usr/src/lib/brand/native/zone/Makefile
index 2d711cb13b..8e87542b1b 100644
--- a/usr/src/lib/brand/native/zone/Makefile
+++ b/usr/src/lib/brand/native/zone/Makefile
@@ -49,14 +49,12 @@ include ../../Makefile.brand
 CPPFLAGS +=	-I/usr/include/libxml2 -D_REENTRANT
 LDLIBS += -lzonecfg -luutil
 
-POFILES=	$(PROGS:%=%.po)
+POFILES=	$(PROGS:%=%.po) common.po
 POFILE=		native_zone.po
 
 $(POFILE): $(POFILES)
 	$(RM) $@
-	$(BUILDPO.pofiles)
-
-_msg: $(MSGDOMAINPOFILE)
+	$(CAT) $(POFILES) > $@
 
 lint: lint_PROG
 
@@ -64,7 +62,6 @@ install: $(PROGS) $(ROOTPROGS) $(ROOTXMLDOCS) $(ROOTTEMPLATES) $(ROOTSHARED) \
 	$(ETCUSER)
 
 clean:
-	-$(RM) $(PROGS)
+	-$(RM) $(PROGS) $(POFILES) $(POFILE)
 
-include $(SRC)/Makefile.msg.targ
 include $(SRC)/cmd/Makefile.targ
diff --git a/usr/src/lib/brand/sn1/Makefile b/usr/src/lib/brand/sn1/Makefile
index 9eff18131b..e717c249a2 100644
--- a/usr/src/lib/brand/sn1/Makefile
+++ b/usr/src/lib/brand/sn1/Makefile
@@ -19,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 
@@ -31,7 +31,7 @@ include Makefile.sn1
 .PARALLEL:
 
 SUBDIRS =	librtld_db sn1_brand zone
-MSGSUBDIRS =	librtld_db sn1_brand zone
+MSGSUBDIRS =	zone
 
 all :=		TARGET= all
 install :=	TARGET= install
diff --git a/usr/src/lib/brand/sn1/zone/Makefile b/usr/src/lib/brand/sn1/zone/Makefile
index 8adc9ad24e..7d8877afaa 100644
--- a/usr/src/lib/brand/sn1/zone/Makefile
+++ b/usr/src/lib/brand/sn1/zone/Makefile
@@ -20,27 +20,33 @@
 #
 
 #
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 BRAND=		sn1
 PROGS=		sn1_boot
 XMLDOCS=	config.xml platform.xml
 TEMPLATES=	SUNWsn1.xml
+CLOBBERFILES=	$(PROGS)
 
 all:	$(PROGS)
 
+include $(SRC)/cmd/Makefile.cmd
 include ../../Makefile.brand
 
+POFILES=	$(PROGS:%=%.po)
+POFILE=		sn1_zone.po
+
+$(POFILE): $(POFILES)
+	$(RM) $@
+	$(CAT) $(POFILES) > $@
+
 lint:
 
 clean:
-	-$(RM) $(PROGS)
+	-$(RM) $(PROGS) $(POFILES) $(POFILE)
 
 install: $(PROGS) $(ROOTPROGS) $(ROOTXMLDOCS) $(ROOTTEMPLATES)
 
-clobber: clean
-	-$(RM) $(ROOTPROGS) $(ROOTXMLDOCS) $(ROOTTEMPLATES)
+include $(SRC)/cmd/Makefile.targ