--- gforth/Makefile.in	1995/11/27 18:37:07	1.43
+++ gforth/Makefile.in	1995/12/04 16:38:51	1.47
@@ -34,7 +34,7 @@ INSTALL	= @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 LN_S	= @LN_S@
-GCC	= gcc
+GCC	= @GCC@
 CC	= $(GCC)
 FORTH	= ./gforth
 FORTHK	= $(FORTH) -i kernal.fi
@@ -79,7 +79,7 @@ FORTH_SRC = anslocal.fs add.fs assert.fs
 	dumpimage.fs environ.fs errore.fs etags.fs extend.fs filedump.fs \
 	float.fs glocals.fs glosgen.fs gray.fs hash.fs history.fs \
 	kernal.fs locals-test.fs look.fs main.fs makedoc.fs \
- 	mach16b.fs mach16l.fs mach32b.fs mach32l.fs mach64b.fs mach64l.fs \
+	mach16b.fs mach16l.fs mach32b.fs mach32l.fs mach64b.fs mach64l.fs \
 	other.fs prims2x.fs random.fs search-order.fs see.fs sieve.fs source.fs \
 	startup.fs site-init.fs struct.fs tools.fs toolsext.fs tt.fs vars.fs \
 	vt100.fs vt100key.fs wordinfo.fs wordsets.fs \
@@ -100,7 +100,7 @@ SOURCES	= Makefile.in configure.in confi
 
 RCS_FILES =  ToDo model high-level
 
-GEN = gforth
+GEN = gforth first
 
 OBJECTS	= engine.o io.o main.o @LIBOBJS@ @getopt_long@
 
@@ -142,15 +142,26 @@ more:	$(FORTH_GEN) gforth
 # `distclean' also deletes the files made by config.
 # `realclean' also deletes everything that could be regenerated automatically."
 
-clean:		
-		-$(RM) $(GEN) *.o *.s gforth.fi
+mostlyclean:
+		-$(RM) -rf *.s gforth.fi *.fi~ *.fi+ version.fs TAGS \
+		crossdoc.fd doc.fd gforth.aux gforth.cp gforth.cps \
+		gforth.dvi gforth.fn gforth.ky gforth.log gforth.pg \
+		gforth.toc gforth.tp gforth.vr html 
+
+clean:		mostlyclean
+		-$(RM) -rf $(GEN) *.o 
 
 distclean:	clean
-		-$(RM) machine.h kernal.fi config.cache config.log
+		-$(RM) machine.h kernal.fi config.cache config.log config.status Makefile
 
 realclean:	distclean
 		-$(RM) $(GEN_PRECIOUS)
 
+#mostlyclean, but also remove some of the stuff that is distributed
+virtualclean:	mostlyclean
+		-$(RM) -rf gforth.fns gforth.texi gforth.ps gforth.info* \
+		gforth-$(VERSION).tar.gz config.cache *~
+
 dist:		$(SOURCES) $(FORTH_GEN) $(DOCDIST)
 		-rm -rf gforth-$(VERSION)
 		mkdir gforth-$(VERSION)
@@ -190,6 +201,7 @@ binonlydist:	$(SOURCES) $(FORTH_GEN) gfo
 install:	gforth $(FORTH_SRC) kernal.fi gforth.fi gforth.1 gforth.info
 		$(INSTALL) -d $(bindir) $(mandir) $(infodir) $(libdir)/gforth/$(VERSION) $(datadir)/gforth/$(VERSION) $(libdir)/gforth/site-forth $(datadir)/gforth/site-forth
 		touch $(datadir)/gforth/site-forth/site-init.fs
+		-$(RM) $(bindir)/gforth
 		$(INSTALL_PROGRAM) -s gforth $(bindir)
 		ln -f $(bindir)/gforth $(bindir)/gforth-$(VERSION)
 		$(INSTALL_DATA) gforth.1 $(mandir)
@@ -197,7 +209,7 @@ install:	gforth $(FORTH_SRC) kernal.fi g
 		for i in $(FORTH_SRC); do \
 			$(INSTALL_DATA) $$i $(datadir)/gforth/$(VERSION); \
 		done
-		rm gforth.fi; make gforth.fi #gforth.fi contains some path names
+		$(RM) gforth.fi; make gforth.fi #gforth.fi contains some path names
 		$(INSTALL_DATA) kernal.fi gforth.fi $(libdir)/gforth/$(VERSION)
 
 
@@ -210,13 +222,13 @@ uninstall:
 check:		test
 		touch test
 
-test:		gforth
+test:		gforth gforth.fi
 		$(FORTH) tester.fs coretest.fs -e bye
 		$(FORTH) code.fs checkans.fs -e bye
 		@echo 'Expect no differences'
 		$(FORTH) prims2x.fs -e "s\" primitives.b\" ' output-c process-file bye"| diff -c - primitives.i
 
-bench:		gforth
+bench:		gforth gforth.fi
 		@echo 'Each benchmark takes about 30s on a 486-66 (gcc-2.6.3 -DFORCE_REG)'
 		time $(FORTH) siev.fs -e "main bye"
 		time $(FORTH) bubble.fs -e "main bye"
@@ -329,7 +341,7 @@ gforth.texi:	gforth.ds primitives.b ds2t
 checkdoc:	gforth.ds primitives.b ds2texi.fs prims2x.fs doc.fd crossdoc.fd answords.fs
 		$(FORTHK) -p . ds2texi.fs answords.fs -e bye
 
-gforth.dvi:	gforth.texi
+gforth.dvi gforth.fns:	gforth.texi
 		$(TEXI2DVI) gforth.texi
 
 gforth.ps:	gforth.dvi
@@ -348,9 +360,9 @@ html:		gforth.texi
 # For an explanation of the following Makefile rules, see node
 # `Automatic Remaking' in GNU Autoconf documentation.
 Makefile: Makefile.in config.status
-	CONFIG_FILES=$@ CONFIG_HEADERS= ./config.status
+	CONFIG_FILES=$@ CONFIG_HEADERS= GCC=$(GCC) ./config.status
 config.status: configure
-	./config.status --recheck
+	GCC=$(GCC) ./config.status --recheck
 configure: configure.in
 	cd $(srcdir) && autoconf