--- a/usr/src/cmd/csh/Makefile	Fri Jan 20 16:06:55 2006 -0800
+++ b/usr/src/cmd/csh/Makefile	Fri Jan 20 17:03:49 2006 -0800
@@ -1,4 +1,4 @@
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 
 #	Copyright (c) 1983, 1984, 1985, 1986, 1987, 1988, 1989 AT&T
@@ -25,6 +25,7 @@
 SED= sed
 POFILE= csh.po
 CLOBBERFILES += sh.tconst.h
+CLEANFILES += sh.tconst.h
 
 all :=          TARGET = all
 install :=      TARGET = install
@@ -66,7 +67,7 @@
 $(POFILE):	$(POFILES)
 	$(RM) $@; cat $(POFILES) > $@
 
-sh.tconst.h:
+sh.tconst.h: sh.tconst.c make.sh.tconst.h.ed
 	$(RM) $@; $(ED) sh.tconst.c < make.sh.tconst.h.ed
 
 clobber: local_clobber $(MACH)
@@ -74,7 +75,12 @@
 local_clobber:
 	$(RM) $(CLOBBERFILES)
 
-$(MACH): FRC
+clean: local_clean 
+
+local_clean:
+	$(RM) $(CLEANFILES)
+
+$(MACH): sh.tconst.h .WAIT FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:

--- a/usr/src/cmd/csh/i386/Makefile	Fri Jan 20 16:06:55 2006 -0800
+++ b/usr/src/cmd/csh/i386/Makefile	Fri Jan 20 17:03:49 2006 -0800
@@ -1,4 +1,4 @@
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 #	Copyright (c) 1983, 1984, 1985, 1986, 1987, 1988, 1989 AT&T
@@ -63,7 +63,7 @@
 	$(COMPILE.c) $<
 	$(POST_PROCESS_O)
 
-$(CSH_PROG): sh.tconst.h .WAIT $(COMMONOBJS) $(PFOBJS) $(LOCALOBJS)
+$(CSH_PROG): $(COMMONOBJS) $(PFOBJS) $(LOCALOBJS)
 	$(LINK.c) $(COMMONOBJS) $(PFOBJS) $(LOCALOBJS) -o $@ $(LDLIBS)
 	$(POST_PROCESS)
 
@@ -71,19 +71,15 @@
 	$(RM) $@
 	$(LN) $(ROOTPROG) $@
 
-sh.tconst.h: ../sh.tconst.c ../make.sh.tconst.h.ed 	
-	$(RM) $@
-	ed ../sh.tconst.c < ../make.sh.tconst.h.ed 
-
-$(HDDEP): sh.tconst.h
+$(HDDEP): ../sh.tconst.h
 
 install: all $(ROOTBINPROG)  $(ROOTPROG) $(ROOTPFCSH)
 
-lint:	sh.tconst.h
+lint:	../sh.tconst.h
 	$(LINT.c) $(COMMONSRCS) $(PFSRCS) signal.c
 
 clean:
-	$(RM) $(LOCALOBJS) $(COMMONOBJS) $(PFOBJS) sh.tconst.h
+	$(RM) $(LOCALOBJS) $(COMMONOBJS) $(PFOBJS)
 
 clobber:	clean
 	$(RM)  $(PROG)

--- a/usr/src/cmd/csh/sparc/Makefile	Fri Jan 20 16:06:55 2006 -0800
+++ b/usr/src/cmd/csh/sparc/Makefile	Fri Jan 20 17:03:49 2006 -0800
@@ -1,4 +1,4 @@
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 
 #	Copyright (c) 1983, 1984, 1985, 1986, 1987, 1988, 1989 AT&T
@@ -63,7 +63,7 @@
 	$(COMPILE.c) $<
 	$(POST_PROCESS_O)
 
-$(CSH_PROG): sh.tconst.h .WAIT $(COMMONOBJS) $(PFOBJS) $(LOCALOBJS)
+$(CSH_PROG): $(COMMONOBJS) $(PFOBJS) $(LOCALOBJS)
 	$(LINK.c) $(COMMONOBJS) $(PFOBJS) $(LOCALOBJS) -o $@ $(LDLIBS)
 	$(POST_PROCESS)
 
@@ -71,19 +71,15 @@
 	$(RM) $@
 	$(LN) $(ROOTPROG) $@
 
-sh.tconst.h: ../sh.tconst.c ../make.sh.tconst.h.ed 	
-	$(RM) $@
-	ed ../sh.tconst.c < ../make.sh.tconst.h.ed 
-
-$(HDDEP): sh.tconst.h
+$(HDDEP): ../sh.tconst.h
 
 install: all $(ROOTBINPROG)  $(ROOTPROG) $(ROOTPFCSH)
 
-lint:	sh.tconst.h
+lint:	../sh.tconst.h
 	$(LINT.c) $(COMMONSRCS) $(PFSRCS) signal.c $(LDLIBS)
 
 clean:
-	$(RM) $(LOCALOBJS) $(COMMONOBJS) $(PFOBJS) sh.tconst.h
+	$(RM) $(LOCALOBJS) $(COMMONOBJS) $(PFOBJS)
 
 clobber:	clean
 	$(RM)  $(PROG)