--- /usr/ports/devel/cocktail/work/cocktail-9309//./puma/src/Makefile	Tue Feb 15 14:25:38 1994
+++ ./puma/src/Makefile	Thu Aug  5 18:49:25 2004
@@ -20,40 +20,40 @@
 	echo p puma | mc -d ../../reuse/src
 
 Scanner.rpp Parser.lalr:	puma.pars
-	cg -xzj puma.pars;
+	$(CG) -xzj puma.pars;
 
 puma.rex:	puma.scan Scanner.rpp
-	rpp < puma.scan > puma.rex;
+	$(RPP) < puma.scan > puma.rex;
 
 Scanner.md Scanner.mi:	puma.rex
-	rex -d puma.rex;
+	$(REX) -d puma.rex;
 
 Parser.md:	Parser.lalr
-	lalr -d -v Parser.lalr;
+	$(LALR) -d -v Parser.lalr;
 
 Parser.mi:	Parser.lalr
-	lalr -v Parser.lalr;
+	$(LALR) -v Parser.lalr;
 
 Tree.md:	puma.cg
-	echo SELECT AstIn Ast Common PumaIn Puma | cat - puma.cg | cg -dimRyq
+	echo SELECT AstIn Ast Common PumaIn Puma | cat - puma.cg | $(CG) -dimRyq
 
 Tree.mi:	puma.cg
-	echo SELECT AstIn Ast Common PumaIn Puma | cat - puma.cg | cg -imRyq
+	echo SELECT AstIn Ast Common PumaIn Puma | cat - puma.cg | $(CG) -imRyq
 
 Tree2.md:	puma.cg
-	echo SUBUNIT Tree2 SELECT AstIn Ast | cat - puma.cg | cg -dig
+	echo SUBUNIT Tree2 SELECT AstIn Ast | cat - puma.cg | $(CG) -dig
 
 Tree2.mi:	puma.cg
-	echo SUBUNIT Tree2 SELECT AstIn Ast | cat - puma.cg | cg -ig
+	echo SUBUNIT Tree2 SELECT AstIn Ast | cat - puma.cg | $(CG) -ig
 
 Tree.TS:	puma.cg
-	echo SELECT PumaIn Puma | cat - puma.cg | cg -4
+	echo SELECT PumaIn Puma | cat - puma.cg | $(CG) -4
 
 Semantics.md Semantics.mi:	sem.puma Tree.TS
-	puma -dinw sem.puma;
+	$(PUMA) -dinw sem.puma;
 
 Optimize.md Optimize.mi:	opt.puma Tree.TS
-	puma -diwk opt.puma;
+	$(PUMA) -diwk opt.puma;
 
 Mod.md Mod.mi:	mod.puma Tree.TS
 	$(SED) < mod.puma | puma -dinw;
@@ -64,9 +64,9 @@
 puma.mi:	puma.sed
 	$(SED) < puma.sed > puma.mi
 
-install:	puma puma.sh $(LIB)/puma
+install:	$(PUMA) puma.sh $(LIB)/puma
 	if test $(LIB) = $(BIN); then echo error: BIN = LIB; false; else true; fi
-	sed 's;LIB;$(LIB);g' < puma.sh > $(BIN)/puma
+	$(SED) 's;LIB;$(LIB);g' < puma.sh > $(BIN)/puma
 	chmod a+rx $(BIN)/puma
 	install -c -s -m 755 puma $(LIB)/puma
 	install -c -m 644 TypeTab.c $(LIB)/puma
@@ -80,7 +80,7 @@
 m2c:
 	# co RCS/*
 	make $(SOURCES)
-	rm -f ../m2c/*.[hc]
+	-rm -f ../m2c/*.[hc]
 	cp TypeTab.[mc] ../m2c
 	ln *.m[id] ../m2c
 	cd ../m2c; make sources M2FLAGS="-c -d../../reuse/src"
@@ -90,9 +90,9 @@
 
 pumaId:	puma.rex
 	echo SCANNER pumaId | cat - puma.rex | \
-	sed 's/\(RETURN 1	\)/yyEcho; IO.WriteNl (IO.StdOutput); \1/' | \
+	$(SED) 's/\(RETURN 1	\)/yyEcho; IO.WriteNl (IO.StdOutput); \1/' | \
 	$(BIN).t/rex -sd;
-	sed 's/@/pumaId/' < ../../front/src/Id.mi > pumaIdDrv.mi
+	$(SED) 's/@/pumaId/' < ../../front/src/Id.mi > pumaIdDrv.mi
 	echo p pumaIdDrv | mc -d ../../reuse/src
 	mv pumaIdDrv pumaId
 
@@ -105,10 +105,11 @@
 	sh -c "if test ! -d $(LIB)/Id; then mkdir -p $(LIB)/Id; else true; fi"
 
 cleanId:
-	rm -f pumaId*
+	-rm -f pumaId*
 
 clean:	cleanId
-	rm -f _Debug core *.[dior] [A-SU-Za-z]*.m Tree*.m *.bak
+	-rm -f $(STDCLEAN) 
+	-rm -f  _Debug  *.[dior] [A-SU-Za-z]*.m Tree*.m *.bak
 
 CLEAN:	clean
-	rm -f puma $(SOURCES) Tree.TS Scanner.rpp puma.rex Parser.lalr
+	-rm -f puma $(SOURCES) Tree.TS Scanner.rpp puma.rex Parser.lalr