--- Makefile.orig	Tue Mar 11 18:34:49 2003
+++ Makefile	Tue Mar 25 12:02:24 2003
@@ -132,13 +132,13 @@
 
 TARGDIR= targets
 TARGETS= runtime prelude libraries greencard hp2graph \
-	 profruntime profprelude profprelude-$(CC) \
-	 timeruntime timeprelude timeprelude-$(CC) \
+	 profruntime profprelude profprelude-gcc \
+	 timeruntime timeprelude timeprelude-gcc \
 	 timetraceruntime timetraceprelude \
-	 compiler-nhc compiler-hbc compiler-ghc compiler-$(CC) \
-	 hmake-nhc hmake-hbc hmake-ghc hmake-$(CC) \
-	 greencard-nhc greencard-hbc greencard-ghc greencard-$(CC) \
-	 prelude-$(CC) pragma-$(CC) libraries-$(CC)
+	 compiler-nhc compiler-hbc compiler-ghc compiler-gcc \
+	 hmake-nhc hmake-hbc hmake-ghc hmake-gcc \
+	 greencard-nhc greencard-hbc greencard-ghc greencard-gcc \
+	 prelude-gcc pragma-gcc libraries-gcc
 
 .PHONY: default basic all compiler help config install
 
@@ -173,8 +173,8 @@
 								libraries
 basic-ghc: $(PRAGMA) runtime hmake-ghc greencard-ghc compiler-ghc prelude \
 								libraries
-basic-$(CC):   runtime prelude-$(CC) pragma-$(CC) compiler-$(CC) \
-		 greencard-$(CC) hmake-$(CC) libraries-$(CC)
+basic-gcc:   runtime prelude-gcc pragma-gcc compiler-gcc \
+		 greencard-gcc hmake-gcc libraries-gcc
 
 all-$(BUILDCOMP): basic-$(BUILDCOMP) heapprofile timeprofile #hoodui
 
@@ -275,41 +275,41 @@
 	touch $(TARGDIR)/$(MACHINE)/timeprelude
 
 
-$(TARGDIR)/$(MACHINE)/prelude-$(CC): $(PRELUDEC)
+$(TARGDIR)/$(MACHINE)/prelude-gcc: $(PRELUDEC)
 	cd src/prelude;        $(MAKE) fromC relink
-	touch $(TARGDIR)/$(MACHINE)/prelude-$(CC)
+	touch $(TARGDIR)/$(MACHINE)/prelude-gcc
 	touch $(TARGDIR)/$(MACHINE)/prelude
-$(TARGDIR)/$(MACHINE)/timeprelude-$(CC): $(PRELUDEC)
+$(TARGDIR)/$(MACHINE)/timeprelude-gcc: $(PRELUDEC)
 	cd src/prelude;        $(MAKE) CFG=z fromC
 	cd src/prelude/$(MACHINE)/NHC; $(MAKE) CFG=z clean all
 	cd src/prelude;        $(MAKE) CFG=z relink
-	touch $(TARGDIR)/$(MACHINE)/timeprelude-$(CC)
+	touch $(TARGDIR)/$(MACHINE)/timeprelude-gcc
 	touch $(TARGDIR)/$(MACHINE)/timeprelude
-$(TARGDIR)/$(MACHINE)/profprelude-$(CC): $(PRELUDEC)
+$(TARGDIR)/$(MACHINE)/profprelude-gcc: $(PRELUDEC)
 	cd src/prelude;        $(MAKE) CFG=p fromC
 	cd src/prelude/$(MACHINE)/NHC; $(MAKE) CFG=p clean all
 	cd src/prelude;        $(MAKE) CFG=p relink
-	touch $(TARGDIR)/$(MACHINE)/profprelude-$(CC)
+	touch $(TARGDIR)/$(MACHINE)/profprelude-gcc
 	touch $(TARGDIR)/$(MACHINE)/profprelude
-$(TARGDIR)/$(MACHINE)/compiler-$(CC): $(COMPILERC)
+$(TARGDIR)/$(MACHINE)/compiler-gcc: $(COMPILERC)
 	cd src/compiler98;     $(MAKE) fromC
 	cd src/prelude/$(MACHINE)/NHC; $(MAKE) clean all	# Patch machine-specific parts.
 	cd src/prelude;        $(MAKE) relink
 	cd src/compiler98;     $(MAKE) relink
-	touch $(TARGDIR)/$(MACHINE)/compiler-$(CC)
-$(TARGDIR)/$(MACHINE)/greencard-$(CC): $(GREENCARDC)
+	touch $(TARGDIR)/$(MACHINE)/compiler-gcc
+$(TARGDIR)/$(MACHINE)/greencard-gcc: $(GREENCARDC)
 	cd src/greencard;      $(MAKE) fromC
-	touch $(TARGDIR)/$(MACHINE)/greencard $(TARGDIR)/$(MACHINE)/greencard-$(CC)
-$(TARGDIR)/$(MACHINE)/pragma-$(CC): script/hmake-PRAGMA.hc
+	touch $(TARGDIR)/$(MACHINE)/greencard $(TARGDIR)/$(MACHINE)/greencard-gcc
+$(TARGDIR)/$(MACHINE)/pragma-gcc: script/hmake-PRAGMA.hc
 	script/nhc98 -o $(PRAGMA) script/hmake-PRAGMA.hc
-	touch $(TARGDIR)/$(MACHINE)/pragma-$(CC)
-$(TARGDIR)/$(MACHINE)/hmake-$(CC): $(HMAKEC)
+	touch $(TARGDIR)/$(MACHINE)/pragma-gcc
+$(TARGDIR)/$(MACHINE)/hmake-gcc: $(HMAKEC)
 	cd src/hmake;          $(MAKE) fromC config
 	cd src/interpreter;    $(MAKE) fromC
-	touch $(TARGDIR)/$(MACHINE)/hmake-$(CC)
-$(TARGDIR)/$(MACHINE)/libraries-$(CC): $(LIBRARIES)
+	touch $(TARGDIR)/$(MACHINE)/hmake-gcc
+$(TARGDIR)/$(MACHINE)/libraries-gcc: $(LIBRARIES)
 	cd src/libraries/base; $(MAKE) -f Makefile.nhc98 fromC
-	touch $(TARGDIR)/$(MACHINE)/libraries-$(CC)
+	touch $(TARGDIR)/$(MACHINE)/libraries-gcc
 
 
 script/errnogen.c: script/GenerateErrNo.hs