--- /usr/ports/devel/cocktail/work/cocktail-9309//./mtc/src/Makefile	Tue Feb 15 14:25:08 1994
+++ ./mtc/src/Makefile	Thu Aug  5 18:49:23 2004
@@ -27,25 +27,25 @@
 	echo p mtc | $(MC)
 
 Scanner.md Scanner.mi:	modula.rex
-	rex -di modula.rex;
+	$(REX) -di modula.rex;
 
 Parser.md Parser.mi:	modula.ell
-	ell -di modula.ell;
+	$(ELL) -di modula.ell;
 
 Tree.md Tree.mi:	modula.cg
-	cg -mRdiDI0 modula.cg;
+	$(CG) -mRdiDI0 modula.cg;
 
 Semantics.md Semantics.mi:	modula.cg
-	cg -DI0 modula.cg;
+	$(CG) -DI0 modula.cg;
 
 Defs.md Defs.mi:	defs.cg
-	cg -mdi defs.cg;
+	$(CG) -mdi defs.cg;
 
 Tree.TS:	modula.cg
 	echo SELECT Abstract | cat - modula.cg | cg -4
 
 Code.md Code.mi:	code.puma Tree.TS opp opp.sed
-	opp code.puma | puma -dis
+	opp code.puma | $(PUMA) -dis
 #	Opp = output pre processor
 
 install:	mtc $(BIN) $(LIB)/mtc
@@ -75,35 +75,36 @@
 MTC	= time mtc -tm -d../../reuse/src s.mi
 
 test:	$(GEN) $(SRCM)
-	cg -IL modula.cg;
+	$(CG) -IL modula.cg;
 	mv Semantics.mi s.mi
-	cg -dimRDI0 modula.cg;
+	$(CG) -dimRDI0 modula.cg;
 	make mtc
 	tcsh -c "$(MTC); $(MTC); $(MTC); $(MTC)"
 	wc Semantics.mi
 	size Semantics.o mtc
-	cg -dimRDI09 modula.cg;
+	$(CG) -dimRDI09 modula.cg;
 	make mtc
 	$(MTC)
-	cg -dimRDI modula.cg;
+	$(CG) -dimRDI modula.cg;
 	make mtc
 	tcsh -c "$(MTC); $(MTC); $(MTC); $(MTC)"
 	wc Semantics.mi
 	size Semantics.o mtc
-	cg -dimRDI9 modula.cg;
+	$(CG) -dimRDI9 modula.cg;
 	make mtc
 	$(MTC)
-	cg -dimRDIL modula.cg;
+	$(CG) -dimRDIL modula.cg;
 	make mtc
 	tcsh -c "$(MTC); $(MTC); $(MTC); $(MTC)"
 	wc Semantics.mi
 	size Semantics.o mtc
-	cg -dimRDIL9 modula.cg;
+	$(CG) -dimRDIL9 modula.cg;
 	make mtc
 	$(MTC)
 
 clean:
-	rm -f *.[dimor] core ERRORS LISTING convert *.bak
+	-rm -f $(STDCLEAN) 
+	-rm -f  *.[dimor]  ERRORS LISTING convert *.bak
 
 CLEAN:	clean
-	rm -f mtc $(GEN) Tree.TS
+	-rm -f mtc $(GEN) Tree.TS