--- gforth/Makefile.in	2008/10/25 17:18:42	1.431
+++ gforth/Makefile.in	2008/11/13 22:27:24	1.437
@@ -269,9 +269,9 @@ FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC)
 	colorize.fs comp-i.fs complex.fs \
 	depth-changes.fs dosekey.fs doskey.fs ds2texi.fs \
 	envos.dos envos.os2 etags.fs fft.fs filedump.fs fi2c.fs \
-	fsl-util.4th glosgen.fs gray.fs httpd.fs proxy.fs \
+	fsl-util.4th glosgen.fs gray.fs httpd.fs install-tags.fs \
 	make-app.fs doc/makedoc.fs locate.fs more.fs onebench.fs \
-	other.fs prims2x.fs prims2x0.6.2.fs random.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 \
 	unbuffer.fs wordsets.fs xwords.fs \
@@ -478,6 +478,9 @@ all: kernel/version.fs more check
 # use this dependency for phony targets just as mostlyclean,...
 FORCE: ;
 
+#targets of failed commands should be deleted:
+.DELETE_ON_ERROR:
+
 #this rule avoids remaking everything after minor changes in Makefile.in
 version:	Makefile.in configure.in
 		if test -r $@ && test x'$(VERSION)' = x`cat $@` ; then true ; else echo $(VERSION) > $@ ; fi
@@ -490,8 +493,7 @@ version:	Makefile.in configure.in
 kernel/version.fs:	version
 	echo ": version-string s\" $(VERSION)\" ;" > kernel/version.fs
 
-more:	$(ENGINES) $(FORTH_GEN) $(GEN)
-	test -n "$(LIBTOOL)" && $(MAKE) build-libcc-named
+more:	$(ENGINES) $(FORTH_GEN) $(GEN) @build_libcc_named@
 
 #from the gcc Makefile: 
 #"Deletion of files made during compilation.
@@ -592,7 +594,7 @@ hpux-workaround:
 install:	gforth$(EC)$(EXE) $(FORTH_SRC) $(kernel_fi) gforth.fi gforthmi vmgen doc/gforth.1 prim install.TAGS installdirs
 		$(NORMAL_INSTALL)
 		touch $(DESTDIR)$(siteforthdir)/siteinit.fs
-		-$(RM) $(DESTDIR)$(bindir)/gforth$(EC)$(EXE) $(DESTDIR)$(bindir)/gforth-$(VERSION)$(EC)$(EXE) $(DESTDIR)$(bindir)/gforthmi #$(DESTDIR)$(bindir)/vmgen
+		-$(RM) $(DESTDIR)$(bindir)/gforth$(EC)$(EXE) $(DESTDIR)$(bindir)/gforth-$(VERSION)$(EC)$(EXE) $(DESTDIR)$(bindir)/gforthmi $(DESTDIR)$(bindir)/vmgen
 		-$(RM) $(DESTDIR)$(bindir)/gforth-fast$(EC)$(EXE) $(DESTDIR)$(bindir)/gforth-fast-$(VERSION)$(EC)$(EXE)
 		-$(RM) $(DESTDIR)$(bindir)/gforth-itc$(EC)$(EXE) $(DESTDIR)$(bindir)/gforth-itc-$(VERSION)$(EC)$(EXE)
 		$(INSTALL_PROGRAM) gforth$(EC)$(EXE) $(DESTDIR)$(bindir)/gforth-$(VERSION)$(EC)$(EXE)
@@ -649,7 +651,7 @@ installdirs:	mkinstalldirs
 #to uninstall version foo, type `make uninstall VERSION=foo'
 uninstall:	FORCE
 		$(NORMAL_UNINSTALL)
-		-$(RM) -rf $(DESTDIR)$(libdir)/gforth/$(VERSION) $(DESTDIR)$(datadir)/gforth/$(VERSION) $(DESTDIR)$(bindir)/gforth-$(VERSION)$(EC)$(EXE) $(DESTDIR)$(bindir)/gforth-fast-$(VERSION)$(EC)$(EXE) $(DESTDIR)$(bindir)/gforth-itc-$(VERSION)$(EC)$(EXE) $(DESTDIR)$(bindir)/gforthmi-$(VERSION) $(DESTDIR)(bindir)/vmgen-$(VERSION) $(DESTDIR)$(includedir)/gforth/$(VERSION)
+		-$(RM) -rf $(DESTDIR)$(libdir)/gforth/$(VERSION) $(DESTDIR)$(datadir)/gforth/$(VERSION) $(DESTDIR)$(bindir)/gforth-$(VERSION)$(EC)$(EXE) $(DESTDIR)$(bindir)/gforth-fast-$(VERSION)$(EC)$(EXE) $(DESTDIR)$(bindir)/gforth-itc-$(VERSION)$(EC)$(EXE) $(DESTDIR)$(bindir)/gforthmi-$(VERSION) $(DESTDIR)$(bindir)/vmgen-$(VERSION) $(DESTDIR)$(includedir)/gforth/$(VERSION)
 		@echo -e "To remove Gforth completely, type\n$(RM) -rf $(DESTDIR)$(bindir)/gforth$(EC)$(EXE) $(DESTDIR)$(bindir)/gforth-fast$(EC)$(EXE) $(DESTDIR)$(bindir)/gforth-itc$(EC)$(EXE) $(DESTDIR)$(bindir)/gforthmi $(DESTDIR)$(bindir)/vmgen $(DESTDIR)$(man1dir)/gforth.1 $(DESTDIR)$(infodir)/gforth.info* $(DESTDIR)$(datadir)/gforth $(DESTDIR)$(libdir)/gforth"
 
 build-libcc-named: $(LIBCC_BUILD_SRC) $(FORTH_GEN) $(GEN) FORCE
@@ -880,8 +882,8 @@ TAGS:		gforth.TAGS
 tags:		gforth.tags
 		$(CP) gforth.tags $@
 
-install.TAGS:	TAGS
-		sed 's;^\$(srcdir)/;;' TAGS|awk 'BEGIN {RS="\014\n"; ORS=RS} {if (NR==1) print $0; else print "$(datadir)/gforth/$(VERSION)/"$$0;}' >install.TAGS
+install.TAGS:	TAGS install-tags.fs
+		sed 's;^\$(srcdir)/;;' TAGS|./gforth -e 's" '$(datadir)/gforth/$(VERSION)/'"' $(srcdir)/install-tags.fs -e bye >install.TAGS
 
 gforth.TAGS:	@kernel_fi@ gforth$(EC)$(EXE) $(GFORTH_FI_SRC) prim.TAGS kernel.TAGS
 		$(FORTHK) etags.fs except.fs startup.fs -e bye
@@ -907,14 +909,14 @@ prim.tags: 	prim.b prims2x.fs
 		$(RM) $@-
 
 kernel.TAGS:
-		rm kernl16l$(EC).fi-; $(MAKE) @kernel_fi@
+		$(RM) kernl16l$(EC).fi-; $(MAKE) @kernel_fi@
 
 kernel.tags:
-		rm kernl16l$(EC).fi-; $(MAKE) @kernel_fi@
+		$(RM) kernl16l$(EC).fi-; $(MAKE) @kernel_fi@
 
 #elc files
 gforth.elc:	gforth.el
-		-$(EMACS) -batch -f batch-byte-compile $(srcdir)/gforth.el
+		-$(EMACS) -batch -f batch-byte-compile gforth.el
 
 #Documentation