--- gforth/Makefile.in	2003/02/03 08:59:29	1.254
+++ gforth/Makefile.in	2003/03/09 15:16:45	1.262
@@ -1,6 +1,6 @@
 #Makefile for Gforth
 
-#Copyright (C) 1995,1996,1997,1998,2000 Free Software Foundation, Inc.
+#Copyright (C) 1995,1996,1997,1998,2000,2003 Free Software Foundation, Inc.
 
 #This file is part of Gforth.
 
@@ -59,6 +59,7 @@ TAR	= tar cf -
 INSTALL	= @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
+INSTALL_INFO = @INSTALL_INFO@
 LN_S	= @LN_S@
 GCC	= @CC@
 CC	= $(GCC)
@@ -74,7 +75,7 @@ FORTHS	= $(ENGINE) $(FORTHS_ARGS)
 # possible to override this variable at the command line for an initial build (jaw)
 BUILDFORTH = $(ENGINE) --die-on-signal -m 4M -p ".$(PATHSEP)~+$(PATHSEP)$(srcdir)" -i $(kernel_fi)
 # the forth system plus flags we use to build
-FORTHB = $(BUILDFORTH) -e 'fpath= .|~+|$(srcdir)' except.fs
+FORTHB = $(BUILDFORTH) -e 3 exboot.fs -e 'fpath= .|~+|$(srcdir)'
 # the Forth system for running prims2x.fs
 FORTHP = $(FORTH)
 ENGINE_FAST = $(ENGINE)-fast
@@ -235,9 +236,9 @@ FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC)
 	envos.fs envos.dos envos.os2 etags.fs filedump.fs fi2c.fs \
 	glosgen.fs gray.fs httpd.fs proxy.fs \
 	make-app.fs doc/makedoc.fs \
-	more.fs other.fs prims2x.fs random.fs \
-	table.fs string.fs \
-	tt.fs sokoban.fs \
+	locate.fs more.fs other.fs prims2x.fs random.fs \
+	sokoban.fs string.fs table.fs tags.fs \
+	tt.fs \
 	unbuffer.fs wordsets.fs \
 	test/tester.fs test/coretest.fs test/postpone.fs test/dbltest.fs \
 	test/string.fs test/float.fs test/gforth.fs \
@@ -336,10 +337,11 @@ SOURCES	= $(CVSDIRS) compat Makefile.in
 	gforthmi.in vmgen.in README.vmgen NEWS.vmgen \
 	configure.in configure config.sub config.guess elisp-comp missing \
 	engine/config.h.in stamp-h.in \
-	iss.sh install-sh INSTALL INSTALL.BINDIST NEWS README ToDo BUGS model \
+	iss.sh install-sh INSTALL INSTALL.BINDIST NEWS README ToDo BUGS \
+	BUILD-FROM-SCRATCH model \
 	COPYING COPYING.DOC AUTHORS ChangeLog Benchres aclocal.m4 \
 	doc/gforth.ds doc/texinfo.tex doc/gforth.1 doc/version.texi.in \
-	doc/vmgen.texi doc/fdl.texi \
+	doc/vmgen.texi doc/fdl.texi doc/gpl.texi \
 	gforth.el \
 	prim peeprules.vmg engine/engine.c engine/main.c \
 	engine/io.c engine/support.c engine/signals.c \
@@ -378,7 +380,8 @@ FORTH_GEN1 = $(FORTH_GEN0) @kernel_fi@
 KERN_DEPS = $(KERN_SRC) kernel/version.fs machpc.fs $(FORTH_GEN0) compat/strcomp.fs
 
 #distributed documentation
-DOCDIST = doc/gforth.info doc/gforth.info-* doc/gforth.ps
+DOCDIST = doc/gforth.info doc/gforth.info-* doc/gforth.ps \
+	  doc/vmgen.info doc/vmgen.info-* doc/vmgen.ps
 
 KERNLS = kernl16b.fi- kernl16l.fi- \
 	 kernl32b.fi- kernl32l.fi- \
@@ -517,7 +520,7 @@ install:	gforth$(EXE) $(FORTH_SRC) $(ker
 		(cd $(bindir) && $(LN_S) gforthmi-$(VERSION) gforthmi)
 		(cd $(bindir) && $(LN_S) vmgen-$(VERSION) vmgen)
 		-$(INSTALL_DATA) $(srcdir)/doc/gforth.1 $(man1dir)
-		-for i in $(srcdir)/doc/gforth.info*; do $(INSTALL_DATA) $$i $(infodir); done
+		-for i in $(srcdir)/doc/gforth.info* $(srcdir)/doc/vmgen.info*; do $(INSTALL_DATA) $$i $(infodir); done
 		for i in $(FORTH_SRC) $(COMPAT) prim; do \
 			$(INSTALL_DATA) $(srcdir)/$$i $(datadir)/gforth/$(VERSION)/$$i; \
 		done
@@ -532,8 +535,8 @@ install:	gforth$(EXE) $(FORTH_SRC) $(ker
 		$(INSTALL_DATA) gforth.fi $(libdir)/gforth/$(VERSION)
 		$(INSTALL_DATA) install.TAGS $(datadir)/gforth/$(VERSION)/TAGS
 		$(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."
+		$(INSTALL_INFO) --info-dir=$(infodir) $(infodir)/gforth.info
+		$(INSTALL_INFO) --info-dir=$(infodir) $(infodir)/vmgen.info
 
 install-strip:	install