diff options
| author | Garrett D'Amore <garrett@nexenta.com> | 2010-10-25 11:04:06 -0700 |
|---|---|---|
| committer | Garrett D'Amore <garrett@nexenta.com> | 2010-10-25 11:04:06 -0700 |
| commit | 65f385795231fc5a4e021acc26afd73365a3b5ab (patch) | |
| tree | 035eb152eedf0762dedb03c76d1ac5eb7e79210d | |
| parent | 82f1abf83edaedb4d5b971f3055460c11992b825 (diff) | |
| download | illumos-joyent-65f385795231fc5a4e021acc26afd73365a3b5ab.tar.gz | |
369 build complaints (packaging mismatches) due to xpg4sh
Reviewed by: gwr@nexenta.com
Approved by: gwr@nexenta.com
| -rw-r--r-- | usr/src/cmd/ksh/builtins/Makefile | 23 | ||||
| -rw-r--r-- | usr/src/cmd/pfexec/Makefile | 2 |
2 files changed, 17 insertions, 8 deletions
diff --git a/usr/src/cmd/ksh/builtins/Makefile b/usr/src/cmd/ksh/builtins/Makefile index bdf1665d8f..40bde75ea2 100644 --- a/usr/src/cmd/ksh/builtins/Makefile +++ b/usr/src/cmd/ksh/builtins/Makefile @@ -62,6 +62,7 @@ ALIASPROG= \ wc XPG4ALIASPROG= \ + alias \ bg \ cd \ command \ @@ -79,10 +80,16 @@ XPG4ALIASPROG= \ 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 @@ FILEMODE= 555 all: $(PROG) -$(ROOTBIN)/%: $(ROOTBIN)/alias - $(INS.link) +$(XPG4ALIASPROG:%=$(ROOTXPG4BIN)/%): + $(RM) $@; $(SYMLINK) ../../bin/alias $@ + +$(XPG4SH:%=$(ROOTXPG4BIN)/%): + $(RM) $@; $(SYMLINK) ../../bin/ksh93 $@ -$(ROOTXPG4BIN)/%: $(ROOTBIN)/alias - $(INS.link) +$(ALIASPROG:%=$(ROOTBIN)/%): $(ROOTPROG) + $(RM) $@; $(LN) $(ROOTPROG) $@ .KEEP_STATE: @@ -126,8 +136,7 @@ CFLAGS64 += \ 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 --git a/usr/src/cmd/pfexec/Makefile b/usr/src/cmd/pfexec/Makefile index 08bfd04df6..8000980f59 100644 --- a/usr/src/cmd/pfexec/Makefile +++ b/usr/src/cmd/pfexec/Makefile @@ -44,7 +44,7 @@ install: all $(ROOTBINPFEXEC) $(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 |