--- gforth/Makefile.in	2007/01/21 17:29:53	1.339
+++ gforth/Makefile.in	2007/02/23 16:43:05	1.341
@@ -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@
@@ -262,7 +263,8 @@ FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC)
 	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 \
@@ -572,8 +574,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))
@@ -657,10 +661,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 +782,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