--- gforth/Makefile.in	2010/12/30 21:46:14	1.454
+++ gforth/Makefile.in	2011/12/18 21:38:56	1.466
@@ -1,6 +1,6 @@
 #Makefile for Gforth
 
-#Copyright (C) 1995,1996,1997,1998,2000,2003,2004,2005,2006,2007,2008,2009 Free Software Foundation, Inc.
+#Copyright (C) 1995,1996,1997,1998,2000,2003,2004,2005,2006,2007,2008,2009,2010 Free Software Foundation, Inc.
 
 #This file is part of Gforth.
 
@@ -47,6 +47,29 @@ PATHSEP = @PATHSEP@
 
 EC = @EC@
 
+# ------------	Install Directories
+
+VPATH = @srcdir@
+prefix = @prefix@
+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@
+libccdir = $(subst $(DESTDIR),,$(libdir)/gforth/$(VERSION)/libcc-named/)
+includedir = @includedir@
+infodir = @infodir@
+htmldir = @htmldir@
+mandir = @mandir@
+man1dir= $(mandir)/man1
+man1ext= .1
+#older emacses have their site-lisp in $(libdir)/emacs/
+emacssitelispdir=@lispdir@
+siteforthdir=$(datadir)/gforth/site-forth
+
 # -------------	Utility programs
 
 SHELL	= /bin/sh
@@ -64,7 +87,7 @@ INSTALL_INFO = @INSTALL_INFO@
 LN_S	= @LN_S@
 M4      = @M4@
 GCC	= @CC@
-EMACS   = emacs
+EMACS   = @EMACS@
 LIBTOOL = @GNU_LIBTOOL@
 PREFORTH	= ./preforth -p ".$(PATHSEP)~+$(PATHSEP)$(srcdir)"
 CC	= $(GCC)
@@ -86,7 +109,7 @@ FORTHB = $(BUILDFORTH) exboot.fs -e 'fpa
 ENGINE_FAST = ./gforth-fast
 FORTH_FAST	= $(ENGINE_FAST) $(FORTH_ARGS)
 FORTHKFLAGS= --die-on-signal -p ".$(PATHSEP)~+$(PATHSEP)$(srcdir)" -i $(kernel_fi)
-FORTHK	= $(ENGINE) $(FORTHKFLAGS)
+FORTHK	= ./gforthker -p ".$(PATHSEP)~+$(PATHSEP)$(srcdir)"
 #FORTHP	= $(ENGINE) --die-on-signal -i ./$(kernel_fi)
 #the "-2 image-included-files +!" undoes the change to image-included-files
 # in exboot.fs
@@ -117,29 +140,6 @@ LDLIBS	= @LIBS@
 STACK_CACHE_REGS = @STACK_CACHE_REGS@
 STACK_CACHE_DEFAULT_FAST = @STACK_CACHE_DEFAULT_FAST@
 
-# ------------	Install Directories
-
-VPATH = @srcdir@
-prefix = @prefix@
-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@
-libccdir = $(subst $(DESTDIR),,$(libdir)/gforth/$(VERSION)/libcc-named/)
-includedir = @includedir@
-infodir = @infodir@
-htmldir = @htmldir@
-mandir = @mandir@
-man1dir= $(mandir)/man1
-man1ext= .1
-#older emacses have their site-lisp in $(libdir)/emacs/
-emacssitelispdir=@lispdir@
-siteforthdir=$(datadir)/gforth/site-forth
-
 PROFOBJS = @PROFOBJS@
 PROFEXES = @PROFEXES@
 
@@ -181,6 +181,7 @@ KERN_SRC = \
 	kernel/basics.fs \
 	kernel/int.fs \
 	kernel/comp.fs \
+	kernel/recognizer.fs \
 	kernel/io.fs \
 	kernel/input.fs \
 	kernel/license.fs \
@@ -245,6 +246,7 @@ GFORTH_FI_SRC2=\
 	simp-see.fs \
 	source.fs \
 	startup.fs \
+	str-exec.fs \
 	struct.fs \
 	struct0x.fs \
 	stuff.fs \
@@ -289,7 +291,7 @@ FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_DIST
 	make-app.fs doc/makedoc.fs locate.fs more.fs onebench.fs \
 	other.fs prims2x.fs prims2x0.6.2.fs proxy.fs random.fs \
 	regexp.fs sokoban.fs string.fs table.fs tags.fs \
-	tt.fs \
+	tt.fs quotations.fs \
 	unbuffer.fs wordsets.fs xwords.fs \
 	test/tester.fs test/ttester.fs \
 	test/coretest.fs test/postpone.fs test/dbltest.fs \
@@ -424,7 +426,7 @@ ENGINE_SOURCES = engine/Makefile.in engi
 	engine/makefile.dos engine/makefile.os2
 
 SOURCES	= $(ENGINE_SOURCES) compat Makefile.in Makedist.in \
