--- gforth/Makefile.in	2010/12/31 18:09:01	1.455
+++ gforth/Makefile.in	2011/11/13 00:45:20	1.461
@@ -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)
@@ -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 \
@@ -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 \
@@ -637,8 +639,9 @@ install:	gforth$(EC)$(EXE) $(FORTH_SRC)
 		done
 		$(INSTALL_DATA) $(kernel_fi) $(DESTDIR)$(datadir)/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