[illumos-gate merge]

commit d867f195bdfb1133b7c8b9f63e50119d1360e0c0
    14638 Makefile.master can forget about /usr/ccs
commit 02b17e23cf5bf66a5ea787e066ae3d1aa49bd856
    14637 various Makefiles should have more faith in Makefile.master

22 files changed, 30 insertions, 74 deletions

diff --git a/usr/src/cmd/Makefile.cmd b/usr/src/cmd/Makefile.cmd
index 8dd94c7aaa..4fcff5f0d7 100644
--- a/usr/src/cmd/Makefile.cmd
+++ b/usr/src/cmd/Makefile.cmd
@@ -28,12 +28,6 @@
 
 include $(SRC)/Makefile.master
 
-LN=		ln
-SH=		sh
-ECHO=		echo
-MKDIR=		mkdir
-TOUCH=		touch
-
 FILEMODE=	0555
 LIBFILEMODE=	0444
 XPG4=		$(XPG4PROG:%=%.xpg4)
diff --git a/usr/src/cmd/Makefile.targ b/usr/src/cmd/Makefile.targ
index 4b3e5b3181..1418854986 100644
--- a/usr/src/cmd/Makefile.targ
+++ b/usr/src/cmd/Makefile.targ
@@ -63,12 +63,12 @@ $(ROOTMANIFESTDIR)/%: %
 
 $(KSHPROG): $(KSHPROG).ksh
 	$(RM) $@
-	sed -e "s/TEXT_DOMAIN/${TEXT_DOMAIN}/g" $(KSHPROG).ksh > $@
+	$(SED) -e "s/TEXT_DOMAIN/${TEXT_DOMAIN}/g" $(KSHPROG).ksh > $@
 	$(CHMOD) +x $@
 
 $(BASHPROG): $(BASHPROG).bash
 	$(RM) $@
-	sed -e "s/TEXT_DOMAIN/${TEXT_DOMAIN}/g" $(BASHPROG).bash > $@
+	$(SED) -e "s/TEXT_DOMAIN/${TEXT_DOMAIN}/g" $(BASHPROG).bash > $@
 	$(CHMOD) +x $@
 
 #
diff --git a/usr/src/cmd/audio/utilities/Makefile b/usr/src/cmd/audio/utilities/Makefile
index 6d62590594..1a4a5bd3b8 100644
--- a/usr/src/cmd/audio/utilities/Makefile
+++ b/usr/src/cmd/audio/utilities/Makefile
@@ -48,9 +48,7 @@ SMATCH=off
 
 LINTFLAGS += -m -v -u
 
-AR=     /usr/ccs/bin/ar
 RANLIB= /usr/ccs/bin/ranlib
-RM=     /usr/bin/rm -f
 
 LIBCSRCS        = device_ctl.c \
 		  filehdr.c \
@@ -97,7 +95,7 @@ libaudio=	libaudio.a
 install all: $(libaudio)
 
 $(libaudio): $(COBJS) $(CCOBJS)
-	$(RM) -f $@
+	$(RM) $@
 	$(AR) cq $@ $(COBJS) $(CCOBJS)
 	test ! -f $(RANLIB) || $(RANLIB) $@
 
diff --git a/usr/src/cmd/bnu/Makefile b/usr/src/cmd/bnu/Makefile
index b51411c6d6..e53db95eba 100644
--- a/usr/src/cmd/bnu/Makefile
+++ b/usr/src/cmd/bnu/Makefile
@@ -59,7 +59,6 @@ TXTFILES =	README $(FILES)	\
 
 ROOTMANIFESTDIR=	$(ROOTSVCNETWORK)
 
-CAT =		cat
 POFILE =	bnu.po
 # step around name collisions
 POFILES =	$(PROG:%=%.cat)
@@ -181,7 +180,7 @@ common.po:	../chmod/common.c
 		$(COMPILE.cpp) ../chmod/common.c > common.c.i
 		$(XGETTEXT) $(XGETFLAGS) common.c.i ;\
 		$(RM)   $@ ;\
-		sed "/^domain/d" < messages.po  > $@ ;\
+		$(SED) "/^domain/d" < messages.po  > $@ ;\
 		$(RM) messages.po common.c.i
 
 include		../Makefile.targ
diff --git a/usr/src/cmd/cal/Makefile b/usr/src/cmd/cal/Makefile
index 8ae9a69d1e..4baf127ee9 100644
--- a/usr/src/cmd/cal/Makefile
+++ b/usr/src/cmd/cal/Makefile
@@ -24,11 +24,10 @@
 # Use is subject to license terms.
 #
 
-PROG= cal 
+PROG= cal
 
 include ../Makefile.cmd
 
-SED= sed
 DCFILE= $(PROG).dc
 
 CFLAGS += $(CCVERBOSE)
@@ -37,7 +36,7 @@ CERRWARN += $(CNOWARN_UNINIT)
 
 .KEEP_STATE:
 
-all: $(PROG) 
+all: $(PROG)
 
 install: all $(ROOTPROG)
 
diff --git a/usr/src/cmd/cfgadm/Makefile b/usr/src/cmd/cfgadm/Makefile
index 08280bcb91..d5e2c81b8f 100644
--- a/usr/src/cmd/cfgadm/Makefile
+++ b/usr/src/cmd/cfgadm/Makefile
@@ -29,7 +29,6 @@ PROG= cfgadm
 
 include ../Makefile.cmd
 
-SED= sed
 DCFILE= $(PROG).dc
 
 XGETFLAGS += -a -x cfgadm.xcl
diff --git a/usr/src/cmd/csh/Makefile b/usr/src/cmd/csh/Makefile
index 0ebc6812d8..74e88633b3 100644
--- a/usr/src/cmd/csh/Makefile
+++ b/usr/src/cmd/csh/Makefile
@@ -8,8 +8,6 @@
 # All rights reserved.  The Berkeley Software License Agreement
 # specifies the terms and conditions for redistribution.
 
-# ident	"%Z%%M%	%I%	%E% SMI"
-
 #
 # C Shell with process control; VM/UNIX VAX Makefile
 # Bill Joy UC Berkeley; Jim Kulp IIASA, Austria
@@ -17,12 +15,9 @@
 
 include ../Makefile.cmd
 
-ED= ed
 #
 # For message catalogue files
 #
-GREP= egrep
-SED= sed
 POFILE= csh.po
 CLOBBERFILES += sh.tconst.h
 CLEANFILES += sh.tconst.h
@@ -57,7 +52,7 @@ XGETFLAGS += -a -x csh.xcl
 #
 _msg: $(MSGDOMAIN) sh.tconst.h .WAIT $(POFILE)
 	$(RM) $(POFILE)
-	cat $(POFILES) > $(POFILE)
+	$(CAT) $(POFILES) > $(POFILE)
 	$(RM) $(MSGDOMAIN)/$(POFILE)
 	$(CP) $(POFILE) $(MSGDOMAIN)
 
@@ -75,7 +70,7 @@ clobber: local_clobber $(MACH)
 local_clobber:
 	$(RM) $(CLOBBERFILES)
 
-clean: local_clean 
+clean: local_clean
 
 local_clean:
 	$(RM) $(CLEANFILES)
diff --git a/usr/src/cmd/fs.d/autofs/Makefile b/usr/src/cmd/fs.d/autofs/Makefile
index 5a3a9fd234..76a3bdb709 100644
--- a/usr/src/cmd/fs.d/autofs/Makefile
+++ b/usr/src/cmd/fs.d/autofs/Makefile
@@ -81,10 +81,8 @@ SHAREOBJS=	$(SHARESRCS:%.c=%.o)
 UNSHAREOBJS=	$(UNSHARESRCS:%.c=%.o)
 
 POFILE= autofs.po
-GREP= egrep
-SED= sed
 
-$(AUTO) := 	LDLIBS += -lnsl -lsldap -lscf
+$(AUTO) :=	LDLIBS += -lnsl -lsldap -lscf
 $(MOUNT):=	LDLIBS += -lscf
 $(TYPEPROG) :=	LDLIBS += -lrpcsvc -lsocket -lnsl -lsldap -lkstat -lscf
 
@@ -150,11 +148,11 @@ XLINE= "program DUMP { version VERS \
 
 $(XFILE):	$(BUILDDIR)
 		$(RM) $(XFILE)
-		echo $(XLINE) > $(XFILE)
+		$(ECHO) $(XLINE) > $(XFILE)
 
 $(BUILDDIR):
 		$(RM) -r $(BUILDDIR)