-	gforthmi.in vmgen.in preforth.in gfgen README.vmgen NEWS.vmgen \
+	gforthmi.in vmgen.in preforth.in gforthker.in gfgen README.vmgen NEWS.vmgen \
 	autogen.sh configure.in configure config.sub config.guess \
 	elisp-comp missing stamp-h.in envos.fs.in \
 	iss.sh install-sh INSTALL INSTALL.BINDIST NEWS README ToDo BUGS \
@@ -450,7 +452,7 @@ ENGINES = gforth$(EC)$(EXE) @NO_EC@ gfor
 
 ENGINES_FAST = @NO_EC@ gforth-fast$(OPT)$(EC)$(EXE) #gforth-native$(OPT)$(EC)$(EXE) 
 
-GEN = $(ENGINES) $(ENGINES_FAST) gforth.elc
+GEN = $(ENGINES) $(ENGINES_FAST) @gforth_elc@
 
 # things that need a working forth system to be generated
 FORTH_GEN_ENGINE=engine/prim.i engine/prim_lab.i engine/prim_names.i \
@@ -464,7 +466,7 @@ FORTH_GEN_ENGINE_FAST= \
 	engine/costs-fast.i engine/super2-fast.i
 FORTH_GEN_PRIMB = $(FORTH_GEN_ENGINE) kernel/aliases.fs kernel/prim.fs
 FORTH_GEN0 = prim.b $(FORTH_GEN_PRIMB)
-FORTH_GEN =  $(FORTH_GEN0) @KERNEL@ @NO_EC@ gforth.fi
+FORTH_GEN =  $(FORTH_GEN0) @KERNEL@ @NO_CROSS@ gforth.fi
 # this is used for antidependences,
 FORTH_GEN1 = $(FORTH_GEN0) @kernel_fi@ build-ec
 
@@ -493,7 +495,7 @@ GEN_PRECIOUS = $(FORTH_GEN) $(KERNLS) \
 .SUFFIXES:
 .SUFFIXES: .c .o
 
-all: kernel/version.fs more @NO_EC@ check
+all: kernel/version.fs more @NO_CROSS@ check
 
 # use this dependency for phony targets just as mostlyclean,...
 FORCE: ;
@@ -635,10 +637,11 @@ install:	gforth$(EC)$(EXE) $(FORTH_SRC)
 		for i in $(FORTH_SRC) $(COMPAT) envos.fs prim; do \
 			$(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(datadir)/gforth/$(VERSION)/$$i; \
 		done
-		$(INSTALL_DATA) $(kernel_fi) $(DESTDIR)$(datadir)/gforth/$(VERSION)
+		$(INSTALL_DATA) $(kernel_fi) $(DESTDIR)$(libdir)/gforth/$(VERSION)
 		@if test -d "$(DESTDIR)$(emacssitelispdir)"; then \
-			$(INSTALL_DATA) gforth.el $(DESTDIR)$(emacssitelispdir); \
-			$(INSTALL_DATA) gforth.elc $(DESTDIR)$(emacssitelispdir); \
+			for i in gforth.el @gforth_elc@; do \
+				$(INSTALL_DATA) $$i $(DESTDIR)$(emacssitelispdir); \
+			done; \
 		else \
 			echo '>>>>>Please install gforth.{el,elc} in your .../emacs/site-lisp directory'; \
 		fi
@@ -689,7 +692,7 @@ check:		gforths	gforth.fi
 		./gforth-fast --diag -e bye
 
 checkone test: 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 test/search.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>/dev/null | 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 test/macros.fs -e bye 2>&1 | tr -d '\015' | diff -c - $(srcdir)/test/gforth.out
@@ -842,7 +845,7 @@ gforth$(OPT)$(EC)$(EXE): $(ENGINE_SOURCE
 		$(CP) engine/$@ $@ && \
 		$(MASSAGE_EXE) $@; \
 		@GFORTH_EXE@; \
-		@NO_EC@ $(MAKE) checkone check-nofast ENGINE=./engine/$@; \
+		@NO_CROSS@ $(MAKE) checkone check-nofast ENGINE=./engine/$@; \
 	fi
 
 optgforth:
@@ -856,7 +859,7 @@ gforth-fast$(OPT)$(EC)$(EXE): $(ENGINE_S
 		$(CP) engine/$@ $@ && \
 		$(MASSAGE_EXE) $@; \
 		@GFORTHFAST_EXE@; \
-		@NO_EC@ $(MAKE) checkone ENGINE=./engine/$@; \
+		@NO_CROSS@ $(MAKE) checkone ENGINE=./engine/$@; \
 	fi
 
 optgforth-fast: