--- gforth/Makefile.in	2007/01/21 17:29:53	1.339
+++ gforth/Makefile.in	2007/03/04 22:49:39	1.343
@@ -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 \
@@ -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
@@ -520,15 +523,11 @@ virtualclean:	mostlyclean
 #Makefile if it contains our dist rules.  Therefore we have put these
 #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
+dist:		Makedist FORCE
 		$(MAKE) -f Makedist d$@
-		-$(RM) machpc.fs
 
-dosdist:	Makedist machpc.fs FORCE
-		-sed -e 's/@[^ ]*CALLFLAG@/false/g' -e 's/@[P]EEPHOLEFLAG@/true/g' <machpc.fs.in >machpc.fs
+dosdist:	Makedist FORCE
 		$(MAKE) -f Makedist d$@
-		-$(RM) machpc.fs
 
 srcdist:	Makedist FORCE
 		$(MAKE) -f Makedist d$@
@@ -542,15 +541,11 @@ docdist:	Makedist FORCE
 htmldist:	Makedist FORCE
 		$(MAKE) -f Makedist d$@
 
-bindist:	Makedist machpc.fs FORCE
-		-sed -e 's/@[^ ]*CALLFLAG@/false/g' -e 's/@[P]EEPHOLEFLAG@/true/g' <machpc.fs.in >machpc.fs
+bindist:	Makedist FORCE
 		$(MAKE) -f Makedist d$@
-		-$(RM) machpc.fs
 
-binonlydist:	Makedist machpc.fs FORCE
-		-sed -e 's/@[^ ]*CALLFLAG@/false/g' -e 's/@[P]EEPHOLEFLAG@/true/g' <machpc.fs.in >machpc.fs
+binonlydist:	Makedist FORCE
 		$(MAKE) -f Makedist d$@
-		-$(RM) machpc.fs
 
 #HPUX make breaks the cycle differently when the dates are equal, so
 # touch some of the files if it acts up
@@ -572,8 +567,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 +585,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 +654,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 +775,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