--- gforth/Makefile.in	2008/11/01 17:10:57	1.434
+++ gforth/Makefile.in	2008/12/14 18:35:13	1.441
@@ -355,7 +355,15 @@ ARCHS =	\
 	arch/sharc/g21k-3.3.4-bp1.diff \
 	arch/r8c/asm.fs \
 	arch/r8c/mach.fs \
-	arch/r8c/prim.fs
+	arch/r8c/errors.fs \
+	arch/r8c/prim.fs \
+	arch/r8c/asm-test.fs \
+	arch/r8c/errors.fs \
+	arch/r8c/lauflicht.fs \
+	arch/r8c/tasker.fs \
+	arch/r8c/terminal.fs \
+	arch/r8c/tt.fs \
+	arch/sharc/unistd.h
 
 #not included in distribution until distribution terms are included:
 ARCHS_NO_DIST = \
@@ -371,14 +379,7 @@ ARCHS_NO_DIST = \
 	arch/c165/asm.fs \
 	arch/c165/mach.fs \
 	arch/c165/prim.fs \
-	arch/h8/asm.fs \
-	arch/r8c/asm-test.fs \
-	arch/r8c/errors.fs \
-	arch/r8c/lauflicht.fs \
-	arch/r8c/tasker.fs \
-	arch/r8c/terminal.fs \
-	arch/r8c/tt.fs \
-	arch/sharc/unistd.h
+	arch/h8/asm.fs
 
 VMGEN_EX = vmgen-ex/CVS vmgen-ex/Makefile vmgen-ex/README vmgen-ex/disasm.c \
 	vmgen-ex/engine.c vmgen-ex/fib.mini \
@@ -478,6 +479,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
@@ -648,7 +652,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
@@ -879,8 +883,8 @@ TAGS:		gforth.TAGS
 tags:		gforth.tags
 		$(CP) gforth.tags $@
 
-install.TAGS:	TAGS
-		sed 's;^\$(srcdir)/;;' TAGS|./gforth -e 's" '$(datadir)/gforth/$(VERSION)/'"' install-tags.fs -e bye >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
@@ -1008,14 +1012,18 @@ config.status: configure
 	./config.status --recheck
 
 #create files for DOS, because DOS cannot do it itself
-makefile.dos engine/makefile.dos: mkdosmf.sed Makefile.in engine/Makefile.in
+makefile.dos: mkdosmf.sed Makefile.in
 	sed -f mkdosmf.sed <Makefile.in >makefile.dos
+
+engine/makefile.dos: mkdosmf.sed engine/Makefile.in
 	sed -f mkdosmf.sed <engine/Makefile.in >engine/makefile.dos
 
-makefile.os2 engine/makefile.os2: mkos2mf.sed Makefile.in engine/Makefile.in
+makefile.os2: mkos2mf.sed Makefile.in
 	sed -f mkos2mf.sed <Makefile.in >makefile.os2
+	echo '%.o:      %.c' >>makefile.os2
+	echo '          $$(GCC) $$(CFLAGS) $$(CPPFLAGS) -c $$<' >>makefile.os2
+
+engine/makefile.os2: mkos2mf.sed engine/Makefile.in
 	sed -f mkos2mf.sed <engine/Makefile.in >engine/makefile.os2
-	echo '%.o:	%.c' >>makefile.os2
-	echo '		$$(GCC) $$(CFLAGS) $$(CPPFLAGS) -c $$<' >>makefile.os2
-	echo '%.o:	%.c' >>engine/makefile.os2
-	echo '		$$(GCC) $$(CFLAGS) $$(CPPFLAGS) -c $$<' >>engine/makefile.os2
+	echo '%.o:      %.c' >>engine/makefile.os2
+	echo '          $$(GCC) $$(CFLAGS) $$(CPPFLAGS) -c $$<' >>engine/makefile.os2