--- gforth/Makefile.in	2006/12/17 16:18:09	1.337
+++ gforth/Makefile.in	2007/03/04 22:32:29	1.342
@@ -1,6 +1,6 @@
 #Makefile for Gforth
 
-#Copyright (C) 1995,1996,1997,1998,2000,2003,2004,2005 Free Software Foundation, Inc.
+#Copyright (C) 1995,1996,1997,1998,2000,2003,2004,2005,2006 Free Software Foundation, Inc.
 
 #This file is part of Gforth.
 
@@ -58,6 +58,7 @@ MV	= mv
 TAR	= tar cf -
 INSTALL	= @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@ -s
+MASSAGE_EXE = @MASSAGE_EXE@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_INFO = @INSTALL_INFO@
@@ -259,10 +260,12 @@ FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC)
 	test/string.fs test/float.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 \
 	bubble.fs siev.fs matrix.fs fib.fs \
 	oof.fs oofsampl.fs objects.fs objexamp.fs mini-oof.fs moof-exm.fs \
 	moofglos.fs fixpath.fs \
-	add.fs lib.fs oldlib.fs fflib.fs libffi.fs sieve.fs unix/socket.fs
+	add.fs lib.fs oldlib.fs fflib.fs libffi.fs sieve.fs unix/socket.fs \
+	endtry-iferror.fs recover-endtry.fs
 
 COMPAT = compat/README \
 	compat/anslocal.fs \
@@ -369,7 +372,7 @@ VMGEN_EX2 = $(VMGEN_EX:vmgen-ex/%=vmgen-
 SOURCES	= $(CVSDIRS) compat Makefile.in Makedist.in engine/Makefile.in \
 	gforthmi.in vmgen.in gfgen README.vmgen NEWS.vmgen \
 	configure.in configure config.sub config.guess elisp-comp missing \
-	engine/config.h.in stamp-h.in \
+	engine/config.h.in stamp-h.in envos.fs.in \
 	iss.sh install-sh INSTALL INSTALL.BINDIST NEWS README ToDo BUGS \
 	BUILD-FROM-SCRATCH model \
 	COPYING COPYING.DOC AUTHORS ChangeLog Benchres aclocal.m4 \
@@ -395,7 +398,7 @@ SOURCES	= $(CVSDIRS) compat Makefile.in
 	gforthmi.cmd glosgen.glo doc/glossaries.doc \
 	$(INCLUDES) $(FORTH_SRC) $(COMPAT) $(VMGEN_EX) $(VMGEN_EX2) \
 	timings.sc \
-	test/coretest.out test/checkans.out \
+	test/coretest.out test/checkans.out test/gforth.out \
 	cache-fast*.vmg
 
 RCS_FILES =  ToDo model high-level
@@ -521,7 +524,7 @@ virtualclean:	mostlyclean
 #rules in Makedist (you can use them with GNU make on these systems).
 
 dist:		Makedist machpc.fs FORCE
-		-sed -e 's/@[^ ]*CALLFLAG@/false/g' -e 's/@[P]EEPHOLEFLAG@/true/g' -e 's/@[L]IBFFIFLAG@/false/g' <machpc.fs.in >machpc.fs
+		-sed -e 's/@[E]C_MODE@/false/g' -e 's/@[^ ]*CALLFLAG@/false/g' -e 's/@[P]EEPHOLEFLAG@/true/g' -e 's/@[L]IBFFIFLAG@/false/g' <machpc.fs.in >machpc.fs
 		$(MAKE) -f Makedist d$@
 		-$(RM) machpc.fs
 
@@ -572,8 +575,10 @@ install:	gforth$(EXE) $(FORTH_SRC) $(ker
 		-$(RM) $(DESTDIR)$(bindir)/gforth-fast$(EXE) $(DESTDIR)$(bindir)/gforth-fast-$(VERSION)$(EXE)
 		-$(RM) $(DESTDIR)$(bindir)/gforth-itc$(EXE) $(DESTDIR)$(bindir)/gforth-itc-$(VERSION)$(EXE)
 		$(INSTALL_PROGRAM) gforth$(EXE) $(DESTDIR)$(bindir)/gforth-$(VERSION)$(EXE)
+		-$(MASSAGE_EXE) $(DESTDIR)$(bindir)/gforth-$(VERSION)$(EXE)
 		(cd $(DESTDIR)$(bindir) && $(LN_S) gforth-$(VERSION)$(EXE) gforth$(EXE))
 		$(INSTALL_PROGRAM) gforth-fast$(EXE) $(DESTDIR)$(bindir)/gforth-fast-$(VERSION)$(EXE)
+		-$(MASSAGE_EXE) $(DESTDIR)$(bindir)/gforth-fast-$(VERSION)$(EXE)
 		(cd $(DESTDIR)$(bindir) && $(LN_S) gforth-fast-$(VERSION)$(EXE) gforth-fast$(EXE))
 		$(INSTALL_PROGRAM) gforth-itc$(EXE) $(DESTDIR)$(bindir)/gforth-itc-$(VERSION)$(EXE)
 		(cd $(DESTDIR)$(bindir) && $(LN_S) gforth-itc-$(VERSION)$(EXE) gforth-itc$(EXE))
@@ -588,7 +593,7 @@ install:	gforth$(EXE) $(FORTH_SRC) $(ker
 			$(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(datadir)/gforth/$(VERSION)/$$i; \
 		done
 		$(INSTALL_DATA) $(kernel_fi) $(DESTDIR)$(datadir)/gforth/$(VERSION)
-		@if test -d "$(emacssitelispdir)"; then \
+		@if test -d "$(DESTDIR)$(emacssitelispdir)"; then \
 			$(INSTALL_DATA) $(srcdir)/gforth.el $(DESTDIR)$(emacssitelispdir); \
 		else \
 			echo ">>>>>Please install $(srcdir)/gforth.el in your .../emacs/site-lisp directory"; \
@@ -657,10 +662,11 @@ bench:		gforth-fast$(EXE) gforth.fi
 		time $(FORTH_FAST) fib.fs -e "main bye"
 
 onebench:
-		@\time -f "siev   %U" $(FORTH_FAST) siev.fs -e "main bye"
-		@\time -f "bubble %U" $(FORTH_FAST) -e "warnings off" bubble.fs -e "main bye"
-		@\time -f "matrix %U" $(FORTH_FAST) matrix.fs -e "main bye"
-		@\time -f "fib    %U" $(FORTH_FAST) fib.fs -e "main bye"
+		@echo 'sieve bubble matrix  fib'
+		@echo -n " "`\time 2>&1 -f "%U" $(FORTH_FAST) siev.fs -e "main bye"`
+		@echo -n "  "`\time 2>&1 -f "%U" $(FORTH_FAST) -e "warnings off" bubble.fs -e "main bye"`
+		@echo -n "   "`\time 2>&1 -f "%U" $(FORTH_FAST) matrix.fs -e "main bye"`
+		@echo "  "`\time 2>&1 -f "%U" $(FORTH_FAST) fib.fs -e "main bye"`
 
 all-bench:	gforth-fast$(EXE) gforth$(EXE) gforth-itc$(EXE) gforth-ditc$(EXE) gforth.fi
 		@echo "*** gforth-fast dynamic:"
@@ -777,14 +783,17 @@ kernel/prim.fs:	prim.b prims2x.fs kernel
 gforth$(EXE):		engines
 		-$(CP) gforth$(EXE) gforth~
 		$(CP) engine/$@ $@
+		-$(MASSAGE_EXE) $@
 		@GFORTH_EXE@
 
 gforth-fast$(EXE):	engines-fast
 		$(CP) engine/$@ $@
+		-$(MASSAGE_EXE) $@
 		@GFORTHFAST_EXE@
 
 gforth-native$(EXE):	engines-fast
 		$(CP) engine/$@ $@
+		-$(MASSAGE_EXE) $@
 #@GFORTHX_EXE@
 
 gforth-itc$(EXE):	engines