-		mkdir $(BUILDDIR)
+		$(MKDIR) $(BUILDDIR)
 
 $(DUMP_PROTO):	$(BUILDDIR) $(XFILE)
 		cd $(BUILDDIR); $(RM) *.[ch] makefile.malloc_dump ; rpcgen -a `basename $(XFILE)
@@ -162,7 +160,7 @@ $(DUMP_PROTO):	$(BUILDDIR) $(XFILE)
 
 $(DUMP_PROG):	$(DUMP_PROTO)
 		$(RM) $@
-		cp $(DUMP_PROTO) $@
+		$(CP) $(DUMP_PROTO) $@
 
 clean_dump:
 		$(RM) -r $(BUILDDIR)
@@ -199,13 +197,13 @@ webnfs.h:	webnfs.x
 
 webnfs.x:	../nfs/lib/webnfs.x
 	$(RM) webnfs.x
-	cp ../nfs/lib/webnfs.x .
+	$(CP) ../nfs/lib/webnfs.x .
 
 catalog: $(POFILE)
 
 $(POFILE):
 	$(RM) messages.po
-	$(SED) -e 's/pr_msg/gettext/' `$(GREP) -l "pr_msg|gettext" *.[ch]` | \
+	$(SED) -e 's/pr_msg/gettext/' `$(EGREP) -l "pr_msg|gettext" *.[ch]` | \
 	$(XGETTEXT) $(XGETFLAGS) -
 	$(SED) -e '/^# msg/d' -e '/^domain/d' < messages.po > $@
 	$(RM) messages.po
diff --git a/usr/src/cmd/keyserv/Makefile b/usr/src/cmd/keyserv/Makefile
index dae01bb1a1..6b5498d9f8 100644
--- a/usr/src/cmd/keyserv/Makefile
+++ b/usr/src/cmd/keyserv/Makefile
@@ -52,8 +52,6 @@ OBJS	= $(KEYSERVOBJS) $(KEYLOGOUTOBJS) $(KEYLOGINOBJS) $(CHKEYOBJS) \
 	$(K_OBJS)  $(CHANGE_OBJS)
 SRCS	= $(OBJS:.o=.c)
 
-SED=	sed
-
 include ../Makefile.cmd
 
 IBINPROG=		$(BINPROG:%=$(ROOTBIN)/%)
diff --git a/usr/src/cmd/ls/Makefile b/usr/src/cmd/ls/Makefile
index d8a22b7c95..a8c1405cef 100644
--- a/usr/src/cmd/ls/Makefile
+++ b/usr/src/cmd/ls/Makefile
@@ -20,16 +20,11 @@
 # CDDL HEADER END
 #
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
 # Copyright (c) 1997 by Sun Microsystems, Inc.
 # All rights reserved.
 #
-# cmd/ls/Makefile
-#
 
 PROG=	ls
-SED=sed
 DCFILE= $(PROG).dc
 
 include ../Makefile.cmd
diff --git a/usr/src/cmd/mail/Makefile b/usr/src/cmd/mail/Makefile
index 16a1786608..c55889cba4 100644
--- a/usr/src/cmd/mail/Makefile
+++ b/usr/src/cmd/mail/Makefile
@@ -29,8 +29,6 @@ BINPROG=	mail
 
 PROG=	       $(BINPROG)
 
-GREP=		grep
-
 include ../Makefile.cmd
 
 CLOBBERFILES=	$(PROG)
@@ -66,7 +64,7 @@ ROOTSYMLINKS=	$(ROOTBIN)/rmail
 
 
 EDITPATH= \
-	sed -e 's!REAL_PATH!/usr/bin!g' \
+	$(SED) -e 's!REAL_PATH!/usr/bin!g' \
 	    -e 's!USR_SHARE_LIB!/usr/share/lib!g' \
 	    -e 's!VAR_MAIL!/var/mail!g' < $? > $@
 
diff --git a/usr/src/cmd/oamuser/lib/Makefile b/usr/src/cmd/oamuser/lib/Makefile
index b5e506554d..0eda91b790 100644
--- a/usr/src/cmd/oamuser/lib/Makefile
+++ b/usr/src/cmd/oamuser/lib/Makefile
@@ -24,13 +24,13 @@
 #
 # Copyright (c) 2018, Joyent, Inc.
 
-LIBRARY= 	lib.a
+LIBRARY=	lib.a
 
-DATEFILE= 	ugdates
-DATEFILESRC= 	ugdates.dat
-TXT= 		$(DATEFILESRC)
+DATEFILE=	ugdates
+DATEFILESRC=	ugdates.dat
+TXT=		$(DATEFILESRC)
 
-OBJECTS= 	putgrent.o \
+OBJECTS=	putgrent.o \
 		errmsg.o \
 		file.o \
 		vgid.o \
@@ -51,7 +51,6 @@ include ../../../lib/Makefile.lib
 
 SRCDIR =	.
 
-GREP= 		grep
 FILEMODE=	$(LIBFILEMODE)
 
 PRODUCT=	$(LIBRARY) $(DATEFILE)
diff --git a/usr/src/cmd/oamuser/user/Makefile b/usr/src/cmd/oamuser/user/Makefile
index aa4f3e1365..4040396df0 100644
--- a/usr/src/cmd/oamuser/user/Makefile
+++ b/usr/src/cmd/oamuser/user/Makefile
@@ -29,11 +29,9 @@ DEFAULTFILES= useradd.dfl
 
 include ../../Makefile.cmd
 
-GREP=		grep
-
-USERADD= 	useradd
-USERDEL= 	userdel
-USERMOD= 	usermod
+USERADD=	useradd
+USERDEL=	userdel
+USERMOD=	usermod
 ROLEADD=	roleadd
 ROLEDEL=	roledel
 ROLEMOD=	rolemod
diff --git a/usr/src/cmd/picl/plugins/sun4u/lib/fruaccess/Makefile b/usr/src/cmd/picl/plugins/sun4u/lib/fruaccess/Makefile
index 046f2155ab..e24e8f2d56 100644
--- a/usr/src/cmd/picl/plugins/sun4u/lib/fruaccess/Makefile
+++ b/usr/src/cmd/picl/plugins/sun4u/lib/fruaccess/Makefile
@@ -70,8 +70,6 @@ clean :=	TARGET= clean
 clobber :=	TARGET= clobber
 _msg :=		TARGET= _msg
 
-LN = ln -s
-
 POFILE=		$(LIBRARY:.a=.po)
 
 all:  $(DYNLIB) $(LIBLINKS) $(CONF)
diff --git a/usr/src/cmd/pr/Makefile b/usr/src/cmd/pr/Makefile
index 6480487087..f9bd37ec3e 100644
--- a/usr/src/cmd/pr/Makefile
+++ b/usr/src/cmd/pr/Makefile
@@ -29,7 +29,6 @@ XPG4PROG= pr
 
 include ../Makefile.cmd
 
-SED = sed
 DCFILE = $(PROG).dc
 
 CERRWARN += -_gcc=-Wno-parentheses
diff --git a/usr/src/cmd/sa/Makefile b/usr/src/cmd/sa/Makefile
index 1b5e2b9fd6..404a3326b6 100644
--- a/usr/src/cmd/sa/Makefile
+++ b/usr/src/cmd/sa/Makefile
@@ -37,10 +37,8 @@ CERRWARN +=	$(CNOWARN_UNINIT)
 
 SMOFF += all_func_returns
 
-GREP=		grep
-
-SADC= 		sadc
-SAR= 		sar
+SADC=		sadc
+SAR=		sar
 TIMEX=		timex
 SA1=		sa1
 SA2=		sa2
@@ -56,7 +54,7 @@ INITSHELL=	$(PERF)
 
 PROGS=		$(BINPROG) $(SBINPROG) $(LIBPROG)
 SHELLS=		$(LIBSHELL)
-TXTS= 		README
+TXTS=		README
 ALL=		$(PROGS) $(SHELLS)
 
 # Source files
@@ -87,11 +85,11 @@ ENTRY3=		'$(POUND_SIGN) 5 18 * * 1-5 /usr/lib/sa/sa2 -s 8:00 -e 18:01 -i 1200 -A
 CLOBBERFILES=	$(PROGS) $(SHELLS)
 
 # Conditionals
-$(LIBSAD)/$(SADC) 	:= FILEMODE = 0555
+$(LIBSAD)/$(SADC)	:= FILEMODE = 0555
 
 .KEEP_STATE:
 
-all: 		$(ALL) $(TXTS)
+all:		$(ALL) $(TXTS)
 
 $(SADC):	$(SADC_OBJECTS)
 	$(LINK.c) -o $@ $(SADC_OBJECTS) $(LDLIBS)
diff --git a/usr/src/cmd/sgs/mcs/Makefile.com b/usr/src/cmd/sgs/mcs/Makefile.com
index 97ee70ac5b..988a4c462f 100644
--- a/usr/src/cmd/sgs/mcs/Makefile.com
+++ b/usr/src/cmd/sgs/mcs/Makefile.com
@@ -34,9 +34,6 @@ ROOTLINKS=	$(VAR_SGSBIN)/$(STRIPFILE)
 include		$(SRC)/cmd/Makefile.cmd
 include		$(SRC)/cmd/sgs/Makefile.com
 
-# avoid bootstrap problems
-MCS =		/usr/ccs/bin/mcs
-
 COMOBJS =	main.o		file.o		utils.o		global.o \
 		message.o
 SGSCOMMONOBJ =	alist.o
diff --git a/usr/src/cmd/sort/Makefile.com b/usr/src/cmd/sort/Makefile.com
index 47bec7879a..611d2394fc 100644
--- a/usr/src/cmd/sort/Makefile.com
+++ b/usr/src/cmd/sort/Makefile.com
@@ -74,7 +74,6 @@ CLEANFILES = $(OBJS) $(XPG4OBJS) $(LNTS)
 
 include ../../Makefile.cmd
 
-SED =		sed
 DCFILE =	$(PROG).dc
 
 SPACEFLAG =
diff --git a/usr/src/cmd/w/Makefile b/usr/src/cmd/w/Makefile
index 61769af023..3ab587eab9 100644
--- a/usr/src/cmd/w/Makefile
+++ b/usr/src/cmd/w/Makefile
@@ -38,7 +38,6 @@ ROOTLINK=	$(ROOTBIN)/uptime
 
 FILEMODE=	4555
 
-SED=	sed
 DCFILE=	$(PROG).dc
 
 .KEEP_STATE:
diff --git a/usr/src/cmd/who/Makefile b/usr/src/cmd/who/Makefile
index fea2089b01..2659e782cd 100644
--- a/usr/src/cmd/who/Makefile
+++ b/usr/src/cmd/who/Makefile
@@ -33,8 +33,6 @@ CLOBBERFILES += $(UTMPS)
 
 include ../Makefile.cmd
 
-SED= sed
-
 $(ROOTUTMPS):= FILEMODE= 644
 
 $(ROOTADM)/%: %
@@ -48,7 +46,7 @@ $(XPG4):= CPPFLAGS += -DXPG4
 all: $(PROG) $(UTMPS) $(XPG4)
 
 $(UTMPS):
-	touch $@
+	$(TOUCH) $@
 
 install: all $(ROOTPROG) $(ROOTUTMPS) $(SYMSETC) $(ROOTXPG4PROG)
 
diff --git a/usr/src/cmd/whodo/Makefile b/usr/src/cmd/whodo/Makefile
index d2e0f76c77..274f221b3c 100644
--- a/usr/src/cmd/whodo/Makefile
+++ b/usr/src/cmd/whodo/Makefile
@@ -28,7 +28,6 @@ PROG= whodo
 
 include ../Makefile.cmd
 
-SED= sed
 DCFILE= $(PROG).dc
 
 SUBDIRS += $(MACH64)
@@ -41,7 +40,7 @@ lint	:=	TARGET = lint
 
 .KEEP_STATE:
 
-all:	$(SUBDIRS) 
+all:	$(SUBDIRS)
 
 clean clobber lint:	$(SUBDIRS)
 
diff --git a/usr/src/cmd/write/Makefile b/usr/src/cmd/write/Makefile
index 56c4911aa6..7ddcc33c29 100644
--- a/usr/src/cmd/write/Makefile
+++ b/usr/src/cmd/write/Makefile
@@ -27,7 +27,6 @@ PROG= write
 
 include ../Makefile.cmd
 
-SED= sed
 DCFILE= $(PROG).dc
 
 FILEMODE = 02555