--- gforth/Makefile.in	2000/09/14 19:16:23	1.186
+++ gforth/Makefile.in	2000/09/27 18:31:47	1.190
@@ -1,6 +1,6 @@
 #Makefile for Gforth
 
-#Copyright (C) 1995,1996,1997,1998 Free Software Foundation, Inc.
+#Copyright (C) 1995,1996,1997,1998,2000 Free Software Foundation, Inc.
 
 #This file is part of Gforth.
 
@@ -16,7 +16,7 @@
 
 #You should have received a copy of the GNU General Public License
 #along with this program; if not, write to the Free Software
-#Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+#Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
 
 # To change the values of `make' variables: instead of editing Makefiles,
 # (1) if the variable is set in `config.status', edit `config.status'
@@ -450,11 +450,13 @@ binonlydist:	Makedist FORCE
 
 
 #strip gforth, because the debugging stuff is hardly useful once
-# gforth manages to execute more than a few primitives
+# gforth manages to execute more than a few primitives.
 
 #install does not depend on gforth.info, because that would require
 #supplying a lot of files that can be easily generated (only info is
-#hard to generate)
+#hard to generate).
+#we rebuild gforth.fi, because it contains some path names.
+#we delete $build/gforth.fi and $build/install.TAGS after installation because of ownership.
 install:	gforth$(EXE) $(FORTH_SRC) $(kernel_fi) gforth.fi gforthmi doc/gforth.1 prim install.TAGS installdirs
 		touch $(siteforthdir)/siteinit.fs
 		-$(RM) $(bindir)/gforth$(EXE) $(bindir)/gforth-$(VERSION)$(EXE) $(bindir)/gforthmi
@@ -477,11 +479,11 @@ install:	gforth$(EXE) $(FORTH_SRC) $(ker
 		else \
 			echo ">>>>>Please install $(srcdir)/gforth.el in your .../emacs/site-lisp directory"; \
 		fi
-		$(RM) gforth.fi
-		GFORTHD="./gforth-ditc -p$(libdir)/gforth/site-forth$(PATHSEP)$(siteforthdir)$(PATHSEP)$(datadir)/gforth/$(VERSION) -i $(kernel_fi)" GFORTH="./gforth-ditc --die-on-signal -i $(kernel_fi) $(STARTUP)" ./gforthmi gforth.fi $(FORTHSIZES) $(STARTUP) #gforth.fi contains some path names
+		-$(RM) gforth.fi
+		GFORTHD="./gforth-ditc -p$(libdir)/gforth/site-forth$(PATHSEP)$(siteforthdir)$(PATHSEP)$(datadir)/gforth/$(VERSION) -i $(kernel_fi)" GFORTH="./gforth-ditc --die-on-signal -i $(kernel_fi) $(STARTUP)" ./gforthmi gforth.fi $(FORTHSIZES) $(STARTUP)
 		$(INSTALL_DATA) gforth.fi $(libdir)/gforth/$(VERSION)
 		$(INSTALL_DATA) install.TAGS $(datadir)/gforth/$(VERSION)/TAGS
-		$(RM) gforth.fi install.TAGS #delete because of ownership
+		$(RM) gforth.fi install.TAGS
 		@echo ">>>>> Please make an entry for Gforth in your info dir file; e.g.:"; \
 		echo "* Gforth: (gforth).	A fast interpreter for the Forth language."
 
@@ -646,7 +648,7 @@ TAGS:		gforth.TAGS
 install.TAGS:	gforth.TAGS
 		sed 's:^\$(srcdir)/:$(datadir)/gforth/$(VERSION)/:' gforth.TAGS >install.TAGS
 
-gforth.TAGS:	@kernel_fi@ gforth$(EXE) $(GFORTH_FI_SRC) prim.TAGS
+gforth.TAGS:	@kernel_fi@ gforth$(EXE) $(GFORTH_FI_SRC) prim.TAGS kernel.TAGS
 		$(FORTHK) etags.fs except.fs startup.fs -e bye
 		cat TAGS prim.TAGS kernel.TAGS >gforth.TAGS
 		rm TAGS
@@ -658,6 +660,9 @@ prim.TAGS: 	prim.b prims2x.fs
 		$(CP) $@- $@
 		$(RM) $@-
 
+kernel.TAGS:
+		rm kernl16l.fi-; $(MAKE) @kernel_fi@
+
 doc/doc.fd:	doc/makedoc.fs $(GFORTH_FI_SRC) code.fs objects.fs oof.fs moofglos.fs
 		$(FORTHK) -e "s\" doc/doc.fd\"" doc/makedoc.fs except.fs startup.fs code.fs objects.fs oof.fs moofglos.fs -e bye
 
@@ -687,10 +692,10 @@ info:		doc/gforth.info
 doc/gforth.info doc/gforth.info-*: $(GFORTH_TEXI)
 		-cd doc; $(MAKEINFO) gforth.texi
 
+### need makeinfo 4.0 to generate html. Otherwise, use texi2html..
 html:		$(GFORTH_TEXI)
 		-$(RMTREE) html
 		-mkdir html
-### need makeinfo 4.0 to generate html. Otherwise, use texi2html..
 		cd html; $(MAKEINFO) --html -I ../doc ../doc/gforth.texi
 ###		cd html; $(TEXI2HTML) -menu -split_node ../doc/gforth.texi