[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

42 files changed, 8 insertions, 119 deletions

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)