--- /usr/ports/devel/cocktail/work/cocktail-9309//./cg/src/Makefile	Tue Feb 15 14:20:44 1994
+++ ./cg/src/Makefile	Thu Aug  5 18:48:37 2004
@@ -43,17 +43,17 @@
 	echo p cg | mc -d ../../reuse/src
 
 Scanner.md Scanner.mi:	cg.rex
-	rex -d cg.rex;
+	$(REX) -d cg.rex;
 
 Parser.md:	cg.lalr
-	lalr -b -d cg.lalr;
+	$(LALR) -b -d cg.lalr;
 
 Parser.mi:	cg.lalr
-	lalr -b -v cg.lalr;
+	$(LALR) -b -v cg.lalr;
 
 Errors.mi:	Errors.0 \
 	/tmp/cg/consts1 /tmp/cg/writes1 /tmp/cg/consts2 /tmp/cg/writes2
-	/lib/cpp -P Errors.0 Errors.mi
+	$(CPP) -P Errors.0 Errors.mi
 
 Tree.md:	cg.cg
 	echo SELECT AstIn Ast Common Cg Ag | cat - cg.cg | cg -diqmR
@@ -71,65 +71,65 @@
 	echo SELECT AstIn Ast Common Cg Ag | cat - cg.cg | cg -4
 
 GramMod.md GramMod.mi:	mod0.puma Tree.TS
-	$(SED) < mod0.puma | puma -dinw;
+	$(SED) < mod0.puma | $(PUMA) -dinw;
 
 GramC.md GramC.mi:	c0.puma Tree.TS
-	$(SED) < c0.puma | puma -dinw;
+	$(SED) < c0.puma | $(PUMA) -dinw;
 
 GramYacc.md GramYacc.mi:	y0.puma Tree.TS
-	$(SED) < y0.puma | puma -dinw;
+	$(SED) < y0.puma | $(PUMA) -dinw;
 
 Semantics.md Semantics.mi /tmp/cg/consts1 /tmp/cg/writes1:	sem.puma Tree.TS /tmp/cg
-	awk -f cg.awk1 < sem.puma > /tmp/cg/sem
-	/lib/cpp -P < /tmp/cg/sem | puma -dinw;
-	sed -f cg.sed2 < /tmp/cg/writes01 > /tmp/cg/writes1
+	$(AWK) -f cg.awk1 < sem.puma > /tmp/cg/sem
+	$(CPP) -P < /tmp/cg/sem | $(PUMA) -dinw;
+	$(SED) -f cg.sed2 < /tmp/cg/writes01 > /tmp/cg/writes1
 
 Order.md Order.mi /tmp/cg/consts2 /tmp/cg/writes2:	oag.puma Tree.TS /tmp/cg
-	awk -f cg.awk2 < oag.puma > /tmp/cg/oag
-	/lib/cpp -P < /tmp/cg/oag | puma -dinw;
-	sed -f cg.sed2 < /tmp/cg/writes02 > /tmp/cg/writes2
+	$(AWK) -f cg.awk2 < oag.puma > /tmp/cg/oag
+	$(CPP) -P < /tmp/cg/oag | $(PUMA) -dinw;
+	$(SED) -f cg.sed2 < /tmp/cg/writes02 > /tmp/cg/writes2
 
 Optimize.md Optimize.mi:	opt.puma Tree.TS
-	/lib/cpp -P < opt.puma | puma -dinw;
+	$(CPP) -P < opt.puma | $(PUMA) -dinw;
 
 Dialog.mi:	Dialog.sed
 	$(SED) < Dialog.sed > Dialog.mi
 
 TreeMod1.md TreeMod1.mi:	mod1.puma Tree.TS
-	$(SED) < mod1.puma | puma -dinw;
+	$(SED) < mod1.puma | $(PUMA) -dinw;
 
 TreeMod2.md TreeMod2.mi:	mod2.puma Tree.TS
-	$(SED) < mod2.puma | puma -dinw;
+	$(SED) < mod2.puma | $(PUMA) -dinw;
 
 EvalMod.md EvalMod.mi:	mod3.puma Tree.TS
-	$(SED) < mod3.puma | puma -dinw;
+	$(SED) < mod3.puma | $(PUMA) -dinw;
 
 EvalMod2.md EvalMod2.mi:	mod4.puma Tree.TS
-	$(SED) < mod4.puma | puma -dinw;
+	$(SED) < mod4.puma | $(PUMA) -dinw;
 
 EvalMod3.md EvalMod3.mi:	mod5.puma Tree.TS
-	$(SED) < mod5.puma | puma -dinw;
+	$(SED) < mod5.puma | $(PUMA) -dinw;
 
 EvalMod4.md EvalMod4.mi:	mod6.puma Tree.TS
-	$(SED) < mod6.puma | puma -dinw;
+	$(SED) < mod6.puma | $(PUMA) -dinw;
 
 TreeC1.md TreeC1.mi:	c1.puma Tree.TS
-	$(SED) < c1.puma | puma -dinw;
+	$(SED) < c1.puma | $(PUMA) -dinw;
 
 TreeC2.md TreeC2.mi:	c2.puma Tree.TS
-	$(SED) < c2.puma | puma -dinw;
+	$(SED) < c2.puma | $(PUMA) -dinw;
 
 EvalC.md EvalC.mi:	c3.puma Tree.TS
-	$(SED) < c3.puma | puma -dinw;
+	$(SED) < c3.puma | $(PUMA) -dinw;
 
 EvalC2.md EvalC2.mi:	c4.puma Tree.TS
-	$(SED) < c4.puma | puma -dinw;
+	$(SED) < c4.puma | $(PUMA) -dinw;
 
 EvalC3.md EvalC3.mi:	c5.puma Tree.TS
-	$(SED) < c5.puma | puma -dinw;
+	$(SED) < c5.puma | $(PUMA) -dinw;
 
 EvalC4.md EvalC4.mi:	c6.puma Tree.TS
-	$(SED) < c6.puma | puma -dinw;
+	$(SED) < c6.puma | $(PUMA) -dinw;
 
 cg.mi:	cg.sed
 	$(SED) < cg.sed > cg.mi
@@ -159,7 +159,7 @@
 m2c:
 	# co RCS/*
 	make $(SOURCES)
-	rm -f ../m2c/*.[hc]
+	-rm -f ../m2c/*.[hc]
 	cp TypeTab.[mc] gmd* ../m2c
 	ln *.m[id] ../m2c
 	cd ../m2c; make sources M2FLAGS="-c -d../../reuse/src"
@@ -184,10 +184,11 @@
 	sh -c "if test ! -d $(LIB)/Id; then mkdir -p $(LIB)/Id; else true; fi"
 
 cleanId:
-	rm -f cgId*
+	-rm -f cgId*
 
 clean:	cleanId
-	rm -f _Debug core *.[dior] [A-SU-Za-z]*.m *.bak
+	-rm -f $(STDCLEAN) 
+	-rm -f  _Debug  *.[dior] [A-SU-Za-z]*.m *.bak
 
 CLEAN:	clean
-	rm -f cg Tree.TS $(SOURCES)
+	-rm -f cg Tree.TS $(SOURCES)