# HG changeset patch
# User Garrett D'Amore <garrett@nexenta.com>
# Date 1288029846 25200
# Node ID 6f4345d35518c2e89d7af74878febf2f18b639f8
# Parent  ef8c14905c5ac644acc6cff79f90cada2532ef8f
369 build complaints (packaging mismatches) due to xpg4sh
Reviewed by: gwr@nexenta.com
Approved by: gwr@nexenta.com

diff -r ef8c14905c5a -r 6f4345d35518 usr/src/cmd/ksh/builtins/Makefile
--- a/usr/src/cmd/ksh/builtins/Makefile	Fri Oct 22 16:59:15 2010 -0700
+++ b/usr/src/cmd/ksh/builtins/Makefile	Mon Oct 25 11:04:06 2010 -0700
@@ -62,6 +62,7 @@
 	wc
 
 XPG4ALIASPROG= \
+	alias \
 	bg \
 	cd \
 	command \
@@ -79,10 +80,16 @@
 	unalias \
 	wait
 
+XPG4SH= \
+	sh
+
+ROOTXPG4ALIAS= \
+	$(XPG4SH:%=$(ROOTXPG4BIN)/%) $(XPG4ALIASPROG:%=$(ROOTXPG4BIN)/%)
+ROOTALIASPROG= $(ALIASPROG:%=$(ROOTBIN)/%)
+
 include ../../Makefile.cmd
 $(SPARC_BLD)include ../../Makefile.cmd.64
 
-ROOTALIASPROG= $(ALIASPROG:%=$(ROOTBIN)/%) $(XPG4ALIASPROG:%=$(ROOTXPG4BIN)/%)
 
 FILEMODE= 555
 
@@ -90,11 +97,14 @@
 
 all: $(PROG)
 
-$(ROOTBIN)/%: $(ROOTBIN)/alias
-	$(INS.link)
+$(XPG4ALIASPROG:%=$(ROOTXPG4BIN)/%):
+	$(RM) $@; $(SYMLINK) ../../bin/alias $@
 
-$(ROOTXPG4BIN)/%: $(ROOTBIN)/alias
-	$(INS.link)
+$(XPG4SH:%=$(ROOTXPG4BIN)/%):
+	$(RM) $@; $(SYMLINK) ../../bin/ksh93 $@
+
+$(ALIASPROG:%=$(ROOTBIN)/%): $(ROOTPROG)
+	$(RM) $@; $(LN) $(ROOTPROG) $@
 
 .KEEP_STATE:
 
@@ -126,8 +136,7 @@
 
 ROOTCMDDIR=$(ROOT)/usr/bin
 
-# .WAIT is needed to get the hardlinks properly done
-install: all $(ROOTCMD) .WAIT $(ROOTALIASPROG)
+install: all $(ROOTPROG) $(ROOTXPG4PROG) $(ROOTALIASPROG) $(ROOTXPG4ALIAS)
 
 $(PROG):	$(OBJECTS)
 	$(RM) alias
diff -r ef8c14905c5a -r 6f4345d35518 usr/src/cmd/pfexec/Makefile
--- a/usr/src/cmd/pfexec/Makefile	Fri Oct 22 16:59:15 2010 -0700
+++ b/usr/src/cmd/pfexec/Makefile	Mon Oct 25 11:04:06 2010 -0700
@@ -44,7 +44,7 @@
 		$(LN) $(ROOTBIN)/pfexec $(ROOTBIN)/pf$$s; \
 	done
 	$(RM) $(ROOTXPG4BIN)/pfsh
-	$(LN) $(ROOTBIN)/pfexec $(ROOTXPG4BIN)/pfsh
+	$(SYMLINK) ../../bin/pfexec $(ROOTXPG4BIN)/pfsh
 	$(RM) $(ROOTSBIN)/pfsh
 	$(SYMLINK) ../usr/bin/pfexec $(ROOTSBIN)/pfsh
 	$(RM) $(ROOTHASBIN)/pfsh