--- gforth/Makefile.in	2007/09/22 15:11:36	1.367
+++ gforth/Makefile.in	2008/01/01 13:39:13	1.373
@@ -1,12 +1,12 @@
 #Makefile for Gforth
 
-#Copyright (C) 1995,1996,1997,1998,2000,2003,2004,2005,2006 Free Software Foundation, Inc.
+#Copyright (C) 1995,1996,1997,1998,2000,2003,2004,2005,2006,2007 Free Software Foundation, Inc.
 
 #This file is part of Gforth.
 
 #Gforth is free software; you can redistribute it and/or
 #modify it under the terms of the GNU General Public License
-#as published by the Free Software Foundation; either version 2
+#as published by the Free Software Foundation, either version 3
 #of the License, or (at your option) any later version.
 
 #This program is distributed in the hope that it will be useful,
@@ -15,8 +15,7 @@
 #GNU General Public License for more details.
 
 #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., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
+#along with this program. If not, see http://www.gnu.org/licenses/.
 
 # To change the values of `make' variables: instead of editing Makefiles,
 # (1) if the variable is set in `config.status', edit `config.status'
@@ -67,6 +66,7 @@ INSTALL_INFO = @INSTALL_INFO@
 LN_S	= @LN_S@
 M4      = @M4@
 GCC	= @CC@
+BOOTFORTH	= @GFORTH@
 CC	= $(GCC)
 FORTHPATH = .$(PATHSEP)$(libdir)/gforth/site-forth$(PATHSEP)$(siteforthdir)$(PATHSEP)$(libdir)/gforth/$(VERSION)$(PATHSEP)$(datadir)/gforth/$(VERSION)
 FORTHSIZES = @FORTHSIZES@
@@ -123,6 +123,7 @@ exec_prefix = @exec_prefix@
 srcdir = @srcdir@
 bindir = @bindir@
 #read-only architecture-independent files
+datarootdir = @datarootdir@
 datadir = @datadir@
 #read-only architecture-dependent non-ascii files
 libdir = @libdir@
@@ -265,7 +266,7 @@ FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC)
 	unbuffer.fs wordsets.fs xwords.fs \
 	test/tester.fs test/ttester.fs \
 	test/coretest.fs test/postpone.fs test/dbltest.fs \
-	test/string.fs test/float.fs test/gforth.fs \
+	test/string.fs test/float.fs test/search.fs test/gforth.fs \
 	test/other.fs test/signals.fs test/checkans.fs \
 	test/primtest.fs test/coreext.fs test/deferred.fs \
 	test/coremore.fs test/gforth-nofast.fs test/libcc.fs \
@@ -443,6 +444,10 @@ KERN_DEPS = $(KERN_SRC) kernel/version.f
 DOCDIST = doc/gforth.info doc/gforth.info-* doc/gforth.ps \
 	  doc/vmgen.info doc/vmgen.ps
 
+BKERNLS = kernl16b$(EC).fi kernl16l$(EC).fi \
+	  kernl32b$(EC).fi kernl32l$(EC).fi \
+	  kernl64b$(EC).fi kernl64l$(EC).fi
+
 KERNLS = kernl16b$(EC).fi- kernl16l$(EC).fi- \
 	 kernl32b$(EC).fi- kernl32l$(EC).fi- \
 	 kernl64b$(EC).fi- kernl64l$(EC).fi-
@@ -641,7 +646,7 @@ check:		gforths	gforth.fi
 		@echo "*** Check successful ***"
 
 checkone test:	gforth$(EC)$(EXE) gforth.fi engine/prim-s.i
-		$(FORTH) test/tester.fs test/coretest.fs test/postpone.fs test/dbltest.fs test/string.fs test/float.fs test/deferred.fs test/coreext.fs -e bye 2>&1 | tr -d '\015' | diff -c - $(srcdir)/test/coretest.out
+		$(FORTH) test/tester.fs test/coretest.fs test/postpone.fs test/dbltest.fs test/string.fs test/float.fs test/deferred.fs test/coreext.fs test/search.fs -e bye 2>&1 | tr -d '\015' | diff -c - $(srcdir)/test/coretest.out
 		$(FORTH) test/other.fs -e bye
 		$(FORTHS) test/signals.fs -e bye
 		$(FORTHS) test/coremore.fs test/gforth.fs -e bye 2>&1 | tr -d '\015' | diff -c - $(srcdir)/test/gforth.out
@@ -677,6 +682,11 @@ all-bench allbench:	gforth-fast$(EC)$(EX
 	./gforth-itc onebench.fs
 	./gforth-ditc onebench.fs
 
+# ------------- Bootstrapping
+bootstrap:
+	[ ! -z "${BOOTFORTH}" ] && \
+	${MAKE} BUILDFORTH="${BOOTFORTH}" FORTHP="${BOOTFORTH}" engine/prim.i ${BKERNLS}
+
 # -------------	Make forth images
 
 # How to make new images:
@@ -869,7 +879,7 @@ gforth.elc:	gforth.el
 #Documentation
 
 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
+		$(FORTHK) -e "s\" doc/doc.fd\"" doc/makedoc.fs except.fs startup.fs code.fs objects.fs oof.fs moofglos.fs regexp.fs fft.fs -e bye
 
 doc/crossdoc.fd:	$(KERN_SRC) kernel/version.fs $(FORTH_GEN0)
 		$(FORTHK) -e 's" mach32l.fs"' kernel/main.fs -e bye