[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

67 files changed, 49 insertions, 210 deletions

diff --git a/usr/src/Makefile.master b/usr/src/Makefile.master
index 9ddb147e7d..9a926c7fbf 100644
--- a/usr/src/Makefile.master
+++ b/usr/src/Makefile.master
@@ -160,6 +160,7 @@ VTFONTCVT=	$(ONBLD_TOOLS)/bin/$(MACH)/vtfontcvt
 ECHO=		echo
 TRUE=		true
 INS=		$(ONBLD_TOOLS)/bin/$(MACH)/install
+ED=		/usr/bin/ed
 SYMLINK=	/usr/bin/ln -s
 LN=		/usr/bin/ln
 MKDIR=		/usr/bin/mkdir
@@ -167,7 +168,7 @@ CHMOD=		/usr/bin/chmod
 MV=		/usr/bin/mv -f
 RM=		/usr/bin/rm -f
 CUT=		/usr/bin/cut
-NM=		/usr/ccs/bin/nm
+NM=		/usr/bin/nm
 DIFF=		/usr/bin/diff
 GREP=		/usr/bin/grep
 EGREP=		/usr/bin/egrep
@@ -176,17 +177,18 @@ KSH93=		/usr/bin/ksh93
 SED=		/usr/bin/sed
 AWK=		/usr/bin/nawk
 CP=		/usr/bin/cp -f
-MCS=		/usr/ccs/bin/mcs
+MCS=		/usr/bin/mcs
 CAT=            /usr/bin/cat
-ELFDUMP=	/usr/ccs/bin/elfdump
+ELFDUMP=	/usr/bin/elfdump
 M4=		/usr/bin/m4
 GM4=		/usr/bin/gm4
-STRIP=		/usr/ccs/bin/strip
-LEX=		/usr/ccs/bin/lex
+STRIP=		/usr/bin/strip
+LEX=		/usr/bin/lex
 FLEX=		/usr/bin/flex
-YACC=		/usr/ccs/bin/yacc
+YACC=		/usr/bin/yacc
 BISON=		/usr/bin/bison
 CPP=		/usr/lib/cpp
+SH=		/usr/bin/sh
 ANSI_CPP=	$(GNUC_ROOT)/bin/cpp
 JAVAC=		$(JAVA_ROOT)/bin/javac
 JAVADOC=	$(JAVA_ROOT)/bin/javadoc
@@ -936,7 +938,7 @@ CW=			$(ONBLD_TOOLS)/bin/$(MACH)/cw
 
 BUILD_CC=		$(CW) $(CW_LINKER) $(CW_CC_COMPILERS) --
 BUILD_CCC=		$(CW) -C $(CW_LINKER) $(CW_CCC_COMPILERS) --
-BUILD_CPP=		/usr/ccs/lib/cpp
+BUILD_CPP=		/usr/lib/cpp
 BUILD_LD=		$(ONBLD_TOOLS)/bin/$(MACH)/ld
 
 $(MACH)_CC=		$(BUILD_CC)
@@ -948,10 +950,10 @@ $(MACH64)_CCC=		$(BUILD_CCC)
 $(MACH64)_CPP=		$(BUILD_CPP)
 $(MACH64)_LD=		$(BUILD_LD)
 
-sparc_AS=		/usr/ccs/bin/as -xregsym=no
+sparc_AS=		/usr/bin/as -xregsym=no
 sparcv9_AS=		$($(MACH)_AS)
 
-i386_AS=		/usr/ccs/bin/as
+i386_AS=		/usr/bin/as
 $(__GNUC)i386_AS=	$(ONBLD_TOOLS)/bin/$(MACH)/aw
 amd64_AS=		$(ONBLD_TOOLS)/bin/$(MACH)/aw
 
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
diff --git a/usr/src/lib/cfgadm_plugins/ac/Makefile b/usr/src/lib/cfgadm_plugins/ac/Makefile
index 374acb5243..f074485485 100644
--- a/usr/src/lib/cfgadm_plugins/ac/Makefile
+++ b/usr/src/lib/cfgadm_plugins/ac/Makefile
@@ -44,9 +44,6 @@ XGETFLAGS=	-a -x ac.xcl
 POFILE=		ac.po
 POFILES=	generic.po
 
-SED=	sed
-GREP=	grep
-
 .KEEP_STATE:
 
 all clean delete install catalog package: $(SUBDIRS)
diff --git a/usr/src/lib/cfgadm_plugins/ccid/Makefile b/usr/src/lib/cfgadm_plugins/ccid/Makefile
index 232f1ec3b5..8854ad74b4 100644
--- a/usr/src/lib/cfgadm_plugins/ccid/Makefile
+++ b/usr/src/lib/cfgadm_plugins/ccid/Makefile
@@ -37,9 +37,6 @@ install :=	TARGET= install
 _msg :=		TARGET= _msg
 package :=	TARGET= package
 
-SED=	sed
-GREP=	grep
-
 .KEEP_STATE:
 
 all clean delete install package: $(SUBDIRS)
diff --git a/usr/src/lib/cfgadm_plugins/fp/Makefile b/usr/src/lib/cfgadm_plugins/fp/Makefile
index 396fd0a6b5..51b14d7dad 100644
--- a/usr/src/lib/cfgadm_plugins/fp/Makefile
+++ b/usr/src/lib/cfgadm_plugins/fp/Makefile
@@ -41,10 +41,6 @@ XGETFLAGS=	-a -x fp.xcl
 POFILE=		fp.po
 POFILES=	generic.po
 
-SED=	sed
-GREP=	grep
-CP=	cp
-
 .KEEP_STATE:
 
 all clean delete install package: $(SUBDIRS)
diff --git a/usr/src/lib/cfgadm_plugins/ib/Makefile b/usr/src/lib/cfgadm_plugins/ib/Makefile
index b017c4a8ca..e3dd5f103b 100644
--- a/usr/src/lib/cfgadm_plugins/ib/Makefile
+++ b/usr/src/lib/cfgadm_plugins/ib/Makefile
@@ -42,9 +42,6 @@ XGETFLAGS=	-a -x ib.xcl
 POFILE=		ib.po
 POFILES=	generic.po
 
-SED=	sed
-GREP=	grep
-
 .KEEP_STATE:
 
 all clean delete install package: $(SUBDIRS)
diff --git a/usr/src/lib/cfgadm_plugins/pci/Makefile b/usr/src/lib/cfgadm_plugins/pci/Makefile
index 9f378bd5c1..83a69a4f62 100644
--- a/usr/src/lib/cfgadm_plugins/pci/Makefile
+++ b/usr/src/lib/cfgadm_plugins/pci/Makefile
@@ -42,9 +42,6 @@ XGETFLAGS=	-a -x pci.xcl
 POFILE=		pci.po
 POFILES=	generic.po
 
-SED=	sed
-GREP=	grep
-
 .KEEP_STATE:
 
 all clean delete install package: $(SUBDIRS)
diff --git a/usr/src/lib/cfgadm_plugins/sata/Makefile b/usr/src/lib/cfgadm_plugins/sata/Makefile
index 92211f3266..448e6b135f 100644
--- a/usr/src/lib/cfgadm_plugins/sata/Makefile
+++ b/usr/src/lib/cfgadm_plugins/sata/Makefile
@@ -41,9 +41,6 @@ XGETFLAGS=	-a -x sata.xcl
 POFILE=		sata.po
 POFILES=	generic.po
 
-SED=	sed
-GREP=	grep
-
 .KEEP_STATE:
 
 all clean delete install package: $(SUBDIRS)
diff --git a/usr/src/lib/cfgadm_plugins/sbd/Makefile b/usr/src/lib/cfgadm_plugins/sbd/Makefile
index 62aff4925b..ddcdcf0583 100644
--- a/usr/src/lib/cfgadm_plugins/sbd/Makefile
+++ b/usr/src/lib/cfgadm_plugins/sbd/Makefile
@@ -43,9 +43,6 @@ XGETFLAGS=	-a -x $(SDB_XCL_FILE)
 POFILE=		sbd.po
 POFILES=	generic.po
 
-SED=	sed
-GREP=	grep
-
 .KEEP_STATE:
 
 all clean delete install package: $(SUBDIRS)
diff --git a/usr/src/lib/cfgadm_plugins/scsi/Makefile b/usr/src/lib/cfgadm_plugins/scsi/Makefile
index d614a17db9..a478520051 100644
--- a/usr/src/lib/cfgadm_plugins/scsi/Makefile
+++ b/usr/src/lib/cfgadm_plugins/scsi/Makefile
@@ -43,9 +43,6 @@ XGETFLAGS=	-a -x scsi.xcl
 POFILE=		scsi.po
 POFILES=	generic.po
 
-SED=	sed
-GREP=	grep
-
 .KEEP_STATE:
 
 all clean delete install package: $(SUBDIRS)
diff --git a/usr/src/lib/cfgadm_plugins/scsi/SUNW,SPARC-Enterprise/Makefile b/usr/src/lib/cfgadm_plugins/scsi/SUNW,SPARC-Enterprise/Makefile
index 4e201005ca..275609da1c 100644
--- a/usr/src/lib/cfgadm_plugins/scsi/SUNW,SPARC-Enterprise/Makefile
+++ b/usr/src/lib/cfgadm_plugins/scsi/SUNW,SPARC-Enterprise/Makefile
@@ -44,9 +44,6 @@ XGETFLAGS=	-a -x ../scsi.xcl
 POFILE=		scsi.po
 POFILES=	generic.po
 
-SED=	sed
-GREP=	grep
-
 .KEEP_STATE:
 
 all clean clobber delete install package: $(SUBDIRS)
diff --git a/usr/src/lib/cfgadm_plugins/shp/Makefile b/usr/src/lib/cfgadm_plugins/shp/Makefile
index c477e91361..fe21d6074a 100644
--- a/usr/src/lib/cfgadm_plugins/shp/Makefile
+++ b/usr/src/lib/cfgadm_plugins/shp/Makefile
@@ -42,9 +42,6 @@ XGETFLAGS=	-a -x shp.xcl
 POFILE=		shp.po
 POFILES=	generic.po
 
-SED=	sed
-GREP=	grep
-
 .KEEP_STATE:
 
 all clean delete install package: $(SUBDIRS)
diff --git a/usr/src/lib/cfgadm_plugins/sysctrl/Makefile b/usr/src/lib/cfgadm_plugins/sysctrl/Makefile
index bd59a9e454..cbd081adba 100644
--- a/usr/src/lib/cfgadm_plugins/sysctrl/Makefile
+++ b/usr/src/lib/cfgadm_plugins/sysctrl/Makefile
@@ -43,9 +43,6 @@ XGETFLAGS=	-a -x sysctrl.xcl
 POFILE=		sysctrl.po
 POFILES=	generic.po
 
-SED=	sed
-GREP=	grep
-
 .KEEP_STATE:
 
 all clean delete install package: $(SUBDIRS)
diff --git a/usr/src/lib/cfgadm_plugins/usb/Makefile b/usr/src/lib/cfgadm_plugins/usb/Makefile
index b1a9874594..dccacbf205 100644
--- a/usr/src/lib/cfgadm_plugins/usb/Makefile
+++ b/usr/src/lib/cfgadm_plugins/usb/Makefile
@@ -42,9 +42,6 @@ XGETFLAGS=	-a -x usb.xcl
 POFILE=		usb.po
 POFILES=	generic.po
 
-SED=	sed
-GREP=	grep
-
 .KEEP_STATE:
 
 all clean delete install package: $(SUBDIRS)
diff --git a/usr/src/lib/gss_mechs/mech_dh/backend/Makefile b/usr/src/lib/gss_mechs/mech_dh/backend/Makefile
index 5854be0a30..4845419b72 100644
--- a/usr/src/lib/gss_mechs/mech_dh/backend/Makefile
+++ b/usr/src/lib/gss_mechs/mech_dh/backend/Makefile
@@ -39,9 +39,6 @@ TEXT_DOMAIN =	SUNW_OST_NETRPC
 POFILES =	generic.po
 POFILE = mech_dh.po
 
-SED=    sed
-GREP=   grep
-
 all :=          TARGET= all
 clean :=        TARGET= clean
 clobber :=      TARGET= clobber
diff --git a/usr/src/lib/gss_mechs/mech_dh/backend/Makefile.com b/usr/src/lib/gss_mechs/mech_dh/backend/Makefile.com
index 7943530d91..3d3893f9fe 100644
--- a/usr/src/lib/gss_mechs/mech_dh/backend/Makefile.com
+++ b/usr/src/lib/gss_mechs/mech_dh/backend/Makefile.com
@@ -69,7 +69,6 @@ MAPFILES =	../mapfile-vers
 LDLIBS +=  -lgss -lnsl -lc
 
 RPCGEN += -C
-SED = sed
 
 .KEEP_STATE:
 
diff --git a/usr/src/lib/gss_mechs/mech_dh/dh1024/Makefile b/usr/src/lib/gss_mechs/mech_dh/dh1024/Makefile
index c4fbf0cca8..e83c250d4f 100644
--- a/usr/src/lib/gss_mechs/mech_dh/dh1024/Makefile
+++ b/usr/src/lib/gss_mechs/mech_dh/dh1024/Makefile
@@ -31,9 +31,6 @@ SUBDIRS = $(MACH) $(BUILD64) $(MACH64)
 # include library definitions
 include ../../../Makefile.lib
 
-SED=    sed
-GREP=   grep
-
 all :=          TARGET= all
 clean :=        TARGET= clean
 clobber :=      TARGET= clobber
diff --git a/usr/src/lib/gss_mechs/mech_dh/dh192/Makefile b/usr/src/lib/gss_mechs/mech_dh/dh192/Makefile
index a65ee24611..06d6d21a6b 100644
--- a/usr/src/lib/gss_mechs/mech_dh/dh192/Makefile
+++ b/usr/src/lib/gss_mechs/mech_dh/dh192/Makefile
@@ -31,9 +31,6 @@ SUBDIRS = $(MACH) $(BUILD64) $(MACH64)
 # include library definitions
 include ../../../Makefile.lib
 
-SED=    sed
-GREP=   grep
-
 all :=          TARGET= all
 clean :=        TARGET= clean
 clobber :=      TARGET= clobber
diff --git a/usr/src/lib/gss_mechs/mech_dh/dh640/Makefile b/usr/src/lib/gss_mechs/mech_dh/dh640/Makefile
index 69d6430ece..ef7c296ecd 100644
--- a/usr/src/lib/gss_mechs/mech_dh/dh640/Makefile
+++ b/usr/src/lib/gss_mechs/mech_dh/dh640/Makefile
@@ -31,9 +31,6 @@ SUBDIRS = $(MACH) $(BUILD64) $(MACH64)
 # include library definitions
 include ../../../Makefile.lib
 
-SED=    sed
-GREP=   grep
-
 all :=          TARGET= all
 clean :=        TARGET= clean
 clobber :=      TARGET= clobber
diff --git a/usr/src/lib/libbsdmalloc/Makefile b/usr/src/lib/libbsdmalloc/Makefile
index 6986d16e17..18e3ccf9b4 100644
--- a/usr/src/lib/libbsdmalloc/Makefile
+++ b/usr/src/lib/libbsdmalloc/Makefile
@@ -43,9 +43,6 @@ XGETFLAGS=	-a
 POFILE=		$(LIBRARY:.a=.po)
 POFILES=	generic.po
 
-SED=	sed
-GREP=	grep
-
 .KEEP_STATE:
 
 all clean clobber delete install package: $(SUBDIRS)
diff --git a/usr/src/lib/libc/amd64/Makefile b/usr/src/lib/libc/amd64/Makefile
index 848ad4a6bd..ddb61be40f 100644
--- a/usr/src/lib/libc/amd64/Makefile
+++ b/usr/src/lib/libc/amd64/Makefile
@@ -33,7 +33,6 @@ LIBCDIR=	$(SRC)/lib/libc
 LIBRARY=	libc.a
 LIB_PIC=	libc_pic.a
 VERS=		.1
-CPP=		/usr/lib/cpp
 TARGET_ARCH=	amd64
 
 # include comm page definitions
diff --git a/usr/src/lib/libc/i386/Makefile.com b/usr/src/lib/libc/i386/Makefile.com
index df33074538..7c07578141 100644
--- a/usr/src/lib/libc/i386/Makefile.com
+++ b/usr/src/lib/libc/i386/Makefile.com
@@ -31,7 +31,6 @@
 LIBCDIR=	$(SRC)/lib/libc
 LIB_PIC=	libc_pic.a
 VERS=		.1
-CPP=		/usr/lib/cpp
 TARGET_ARCH=	i386
 
 # include comm page definitions
diff --git a/usr/src/lib/libc/sparc/Makefile.com b/usr/src/lib/libc/sparc/Makefile.com
index f5570084da..24c31e4c02 100644
--- a/usr/src/lib/libc/sparc/Makefile.com
+++ b/usr/src/lib/libc/sparc/Makefile.com
@@ -32,7 +32,6 @@
 LIBCDIR=	$(SRC)/lib/libc
 LIB_PIC=	libc_pic.a
 VERS=		.1
-CPP=		/usr/lib/cpp
 TARGET_ARCH=	sparc
 
 # objects are grouped by source directory
diff --git a/usr/src/lib/libc/sparcv9/Makefile.com b/usr/src/lib/libc/sparcv9/Makefile.com
index f229f21e50..eaa772040b 100644
--- a/usr/src/lib/libc/sparcv9/Makefile.com
+++ b/usr/src/lib/libc/sparcv9/Makefile.com
@@ -33,7 +33,6 @@
 LIBCDIR=	$(SRC)/lib/libc
 LIB_PIC=	libc_pic.a
 VERS=		.1
-CPP=		/usr/lib/cpp
 TARGET_ARCH=	sparc
 
 # objects are grouped by source directory
diff --git a/usr/src/lib/libcurses/Makefile b/usr/src/lib/libcurses/Makefile
index df434327f4..f1ebcb2e50 100644
--- a/usr/src/lib/libcurses/Makefile
+++ b/usr/src/lib/libcurses/Makefile
@@ -62,7 +62,8 @@ CLEANFILES +=	$(SCRFILES)
 # limit.  maketerm.ed can probably be fixed to prevent this, but it is arguable
 # if this work would ever be worth it.
 #
-screen/term.check      := CSTYLE_TAIL = | grep -v "line > 80 characters" | true
+screen/term.check      := CSTYLE_TAIL = | $(GREP) -v "line > 80 characters" | \
+	$(TRUE)
 
 .KEEP_STATE:
 
@@ -81,18 +82,16 @@ scrfiles:	$(SCRFILES)
 $(SUBDIRS):	FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
-ED = ed
-
 screen/curses.h:	screen/curses.ed screen/keycaps screen/tmp
 	(cd screen; $(ED) - < curses.ed)
 
 screen/keycaps:		screen/caps
-	grep "KEY_" screen/caps > screen/keycaps
-	@if tail -1 screen/keycaps | grep 'KEY_MOUSE' > /dev/null;then :; \
+	$(GREP) "KEY_" screen/caps > screen/keycaps
+	@if tail -1 screen/keycaps | $(GREP) 'KEY_MOUSE' > /dev/null;then :; \
 		else echo new keys!! must change setkeymap.c; exit 1;fi
 
 screen/keyname.c:    screen/keyname.sh screen/keycaps
-	(cd screen; sh keyname.sh)
+	(cd screen; $(SH) keyname.sh)
 
 screen/termcap.c:    screen/termcap.ed
 	(cd screen; $(ED) - < termcap.ed)
@@ -109,8 +108,8 @@ screen/term.h:   screen/maketerm.ed
 	(cd screen; $(ED) - < maketerm.ed)
 
 screen/tmp:
-	rm -rf $@
-	mkdir $@
+	$(RM) -r $@
+	$(MKDIR) $@
 
 CLEANFILES += \
 	screen/tmp/keycaps \
diff --git a/usr/src/lib/libcurses/Makefile.com b/usr/src/lib/libcurses/Makefile.com
index 2082f3b634..daa2120eba 100644
--- a/usr/src/lib/libcurses/Makefile.com
+++ b/usr/src/lib/libcurses/Makefile.com
@@ -151,9 +151,6 @@ LDLIBS += -lc
 
 CPPFLAGS += -I../screen -I../../common/inc
 
-ED = ed
-RM = rm -f
-
 #
 # If and when somebody gets around to messaging this, CLOBBERFILE should not
 # be cleared (so that any .po file will be clobbered.
diff --git a/usr/src/lib/libexacct/Makefile b/usr/src/lib/libexacct/Makefile
index 4bbfb1cd6c..a8b3960848 100644
--- a/usr/src/lib/libexacct/Makefile
+++ b/usr/src/lib/libexacct/Makefile
@@ -44,9 +44,6 @@ XGETFLAGS=	-a
 POFILE=		$(LIBRARY:.a=.po)
 POFILES=	generic.po
 
-SED=	sed
-GREP=	grep
-
 .KEEP_STATE:
 
 all debug clean clobber delete install package: $(SUBDIRS)
diff --git a/usr/src/lib/libfru/Makefile.obj b/usr/src/lib/libfru/Makefile.obj
index 6b32eb1147..4d23e24ddb 100644
--- a/usr/src/lib/libfru/Makefile.obj
+++ b/usr/src/lib/libfru/Makefile.obj
@@ -22,8 +22,6 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 #
 # define all the common stuff here for all the different platforms we are
@@ -33,8 +31,6 @@
 LIBRARYCCC=	libfru.a
 VERS=		.1
 
-SED=		sed
-
 MAINOBJS=	Parser.o \
 		PayloadReader.o \
 		libfru.o \
diff --git a/usr/src/lib/libkstat/Makefile b/usr/src/lib/libkstat/Makefile
index bcd94996c4..bb9d2a0a25 100644
--- a/usr/src/lib/libkstat/Makefile
+++ b/usr/src/lib/libkstat/Makefile
@@ -44,9 +44,6 @@ XGETFLAGS=	-a
 POFILE=		$(LIBRARY:.a=.po)
 POFILES=	generic.po
 
-SED=	sed
-GREP=	grep
-
 .KEEP_STATE:
 
 all clean clobber delete install package: $(SUBDIRS)
diff --git a/usr/src/lib/liblm/Makefile b/usr/src/lib/liblm/Makefile
index f4d4e770ca..d4c15dae65 100644
--- a/usr/src/lib/liblm/Makefile
+++ b/usr/src/lib/liblm/Makefile
@@ -43,9 +43,6 @@ XGETFLAGS=	-a
 POFILE=		$(LIBRARY:.a=.po)
 POFILES=	generic.po
 
-SED=	sed
-GREP=	grep
-
 .KEEP_STATE:
 
 all clean clobber delete install package: $(SUBDIRS)
diff --git a/usr/src/lib/libmail/Makefile b/usr/src/lib/libmail/Makefile
index b1f249b754..0d3539335e 100644
--- a/usr/src/lib/libmail/Makefile
+++ b/usr/src/lib/libmail/Makefile
@@ -43,8 +43,6 @@ XGETFLAGS=	-a
 POFILE=		$(LIBRARY:.a=.po)
 POFILES=	generic.po
 
-SED=	sed
-
 .KEEP_STATE:
 
 all clean clobber install package: $(SUBDIRS)
diff --git a/usr/src/lib/libmalloc/Makefile b/usr/src/lib/libmalloc/Makefile
index ed60dde730..baf7409ba7 100644
--- a/usr/src/lib/libmalloc/Makefile
+++ b/usr/src/lib/libmalloc/Makefile
@@ -43,9 +43,6 @@ XGETFLAGS=	-a
 POFILE=		$(LIBRARY:.a=.po)
 POFILES=	generic.po
 
-SED=	sed
-GREP=	grep
-
 .KEEP_STATE:
 
 all clean clobber delete install package: $(SUBDIRS)
diff --git a/usr/src/lib/libmapmalloc/Makefile b/usr/src/lib/libmapmalloc/Makefile
index def5e11d9f..7ef17bb72c 100644
--- a/usr/src/lib/libmapmalloc/Makefile
+++ b/usr/src/lib/libmapmalloc/Makefile
@@ -44,9 +44,6 @@ XGETFLAGS=	-a
 POFILE=		$(LIBRARY:.a=.po)
 POFILES=	generic.po
 
-SED=	sed
-GREP=	grep
-
 .KEEP_STATE:
 
 all clean clobber delete install package: $(SUBDIRS)
diff --git a/usr/src/lib/libnisdb/Makefile b/usr/src/lib/libnisdb/Makefile
index d09ddee226..a9629a095f 100644
--- a/usr/src/lib/libnisdb/Makefile
+++ b/usr/src/lib/libnisdb/Makefile
@@ -32,8 +32,6 @@ VERS=	.2
 PROTOCOL_DIR= $(ROOT)/include/rpcsvc
 YPTOL_DIR= ./yptol
 
-SED=	sed
-
 OBJECTS = \
 	db_entry.o db_entry_c_xdr.o \
 	db_item.o db_item_c_xdr.o \
diff --git a/usr/src/lib/libnls/Makefile b/usr/src/lib/libnls/Makefile
index 4be6bfef0a..6d62ce75d4 100644
--- a/usr/src/lib/libnls/Makefile
+++ b/usr/src/lib/libnls/Makefile
@@ -43,9 +43,6 @@ XGETFLAGS=	-a
 POFILE=		$(LIBRARY:.a=.po)
 POFILES=	generic.po
 
-SED=	sed
-GREP=	grep
-
 .KEEP_STATE:
 
 all clean clobber delete install package: $(SUBDIRS)
diff --git a/usr/src/lib/libproc/Makefile b/usr/src/lib/libproc/Makefile
index ad175b0e9d..2ba46b92db 100644
--- a/usr/src/lib/libproc/Makefile
+++ b/usr/src/lib/libproc/Makefile
@@ -44,9 +44,6 @@ XGETFLAGS=	-a
 POFILE=		$(LIBRARY:.a=.po)
 POFILES=	generic.po
 
-SED=	sed
-GREP=	grep
-
 # definitions for install_h target
 HDRS=		libproc.h
 ROOTHDRDIR=	$(ROOT)/usr/include
diff --git a/usr/src/lib/libprtdiag/sparc/sun4u/Makefile b/usr/src/lib/libprtdiag/sparc/sun4u/Makefile
index 53716929ca..99935fba1e 100644
--- a/usr/src/lib/libprtdiag/sparc/sun4u/Makefile
+++ b/usr/src/lib/libprtdiag/sparc/sun4u/Makefile
@@ -46,8 +46,6 @@ LDLIBS		+= -ldevinfo
 # used for creating message catalogue files
 #
 TEXT_DOMAIN=	SUNW_OST_OSLIB
-SED=		sed
-GREP=		grep
 
 .KEEP_STATE:
 
diff --git a/usr/src/lib/libprtdiag/sparc/sun4v/Makefile b/usr/src/lib/libprtdiag/sparc/sun4v/Makefile
index 0dd124f313..b95e864b19 100644
--- a/usr/src/lib/libprtdiag/sparc/sun4v/Makefile
+++ b/usr/src/lib/libprtdiag/sparc/sun4v/Makefile
@@ -45,8 +45,6 @@ LDLIBS		+= -lpicl -lm
 # used for creating message catalogue files
 #
 TEXT_DOMAIN=	SUNW_OST_OSLIB
-SED=		sed
-GREP=		grep
 
 .KEEP_STATE:
 
diff --git a/usr/src/lib/libresolv2/Makefile b/usr/src/lib/libresolv2/Makefile
index 2433a55436..ef5ef9485e 100644
--- a/usr/src/lib/libresolv2/Makefile
+++ b/usr/src/lib/libresolv2/Makefile
@@ -55,9 +55,6 @@ XGETFLAGS=	-a
 POFILE=		$(LIBRARY:.a=.po)
 POFILES=	generic.po
 
-SED=	sed
-GREP=	grep
-
 .KEEP_STATE:
 
 all clean clobber: $(SUBDIRS)
diff --git a/usr/src/lib/libsmedia/library/Makefile b/usr/src/lib/libsmedia/library/Makefile
index 7bb74c58a8..f394c2b5ba 100644
--- a/usr/src/lib/libsmedia/library/Makefile
+++ b/usr/src/lib/libsmedia/library/Makefile
@@ -42,9 +42,6 @@ XGETFLAGS=	-a
 POFILE=		$(LIBRARY:.a=.po)
 POFILES=	generic.po
 
-SED=	sed
-GREP=	grep
-
 .KEEP_STATE:
 
 all clean delete install package: $(SUBDIRS)
diff --git a/usr/src/lib/libsmedia/plugins/Makefile.plugin b/usr/src/lib/libsmedia/plugins/Makefile.plugin
index 6f3ac8ab63..6b996ab1f4 100644
--- a/usr/src/lib/libsmedia/plugins/Makefile.plugin
+++ b/usr/src/lib/libsmedia/plugins/Makefile.plugin
@@ -29,8 +29,6 @@ CPPFLAGS +=	-I../inc -I$(SRC)/cmd/smserverd/
 
 POFILE  = $(LIBRARY:%.a=%.po)
 POFILE_SRCS =  $(OBJECTS:%.o=common/%.c)
-SED	= /usr/bin/sed
-CP	= /usr/bin/cp
 
 SUBDIRS =	$(MACH)
 $(BUILD64)SUBDIRS += $(MACH64)
@@ -43,7 +41,7 @@ install :=	TARGET= install
 all install clean: $(SUBDIRS)
 
 clobber : $(SUBDIRS)
-	$(RM) -f $(POFILE)
+	$(RM) $(POFILE)
 
 $(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
diff --git a/usr/src/lib/libtnf/Makefile b/usr/src/lib/libtnf/Makefile
index 1e3ba360aa..6bdbfa0f33 100644
--- a/usr/src/lib/libtnf/Makefile
+++ b/usr/src/lib/libtnf/Makefile
@@ -50,9 +50,6 @@ XGETFLAGS=	-a
 POFILE=		$(LIBRARY:%.a=%.po)
 POFILES=	_error.po
 
-SED=	sed
-GREP=	grep
-
 LIBS=		$(DYNLIB)
 
 LDLIBS += -lc
diff --git a/usr/src/lib/libtnfctl/Makefile b/usr/src/lib/libtnfctl/Makefile
index b126ac0d1f..dd6423c945 100644
--- a/usr/src/lib/libtnfctl/Makefile
+++ b/usr/src/lib/libtnfctl/Makefile
@@ -43,9 +43,6 @@ MSGDIRS=
 POFILE=		$(LIBRARY:.a=.po)
 POFILES=	generic.po
 
-SED=	sed
-GREP=	grep
-
 #definitions for install_h target
 HDRS=		tnfctl.h
 ROOTHDRDIR=	$(ROOT)/usr/include/tnf
diff --git a/usr/src/lib/libvolmgt/Makefile b/usr/src/lib/libvolmgt/Makefile
index eb89d02f72..09f9f32cd4 100644
--- a/usr/src/lib/libvolmgt/Makefile
+++ b/usr/src/lib/libvolmgt/Makefile
@@ -44,9 +44,6 @@ XGETFLAGS=	-a
 POFILE=		$(LIBRARY:.a=.po)
 POFILES=	generic.po
 
-SED=	sed
-GREP=	grep
-
 .KEEP_STATE:
 
 all clean clobber delete install package: $(SUBDIRS)
diff --git a/usr/src/psm/stand/cpr/common/Makefile.com b/usr/src/psm/stand/cpr/common/Makefile.com
index a8d25741d9..68e3f0fb16 100644
--- a/usr/src/psm/stand/cpr/common/Makefile.com
+++ b/usr/src/psm/stand/cpr/common/Makefile.com
@@ -23,8 +23,6 @@
 # Use is subject to license terms.
 #
 
-GREP	=	egrep
-WC	=	wc
 TOPDIR	=	../../../../..
 
 include $(TOPDIR)/Makefile.master
diff --git a/usr/src/ucbcmd/Makefile.ucbcmd b/usr/src/ucbcmd/Makefile.ucbcmd
index cca40dffeb..7e26afdd9b 100644
--- a/usr/src/ucbcmd/Makefile.ucbcmd
+++ b/usr/src/ucbcmd/Makefile.ucbcmd
@@ -34,12 +34,6 @@
 
 include $(SRC)/Makefile.master
 
-LN=		ln
-SH=		sh
-CHMOD=		chmod
-MKDIR=		mkdir
-TOUCH=		touch
-
 FILEMODE=	0555
 LIBFILEMODE=	0444
 ROOTBIN=	$(ROOT)/usr/ucb