From: Paolo Bonzini <bonzini@gnu.org>
Date: Wed, 5 Oct 2005 07:32:13 +0000 (+0000)
Subject: re PR ada/22340 (Ada build fails with --enable-bootstrap)
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=1061f99e78a8e42f91e84588ec45e3fa3b0693a4;p=gcc.git

re PR ada/22340 (Ada build fails with --enable-bootstrap)

2005-10-05  Paolo Bonzini  <bonzini@gnu.org>

	PR bootstrap/22340

	* configure.in (default_target): Remove.
	* Makefile.tpl (all): Do not use prerequisites as subroutines
	(all) [gcc-bootstrap]: Bootstrap gcc first if it was not done yet.
	(do-[+make_target+], check, install, [+bootstrap_target+]): Do not
	use prerequisites as subroutines.
	(check-host, check-target): New.
	(bootstrap configure & all targets): Do not use stage*-start
	if the directory layout is already ok.
	(non-bootstrap configure & all targets): Prepend a $(unstage).
	(stage[+id+]-bubble): Do that here.  Do not use NOTPARALLEL.
	(NOTPARALLEL): Remove.
	(unstage, stage variables): New variables.
	(unstage, stage targets): Simply expand to those variables.

	* configure: Regenerate.
	* Makefile.in: Regenerate.

From-SVN: r104978
---

diff --git a/ChangeLog b/ChangeLog
index cad644379be..45cc6e18152 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,24 @@
+2005-10-05  Paolo Bonzini  <bonzini@gnu.org>
+
+	PR bootstrap/22340
+
+	* configure.in (default_target): Remove.
+	* Makefile.tpl (all): Do not use prerequisites as subroutines
+	(all) [gcc-bootstrap]: Bootstrap gcc first if it was not done yet.
+	(do-[+make_target+], check, install, [+bootstrap_target+]): Do not
+	use prerequisites as subroutines.
+	(check-host, check-target): New.
+	(bootstrap configure & all targets): Do not use stage*-start
+	if the directory layout is already ok.
+	(non-bootstrap configure & all targets): Prepend a $(unstage).
+	(stage[+id+]-bubble): Do that here.  Do not use NOTPARALLEL.
+	(NOTPARALLEL): Remove.
+	(unstage, stage variables): New variables.
+	(unstage, stage targets): Simply expand to those variables.
+
+	* configure: Regenerate.
+	* Makefile.in: Regenerate.
+
 2005-10-04  James E Wilson  <wilson@specifix.com>
 
 	* Makefile.def (lang_env_dependencies): Add libmudflap.
diff --git a/Makefile.in b/Makefile.in
index 64ddf93f116..98c0ca98ca4 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -155,11 +155,13 @@ HOST_EXPORTS = \
 	TOPLEVEL_CONFIGURE_ARGUMENTS="$(TOPLEVEL_CONFIGURE_ARGUMENTS)"; export TOPLEVEL_CONFIGURE_ARGUMENTS; \
 	GMPLIBS="$(HOST_GMPLIBS)"; export GMPLIBS; \
 	GMPINC="$(HOST_GMPINC)"; export GMPINC; \
+@if gcc-bootstrap
+	$(RPATH_ENVVAR)=`echo "$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); \
+@endif gcc-bootstrap
 	$(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR);
 
 # Similar, for later GCC stages.
 POSTSTAGE1_HOST_EXPORTS = \
-	$(RPATH_ENVVAR)=`echo "$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); \
 	$(HOST_EXPORTS) \
 	CC="$(STAGE_CC_WRAPPER) $$r/$(HOST_SUBDIR)/prev-gcc/xgcc$(exeext) \
 	  -B$$r/$(HOST_SUBDIR)/prev-gcc/ -B$(build_tooldir)/bin/"; export CC; \
@@ -563,7 +565,7 @@ PICFLAG_FOR_TARGET =
 
 # The first rule in the file had better be this one.  Don't put any above it.
 # This lives here to allow makefile fragments to contain dependencies.
-@default_target@:
+all:
 
 #### host and target specific makefile fragments come in here.
 @target_makefile_frag@
@@ -845,7 +847,26 @@ configure-target:  \
 
 # The target built for a native non-bootstrap build.
 .PHONY: all
-all: unstage all-host all-target stage
+all:
+@if gcc-bootstrap
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	if [ ! -f stage_last ]; then \
+	  $(MAKE) $(RECURSE_FLAGS_TO_PASS) bootstrap; \
+	fi
+@endif gcc-bootstrap
+	@$(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	if [ -f stage_last ]; then \
+	  $(MAKE) $(TARGET_FLAGS_TO_PASS) all-host; \
+	else \
+	  $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-host; \
+	fi
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(MAKE) $(RECURSE_FLAGS_TO_PASS) all-target
+	@$(stage)
 
 .PHONY: all-build
 all-build:  \
@@ -953,7 +974,12 @@ all-target:  \
 # but it may do additional work as well).
 
 .PHONY: do-info
-do-info: unstage info-host info-target stage
+do-info:
+	@$(unstage)
+	@$(MAKE) $(RECURSE_FLAGS_TO_PASS) info-host \
+	  info-target
+	@$(stage)
+
 
 .PHONY: info-host
 info-host:  \
@@ -1048,7 +1074,12 @@ info-target:  \
     maybe-info-target-libada
 
 .PHONY: do-dvi
-do-dvi: unstage dvi-host dvi-target stage
+do-dvi:
+	@$(unstage)
+	@$(MAKE) $(RECURSE_FLAGS_TO_PASS) dvi-host \
+	  dvi-target
+	@$(stage)
+
 
 .PHONY: dvi-host
 dvi-host:  \
@@ -1143,7 +1174,12 @@ dvi-target:  \
     maybe-dvi-target-libada
 
 .PHONY: do-html
-do-html: unstage html-host html-target stage
+do-html:
+	@$(unstage)
+	@$(MAKE) $(RECURSE_FLAGS_TO_PASS) html-host \
+	  html-target
+	@$(stage)
+
 
 .PHONY: html-host
 html-host:  \
@@ -1238,7 +1274,12 @@ html-target:  \
     maybe-html-target-libada
 
 .PHONY: do-TAGS
-do-TAGS: unstage TAGS-host TAGS-target stage
+do-TAGS:
+	@$(unstage)
+	@$(MAKE) $(RECURSE_FLAGS_TO_PASS) TAGS-host \
+	  TAGS-target
+	@$(stage)
+
 
 .PHONY: TAGS-host
 TAGS-host:  \
@@ -1333,7 +1374,12 @@ TAGS-target:  \
     maybe-TAGS-target-libada
 
 .PHONY: do-install-info
-do-install-info: unstage install-info-host install-info-target stage
+do-install-info:
+	@$(unstage)
+	@$(MAKE) $(RECURSE_FLAGS_TO_PASS) install-info-host \
+	  install-info-target
+	@$(stage)
+
 
 .PHONY: install-info-host
 install-info-host:  \
@@ -1428,7 +1474,12 @@ install-info-target:  \
     maybe-install-info-target-libada
 
 .PHONY: do-installcheck
-do-installcheck: unstage installcheck-host installcheck-target stage
+do-installcheck:
+	@$(unstage)
+	@$(MAKE) $(RECURSE_FLAGS_TO_PASS) installcheck-host \
+	  installcheck-target
+	@$(stage)
+
 
 .PHONY: installcheck-host
 installcheck-host:  \
@@ -1523,7 +1574,12 @@ installcheck-target:  \
     maybe-installcheck-target-libada
 
 .PHONY: do-mostlyclean
-do-mostlyclean: unstage mostlyclean-host mostlyclean-target stage
+do-mostlyclean:
+	@$(unstage)
+	@$(MAKE) $(RECURSE_FLAGS_TO_PASS) mostlyclean-host \
+	  mostlyclean-target
+	@$(stage)
+
 
 .PHONY: mostlyclean-host
 mostlyclean-host:  \
@@ -1618,7 +1674,12 @@ mostlyclean-target:  \
     maybe-mostlyclean-target-libada
 
 .PHONY: do-clean
-do-clean: unstage clean-host clean-target stage
+do-clean:
+	@$(unstage)
+	@$(MAKE) $(RECURSE_FLAGS_TO_PASS) clean-host \
+	  clean-target
+	@$(stage)
+
 
 .PHONY: clean-host
 clean-host:  \
@@ -1713,7 +1774,12 @@ clean-target:  \
     maybe-clean-target-libada
 
 .PHONY: do-distclean
-do-distclean: unstage distclean-host distclean-target stage
+do-distclean:
+	@$(unstage)
+	@$(MAKE) $(RECURSE_FLAGS_TO_PASS) distclean-host \
+	  distclean-target
+	@$(stage)
+
 
 .PHONY: distclean-host
 distclean-host:  \
@@ -1808,7 +1874,12 @@ distclean-target:  \
     maybe-distclean-target-libada
 
 .PHONY: do-maintainer-clean
-do-maintainer-clean: unstage maintainer-clean-host maintainer-clean-target stage
+do-maintainer-clean:
+	@$(unstage)
+	@$(MAKE) $(RECURSE_FLAGS_TO_PASS) maintainer-clean-host \
+	  maintainer-clean-target
+	@$(stage)
+
 
 .PHONY: maintainer-clean-host
 maintainer-clean-host:  \
@@ -1968,7 +2039,8 @@ clean-target-libgcc:
 check: do-check
 
 # Only include modules actually being configured and built.
-do-check: unstage  \
+.PHONY: check-host
+check-host:  \
     maybe-check-ash \
     maybe-check-autoconf \
     maybe-check-automake \
@@ -2035,7 +2107,10 @@ do-check: unstage  \
     maybe-check-tk \
     maybe-check-libtermcap \
     maybe-check-utils \
-    maybe-check-gnattools \
+    maybe-check-gnattools
+
+.PHONY: check-target
+check-target:  \
     maybe-check-target-libstdc++-v3 \
     maybe-check-target-libmudflap \
     maybe-check-target-libssp \
@@ -2054,7 +2129,12 @@ do-check: unstage  \
     maybe-check-target-boehm-gc \
     maybe-check-target-qthreads \
     maybe-check-target-rda \
-    maybe-check-target-libada stage
+    maybe-check-target-libada
+
+do-check:
+	@$(unstage)
+	@$(MAKE) $(RECURSE_FLAGS_TO_PASS) check-host check-target
+	@$(stage)
 
 # Automated reporting of test results.
 
@@ -2080,7 +2160,10 @@ mail-report-with-warnings.log: warning.log
 # Installation targets.
 
 .PHONY: install uninstall
-install: installdirs install-host install-target
+install:
+	@$(unstage)
+	@$(MAKE) $(RECURSE_FLAGS_TO_PASS) installdirs install-host install-target
+	@$(stage)
 
 .PHONY: install-host-nogcc
 install-host-nogcc:  \
@@ -2311,6 +2394,7 @@ maybe-configure-build-libiberty:
 @if build-libiberty
 maybe-configure-build-libiberty: configure-build-libiberty
 configure-build-libiberty: 
+	@$(unstage)
 	@test ! -f $(BUILD_SUBDIR)/libiberty/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/libiberty ; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -2341,6 +2425,7 @@ maybe-all-build-libiberty:
 TARGET-build-libiberty=all
 maybe-all-build-libiberty: all-build-libiberty
 all-build-libiberty: configure-build-libiberty
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(BUILD_EXPORTS) \
@@ -2357,6 +2442,7 @@ maybe-configure-build-bison:
 @if build-bison
 maybe-configure-build-bison: configure-build-bison
 configure-build-bison: 
+	@$(unstage)
 	@test ! -f $(BUILD_SUBDIR)/bison/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/bison ; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -2387,6 +2473,7 @@ maybe-all-build-bison:
 TARGET-build-bison=all
 maybe-all-build-bison: all-build-bison
 all-build-bison: configure-build-bison
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(BUILD_EXPORTS) \
@@ -2403,6 +2490,7 @@ maybe-configure-build-byacc:
 @if build-byacc
 maybe-configure-build-byacc: configure-build-byacc
 configure-build-byacc: 
+	@$(unstage)
 	@test ! -f $(BUILD_SUBDIR)/byacc/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/byacc ; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -2433,6 +2521,7 @@ maybe-all-build-byacc:
 TARGET-build-byacc=all
 maybe-all-build-byacc: all-build-byacc
 all-build-byacc: configure-build-byacc
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(BUILD_EXPORTS) \
@@ -2449,6 +2538,7 @@ maybe-configure-build-flex:
 @if build-flex
 maybe-configure-build-flex: configure-build-flex
 configure-build-flex: 
+	@$(unstage)
 	@test ! -f $(BUILD_SUBDIR)/flex/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/flex ; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -2479,6 +2569,7 @@ maybe-all-build-flex:
 TARGET-build-flex=all
 maybe-all-build-flex: all-build-flex
 all-build-flex: configure-build-flex
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(BUILD_EXPORTS) \
@@ -2495,6 +2586,7 @@ maybe-configure-build-m4:
 @if build-m4
 maybe-configure-build-m4: configure-build-m4
 configure-build-m4: 
+	@$(unstage)
 	@test ! -f $(BUILD_SUBDIR)/m4/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/m4 ; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -2525,6 +2617,7 @@ maybe-all-build-m4:
 TARGET-build-m4=all
 maybe-all-build-m4: all-build-m4
 all-build-m4: configure-build-m4
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(BUILD_EXPORTS) \
@@ -2541,6 +2634,7 @@ maybe-configure-build-texinfo:
 @if build-texinfo
 maybe-configure-build-texinfo: configure-build-texinfo
 configure-build-texinfo: 
+	@$(unstage)
 	@test ! -f $(BUILD_SUBDIR)/texinfo/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/texinfo ; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -2571,6 +2665,7 @@ maybe-all-build-texinfo:
 TARGET-build-texinfo=all
 maybe-all-build-texinfo: all-build-texinfo
 all-build-texinfo: configure-build-texinfo
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(BUILD_EXPORTS) \
@@ -2587,6 +2682,7 @@ maybe-configure-build-fixincludes:
 @if build-fixincludes
 maybe-configure-build-fixincludes: configure-build-fixincludes
 configure-build-fixincludes: 
+	@$(unstage)
 	@test ! -f $(BUILD_SUBDIR)/fixincludes/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/fixincludes ; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -2617,6 +2713,7 @@ maybe-all-build-fixincludes:
 TARGET-build-fixincludes=all
 maybe-all-build-fixincludes: all-build-fixincludes
 all-build-fixincludes: configure-build-fixincludes
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(BUILD_EXPORTS) \
@@ -2638,6 +2735,7 @@ maybe-configure-ash:
 @if ash
 maybe-configure-ash: configure-ash
 configure-ash: 
+	@$(unstage)
 	@test ! -f $(HOST_SUBDIR)/ash/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ash ; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -2667,6 +2765,7 @@ maybe-all-ash:
 TARGET-ash=all
 maybe-all-ash: all-ash
 all-ash: configure-ash
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -2683,6 +2782,7 @@ maybe-check-ash:
 maybe-check-ash: check-ash
 
 check-ash:
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -2697,6 +2797,7 @@ maybe-install-ash:
 maybe-install-ash: install-ash
 
 install-ash: installdirs
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -2714,6 +2815,7 @@ maybe-info-ash: info-ash
 
 info-ash: \
     configure-ash 
+	@$(unstage)
 	@[ -f ./ash/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -2739,6 +2841,7 @@ maybe-dvi-ash: dvi-ash
 
 dvi-ash: \
     configure-ash 
+	@$(unstage)
 	@[ -f ./ash/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -2764,6 +2867,7 @@ maybe-html-ash: html-ash
 
 html-ash: \
     configure-ash 
+	@$(unstage)
 	@[ -f ./ash/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -2789,6 +2893,7 @@ maybe-TAGS-ash: TAGS-ash
 
 TAGS-ash: \
     configure-ash 
+	@$(unstage)
 	@[ -f ./ash/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -2815,6 +2920,7 @@ maybe-install-info-ash: install-info-ash
 install-info-ash: \
     configure-ash \
     info-ash 
+	@$(unstage)
 	@[ -f ./ash/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -2840,6 +2946,7 @@ maybe-installcheck-ash: installcheck-ash
 
 installcheck-ash: \
     configure-ash 
+	@$(unstage)
 	@[ -f ./ash/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -2864,6 +2971,7 @@ maybe-mostlyclean-ash:
 maybe-mostlyclean-ash: mostlyclean-ash
 
 mostlyclean-ash: 
+	@$(unstage)
 	@[ -f ./ash/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -2888,6 +2996,7 @@ maybe-clean-ash:
 maybe-clean-ash: clean-ash
 
 clean-ash: 
+	@$(unstage)
 	@[ -f ./ash/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -2912,6 +3021,7 @@ maybe-distclean-ash:
 maybe-distclean-ash: distclean-ash
 
 distclean-ash: 
+	@$(unstage)
 	@[ -f ./ash/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -2936,6 +3046,7 @@ maybe-maintainer-clean-ash:
 maybe-maintainer-clean-ash: maintainer-clean-ash
 
 maintainer-clean-ash: 
+	@$(unstage)
 	@[ -f ./ash/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -2961,6 +3072,7 @@ maybe-configure-autoconf:
 @if autoconf
 maybe-configure-autoconf: configure-autoconf
 configure-autoconf: 
+	@$(unstage)
 	@test ! -f $(HOST_SUBDIR)/autoconf/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/autoconf ; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -2990,6 +3102,7 @@ maybe-all-autoconf:
 TARGET-autoconf=all
 maybe-all-autoconf: all-autoconf
 all-autoconf: configure-autoconf
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -3006,6 +3119,7 @@ maybe-check-autoconf:
 maybe-check-autoconf: check-autoconf
 
 check-autoconf:
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -3020,6 +3134,7 @@ maybe-install-autoconf:
 maybe-install-autoconf: install-autoconf
 
 install-autoconf: installdirs
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -3037,6 +3152,7 @@ maybe-info-autoconf: info-autoconf
 
 info-autoconf: \
     configure-autoconf 
+	@$(unstage)
 	@[ -f ./autoconf/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -3062,6 +3178,7 @@ maybe-dvi-autoconf: dvi-autoconf
 
 dvi-autoconf: \
     configure-autoconf 
+	@$(unstage)
 	@[ -f ./autoconf/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -3087,6 +3204,7 @@ maybe-html-autoconf: html-autoconf
 
 html-autoconf: \
     configure-autoconf 
+	@$(unstage)
 	@[ -f ./autoconf/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -3112,6 +3230,7 @@ maybe-TAGS-autoconf: TAGS-autoconf
 
 TAGS-autoconf: \
     configure-autoconf 
+	@$(unstage)
 	@[ -f ./autoconf/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -3138,6 +3257,7 @@ maybe-install-info-autoconf: install-info-autoconf
 install-info-autoconf: \
     configure-autoconf \
     info-autoconf 
+	@$(unstage)
 	@[ -f ./autoconf/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -3163,6 +3283,7 @@ maybe-installcheck-autoconf: installcheck-autoconf
 
 installcheck-autoconf: \
     configure-autoconf 
+	@$(unstage)
 	@[ -f ./autoconf/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -3187,6 +3308,7 @@ maybe-mostlyclean-autoconf:
 maybe-mostlyclean-autoconf: mostlyclean-autoconf
 
 mostlyclean-autoconf: 
+	@$(unstage)
 	@[ -f ./autoconf/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -3211,6 +3333,7 @@ maybe-clean-autoconf:
 maybe-clean-autoconf: clean-autoconf
 
 clean-autoconf: 
+	@$(unstage)
 	@[ -f ./autoconf/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -3235,6 +3358,7 @@ maybe-distclean-autoconf:
 maybe-distclean-autoconf: distclean-autoconf
 
 distclean-autoconf: 
+	@$(unstage)
 	@[ -f ./autoconf/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -3259,6 +3383,7 @@ maybe-maintainer-clean-autoconf:
 maybe-maintainer-clean-autoconf: maintainer-clean-autoconf
 
 maintainer-clean-autoconf: 
+	@$(unstage)
 	@[ -f ./autoconf/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -3284,6 +3409,7 @@ maybe-configure-automake:
 @if automake
 maybe-configure-automake: configure-automake
 configure-automake: 
+	@$(unstage)
 	@test ! -f $(HOST_SUBDIR)/automake/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/automake ; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -3313,6 +3439,7 @@ maybe-all-automake:
 TARGET-automake=all
 maybe-all-automake: all-automake
 all-automake: configure-automake
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -3329,6 +3456,7 @@ maybe-check-automake:
 maybe-check-automake: check-automake
 
 check-automake:
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -3343,6 +3471,7 @@ maybe-install-automake:
 maybe-install-automake: install-automake
 
 install-automake: installdirs
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -3360,6 +3489,7 @@ maybe-info-automake: info-automake
 
 info-automake: \
     configure-automake 
+	@$(unstage)
 	@[ -f ./automake/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -3385,6 +3515,7 @@ maybe-dvi-automake: dvi-automake
 
 dvi-automake: \
     configure-automake 
+	@$(unstage)
 	@[ -f ./automake/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -3410,6 +3541,7 @@ maybe-html-automake: html-automake
 
 html-automake: \
     configure-automake 
+	@$(unstage)
 	@[ -f ./automake/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -3435,6 +3567,7 @@ maybe-TAGS-automake: TAGS-automake
 
 TAGS-automake: \
     configure-automake 
+	@$(unstage)
 	@[ -f ./automake/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -3461,6 +3594,7 @@ maybe-install-info-automake: install-info-automake
 install-info-automake: \
     configure-automake \
     info-automake 
+	@$(unstage)
 	@[ -f ./automake/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -3486,6 +3620,7 @@ maybe-installcheck-automake: installcheck-automake
 
 installcheck-automake: \
     configure-automake 
+	@$(unstage)
 	@[ -f ./automake/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -3510,6 +3645,7 @@ maybe-mostlyclean-automake:
 maybe-mostlyclean-automake: mostlyclean-automake
 
 mostlyclean-automake: 
+	@$(unstage)
 	@[ -f ./automake/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -3534,6 +3670,7 @@ maybe-clean-automake:
 maybe-clean-automake: clean-automake
 
 clean-automake: 
+	@$(unstage)
 	@[ -f ./automake/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -3558,6 +3695,7 @@ maybe-distclean-automake:
 maybe-distclean-automake: distclean-automake
 
 distclean-automake: 
+	@$(unstage)
 	@[ -f ./automake/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -3582,6 +3720,7 @@ maybe-maintainer-clean-automake:
 maybe-maintainer-clean-automake: maintainer-clean-automake
 
 maintainer-clean-automake: 
+	@$(unstage)
 	@[ -f ./automake/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -3607,6 +3746,7 @@ maybe-configure-bash:
 @if bash
 maybe-configure-bash: configure-bash
 configure-bash: 
+	@$(unstage)
 	@test ! -f $(HOST_SUBDIR)/bash/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bash ; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -3636,6 +3776,7 @@ maybe-all-bash:
 TARGET-bash=all
 maybe-all-bash: all-bash
 all-bash: configure-bash
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -3652,6 +3793,7 @@ maybe-check-bash:
 maybe-check-bash: check-bash
 
 check-bash:
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -3666,6 +3808,7 @@ maybe-install-bash:
 maybe-install-bash: install-bash
 
 install-bash: installdirs
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -3683,6 +3826,7 @@ maybe-info-bash: info-bash
 
 info-bash: \
     configure-bash 
+	@$(unstage)
 	@[ -f ./bash/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -3708,6 +3852,7 @@ maybe-dvi-bash: dvi-bash
 
 dvi-bash: \
     configure-bash 
+	@$(unstage)
 	@[ -f ./bash/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -3733,6 +3878,7 @@ maybe-html-bash: html-bash
 
 html-bash: \
     configure-bash 
+	@$(unstage)
 	@[ -f ./bash/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -3758,6 +3904,7 @@ maybe-TAGS-bash: TAGS-bash
 
 TAGS-bash: \
     configure-bash 
+	@$(unstage)
 	@[ -f ./bash/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -3784,6 +3931,7 @@ maybe-install-info-bash: install-info-bash
 install-info-bash: \
     configure-bash \
     info-bash 
+	@$(unstage)
 	@[ -f ./bash/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -3809,6 +3957,7 @@ maybe-installcheck-bash: installcheck-bash
 
 installcheck-bash: \
     configure-bash 
+	@$(unstage)
 	@[ -f ./bash/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -3833,6 +3982,7 @@ maybe-mostlyclean-bash:
 maybe-mostlyclean-bash: mostlyclean-bash
 
 mostlyclean-bash: 
+	@$(unstage)
 	@[ -f ./bash/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -3857,6 +4007,7 @@ maybe-clean-bash:
 maybe-clean-bash: clean-bash
 
 clean-bash: 
+	@$(unstage)
 	@[ -f ./bash/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -3881,6 +4032,7 @@ maybe-distclean-bash:
 maybe-distclean-bash: distclean-bash
 
 distclean-bash: 
+	@$(unstage)
 	@[ -f ./bash/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -3905,6 +4057,7 @@ maybe-maintainer-clean-bash:
 maybe-maintainer-clean-bash: maintainer-clean-bash
 
 maintainer-clean-bash: 
+	@$(unstage)
 	@[ -f ./bash/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -3957,7 +4110,7 @@ maybe-configure-stage1-bfd:
 @if bfd-bootstrap
 maybe-configure-stage1-bfd: configure-stage1-bfd
 configure-stage1-bfd: 
-	@$(MAKE) stage1-start
+	@[ `cat stage_current` = stage1 ] || $(MAKE) stage1-start
 	@[ -f $(HOST_SUBDIR)/bfd/Makefile ] && exit 0 || : ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -3981,7 +4134,7 @@ maybe-configure-stage2-bfd:
 @if bfd-bootstrap
 maybe-configure-stage2-bfd: configure-stage2-bfd
 configure-stage2-bfd: 
-	@$(MAKE) stage2-start
+	@[ `cat stage_current` = stage2 ] || $(MAKE) stage2-start
 	@[ -f $(HOST_SUBDIR)/bfd/Makefile ] && exit 0 || : ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -4006,7 +4159,7 @@ maybe-configure-stage3-bfd:
 @if bfd-bootstrap
 maybe-configure-stage3-bfd: configure-stage3-bfd
 configure-stage3-bfd: 
-	@$(MAKE) stage3-start
+	@[ `cat stage_current` = stage3 ] || $(MAKE) stage3-start
 	@[ -f $(HOST_SUBDIR)/bfd/Makefile ] && exit 0 || : ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -4031,7 +4184,7 @@ maybe-configure-stage4-bfd:
 @if bfd-bootstrap
 maybe-configure-stage4-bfd: configure-stage4-bfd
 configure-stage4-bfd: 
-	@$(MAKE) stage4-start
+	@[ `cat stage_current` = stage4 ] || $(MAKE) stage4-start
 	@[ -f $(HOST_SUBDIR)/bfd/Makefile ] && exit 0 || : ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -4056,7 +4209,7 @@ maybe-configure-stageprofile-bfd:
 @if bfd-bootstrap
 maybe-configure-stageprofile-bfd: configure-stageprofile-bfd
 configure-stageprofile-bfd: 
-	@$(MAKE) stageprofile-start
+	@[ `cat stage_current` = stageprofile ] || $(MAKE) stageprofile-start
 	@[ -f $(HOST_SUBDIR)/bfd/Makefile ] && exit 0 || : ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -4081,7 +4234,7 @@ maybe-configure-stagefeedback-bfd:
 @if bfd-bootstrap
 maybe-configure-stagefeedback-bfd: configure-stagefeedback-bfd
 configure-stagefeedback-bfd: 
-	@$(MAKE) stagefeedback-start
+	@[ `cat stage_current` = stagefeedback ] || $(MAKE) stagefeedback-start
 	@[ -f $(HOST_SUBDIR)/bfd/Makefile ] && exit 0 || : ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -4128,20 +4281,22 @@ maybe-clean-stage1-bfd:
 @if bfd-bootstrap
 maybe-all-stage1-bfd: all-stage1-bfd
 all-stage1: all-stage1-bfd
+TARGET-stage1-bfd = $(TARGET-bfd)
 all-stage1-bfd: configure-stage1-bfd
-	@$(MAKE) stage1-start
+	@[ `cat stage_current` = stage1 ] || $(MAKE) stage1-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/bfd && \
-	$(MAKE) $(FLAGS_TO_PASS)  CFLAGS="$(STAGE1_CFLAGS)" 
+	$(MAKE) $(FLAGS_TO_PASS)  CFLAGS="$(STAGE1_CFLAGS)"  \
+		$(TARGET-stage1-bfd)
 
 maybe-clean-stage1-bfd: clean-stage1-bfd
 clean-stage1: clean-stage1-bfd
 clean-stage1-bfd:
 	@[ -f $(HOST_SUBDIR)/bfd/Makefile ] || [ -f $(HOST_SUBDIR)/stage1-bfd/Makefile ] \
 	  || exit 0 ; \
-	[ -f $(HOST_SUBDIR)/bfd/Makefile ] || $(MAKE) stage1-start ; \
+	@[ `cat stage_current` = stage1 ] || $(MAKE) stage1-start
 	cd $(HOST_SUBDIR)/bfd && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		CFLAGS="$(STAGE1_CFLAGS)"  clean
@@ -4155,21 +4310,23 @@ maybe-clean-stage2-bfd:
 @if bfd-bootstrap
 maybe-all-stage2-bfd: all-stage2-bfd
 all-stage2: all-stage2-bfd
+TARGET-stage2-bfd = $(TARGET-bfd)
 all-stage2-bfd: configure-stage2-bfd
-	@$(MAKE) stage2-start
+	@[ `cat stage_current` = stage2 ] || $(MAKE) stage2-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/bfd && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)  
+	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)   \
+		$(TARGET-stage2-bfd)
 
 maybe-clean-stage2-bfd: clean-stage2-bfd
 clean-stage2: clean-stage2-bfd
 clean-stage2-bfd:
 	@[ -f $(HOST_SUBDIR)/bfd/Makefile ] || [ -f $(HOST_SUBDIR)/stage2-bfd/Makefile ] \
 	  || exit 0 ; \
-	[ -f $(HOST_SUBDIR)/bfd/Makefile ] || $(MAKE) stage2-start ; \
+	@[ `cat stage_current` = stage2 ] || $(MAKE) stage2-start
 	cd $(HOST_SUBDIR)/bfd && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -4184,21 +4341,23 @@ maybe-clean-stage3-bfd:
 @if bfd-bootstrap
 maybe-all-stage3-bfd: all-stage3-bfd
 all-stage3: all-stage3-bfd
+TARGET-stage3-bfd = $(TARGET-bfd)
 all-stage3-bfd: configure-stage3-bfd
-	@$(MAKE) stage3-start
+	@[ `cat stage_current` = stage3 ] || $(MAKE) stage3-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/bfd && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)  
+	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)   \
+		$(TARGET-stage3-bfd)
 
 maybe-clean-stage3-bfd: clean-stage3-bfd
 clean-stage3: clean-stage3-bfd
 clean-stage3-bfd:
 	@[ -f $(HOST_SUBDIR)/bfd/Makefile ] || [ -f $(HOST_SUBDIR)/stage3-bfd/Makefile ] \
 	  || exit 0 ; \
-	[ -f $(HOST_SUBDIR)/bfd/Makefile ] || $(MAKE) stage3-start ; \
+	@[ `cat stage_current` = stage3 ] || $(MAKE) stage3-start
 	cd $(HOST_SUBDIR)/bfd && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -4213,21 +4372,23 @@ maybe-clean-stage4-bfd:
 @if bfd-bootstrap
 maybe-all-stage4-bfd: all-stage4-bfd
 all-stage4: all-stage4-bfd
+TARGET-stage4-bfd = $(TARGET-bfd)
 all-stage4-bfd: configure-stage4-bfd
-	@$(MAKE) stage4-start
+	@[ `cat stage_current` = stage4 ] || $(MAKE) stage4-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/bfd && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)  
+	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)   \
+		$(TARGET-stage4-bfd)
 
 maybe-clean-stage4-bfd: clean-stage4-bfd
 clean-stage4: clean-stage4-bfd
 clean-stage4-bfd:
 	@[ -f $(HOST_SUBDIR)/bfd/Makefile ] || [ -f $(HOST_SUBDIR)/stage4-bfd/Makefile ] \
 	  || exit 0 ; \
-	[ -f $(HOST_SUBDIR)/bfd/Makefile ] || $(MAKE) stage4-start ; \
+	@[ `cat stage_current` = stage4 ] || $(MAKE) stage4-start
 	cd $(HOST_SUBDIR)/bfd && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -4242,21 +4403,23 @@ maybe-clean-stageprofile-bfd:
 @if bfd-bootstrap
 maybe-all-stageprofile-bfd: all-stageprofile-bfd
 all-stageprofile: all-stageprofile-bfd
+TARGET-stageprofile-bfd = $(TARGET-bfd)
 all-stageprofile-bfd: configure-stageprofile-bfd
-	@$(MAKE) stageprofile-start
+	@[ `cat stage_current` = stageprofile ] || $(MAKE) stageprofile-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/bfd && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" 
+	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-generate"  \
+		$(TARGET-stageprofile-bfd)
 
 maybe-clean-stageprofile-bfd: clean-stageprofile-bfd
 clean-stageprofile: clean-stageprofile-bfd
 clean-stageprofile-bfd:
 	@[ -f $(HOST_SUBDIR)/bfd/Makefile ] || [ -f $(HOST_SUBDIR)/stageprofile-bfd/Makefile ] \
 	  || exit 0 ; \
-	[ -f $(HOST_SUBDIR)/bfd/Makefile ] || $(MAKE) stageprofile-start ; \
+	@[ `cat stage_current` = stageprofile ] || $(MAKE) stageprofile-start
 	cd $(HOST_SUBDIR)/bfd && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -4271,21 +4434,23 @@ maybe-clean-stagefeedback-bfd:
 @if bfd-bootstrap
 maybe-all-stagefeedback-bfd: all-stagefeedback-bfd
 all-stagefeedback: all-stagefeedback-bfd
+TARGET-stagefeedback-bfd = $(TARGET-bfd)
 all-stagefeedback-bfd: configure-stagefeedback-bfd
-	@$(MAKE) stagefeedback-start
+	@[ `cat stage_current` = stagefeedback ] || $(MAKE) stagefeedback-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/bfd && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-use" 
+	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-use"  \
+		$(TARGET-stagefeedback-bfd)
 
 maybe-clean-stagefeedback-bfd: clean-stagefeedback-bfd
 clean-stagefeedback: clean-stagefeedback-bfd
 clean-stagefeedback-bfd:
 	@[ -f $(HOST_SUBDIR)/bfd/Makefile ] || [ -f $(HOST_SUBDIR)/stagefeedback-bfd/Makefile ] \
 	  || exit 0 ; \
-	[ -f $(HOST_SUBDIR)/bfd/Makefile ] || $(MAKE) stagefeedback-start ; \
+	@[ `cat stage_current` = stagefeedback ] || $(MAKE) stagefeedback-start
 	cd $(HOST_SUBDIR)/bfd && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -4302,6 +4467,7 @@ maybe-check-bfd:
 maybe-check-bfd: check-bfd
 
 check-bfd:
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -4316,6 +4482,7 @@ maybe-install-bfd:
 maybe-install-bfd: install-bfd
 
 install-bfd: installdirs
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -4607,7 +4774,7 @@ maybe-configure-stage1-opcodes:
 @if opcodes-bootstrap
 maybe-configure-stage1-opcodes: configure-stage1-opcodes
 configure-stage1-opcodes: 
-	@$(MAKE) stage1-start
+	@[ `cat stage_current` = stage1 ] || $(MAKE) stage1-start
 	@[ -f $(HOST_SUBDIR)/opcodes/Makefile ] && exit 0 || : ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -4631,7 +4798,7 @@ maybe-configure-stage2-opcodes:
 @if opcodes-bootstrap
 maybe-configure-stage2-opcodes: configure-stage2-opcodes
 configure-stage2-opcodes: 
-	@$(MAKE) stage2-start
+	@[ `cat stage_current` = stage2 ] || $(MAKE) stage2-start
 	@[ -f $(HOST_SUBDIR)/opcodes/Makefile ] && exit 0 || : ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -4656,7 +4823,7 @@ maybe-configure-stage3-opcodes:
 @if opcodes-bootstrap
 maybe-configure-stage3-opcodes: configure-stage3-opcodes
 configure-stage3-opcodes: 
-	@$(MAKE) stage3-start
+	@[ `cat stage_current` = stage3 ] || $(MAKE) stage3-start
 	@[ -f $(HOST_SUBDIR)/opcodes/Makefile ] && exit 0 || : ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -4681,7 +4848,7 @@ maybe-configure-stage4-opcodes:
 @if opcodes-bootstrap
 maybe-configure-stage4-opcodes: configure-stage4-opcodes
 configure-stage4-opcodes: 
-	@$(MAKE) stage4-start
+	@[ `cat stage_current` = stage4 ] || $(MAKE) stage4-start
 	@[ -f $(HOST_SUBDIR)/opcodes/Makefile ] && exit 0 || : ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -4706,7 +4873,7 @@ maybe-configure-stageprofile-opcodes:
 @if opcodes-bootstrap
 maybe-configure-stageprofile-opcodes: configure-stageprofile-opcodes
 configure-stageprofile-opcodes: 
-	@$(MAKE) stageprofile-start
+	@[ `cat stage_current` = stageprofile ] || $(MAKE) stageprofile-start
 	@[ -f $(HOST_SUBDIR)/opcodes/Makefile ] && exit 0 || : ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -4731,7 +4898,7 @@ maybe-configure-stagefeedback-opcodes:
 @if opcodes-bootstrap
 maybe-configure-stagefeedback-opcodes: configure-stagefeedback-opcodes
 configure-stagefeedback-opcodes: 
-	@$(MAKE) stagefeedback-start
+	@[ `cat stage_current` = stagefeedback ] || $(MAKE) stagefeedback-start
 	@[ -f $(HOST_SUBDIR)/opcodes/Makefile ] && exit 0 || : ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -4778,20 +4945,22 @@ maybe-clean-stage1-opcodes:
 @if opcodes-bootstrap
 maybe-all-stage1-opcodes: all-stage1-opcodes
 all-stage1: all-stage1-opcodes
+TARGET-stage1-opcodes = $(TARGET-opcodes)
 all-stage1-opcodes: configure-stage1-opcodes
-	@$(MAKE) stage1-start
+	@[ `cat stage_current` = stage1 ] || $(MAKE) stage1-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/opcodes && \
-	$(MAKE) $(FLAGS_TO_PASS)  CFLAGS="$(STAGE1_CFLAGS)" 
+	$(MAKE) $(FLAGS_TO_PASS)  CFLAGS="$(STAGE1_CFLAGS)"  \
+		$(TARGET-stage1-opcodes)
 
 maybe-clean-stage1-opcodes: clean-stage1-opcodes
 clean-stage1: clean-stage1-opcodes
 clean-stage1-opcodes:
 	@[ -f $(HOST_SUBDIR)/opcodes/Makefile ] || [ -f $(HOST_SUBDIR)/stage1-opcodes/Makefile ] \
 	  || exit 0 ; \
-	[ -f $(HOST_SUBDIR)/opcodes/Makefile ] || $(MAKE) stage1-start ; \
+	@[ `cat stage_current` = stage1 ] || $(MAKE) stage1-start
 	cd $(HOST_SUBDIR)/opcodes && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		CFLAGS="$(STAGE1_CFLAGS)"  clean
@@ -4805,21 +4974,23 @@ maybe-clean-stage2-opcodes:
 @if opcodes-bootstrap
 maybe-all-stage2-opcodes: all-stage2-opcodes
 all-stage2: all-stage2-opcodes
+TARGET-stage2-opcodes = $(TARGET-opcodes)
 all-stage2-opcodes: configure-stage2-opcodes
-	@$(MAKE) stage2-start
+	@[ `cat stage_current` = stage2 ] || $(MAKE) stage2-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/opcodes && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)  
+	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)   \
+		$(TARGET-stage2-opcodes)
 
 maybe-clean-stage2-opcodes: clean-stage2-opcodes
 clean-stage2: clean-stage2-opcodes
 clean-stage2-opcodes:
 	@[ -f $(HOST_SUBDIR)/opcodes/Makefile ] || [ -f $(HOST_SUBDIR)/stage2-opcodes/Makefile ] \
 	  || exit 0 ; \
-	[ -f $(HOST_SUBDIR)/opcodes/Makefile ] || $(MAKE) stage2-start ; \
+	@[ `cat stage_current` = stage2 ] || $(MAKE) stage2-start
 	cd $(HOST_SUBDIR)/opcodes && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -4834,21 +5005,23 @@ maybe-clean-stage3-opcodes:
 @if opcodes-bootstrap
 maybe-all-stage3-opcodes: all-stage3-opcodes
 all-stage3: all-stage3-opcodes
+TARGET-stage3-opcodes = $(TARGET-opcodes)
 all-stage3-opcodes: configure-stage3-opcodes
-	@$(MAKE) stage3-start
+	@[ `cat stage_current` = stage3 ] || $(MAKE) stage3-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/opcodes && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)  
+	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)   \
+		$(TARGET-stage3-opcodes)
 
 maybe-clean-stage3-opcodes: clean-stage3-opcodes
 clean-stage3: clean-stage3-opcodes
 clean-stage3-opcodes:
 	@[ -f $(HOST_SUBDIR)/opcodes/Makefile ] || [ -f $(HOST_SUBDIR)/stage3-opcodes/Makefile ] \
 	  || exit 0 ; \
-	[ -f $(HOST_SUBDIR)/opcodes/Makefile ] || $(MAKE) stage3-start ; \
+	@[ `cat stage_current` = stage3 ] || $(MAKE) stage3-start
 	cd $(HOST_SUBDIR)/opcodes && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -4863,21 +5036,23 @@ maybe-clean-stage4-opcodes:
 @if opcodes-bootstrap
 maybe-all-stage4-opcodes: all-stage4-opcodes
 all-stage4: all-stage4-opcodes
+TARGET-stage4-opcodes = $(TARGET-opcodes)
 all-stage4-opcodes: configure-stage4-opcodes
-	@$(MAKE) stage4-start
+	@[ `cat stage_current` = stage4 ] || $(MAKE) stage4-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/opcodes && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)  
+	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)   \
+		$(TARGET-stage4-opcodes)
 
 maybe-clean-stage4-opcodes: clean-stage4-opcodes
 clean-stage4: clean-stage4-opcodes
 clean-stage4-opcodes:
 	@[ -f $(HOST_SUBDIR)/opcodes/Makefile ] || [ -f $(HOST_SUBDIR)/stage4-opcodes/Makefile ] \
 	  || exit 0 ; \
-	[ -f $(HOST_SUBDIR)/opcodes/Makefile ] || $(MAKE) stage4-start ; \
+	@[ `cat stage_current` = stage4 ] || $(MAKE) stage4-start
 	cd $(HOST_SUBDIR)/opcodes && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -4892,21 +5067,23 @@ maybe-clean-stageprofile-opcodes:
 @if opcodes-bootstrap
 maybe-all-stageprofile-opcodes: all-stageprofile-opcodes
 all-stageprofile: all-stageprofile-opcodes
+TARGET-stageprofile-opcodes = $(TARGET-opcodes)
 all-stageprofile-opcodes: configure-stageprofile-opcodes
-	@$(MAKE) stageprofile-start
+	@[ `cat stage_current` = stageprofile ] || $(MAKE) stageprofile-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/opcodes && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" 
+	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-generate"  \
+		$(TARGET-stageprofile-opcodes)
 
 maybe-clean-stageprofile-opcodes: clean-stageprofile-opcodes
 clean-stageprofile: clean-stageprofile-opcodes
 clean-stageprofile-opcodes:
 	@[ -f $(HOST_SUBDIR)/opcodes/Makefile ] || [ -f $(HOST_SUBDIR)/stageprofile-opcodes/Makefile ] \
 	  || exit 0 ; \
-	[ -f $(HOST_SUBDIR)/opcodes/Makefile ] || $(MAKE) stageprofile-start ; \
+	@[ `cat stage_current` = stageprofile ] || $(MAKE) stageprofile-start
 	cd $(HOST_SUBDIR)/opcodes && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -4921,21 +5098,23 @@ maybe-clean-stagefeedback-opcodes:
 @if opcodes-bootstrap
 maybe-all-stagefeedback-opcodes: all-stagefeedback-opcodes
 all-stagefeedback: all-stagefeedback-opcodes
+TARGET-stagefeedback-opcodes = $(TARGET-opcodes)
 all-stagefeedback-opcodes: configure-stagefeedback-opcodes
-	@$(MAKE) stagefeedback-start
+	@[ `cat stage_current` = stagefeedback ] || $(MAKE) stagefeedback-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/opcodes && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-use" 
+	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-use"  \
+		$(TARGET-stagefeedback-opcodes)
 
 maybe-clean-stagefeedback-opcodes: clean-stagefeedback-opcodes
 clean-stagefeedback: clean-stagefeedback-opcodes
 clean-stagefeedback-opcodes:
 	@[ -f $(HOST_SUBDIR)/opcodes/Makefile ] || [ -f $(HOST_SUBDIR)/stagefeedback-opcodes/Makefile ] \
 	  || exit 0 ; \
-	[ -f $(HOST_SUBDIR)/opcodes/Makefile ] || $(MAKE) stagefeedback-start ; \
+	@[ `cat stage_current` = stagefeedback ] || $(MAKE) stagefeedback-start
 	cd $(HOST_SUBDIR)/opcodes && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -4952,6 +5131,7 @@ maybe-check-opcodes:
 maybe-check-opcodes: check-opcodes
 
 check-opcodes:
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -4966,6 +5146,7 @@ maybe-install-opcodes:
 maybe-install-opcodes: install-opcodes
 
 install-opcodes: installdirs
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -5257,7 +5438,7 @@ maybe-configure-stage1-binutils:
 @if binutils-bootstrap
 maybe-configure-stage1-binutils: configure-stage1-binutils
 configure-stage1-binutils: 
-	@$(MAKE) stage1-start
+	@[ `cat stage_current` = stage1 ] || $(MAKE) stage1-start
 	@[ -f $(HOST_SUBDIR)/binutils/Makefile ] && exit 0 || : ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -5281,7 +5462,7 @@ maybe-configure-stage2-binutils:
 @if binutils-bootstrap
 maybe-configure-stage2-binutils: configure-stage2-binutils
 configure-stage2-binutils: 
-	@$(MAKE) stage2-start
+	@[ `cat stage_current` = stage2 ] || $(MAKE) stage2-start
 	@[ -f $(HOST_SUBDIR)/binutils/Makefile ] && exit 0 || : ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -5306,7 +5487,7 @@ maybe-configure-stage3-binutils:
 @if binutils-bootstrap
 maybe-configure-stage3-binutils: configure-stage3-binutils
 configure-stage3-binutils: 
-	@$(MAKE) stage3-start
+	@[ `cat stage_current` = stage3 ] || $(MAKE) stage3-start
 	@[ -f $(HOST_SUBDIR)/binutils/Makefile ] && exit 0 || : ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -5331,7 +5512,7 @@ maybe-configure-stage4-binutils:
 @if binutils-bootstrap
 maybe-configure-stage4-binutils: configure-stage4-binutils
 configure-stage4-binutils: 
-	@$(MAKE) stage4-start
+	@[ `cat stage_current` = stage4 ] || $(MAKE) stage4-start
 	@[ -f $(HOST_SUBDIR)/binutils/Makefile ] && exit 0 || : ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -5356,7 +5537,7 @@ maybe-configure-stageprofile-binutils:
 @if binutils-bootstrap
 maybe-configure-stageprofile-binutils: configure-stageprofile-binutils
 configure-stageprofile-binutils: 
-	@$(MAKE) stageprofile-start
+	@[ `cat stage_current` = stageprofile ] || $(MAKE) stageprofile-start
 	@[ -f $(HOST_SUBDIR)/binutils/Makefile ] && exit 0 || : ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -5381,7 +5562,7 @@ maybe-configure-stagefeedback-binutils:
 @if binutils-bootstrap
 maybe-configure-stagefeedback-binutils: configure-stagefeedback-binutils
 configure-stagefeedback-binutils: 
-	@$(MAKE) stagefeedback-start
+	@[ `cat stage_current` = stagefeedback ] || $(MAKE) stagefeedback-start
 	@[ -f $(HOST_SUBDIR)/binutils/Makefile ] && exit 0 || : ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -5428,20 +5609,22 @@ maybe-clean-stage1-binutils:
 @if binutils-bootstrap
 maybe-all-stage1-binutils: all-stage1-binutils
 all-stage1: all-stage1-binutils
+TARGET-stage1-binutils = $(TARGET-binutils)
 all-stage1-binutils: configure-stage1-binutils
-	@$(MAKE) stage1-start
+	@[ `cat stage_current` = stage1 ] || $(MAKE) stage1-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/binutils && \
-	$(MAKE) $(FLAGS_TO_PASS)  CFLAGS="$(STAGE1_CFLAGS)" 
+	$(MAKE) $(FLAGS_TO_PASS)  CFLAGS="$(STAGE1_CFLAGS)"  \
+		$(TARGET-stage1-binutils)
 
 maybe-clean-stage1-binutils: clean-stage1-binutils
 clean-stage1: clean-stage1-binutils
 clean-stage1-binutils:
 	@[ -f $(HOST_SUBDIR)/binutils/Makefile ] || [ -f $(HOST_SUBDIR)/stage1-binutils/Makefile ] \
 	  || exit 0 ; \
-	[ -f $(HOST_SUBDIR)/binutils/Makefile ] || $(MAKE) stage1-start ; \
+	@[ `cat stage_current` = stage1 ] || $(MAKE) stage1-start
 	cd $(HOST_SUBDIR)/binutils && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		CFLAGS="$(STAGE1_CFLAGS)"  clean
@@ -5455,21 +5638,23 @@ maybe-clean-stage2-binutils:
 @if binutils-bootstrap
 maybe-all-stage2-binutils: all-stage2-binutils
 all-stage2: all-stage2-binutils
+TARGET-stage2-binutils = $(TARGET-binutils)
 all-stage2-binutils: configure-stage2-binutils
-	@$(MAKE) stage2-start
+	@[ `cat stage_current` = stage2 ] || $(MAKE) stage2-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/binutils && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)  
+	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)   \
+		$(TARGET-stage2-binutils)
 
 maybe-clean-stage2-binutils: clean-stage2-binutils
 clean-stage2: clean-stage2-binutils
 clean-stage2-binutils:
 	@[ -f $(HOST_SUBDIR)/binutils/Makefile ] || [ -f $(HOST_SUBDIR)/stage2-binutils/Makefile ] \
 	  || exit 0 ; \
-	[ -f $(HOST_SUBDIR)/binutils/Makefile ] || $(MAKE) stage2-start ; \
+	@[ `cat stage_current` = stage2 ] || $(MAKE) stage2-start
 	cd $(HOST_SUBDIR)/binutils && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -5484,21 +5669,23 @@ maybe-clean-stage3-binutils:
 @if binutils-bootstrap
 maybe-all-stage3-binutils: all-stage3-binutils
 all-stage3: all-stage3-binutils
+TARGET-stage3-binutils = $(TARGET-binutils)
 all-stage3-binutils: configure-stage3-binutils
-	@$(MAKE) stage3-start
+	@[ `cat stage_current` = stage3 ] || $(MAKE) stage3-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/binutils && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)  
+	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)   \
+		$(TARGET-stage3-binutils)
 
 maybe-clean-stage3-binutils: clean-stage3-binutils
 clean-stage3: clean-stage3-binutils
 clean-stage3-binutils:
 	@[ -f $(HOST_SUBDIR)/binutils/Makefile ] || [ -f $(HOST_SUBDIR)/stage3-binutils/Makefile ] \
 	  || exit 0 ; \
-	[ -f $(HOST_SUBDIR)/binutils/Makefile ] || $(MAKE) stage3-start ; \
+	@[ `cat stage_current` = stage3 ] || $(MAKE) stage3-start
 	cd $(HOST_SUBDIR)/binutils && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -5513,21 +5700,23 @@ maybe-clean-stage4-binutils:
 @if binutils-bootstrap
 maybe-all-stage4-binutils: all-stage4-binutils
 all-stage4: all-stage4-binutils
+TARGET-stage4-binutils = $(TARGET-binutils)
 all-stage4-binutils: configure-stage4-binutils
-	@$(MAKE) stage4-start
+	@[ `cat stage_current` = stage4 ] || $(MAKE) stage4-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/binutils && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)  
+	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)   \
+		$(TARGET-stage4-binutils)
 
 maybe-clean-stage4-binutils: clean-stage4-binutils
 clean-stage4: clean-stage4-binutils
 clean-stage4-binutils:
 	@[ -f $(HOST_SUBDIR)/binutils/Makefile ] || [ -f $(HOST_SUBDIR)/stage4-binutils/Makefile ] \
 	  || exit 0 ; \
-	[ -f $(HOST_SUBDIR)/binutils/Makefile ] || $(MAKE) stage4-start ; \
+	@[ `cat stage_current` = stage4 ] || $(MAKE) stage4-start
 	cd $(HOST_SUBDIR)/binutils && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -5542,21 +5731,23 @@ maybe-clean-stageprofile-binutils:
 @if binutils-bootstrap
 maybe-all-stageprofile-binutils: all-stageprofile-binutils
 all-stageprofile: all-stageprofile-binutils
+TARGET-stageprofile-binutils = $(TARGET-binutils)
 all-stageprofile-binutils: configure-stageprofile-binutils
-	@$(MAKE) stageprofile-start
+	@[ `cat stage_current` = stageprofile ] || $(MAKE) stageprofile-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/binutils && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" 
+	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-generate"  \
+		$(TARGET-stageprofile-binutils)
 
 maybe-clean-stageprofile-binutils: clean-stageprofile-binutils
 clean-stageprofile: clean-stageprofile-binutils
 clean-stageprofile-binutils:
 	@[ -f $(HOST_SUBDIR)/binutils/Makefile ] || [ -f $(HOST_SUBDIR)/stageprofile-binutils/Makefile ] \
 	  || exit 0 ; \
-	[ -f $(HOST_SUBDIR)/binutils/Makefile ] || $(MAKE) stageprofile-start ; \
+	@[ `cat stage_current` = stageprofile ] || $(MAKE) stageprofile-start
 	cd $(HOST_SUBDIR)/binutils && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -5571,21 +5762,23 @@ maybe-clean-stagefeedback-binutils:
 @if binutils-bootstrap
 maybe-all-stagefeedback-binutils: all-stagefeedback-binutils
 all-stagefeedback: all-stagefeedback-binutils
+TARGET-stagefeedback-binutils = $(TARGET-binutils)
 all-stagefeedback-binutils: configure-stagefeedback-binutils
-	@$(MAKE) stagefeedback-start
+	@[ `cat stage_current` = stagefeedback ] || $(MAKE) stagefeedback-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/binutils && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-use" 
+	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-use"  \
+		$(TARGET-stagefeedback-binutils)
 
 maybe-clean-stagefeedback-binutils: clean-stagefeedback-binutils
 clean-stagefeedback: clean-stagefeedback-binutils
 clean-stagefeedback-binutils:
 	@[ -f $(HOST_SUBDIR)/binutils/Makefile ] || [ -f $(HOST_SUBDIR)/stagefeedback-binutils/Makefile ] \
 	  || exit 0 ; \
-	[ -f $(HOST_SUBDIR)/binutils/Makefile ] || $(MAKE) stagefeedback-start ; \
+	@[ `cat stage_current` = stagefeedback ] || $(MAKE) stagefeedback-start
 	cd $(HOST_SUBDIR)/binutils && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -5602,6 +5795,7 @@ maybe-check-binutils:
 maybe-check-binutils: check-binutils
 
 check-binutils:
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -5616,6 +5810,7 @@ maybe-install-binutils:
 maybe-install-binutils: install-binutils
 
 install-binutils: installdirs
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -5880,6 +6075,7 @@ maybe-configure-bison:
 @if bison
 maybe-configure-bison: configure-bison
 configure-bison: 
+	@$(unstage)
 	@test ! -f $(HOST_SUBDIR)/bison/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bison ; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -5909,6 +6105,7 @@ maybe-all-bison:
 TARGET-bison=all
 maybe-all-bison: all-bison
 all-bison: configure-bison
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -5926,6 +6123,7 @@ maybe-check-bison: check-bison
 
 # This module is only tested in a native toolchain.
 check-bison:
+	@$(unstage)
 	@if [ '$(host)' = '$(target)' ] ; then \
 	  r=`${PWD_COMMAND}`; export r; \
 	  s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -5942,6 +6140,7 @@ maybe-install-bison:
 maybe-install-bison: install-bison
 
 install-bison: installdirs
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -5959,6 +6158,7 @@ maybe-info-bison: info-bison
 
 info-bison: \
     configure-bison 
+	@$(unstage)
 	@[ -f ./bison/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -5984,6 +6184,7 @@ maybe-dvi-bison: dvi-bison
 
 dvi-bison: \
     configure-bison 
+	@$(unstage)
 	@[ -f ./bison/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -6009,6 +6210,7 @@ maybe-html-bison: html-bison
 
 html-bison: \
     configure-bison 
+	@$(unstage)
 	@[ -f ./bison/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -6034,6 +6236,7 @@ maybe-TAGS-bison: TAGS-bison
 
 TAGS-bison: \
     configure-bison 
+	@$(unstage)
 	@[ -f ./bison/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -6060,6 +6263,7 @@ maybe-install-info-bison: install-info-bison
 install-info-bison: \
     configure-bison \
     info-bison 
+	@$(unstage)
 	@[ -f ./bison/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -6085,6 +6289,7 @@ maybe-installcheck-bison: installcheck-bison
 
 installcheck-bison: \
     configure-bison 
+	@$(unstage)
 	@[ -f ./bison/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -6109,6 +6314,7 @@ maybe-mostlyclean-bison:
 maybe-mostlyclean-bison: mostlyclean-bison
 
 mostlyclean-bison: 
+	@$(unstage)
 	@[ -f ./bison/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -6133,6 +6339,7 @@ maybe-clean-bison:
 maybe-clean-bison: clean-bison
 
 clean-bison: 
+	@$(unstage)
 	@[ -f ./bison/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -6157,6 +6364,7 @@ maybe-distclean-bison:
 maybe-distclean-bison: distclean-bison
 
 distclean-bison: 
+	@$(unstage)
 	@[ -f ./bison/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -6181,6 +6389,7 @@ maybe-maintainer-clean-bison:
 maybe-maintainer-clean-bison: maintainer-clean-bison
 
 maintainer-clean-bison: 
+	@$(unstage)
 	@[ -f ./bison/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -6206,6 +6415,7 @@ maybe-configure-byacc:
 @if byacc
 maybe-configure-byacc: configure-byacc
 configure-byacc: 
+	@$(unstage)
 	@test ! -f $(HOST_SUBDIR)/byacc/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/byacc ; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -6235,6 +6445,7 @@ maybe-all-byacc:
 TARGET-byacc=all
 maybe-all-byacc: all-byacc
 all-byacc: configure-byacc
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -6252,6 +6463,7 @@ maybe-check-byacc: check-byacc
 
 # This module is only tested in a native toolchain.
 check-byacc:
+	@$(unstage)
 	@if [ '$(host)' = '$(target)' ] ; then \
 	  r=`${PWD_COMMAND}`; export r; \
 	  s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -6268,6 +6480,7 @@ maybe-install-byacc:
 maybe-install-byacc: install-byacc
 
 install-byacc: installdirs
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -6285,6 +6498,7 @@ maybe-info-byacc: info-byacc
 
 info-byacc: \
     configure-byacc 
+	@$(unstage)
 	@[ -f ./byacc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -6310,6 +6524,7 @@ maybe-dvi-byacc: dvi-byacc
 
 dvi-byacc: \
     configure-byacc 
+	@$(unstage)
 	@[ -f ./byacc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -6335,6 +6550,7 @@ maybe-html-byacc: html-byacc
 
 html-byacc: \
     configure-byacc 
+	@$(unstage)
 	@[ -f ./byacc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -6360,6 +6576,7 @@ maybe-TAGS-byacc: TAGS-byacc
 
 TAGS-byacc: \
     configure-byacc 
+	@$(unstage)
 	@[ -f ./byacc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -6386,6 +6603,7 @@ maybe-install-info-byacc: install-info-byacc
 install-info-byacc: \
     configure-byacc \
     info-byacc 
+	@$(unstage)
 	@[ -f ./byacc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -6411,6 +6629,7 @@ maybe-installcheck-byacc: installcheck-byacc
 
 installcheck-byacc: \
     configure-byacc 
+	@$(unstage)
 	@[ -f ./byacc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -6435,6 +6654,7 @@ maybe-mostlyclean-byacc:
 maybe-mostlyclean-byacc: mostlyclean-byacc
 
 mostlyclean-byacc: 
+	@$(unstage)
 	@[ -f ./byacc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -6459,6 +6679,7 @@ maybe-clean-byacc:
 maybe-clean-byacc: clean-byacc
 
 clean-byacc: 
+	@$(unstage)
 	@[ -f ./byacc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -6483,6 +6704,7 @@ maybe-distclean-byacc:
 maybe-distclean-byacc: distclean-byacc
 
 distclean-byacc: 
+	@$(unstage)
 	@[ -f ./byacc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -6507,6 +6729,7 @@ maybe-maintainer-clean-byacc:
 maybe-maintainer-clean-byacc: maintainer-clean-byacc
 
 maintainer-clean-byacc: 
+	@$(unstage)
 	@[ -f ./byacc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -6532,6 +6755,7 @@ maybe-configure-bzip2:
 @if bzip2
 maybe-configure-bzip2: configure-bzip2
 configure-bzip2: 
+	@$(unstage)
 	@test ! -f $(HOST_SUBDIR)/bzip2/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bzip2 ; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -6561,6 +6785,7 @@ maybe-all-bzip2:
 TARGET-bzip2=all
 maybe-all-bzip2: all-bzip2
 all-bzip2: configure-bzip2
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -6577,6 +6802,7 @@ maybe-check-bzip2:
 maybe-check-bzip2: check-bzip2
 
 check-bzip2:
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -6591,6 +6817,7 @@ maybe-install-bzip2:
 maybe-install-bzip2: install-bzip2
 
 install-bzip2: installdirs
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -6608,6 +6835,7 @@ maybe-info-bzip2: info-bzip2
 
 info-bzip2: \
     configure-bzip2 
+	@$(unstage)
 	@[ -f ./bzip2/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -6633,6 +6861,7 @@ maybe-dvi-bzip2: dvi-bzip2
 
 dvi-bzip2: \
     configure-bzip2 
+	@$(unstage)
 	@[ -f ./bzip2/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -6658,6 +6887,7 @@ maybe-html-bzip2: html-bzip2
 
 html-bzip2: \
     configure-bzip2 
+	@$(unstage)
 	@[ -f ./bzip2/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -6683,6 +6913,7 @@ maybe-TAGS-bzip2: TAGS-bzip2
 
 TAGS-bzip2: \
     configure-bzip2 
+	@$(unstage)
 	@[ -f ./bzip2/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -6709,6 +6940,7 @@ maybe-install-info-bzip2: install-info-bzip2
 install-info-bzip2: \
     configure-bzip2 \
     info-bzip2 
+	@$(unstage)
 	@[ -f ./bzip2/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -6734,6 +6966,7 @@ maybe-installcheck-bzip2: installcheck-bzip2
 
 installcheck-bzip2: \
     configure-bzip2 
+	@$(unstage)
 	@[ -f ./bzip2/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -6758,6 +6991,7 @@ maybe-mostlyclean-bzip2:
 maybe-mostlyclean-bzip2: mostlyclean-bzip2
 
 mostlyclean-bzip2: 
+	@$(unstage)
 	@[ -f ./bzip2/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -6782,6 +7016,7 @@ maybe-clean-bzip2:
 maybe-clean-bzip2: clean-bzip2
 
 clean-bzip2: 
+	@$(unstage)
 	@[ -f ./bzip2/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -6806,6 +7041,7 @@ maybe-distclean-bzip2:
 maybe-distclean-bzip2: distclean-bzip2
 
 distclean-bzip2: 
+	@$(unstage)
 	@[ -f ./bzip2/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -6830,6 +7066,7 @@ maybe-maintainer-clean-bzip2:
 maybe-maintainer-clean-bzip2: maintainer-clean-bzip2
 
 maintainer-clean-bzip2: 
+	@$(unstage)
 	@[ -f ./bzip2/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -6855,6 +7092,7 @@ maybe-configure-dejagnu:
 @if dejagnu
 maybe-configure-dejagnu: configure-dejagnu
 configure-dejagnu: 
+	@$(unstage)
 	@test ! -f $(HOST_SUBDIR)/dejagnu/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/dejagnu ; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -6884,6 +7122,7 @@ maybe-all-dejagnu:
 TARGET-dejagnu=all
 maybe-all-dejagnu: all-dejagnu
 all-dejagnu: configure-dejagnu
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -6900,6 +7139,7 @@ maybe-check-dejagnu:
 maybe-check-dejagnu: check-dejagnu
 
 check-dejagnu:
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -6914,6 +7154,7 @@ maybe-install-dejagnu:
 maybe-install-dejagnu: install-dejagnu
 
 install-dejagnu: installdirs
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -6931,6 +7172,7 @@ maybe-info-dejagnu: info-dejagnu
 
 info-dejagnu: \
     configure-dejagnu 
+	@$(unstage)
 	@[ -f ./dejagnu/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -6956,6 +7198,7 @@ maybe-dvi-dejagnu: dvi-dejagnu
 
 dvi-dejagnu: \
     configure-dejagnu 
+	@$(unstage)
 	@[ -f ./dejagnu/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -6981,6 +7224,7 @@ maybe-html-dejagnu: html-dejagnu
 
 html-dejagnu: \
     configure-dejagnu 
+	@$(unstage)
 	@[ -f ./dejagnu/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -7006,6 +7250,7 @@ maybe-TAGS-dejagnu: TAGS-dejagnu
 
 TAGS-dejagnu: \
     configure-dejagnu 
+	@$(unstage)
 	@[ -f ./dejagnu/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -7032,6 +7277,7 @@ maybe-install-info-dejagnu: install-info-dejagnu
 install-info-dejagnu: \
     configure-dejagnu \
     info-dejagnu 
+	@$(unstage)
 	@[ -f ./dejagnu/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -7057,6 +7303,7 @@ maybe-installcheck-dejagnu: installcheck-dejagnu
 
 installcheck-dejagnu: \
     configure-dejagnu 
+	@$(unstage)
 	@[ -f ./dejagnu/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -7081,6 +7328,7 @@ maybe-mostlyclean-dejagnu:
 maybe-mostlyclean-dejagnu: mostlyclean-dejagnu
 
 mostlyclean-dejagnu: 
+	@$(unstage)
 	@[ -f ./dejagnu/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -7105,6 +7353,7 @@ maybe-clean-dejagnu:
 maybe-clean-dejagnu: clean-dejagnu
 
 clean-dejagnu: 
+	@$(unstage)
 	@[ -f ./dejagnu/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -7129,6 +7378,7 @@ maybe-distclean-dejagnu:
 maybe-distclean-dejagnu: distclean-dejagnu
 
 distclean-dejagnu: 
+	@$(unstage)
 	@[ -f ./dejagnu/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -7153,6 +7403,7 @@ maybe-maintainer-clean-dejagnu:
 maybe-maintainer-clean-dejagnu: maintainer-clean-dejagnu
 
 maintainer-clean-dejagnu: 
+	@$(unstage)
 	@[ -f ./dejagnu/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -7178,6 +7429,7 @@ maybe-configure-diff:
 @if diff
 maybe-configure-diff: configure-diff
 configure-diff: 
+	@$(unstage)
 	@test ! -f $(HOST_SUBDIR)/diff/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/diff ; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -7207,6 +7459,7 @@ maybe-all-diff:
 TARGET-diff=all
 maybe-all-diff: all-diff
 all-diff: configure-diff
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -7223,6 +7476,7 @@ maybe-check-diff:
 maybe-check-diff: check-diff
 
 check-diff:
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -7237,6 +7491,7 @@ maybe-install-diff:
 maybe-install-diff: install-diff
 
 install-diff: installdirs
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -7254,6 +7509,7 @@ maybe-info-diff: info-diff
 
 info-diff: \
     configure-diff 
+	@$(unstage)
 	@[ -f ./diff/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -7279,6 +7535,7 @@ maybe-dvi-diff: dvi-diff
 
 dvi-diff: \
     configure-diff 
+	@$(unstage)
 	@[ -f ./diff/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -7304,6 +7561,7 @@ maybe-html-diff: html-diff
 
 html-diff: \
     configure-diff 
+	@$(unstage)
 	@[ -f ./diff/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -7329,6 +7587,7 @@ maybe-TAGS-diff: TAGS-diff
 
 TAGS-diff: \
     configure-diff 
+	@$(unstage)
 	@[ -f ./diff/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -7355,6 +7614,7 @@ maybe-install-info-diff: install-info-diff
 install-info-diff: \
     configure-diff \
     info-diff 
+	@$(unstage)
 	@[ -f ./diff/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -7380,6 +7640,7 @@ maybe-installcheck-diff: installcheck-diff
 
 installcheck-diff: \
     configure-diff 
+	@$(unstage)
 	@[ -f ./diff/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -7404,6 +7665,7 @@ maybe-mostlyclean-diff:
 maybe-mostlyclean-diff: mostlyclean-diff
 
 mostlyclean-diff: 
+	@$(unstage)
 	@[ -f ./diff/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -7428,6 +7690,7 @@ maybe-clean-diff:
 maybe-clean-diff: clean-diff
 
 clean-diff: 
+	@$(unstage)
 	@[ -f ./diff/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -7452,6 +7715,7 @@ maybe-distclean-diff:
 maybe-distclean-diff: distclean-diff
 
 distclean-diff: 
+	@$(unstage)
 	@[ -f ./diff/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -7476,6 +7740,7 @@ maybe-maintainer-clean-diff:
 maybe-maintainer-clean-diff: maintainer-clean-diff
 
 maintainer-clean-diff: 
+	@$(unstage)
 	@[ -f ./diff/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -7501,6 +7766,7 @@ maybe-configure-dosutils:
 @if dosutils
 maybe-configure-dosutils: configure-dosutils
 configure-dosutils: 
+	@$(unstage)
 	@test ! -f $(HOST_SUBDIR)/dosutils/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/dosutils ; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -7530,6 +7796,7 @@ maybe-all-dosutils:
 TARGET-dosutils=all
 maybe-all-dosutils: all-dosutils
 all-dosutils: configure-dosutils
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -7555,6 +7822,7 @@ maybe-install-dosutils:
 maybe-install-dosutils: install-dosutils
 
 install-dosutils: installdirs
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -7572,6 +7840,7 @@ maybe-info-dosutils: info-dosutils
 
 info-dosutils: \
     configure-dosutils 
+	@$(unstage)
 	@[ -f ./dosutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -7597,6 +7866,7 @@ maybe-dvi-dosutils: dvi-dosutils
 
 dvi-dosutils: \
     configure-dosutils 
+	@$(unstage)
 	@[ -f ./dosutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -7622,6 +7892,7 @@ maybe-html-dosutils: html-dosutils
 
 html-dosutils: \
     configure-dosutils 
+	@$(unstage)
 	@[ -f ./dosutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -7647,6 +7918,7 @@ maybe-TAGS-dosutils: TAGS-dosutils
 
 TAGS-dosutils: \
     configure-dosutils 
+	@$(unstage)
 	@[ -f ./dosutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -7673,6 +7945,7 @@ maybe-install-info-dosutils: install-info-dosutils
 install-info-dosutils: \
     configure-dosutils \
     info-dosutils 
+	@$(unstage)
 	@[ -f ./dosutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -7698,6 +7971,7 @@ maybe-installcheck-dosutils: installcheck-dosutils
 
 installcheck-dosutils: \
     configure-dosutils 
+	@$(unstage)
 	@[ -f ./dosutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -7722,6 +7996,7 @@ maybe-mostlyclean-dosutils:
 maybe-mostlyclean-dosutils: mostlyclean-dosutils
 
 mostlyclean-dosutils: 
+	@$(unstage)
 	@[ -f ./dosutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -7746,6 +8021,7 @@ maybe-clean-dosutils:
 maybe-clean-dosutils: clean-dosutils
 
 clean-dosutils: 
+	@$(unstage)
 	@[ -f ./dosutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -7770,6 +8046,7 @@ maybe-distclean-dosutils:
 maybe-distclean-dosutils: distclean-dosutils
 
 distclean-dosutils: 
+	@$(unstage)
 	@[ -f ./dosutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -7794,6 +8071,7 @@ maybe-maintainer-clean-dosutils:
 maybe-maintainer-clean-dosutils: maintainer-clean-dosutils
 
 maintainer-clean-dosutils: 
+	@$(unstage)
 	@[ -f ./dosutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -7819,6 +8097,7 @@ maybe-configure-etc:
 @if etc
 maybe-configure-etc: configure-etc
 configure-etc: 
+	@$(unstage)
 	@test ! -f $(HOST_SUBDIR)/etc/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/etc ; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -7848,6 +8127,7 @@ maybe-all-etc:
 TARGET-etc=all
 maybe-all-etc: all-etc
 all-etc: configure-etc
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -7864,6 +8144,7 @@ maybe-check-etc:
 maybe-check-etc: check-etc
 
 check-etc:
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -7878,6 +8159,7 @@ maybe-install-etc:
 maybe-install-etc: install-etc
 
 install-etc: installdirs
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -7895,6 +8177,7 @@ maybe-info-etc: info-etc
 
 info-etc: \
     configure-etc 
+	@$(unstage)
 	@[ -f ./etc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -7920,6 +8203,7 @@ maybe-dvi-etc: dvi-etc
 
 dvi-etc: \
     configure-etc 
+	@$(unstage)
 	@[ -f ./etc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -7945,6 +8229,7 @@ maybe-html-etc: html-etc
 
 html-etc: \
     configure-etc 
+	@$(unstage)
 	@[ -f ./etc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -7970,6 +8255,7 @@ maybe-TAGS-etc: TAGS-etc
 
 TAGS-etc: \
     configure-etc 
+	@$(unstage)
 	@[ -f ./etc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -7996,6 +8282,7 @@ maybe-install-info-etc: install-info-etc
 install-info-etc: \
     configure-etc \
     info-etc 
+	@$(unstage)
 	@[ -f ./etc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8021,6 +8308,7 @@ maybe-installcheck-etc: installcheck-etc
 
 installcheck-etc: \
     configure-etc 
+	@$(unstage)
 	@[ -f ./etc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8045,6 +8333,7 @@ maybe-mostlyclean-etc:
 maybe-mostlyclean-etc: mostlyclean-etc
 
 mostlyclean-etc: 
+	@$(unstage)
 	@[ -f ./etc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8069,6 +8358,7 @@ maybe-clean-etc:
 maybe-clean-etc: clean-etc
 
 clean-etc: 
+	@$(unstage)
 	@[ -f ./etc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8093,6 +8383,7 @@ maybe-distclean-etc:
 maybe-distclean-etc: distclean-etc
 
 distclean-etc: 
+	@$(unstage)
 	@[ -f ./etc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8117,6 +8408,7 @@ maybe-maintainer-clean-etc:
 maybe-maintainer-clean-etc: maintainer-clean-etc
 
 maintainer-clean-etc: 
+	@$(unstage)
 	@[ -f ./etc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8142,6 +8434,7 @@ maybe-configure-fastjar:
 @if fastjar
 maybe-configure-fastjar: configure-fastjar
 configure-fastjar: 
+	@$(unstage)
 	@test ! -f $(HOST_SUBDIR)/fastjar/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/fastjar ; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -8171,6 +8464,7 @@ maybe-all-fastjar:
 TARGET-fastjar=all
 maybe-all-fastjar: all-fastjar
 all-fastjar: configure-fastjar
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -8188,6 +8482,7 @@ maybe-check-fastjar: check-fastjar
 
 # This module is only tested in a native toolchain.
 check-fastjar:
+	@$(unstage)
 	@if [ '$(host)' = '$(target)' ] ; then \
 	  r=`${PWD_COMMAND}`; export r; \
 	  s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8204,6 +8499,7 @@ maybe-install-fastjar:
 maybe-install-fastjar: install-fastjar
 
 install-fastjar: installdirs
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -8221,6 +8517,7 @@ maybe-info-fastjar: info-fastjar
 
 info-fastjar: \
     configure-fastjar 
+	@$(unstage)
 	@[ -f ./fastjar/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8246,6 +8543,7 @@ maybe-dvi-fastjar: dvi-fastjar
 
 dvi-fastjar: \
     configure-fastjar 
+	@$(unstage)
 	@[ -f ./fastjar/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8271,6 +8569,7 @@ maybe-html-fastjar: html-fastjar
 
 html-fastjar: \
     configure-fastjar 
+	@$(unstage)
 	@[ -f ./fastjar/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8296,6 +8595,7 @@ maybe-TAGS-fastjar: TAGS-fastjar
 
 TAGS-fastjar: \
     configure-fastjar 
+	@$(unstage)
 	@[ -f ./fastjar/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8322,6 +8622,7 @@ maybe-install-info-fastjar: install-info-fastjar
 install-info-fastjar: \
     configure-fastjar \
     info-fastjar 
+	@$(unstage)
 	@[ -f ./fastjar/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8347,6 +8648,7 @@ maybe-installcheck-fastjar: installcheck-fastjar
 
 installcheck-fastjar: \
     configure-fastjar 
+	@$(unstage)
 	@[ -f ./fastjar/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8371,6 +8673,7 @@ maybe-mostlyclean-fastjar:
 maybe-mostlyclean-fastjar: mostlyclean-fastjar
 
 mostlyclean-fastjar: 
+	@$(unstage)
 	@[ -f ./fastjar/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8395,6 +8698,7 @@ maybe-clean-fastjar:
 maybe-clean-fastjar: clean-fastjar
 
 clean-fastjar: 
+	@$(unstage)
 	@[ -f ./fastjar/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8419,6 +8723,7 @@ maybe-distclean-fastjar:
 maybe-distclean-fastjar: distclean-fastjar
 
 distclean-fastjar: 
+	@$(unstage)
 	@[ -f ./fastjar/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8443,6 +8748,7 @@ maybe-maintainer-clean-fastjar:
 maybe-maintainer-clean-fastjar: maintainer-clean-fastjar
 
 maintainer-clean-fastjar: 
+	@$(unstage)
 	@[ -f ./fastjar/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8468,6 +8774,7 @@ maybe-configure-fileutils:
 @if fileutils
 maybe-configure-fileutils: configure-fileutils
 configure-fileutils: 
+	@$(unstage)
 	@test ! -f $(HOST_SUBDIR)/fileutils/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/fileutils ; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -8497,6 +8804,7 @@ maybe-all-fileutils:
 TARGET-fileutils=all
 maybe-all-fileutils: all-fileutils
 all-fileutils: configure-fileutils
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -8513,6 +8821,7 @@ maybe-check-fileutils:
 maybe-check-fileutils: check-fileutils
 
 check-fileutils:
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -8527,6 +8836,7 @@ maybe-install-fileutils:
 maybe-install-fileutils: install-fileutils
 
 install-fileutils: installdirs
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -8544,6 +8854,7 @@ maybe-info-fileutils: info-fileutils
 
 info-fileutils: \
     configure-fileutils 
+	@$(unstage)
 	@[ -f ./fileutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8569,6 +8880,7 @@ maybe-dvi-fileutils: dvi-fileutils
 
 dvi-fileutils: \
     configure-fileutils 
+	@$(unstage)
 	@[ -f ./fileutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8594,6 +8906,7 @@ maybe-html-fileutils: html-fileutils
 
 html-fileutils: \
     configure-fileutils 
+	@$(unstage)
 	@[ -f ./fileutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8619,6 +8932,7 @@ maybe-TAGS-fileutils: TAGS-fileutils
 
 TAGS-fileutils: \
     configure-fileutils 
+	@$(unstage)
 	@[ -f ./fileutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8645,6 +8959,7 @@ maybe-install-info-fileutils: install-info-fileutils
 install-info-fileutils: \
     configure-fileutils \
     info-fileutils 
+	@$(unstage)
 	@[ -f ./fileutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8670,6 +8985,7 @@ maybe-installcheck-fileutils: installcheck-fileutils
 
 installcheck-fileutils: \
     configure-fileutils 
+	@$(unstage)
 	@[ -f ./fileutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8694,6 +9010,7 @@ maybe-mostlyclean-fileutils:
 maybe-mostlyclean-fileutils: mostlyclean-fileutils
 
 mostlyclean-fileutils: 
+	@$(unstage)
 	@[ -f ./fileutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8718,6 +9035,7 @@ maybe-clean-fileutils:
 maybe-clean-fileutils: clean-fileutils
 
 clean-fileutils: 
+	@$(unstage)
 	@[ -f ./fileutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8742,6 +9060,7 @@ maybe-distclean-fileutils:
 maybe-distclean-fileutils: distclean-fileutils
 
 distclean-fileutils: 
+	@$(unstage)
 	@[ -f ./fileutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8766,6 +9085,7 @@ maybe-maintainer-clean-fileutils:
 maybe-maintainer-clean-fileutils: maintainer-clean-fileutils
 
 maintainer-clean-fileutils: 
+	@$(unstage)
 	@[ -f ./fileutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8791,6 +9111,7 @@ maybe-configure-findutils:
 @if findutils
 maybe-configure-findutils: configure-findutils
 configure-findutils: 
+	@$(unstage)
 	@test ! -f $(HOST_SUBDIR)/findutils/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/findutils ; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -8820,6 +9141,7 @@ maybe-all-findutils:
 TARGET-findutils=all
 maybe-all-findutils: all-findutils
 all-findutils: configure-findutils
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -8836,6 +9158,7 @@ maybe-check-findutils:
 maybe-check-findutils: check-findutils
 
 check-findutils:
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -8850,6 +9173,7 @@ maybe-install-findutils:
 maybe-install-findutils: install-findutils
 
 install-findutils: installdirs
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -8867,6 +9191,7 @@ maybe-info-findutils: info-findutils
 
 info-findutils: \
     configure-findutils 
+	@$(unstage)
 	@[ -f ./findutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8892,6 +9217,7 @@ maybe-dvi-findutils: dvi-findutils
 
 dvi-findutils: \
     configure-findutils 
+	@$(unstage)
 	@[ -f ./findutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8917,6 +9243,7 @@ maybe-html-findutils: html-findutils
 
 html-findutils: \
     configure-findutils 
+	@$(unstage)
 	@[ -f ./findutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8942,6 +9269,7 @@ maybe-TAGS-findutils: TAGS-findutils
 
 TAGS-findutils: \
     configure-findutils 
+	@$(unstage)
 	@[ -f ./findutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8968,6 +9296,7 @@ maybe-install-info-findutils: install-info-findutils
 install-info-findutils: \
     configure-findutils \
     info-findutils 
+	@$(unstage)
 	@[ -f ./findutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8993,6 +9322,7 @@ maybe-installcheck-findutils: installcheck-findutils
 
 installcheck-findutils: \
     configure-findutils 
+	@$(unstage)
 	@[ -f ./findutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -9017,6 +9347,7 @@ maybe-mostlyclean-findutils:
 maybe-mostlyclean-findutils: mostlyclean-findutils
 
 mostlyclean-findutils: 
+	@$(unstage)
 	@[ -f ./findutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -9041,6 +9372,7 @@ maybe-clean-findutils:
 maybe-clean-findutils: clean-findutils
 
 clean-findutils: 
+	@$(unstage)
 	@[ -f ./findutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -9065,6 +9397,7 @@ maybe-distclean-findutils:
 maybe-distclean-findutils: distclean-findutils
 
 distclean-findutils: 
+	@$(unstage)
 	@[ -f ./findutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -9089,6 +9422,7 @@ maybe-maintainer-clean-findutils:
 maybe-maintainer-clean-findutils: maintainer-clean-findutils
 
 maintainer-clean-findutils: 
+	@$(unstage)
 	@[ -f ./findutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -9114,6 +9448,7 @@ maybe-configure-find:
 @if find
 maybe-configure-find: configure-find
 configure-find: 
+	@$(unstage)
 	@test ! -f $(HOST_SUBDIR)/find/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/find ; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -9143,6 +9478,7 @@ maybe-all-find:
 TARGET-find=all
 maybe-all-find: all-find
 all-find: configure-find
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -9159,6 +9495,7 @@ maybe-check-find:
 maybe-check-find: check-find
 
 check-find:
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -9173,6 +9510,7 @@ maybe-install-find:
 maybe-install-find: install-find
 
 install-find: installdirs
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -9190,6 +9528,7 @@ maybe-info-find: info-find
 
 info-find: \
     configure-find 
+	@$(unstage)
 	@[ -f ./find/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -9215,6 +9554,7 @@ maybe-dvi-find: dvi-find
 
 dvi-find: \
     configure-find 
+	@$(unstage)
 	@[ -f ./find/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -9240,6 +9580,7 @@ maybe-html-find: html-find
 
 html-find: \
     configure-find 
+	@$(unstage)
 	@[ -f ./find/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -9265,6 +9606,7 @@ maybe-TAGS-find: TAGS-find
 
 TAGS-find: \
     configure-find 
+	@$(unstage)
 	@[ -f ./find/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -9291,6 +9633,7 @@ maybe-install-info-find: install-info-find
 install-info-find: \
     configure-find \
     info-find 
+	@$(unstage)
 	@[ -f ./find/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -9316,6 +9659,7 @@ maybe-installcheck-find: installcheck-find
 
 installcheck-find: \
     configure-find 
+	@$(unstage)
 	@[ -f ./find/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -9340,6 +9684,7 @@ maybe-mostlyclean-find:
 maybe-mostlyclean-find: mostlyclean-find
 
 mostlyclean-find: 
+	@$(unstage)
 	@[ -f ./find/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -9364,6 +9709,7 @@ maybe-clean-find:
 maybe-clean-find: clean-find
 
 clean-find: 
+	@$(unstage)
 	@[ -f ./find/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -9388,6 +9734,7 @@ maybe-distclean-find:
 maybe-distclean-find: distclean-find
 
 distclean-find: 
+	@$(unstage)
 	@[ -f ./find/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -9412,6 +9759,7 @@ maybe-maintainer-clean-find:
 maybe-maintainer-clean-find: maintainer-clean-find
 
 maintainer-clean-find: 
+	@$(unstage)
 	@[ -f ./find/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -9437,6 +9785,7 @@ maybe-configure-fixincludes:
 @if fixincludes
 maybe-configure-fixincludes: configure-fixincludes
 configure-fixincludes: 
+	@$(unstage)
 	@test ! -f $(HOST_SUBDIR)/fixincludes/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/fixincludes ; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -9466,6 +9815,7 @@ maybe-all-fixincludes:
 TARGET-fixincludes=all
 maybe-all-fixincludes: all-fixincludes
 all-fixincludes: configure-fixincludes
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -9482,6 +9832,7 @@ maybe-check-fixincludes:
 maybe-check-fixincludes: check-fixincludes
 
 check-fixincludes:
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -9496,6 +9847,7 @@ maybe-install-fixincludes:
 maybe-install-fixincludes: install-fixincludes
 
 install-fixincludes: installdirs
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -9533,6 +9885,7 @@ maybe-html-fixincludes: html-fixincludes
 
 html-fixincludes: \
     configure-fixincludes 
+	@$(unstage)
 	@[ -f ./fixincludes/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -9587,6 +9940,7 @@ maybe-mostlyclean-fixincludes:
 maybe-mostlyclean-fixincludes: mostlyclean-fixincludes
 
 mostlyclean-fixincludes: 
+	@$(unstage)
 	@[ -f ./fixincludes/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -9611,6 +9965,7 @@ maybe-clean-fixincludes:
 maybe-clean-fixincludes: clean-fixincludes
 
 clean-fixincludes: 
+	@$(unstage)
 	@[ -f ./fixincludes/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -9635,6 +9990,7 @@ maybe-distclean-fixincludes:
 maybe-distclean-fixincludes: distclean-fixincludes
 
 distclean-fixincludes: 
+	@$(unstage)
 	@[ -f ./fixincludes/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -9659,6 +10015,7 @@ maybe-maintainer-clean-fixincludes:
 maybe-maintainer-clean-fixincludes: maintainer-clean-fixincludes
 
 maintainer-clean-fixincludes: 
+	@$(unstage)
 	@[ -f ./fixincludes/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -9684,6 +10041,7 @@ maybe-configure-flex:
 @if flex
 maybe-configure-flex: configure-flex
 configure-flex: 
+	@$(unstage)
 	@test ! -f $(HOST_SUBDIR)/flex/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/flex ; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -9713,6 +10071,7 @@ maybe-all-flex:
 TARGET-flex=all
 maybe-all-flex: all-flex
 all-flex: configure-flex
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -9730,6 +10089,7 @@ maybe-check-flex: check-flex
 
 # This module is only tested in a native toolchain.
 check-flex:
+	@$(unstage)
 	@if [ '$(host)' = '$(target)' ] ; then \
 	  r=`${PWD_COMMAND}`; export r; \
 	  s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -9746,6 +10106,7 @@ maybe-install-flex:
 maybe-install-flex: install-flex
 
 install-flex: installdirs
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -9763,6 +10124,7 @@ maybe-info-flex: info-flex
 
 info-flex: \
     configure-flex 
+	@$(unstage)
 	@[ -f ./flex/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -9788,6 +10150,7 @@ maybe-dvi-flex: dvi-flex
 
 dvi-flex: \
     configure-flex 
+	@$(unstage)
 	@[ -f ./flex/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -9813,6 +10176,7 @@ maybe-html-flex: html-flex
 
 html-flex: \
     configure-flex 
+	@$(unstage)
 	@[ -f ./flex/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -9838,6 +10202,7 @@ maybe-TAGS-flex: TAGS-flex
 
 TAGS-flex: \
     configure-flex 
+	@$(unstage)
 	@[ -f ./flex/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -9864,6 +10229,7 @@ maybe-install-info-flex: install-info-flex
 install-info-flex: \
     configure-flex \
     info-flex 
+	@$(unstage)
 	@[ -f ./flex/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -9889,6 +10255,7 @@ maybe-installcheck-flex: installcheck-flex
 
 installcheck-flex: \
     configure-flex 
+	@$(unstage)
 	@[ -f ./flex/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -9913,6 +10280,7 @@ maybe-mostlyclean-flex:
 maybe-mostlyclean-flex: mostlyclean-flex
 
 mostlyclean-flex: 
+	@$(unstage)
 	@[ -f ./flex/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -9937,6 +10305,7 @@ maybe-clean-flex:
 maybe-clean-flex: clean-flex
 
 clean-flex: 
+	@$(unstage)
 	@[ -f ./flex/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -9961,6 +10330,7 @@ maybe-distclean-flex:
 maybe-distclean-flex: distclean-flex
 
 distclean-flex: 
+	@$(unstage)
 	@[ -f ./flex/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -9985,6 +10355,7 @@ maybe-maintainer-clean-flex:
 maybe-maintainer-clean-flex: maintainer-clean-flex
 
 maintainer-clean-flex: 
+	@$(unstage)
 	@[ -f ./flex/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -10037,7 +10408,7 @@ maybe-configure-stage1-gas:
 @if gas-bootstrap
 maybe-configure-stage1-gas: configure-stage1-gas
 configure-stage1-gas: 
-	@$(MAKE) stage1-start
+	@[ `cat stage_current` = stage1 ] || $(MAKE) stage1-start
 	@[ -f $(HOST_SUBDIR)/gas/Makefile ] && exit 0 || : ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -10061,7 +10432,7 @@ maybe-configure-stage2-gas:
 @if gas-bootstrap
 maybe-configure-stage2-gas: configure-stage2-gas
 configure-stage2-gas: 
-	@$(MAKE) stage2-start
+	@[ `cat stage_current` = stage2 ] || $(MAKE) stage2-start
 	@[ -f $(HOST_SUBDIR)/gas/Makefile ] && exit 0 || : ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -10086,7 +10457,7 @@ maybe-configure-stage3-gas:
 @if gas-bootstrap
 maybe-configure-stage3-gas: configure-stage3-gas
 configure-stage3-gas: 
-	@$(MAKE) stage3-start
+	@[ `cat stage_current` = stage3 ] || $(MAKE) stage3-start
 	@[ -f $(HOST_SUBDIR)/gas/Makefile ] && exit 0 || : ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -10111,7 +10482,7 @@ maybe-configure-stage4-gas:
 @if gas-bootstrap
 maybe-configure-stage4-gas: configure-stage4-gas
 configure-stage4-gas: 
-	@$(MAKE) stage4-start
+	@[ `cat stage_current` = stage4 ] || $(MAKE) stage4-start
 	@[ -f $(HOST_SUBDIR)/gas/Makefile ] && exit 0 || : ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -10136,7 +10507,7 @@ maybe-configure-stageprofile-gas:
 @if gas-bootstrap
 maybe-configure-stageprofile-gas: configure-stageprofile-gas
 configure-stageprofile-gas: 
-	@$(MAKE) stageprofile-start
+	@[ `cat stage_current` = stageprofile ] || $(MAKE) stageprofile-start
 	@[ -f $(HOST_SUBDIR)/gas/Makefile ] && exit 0 || : ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -10161,7 +10532,7 @@ maybe-configure-stagefeedback-gas:
 @if gas-bootstrap
 maybe-configure-stagefeedback-gas: configure-stagefeedback-gas
 configure-stagefeedback-gas: 
-	@$(MAKE) stagefeedback-start
+	@[ `cat stage_current` = stagefeedback ] || $(MAKE) stagefeedback-start
 	@[ -f $(HOST_SUBDIR)/gas/Makefile ] && exit 0 || : ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -10208,20 +10579,22 @@ maybe-clean-stage1-gas:
 @if gas-bootstrap
 maybe-all-stage1-gas: all-stage1-gas
 all-stage1: all-stage1-gas
+TARGET-stage1-gas = $(TARGET-gas)
 all-stage1-gas: configure-stage1-gas
-	@$(MAKE) stage1-start
+	@[ `cat stage_current` = stage1 ] || $(MAKE) stage1-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/gas && \
-	$(MAKE) $(FLAGS_TO_PASS)  CFLAGS="$(STAGE1_CFLAGS)" 
+	$(MAKE) $(FLAGS_TO_PASS)  CFLAGS="$(STAGE1_CFLAGS)"  \
+		$(TARGET-stage1-gas)
 
 maybe-clean-stage1-gas: clean-stage1-gas
 clean-stage1: clean-stage1-gas
 clean-stage1-gas:
 	@[ -f $(HOST_SUBDIR)/gas/Makefile ] || [ -f $(HOST_SUBDIR)/stage1-gas/Makefile ] \
 	  || exit 0 ; \
-	[ -f $(HOST_SUBDIR)/gas/Makefile ] || $(MAKE) stage1-start ; \
+	@[ `cat stage_current` = stage1 ] || $(MAKE) stage1-start
 	cd $(HOST_SUBDIR)/gas && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		CFLAGS="$(STAGE1_CFLAGS)"  clean
@@ -10235,21 +10608,23 @@ maybe-clean-stage2-gas:
 @if gas-bootstrap
 maybe-all-stage2-gas: all-stage2-gas
 all-stage2: all-stage2-gas
+TARGET-stage2-gas = $(TARGET-gas)
 all-stage2-gas: configure-stage2-gas
-	@$(MAKE) stage2-start
+	@[ `cat stage_current` = stage2 ] || $(MAKE) stage2-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/gas && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)  
+	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)   \
+		$(TARGET-stage2-gas)
 
 maybe-clean-stage2-gas: clean-stage2-gas
 clean-stage2: clean-stage2-gas
 clean-stage2-gas:
 	@[ -f $(HOST_SUBDIR)/gas/Makefile ] || [ -f $(HOST_SUBDIR)/stage2-gas/Makefile ] \
 	  || exit 0 ; \
-	[ -f $(HOST_SUBDIR)/gas/Makefile ] || $(MAKE) stage2-start ; \
+	@[ `cat stage_current` = stage2 ] || $(MAKE) stage2-start
 	cd $(HOST_SUBDIR)/gas && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -10264,21 +10639,23 @@ maybe-clean-stage3-gas:
 @if gas-bootstrap
 maybe-all-stage3-gas: all-stage3-gas
 all-stage3: all-stage3-gas
+TARGET-stage3-gas = $(TARGET-gas)
 all-stage3-gas: configure-stage3-gas
-	@$(MAKE) stage3-start
+	@[ `cat stage_current` = stage3 ] || $(MAKE) stage3-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/gas && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)  
+	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)   \
+		$(TARGET-stage3-gas)
 
 maybe-clean-stage3-gas: clean-stage3-gas
 clean-stage3: clean-stage3-gas
 clean-stage3-gas:
 	@[ -f $(HOST_SUBDIR)/gas/Makefile ] || [ -f $(HOST_SUBDIR)/stage3-gas/Makefile ] \
 	  || exit 0 ; \
-	[ -f $(HOST_SUBDIR)/gas/Makefile ] || $(MAKE) stage3-start ; \
+	@[ `cat stage_current` = stage3 ] || $(MAKE) stage3-start
 	cd $(HOST_SUBDIR)/gas && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -10293,21 +10670,23 @@ maybe-clean-stage4-gas:
 @if gas-bootstrap
 maybe-all-stage4-gas: all-stage4-gas
 all-stage4: all-stage4-gas
+TARGET-stage4-gas = $(TARGET-gas)
 all-stage4-gas: configure-stage4-gas
-	@$(MAKE) stage4-start
+	@[ `cat stage_current` = stage4 ] || $(MAKE) stage4-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/gas && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)  
+	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)   \
+		$(TARGET-stage4-gas)
 
 maybe-clean-stage4-gas: clean-stage4-gas
 clean-stage4: clean-stage4-gas
 clean-stage4-gas:
 	@[ -f $(HOST_SUBDIR)/gas/Makefile ] || [ -f $(HOST_SUBDIR)/stage4-gas/Makefile ] \
 	  || exit 0 ; \
-	[ -f $(HOST_SUBDIR)/gas/Makefile ] || $(MAKE) stage4-start ; \
+	@[ `cat stage_current` = stage4 ] || $(MAKE) stage4-start
 	cd $(HOST_SUBDIR)/gas && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -10322,21 +10701,23 @@ maybe-clean-stageprofile-gas:
 @if gas-bootstrap
 maybe-all-stageprofile-gas: all-stageprofile-gas
 all-stageprofile: all-stageprofile-gas
+TARGET-stageprofile-gas = $(TARGET-gas)
 all-stageprofile-gas: configure-stageprofile-gas
-	@$(MAKE) stageprofile-start
+	@[ `cat stage_current` = stageprofile ] || $(MAKE) stageprofile-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/gas && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" 
+	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-generate"  \
+		$(TARGET-stageprofile-gas)
 
 maybe-clean-stageprofile-gas: clean-stageprofile-gas
 clean-stageprofile: clean-stageprofile-gas
 clean-stageprofile-gas:
 	@[ -f $(HOST_SUBDIR)/gas/Makefile ] || [ -f $(HOST_SUBDIR)/stageprofile-gas/Makefile ] \
 	  || exit 0 ; \
-	[ -f $(HOST_SUBDIR)/gas/Makefile ] || $(MAKE) stageprofile-start ; \
+	@[ `cat stage_current` = stageprofile ] || $(MAKE) stageprofile-start
 	cd $(HOST_SUBDIR)/gas && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -10351,21 +10732,23 @@ maybe-clean-stagefeedback-gas:
 @if gas-bootstrap
 maybe-all-stagefeedback-gas: all-stagefeedback-gas
 all-stagefeedback: all-stagefeedback-gas
+TARGET-stagefeedback-gas = $(TARGET-gas)
 all-stagefeedback-gas: configure-stagefeedback-gas
-	@$(MAKE) stagefeedback-start
+	@[ `cat stage_current` = stagefeedback ] || $(MAKE) stagefeedback-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/gas && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-use" 
+	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-use"  \
+		$(TARGET-stagefeedback-gas)
 
 maybe-clean-stagefeedback-gas: clean-stagefeedback-gas
 clean-stagefeedback: clean-stagefeedback-gas
 clean-stagefeedback-gas:
 	@[ -f $(HOST_SUBDIR)/gas/Makefile ] || [ -f $(HOST_SUBDIR)/stagefeedback-gas/Makefile ] \
 	  || exit 0 ; \
-	[ -f $(HOST_SUBDIR)/gas/Makefile ] || $(MAKE) stagefeedback-start ; \
+	@[ `cat stage_current` = stagefeedback ] || $(MAKE) stagefeedback-start
 	cd $(HOST_SUBDIR)/gas && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -10382,6 +10765,7 @@ maybe-check-gas:
 maybe-check-gas: check-gas
 
 check-gas:
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -10396,6 +10780,7 @@ maybe-install-gas:
 maybe-install-gas: install-gas
 
 install-gas: installdirs
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -10687,7 +11072,7 @@ maybe-configure-stage1-gcc:
 @if gcc-bootstrap
 maybe-configure-stage1-gcc: configure-stage1-gcc
 configure-stage1-gcc: 
-	@$(MAKE) stage1-start
+	@[ `cat stage_current` = stage1 ] || $(MAKE) stage1-start
 	@[ -f $(HOST_SUBDIR)/gcc/Makefile ] && exit 0 || : ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -10711,7 +11096,7 @@ maybe-configure-stage2-gcc:
 @if gcc-bootstrap
 maybe-configure-stage2-gcc: configure-stage2-gcc
 configure-stage2-gcc: 
-	@$(MAKE) stage2-start
+	@[ `cat stage_current` = stage2 ] || $(MAKE) stage2-start
 	@[ -f $(HOST_SUBDIR)/gcc/Makefile ] && exit 0 || : ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -10736,7 +11121,7 @@ maybe-configure-stage3-gcc:
 @if gcc-bootstrap
 maybe-configure-stage3-gcc: configure-stage3-gcc
 configure-stage3-gcc: 
-	@$(MAKE) stage3-start
+	@[ `cat stage_current` = stage3 ] || $(MAKE) stage3-start
 	@[ -f $(HOST_SUBDIR)/gcc/Makefile ] && exit 0 || : ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -10761,7 +11146,7 @@ maybe-configure-stage4-gcc:
 @if gcc-bootstrap
 maybe-configure-stage4-gcc: configure-stage4-gcc
 configure-stage4-gcc: 
-	@$(MAKE) stage4-start
+	@[ `cat stage_current` = stage4 ] || $(MAKE) stage4-start
 	@[ -f $(HOST_SUBDIR)/gcc/Makefile ] && exit 0 || : ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -10786,7 +11171,7 @@ maybe-configure-stageprofile-gcc:
 @if gcc-bootstrap
 maybe-configure-stageprofile-gcc: configure-stageprofile-gcc
 configure-stageprofile-gcc: 
-	@$(MAKE) stageprofile-start
+	@[ `cat stage_current` = stageprofile ] || $(MAKE) stageprofile-start
 	@[ -f $(HOST_SUBDIR)/gcc/Makefile ] && exit 0 || : ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -10811,7 +11196,7 @@ maybe-configure-stagefeedback-gcc:
 @if gcc-bootstrap
 maybe-configure-stagefeedback-gcc: configure-stagefeedback-gcc
 configure-stagefeedback-gcc: 
-	@$(MAKE) stagefeedback-start
+	@[ `cat stage_current` = stagefeedback ] || $(MAKE) stagefeedback-start
 	@[ -f $(HOST_SUBDIR)/gcc/Makefile ] && exit 0 || : ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -10858,20 +11243,22 @@ maybe-clean-stage1-gcc:
 @if gcc-bootstrap
 maybe-all-stage1-gcc: all-stage1-gcc
 all-stage1: all-stage1-gcc
+TARGET-stage1-gcc = $(TARGET-gcc)
 all-stage1-gcc: configure-stage1-gcc
-	@$(MAKE) stage1-start
+	@[ `cat stage_current` = stage1 ] || $(MAKE) stage1-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/gcc && \
-	$(MAKE) $(FLAGS_TO_PASS)  CFLAGS="$(STAGE1_CFLAGS)" $(EXTRA_GCC_FLAGS)
+	$(MAKE) $(FLAGS_TO_PASS)  CFLAGS="$(STAGE1_CFLAGS)" $(EXTRA_GCC_FLAGS) \
+		$(TARGET-stage1-gcc)
 
 maybe-clean-stage1-gcc: clean-stage1-gcc
 clean-stage1: clean-stage1-gcc
 clean-stage1-gcc:
 	@[ -f $(HOST_SUBDIR)/gcc/Makefile ] || [ -f $(HOST_SUBDIR)/stage1-gcc/Makefile ] \
 	  || exit 0 ; \
-	[ -f $(HOST_SUBDIR)/gcc/Makefile ] || $(MAKE) stage1-start ; \
+	@[ `cat stage_current` = stage1 ] || $(MAKE) stage1-start
 	cd $(HOST_SUBDIR)/gcc && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		CFLAGS="$(STAGE1_CFLAGS)" $(EXTRA_GCC_FLAGS) clean
@@ -10885,21 +11272,23 @@ maybe-clean-stage2-gcc:
 @if gcc-bootstrap
 maybe-all-stage2-gcc: all-stage2-gcc
 all-stage2: all-stage2-gcc
+TARGET-stage2-gcc = $(TARGET-gcc)
 all-stage2-gcc: configure-stage2-gcc
-	@$(MAKE) stage2-start
+	@[ `cat stage_current` = stage2 ] || $(MAKE) stage2-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/gcc && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)  $(EXTRA_GCC_FLAGS)
+	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)  $(EXTRA_GCC_FLAGS) \
+		$(TARGET-stage2-gcc)
 
 maybe-clean-stage2-gcc: clean-stage2-gcc
 clean-stage2: clean-stage2-gcc
 clean-stage2-gcc:
 	@[ -f $(HOST_SUBDIR)/gcc/Makefile ] || [ -f $(HOST_SUBDIR)/stage2-gcc/Makefile ] \
 	  || exit 0 ; \
-	[ -f $(HOST_SUBDIR)/gcc/Makefile ] || $(MAKE) stage2-start ; \
+	@[ `cat stage_current` = stage2 ] || $(MAKE) stage2-start
 	cd $(HOST_SUBDIR)/gcc && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -10914,21 +11303,23 @@ maybe-clean-stage3-gcc:
 @if gcc-bootstrap
 maybe-all-stage3-gcc: all-stage3-gcc
 all-stage3: all-stage3-gcc
+TARGET-stage3-gcc = $(TARGET-gcc)
 all-stage3-gcc: configure-stage3-gcc
-	@$(MAKE) stage3-start
+	@[ `cat stage_current` = stage3 ] || $(MAKE) stage3-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/gcc && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)  $(EXTRA_GCC_FLAGS)
+	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)  $(EXTRA_GCC_FLAGS) \
+		$(TARGET-stage3-gcc)
 
 maybe-clean-stage3-gcc: clean-stage3-gcc
 clean-stage3: clean-stage3-gcc
 clean-stage3-gcc:
 	@[ -f $(HOST_SUBDIR)/gcc/Makefile ] || [ -f $(HOST_SUBDIR)/stage3-gcc/Makefile ] \
 	  || exit 0 ; \
-	[ -f $(HOST_SUBDIR)/gcc/Makefile ] || $(MAKE) stage3-start ; \
+	@[ `cat stage_current` = stage3 ] || $(MAKE) stage3-start
 	cd $(HOST_SUBDIR)/gcc && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -10943,21 +11334,23 @@ maybe-clean-stage4-gcc:
 @if gcc-bootstrap
 maybe-all-stage4-gcc: all-stage4-gcc
 all-stage4: all-stage4-gcc
+TARGET-stage4-gcc = $(TARGET-gcc)
 all-stage4-gcc: configure-stage4-gcc
-	@$(MAKE) stage4-start
+	@[ `cat stage_current` = stage4 ] || $(MAKE) stage4-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/gcc && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)  $(EXTRA_GCC_FLAGS)
+	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)  $(EXTRA_GCC_FLAGS) \
+		$(TARGET-stage4-gcc)
 
 maybe-clean-stage4-gcc: clean-stage4-gcc
 clean-stage4: clean-stage4-gcc
 clean-stage4-gcc:
 	@[ -f $(HOST_SUBDIR)/gcc/Makefile ] || [ -f $(HOST_SUBDIR)/stage4-gcc/Makefile ] \
 	  || exit 0 ; \
-	[ -f $(HOST_SUBDIR)/gcc/Makefile ] || $(MAKE) stage4-start ; \
+	@[ `cat stage_current` = stage4 ] || $(MAKE) stage4-start
 	cd $(HOST_SUBDIR)/gcc && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -10972,21 +11365,23 @@ maybe-clean-stageprofile-gcc:
 @if gcc-bootstrap
 maybe-all-stageprofile-gcc: all-stageprofile-gcc
 all-stageprofile: all-stageprofile-gcc
+TARGET-stageprofile-gcc = $(TARGET-gcc)
 all-stageprofile-gcc: configure-stageprofile-gcc
-	@$(MAKE) stageprofile-start
+	@[ `cat stage_current` = stageprofile ] || $(MAKE) stageprofile-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/gcc && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" $(EXTRA_GCC_FLAGS)
+	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" $(EXTRA_GCC_FLAGS) \
+		$(TARGET-stageprofile-gcc)
 
 maybe-clean-stageprofile-gcc: clean-stageprofile-gcc
 clean-stageprofile: clean-stageprofile-gcc
 clean-stageprofile-gcc:
 	@[ -f $(HOST_SUBDIR)/gcc/Makefile ] || [ -f $(HOST_SUBDIR)/stageprofile-gcc/Makefile ] \
 	  || exit 0 ; \
-	[ -f $(HOST_SUBDIR)/gcc/Makefile ] || $(MAKE) stageprofile-start ; \
+	@[ `cat stage_current` = stageprofile ] || $(MAKE) stageprofile-start
 	cd $(HOST_SUBDIR)/gcc && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -11001,21 +11396,23 @@ maybe-clean-stagefeedback-gcc:
 @if gcc-bootstrap
 maybe-all-stagefeedback-gcc: all-stagefeedback-gcc
 all-stagefeedback: all-stagefeedback-gcc
+TARGET-stagefeedback-gcc = $(TARGET-gcc)
 all-stagefeedback-gcc: configure-stagefeedback-gcc
-	@$(MAKE) stagefeedback-start
+	@[ `cat stage_current` = stagefeedback ] || $(MAKE) stagefeedback-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/gcc && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-use" $(EXTRA_GCC_FLAGS)
+	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-use" $(EXTRA_GCC_FLAGS) \
+		$(TARGET-stagefeedback-gcc)
 
 maybe-clean-stagefeedback-gcc: clean-stagefeedback-gcc
 clean-stagefeedback: clean-stagefeedback-gcc
 clean-stagefeedback-gcc:
 	@[ -f $(HOST_SUBDIR)/gcc/Makefile ] || [ -f $(HOST_SUBDIR)/stagefeedback-gcc/Makefile ] \
 	  || exit 0 ; \
-	[ -f $(HOST_SUBDIR)/gcc/Makefile ] || $(MAKE) stagefeedback-start ; \
+	@[ `cat stage_current` = stagefeedback ] || $(MAKE) stagefeedback-start
 	cd $(HOST_SUBDIR)/gcc && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -11032,6 +11429,7 @@ maybe-check-gcc:
 maybe-check-gcc: check-gcc
 
 check-gcc:
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -11046,6 +11444,7 @@ maybe-install-gcc:
 maybe-install-gcc: install-gcc
 
 install-gcc: installdirs
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -11310,6 +11709,7 @@ maybe-configure-gawk:
 @if gawk
 maybe-configure-gawk: configure-gawk
 configure-gawk: 
+	@$(unstage)
 	@test ! -f $(HOST_SUBDIR)/gawk/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gawk ; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -11339,6 +11739,7 @@ maybe-all-gawk:
 TARGET-gawk=all
 maybe-all-gawk: all-gawk
 all-gawk: configure-gawk
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -11355,6 +11756,7 @@ maybe-check-gawk:
 maybe-check-gawk: check-gawk
 
 check-gawk:
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -11369,6 +11771,7 @@ maybe-install-gawk:
 maybe-install-gawk: install-gawk
 
 install-gawk: installdirs
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -11386,6 +11789,7 @@ maybe-info-gawk: info-gawk
 
 info-gawk: \
     configure-gawk 
+	@$(unstage)
 	@[ -f ./gawk/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -11411,6 +11815,7 @@ maybe-dvi-gawk: dvi-gawk
 
 dvi-gawk: \
     configure-gawk 
+	@$(unstage)
 	@[ -f ./gawk/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -11436,6 +11841,7 @@ maybe-html-gawk: html-gawk
 
 html-gawk: \
     configure-gawk 
+	@$(unstage)
 	@[ -f ./gawk/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -11461,6 +11867,7 @@ maybe-TAGS-gawk: TAGS-gawk
 
 TAGS-gawk: \
     configure-gawk 
+	@$(unstage)
 	@[ -f ./gawk/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -11487,6 +11894,7 @@ maybe-install-info-gawk: install-info-gawk
 install-info-gawk: \
     configure-gawk \
     info-gawk 
+	@$(unstage)
 	@[ -f ./gawk/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -11512,6 +11920,7 @@ maybe-installcheck-gawk: installcheck-gawk
 
 installcheck-gawk: \
     configure-gawk 
+	@$(unstage)
 	@[ -f ./gawk/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -11536,6 +11945,7 @@ maybe-mostlyclean-gawk:
 maybe-mostlyclean-gawk: mostlyclean-gawk
 
 mostlyclean-gawk: 
+	@$(unstage)
 	@[ -f ./gawk/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -11560,6 +11970,7 @@ maybe-clean-gawk:
 maybe-clean-gawk: clean-gawk
 
 clean-gawk: 
+	@$(unstage)
 	@[ -f ./gawk/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -11584,6 +11995,7 @@ maybe-distclean-gawk:
 maybe-distclean-gawk: distclean-gawk
 
 distclean-gawk: 
+	@$(unstage)
 	@[ -f ./gawk/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -11608,6 +12020,7 @@ maybe-maintainer-clean-gawk:
 maybe-maintainer-clean-gawk: maintainer-clean-gawk
 
 maintainer-clean-gawk: 
+	@$(unstage)
 	@[ -f ./gawk/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -11633,6 +12046,7 @@ maybe-configure-gettext:
 @if gettext
 maybe-configure-gettext: configure-gettext
 configure-gettext: 
+	@$(unstage)
 	@test ! -f $(HOST_SUBDIR)/gettext/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gettext ; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -11662,6 +12076,7 @@ maybe-all-gettext:
 TARGET-gettext=all
 maybe-all-gettext: all-gettext
 all-gettext: configure-gettext
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -11678,6 +12093,7 @@ maybe-check-gettext:
 maybe-check-gettext: check-gettext
 
 check-gettext:
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -11692,6 +12108,7 @@ maybe-install-gettext:
 maybe-install-gettext: install-gettext
 
 install-gettext: installdirs
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -11709,6 +12126,7 @@ maybe-info-gettext: info-gettext
 
 info-gettext: \
     configure-gettext 
+	@$(unstage)
 	@[ -f ./gettext/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -11734,6 +12152,7 @@ maybe-dvi-gettext: dvi-gettext
 
 dvi-gettext: \
     configure-gettext 
+	@$(unstage)
 	@[ -f ./gettext/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -11759,6 +12178,7 @@ maybe-html-gettext: html-gettext
 
 html-gettext: \
     configure-gettext 
+	@$(unstage)
 	@[ -f ./gettext/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -11784,6 +12204,7 @@ maybe-TAGS-gettext: TAGS-gettext
 
 TAGS-gettext: \
     configure-gettext 
+	@$(unstage)
 	@[ -f ./gettext/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -11810,6 +12231,7 @@ maybe-install-info-gettext: install-info-gettext
 install-info-gettext: \
     configure-gettext \
     info-gettext 
+	@$(unstage)
 	@[ -f ./gettext/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -11835,6 +12257,7 @@ maybe-installcheck-gettext: installcheck-gettext
 
 installcheck-gettext: \
     configure-gettext 
+	@$(unstage)
 	@[ -f ./gettext/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -11859,6 +12282,7 @@ maybe-mostlyclean-gettext:
 maybe-mostlyclean-gettext: mostlyclean-gettext
 
 mostlyclean-gettext: 
+	@$(unstage)
 	@[ -f ./gettext/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -11883,6 +12307,7 @@ maybe-clean-gettext:
 maybe-clean-gettext: clean-gettext
 
 clean-gettext: 
+	@$(unstage)
 	@[ -f ./gettext/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -11907,6 +12332,7 @@ maybe-distclean-gettext:
 maybe-distclean-gettext: distclean-gettext
 
 distclean-gettext: 
+	@$(unstage)
 	@[ -f ./gettext/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -11931,6 +12357,7 @@ maybe-maintainer-clean-gettext:
 maybe-maintainer-clean-gettext: maintainer-clean-gettext
 
 maintainer-clean-gettext: 
+	@$(unstage)
 	@[ -f ./gettext/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -11956,6 +12383,7 @@ maybe-configure-gnuserv:
 @if gnuserv
 maybe-configure-gnuserv: configure-gnuserv
 configure-gnuserv: 
+	@$(unstage)
 	@test ! -f $(HOST_SUBDIR)/gnuserv/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gnuserv ; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -11985,6 +12413,7 @@ maybe-all-gnuserv:
 TARGET-gnuserv=all
 maybe-all-gnuserv: all-gnuserv
 all-gnuserv: configure-gnuserv
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -12001,6 +12430,7 @@ maybe-check-gnuserv:
 maybe-check-gnuserv: check-gnuserv
 
 check-gnuserv:
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -12015,6 +12445,7 @@ maybe-install-gnuserv:
 maybe-install-gnuserv: install-gnuserv
 
 install-gnuserv: installdirs
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -12032,6 +12463,7 @@ maybe-info-gnuserv: info-gnuserv
 
 info-gnuserv: \
     configure-gnuserv 
+	@$(unstage)
 	@[ -f ./gnuserv/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -12057,6 +12489,7 @@ maybe-dvi-gnuserv: dvi-gnuserv
 
 dvi-gnuserv: \
     configure-gnuserv 
+	@$(unstage)
 	@[ -f ./gnuserv/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -12082,6 +12515,7 @@ maybe-html-gnuserv: html-gnuserv
 
 html-gnuserv: \
     configure-gnuserv 
+	@$(unstage)
 	@[ -f ./gnuserv/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -12107,6 +12541,7 @@ maybe-TAGS-gnuserv: TAGS-gnuserv
 
 TAGS-gnuserv: \
     configure-gnuserv 
+	@$(unstage)
 	@[ -f ./gnuserv/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -12133,6 +12568,7 @@ maybe-install-info-gnuserv: install-info-gnuserv
 install-info-gnuserv: \
     configure-gnuserv \
     info-gnuserv 
+	@$(unstage)
 	@[ -f ./gnuserv/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -12158,6 +12594,7 @@ maybe-installcheck-gnuserv: installcheck-gnuserv
 
 installcheck-gnuserv: \
     configure-gnuserv 
+	@$(unstage)
 	@[ -f ./gnuserv/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -12182,6 +12619,7 @@ maybe-mostlyclean-gnuserv:
 maybe-mostlyclean-gnuserv: mostlyclean-gnuserv
 
 mostlyclean-gnuserv: 
+	@$(unstage)
 	@[ -f ./gnuserv/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -12206,6 +12644,7 @@ maybe-clean-gnuserv:
 maybe-clean-gnuserv: clean-gnuserv
 
 clean-gnuserv: 
+	@$(unstage)
 	@[ -f ./gnuserv/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -12230,6 +12669,7 @@ maybe-distclean-gnuserv:
 maybe-distclean-gnuserv: distclean-gnuserv
 
 distclean-gnuserv: 
+	@$(unstage)
 	@[ -f ./gnuserv/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -12254,6 +12694,7 @@ maybe-maintainer-clean-gnuserv:
 maybe-maintainer-clean-gnuserv: maintainer-clean-gnuserv
 
 maintainer-clean-gnuserv: 
+	@$(unstage)
 	@[ -f ./gnuserv/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -12279,6 +12720,7 @@ maybe-configure-gprof:
 @if gprof
 maybe-configure-gprof: configure-gprof
 configure-gprof: 
+	@$(unstage)
 	@test ! -f $(HOST_SUBDIR)/gprof/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gprof ; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -12308,6 +12750,7 @@ maybe-all-gprof:
 TARGET-gprof=all
 maybe-all-gprof: all-gprof
 all-gprof: configure-gprof
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -12324,6 +12767,7 @@ maybe-check-gprof:
 maybe-check-gprof: check-gprof
 
 check-gprof:
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -12338,6 +12782,7 @@ maybe-install-gprof:
 maybe-install-gprof: install-gprof
 
 install-gprof: installdirs
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -12355,6 +12800,7 @@ maybe-info-gprof: info-gprof
 
 info-gprof: \
     configure-gprof 
+	@$(unstage)
 	@[ -f ./gprof/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -12380,6 +12826,7 @@ maybe-dvi-gprof: dvi-gprof
 
 dvi-gprof: \
     configure-gprof 
+	@$(unstage)
 	@[ -f ./gprof/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -12405,6 +12852,7 @@ maybe-html-gprof: html-gprof
 
 html-gprof: \
     configure-gprof 
+	@$(unstage)
 	@[ -f ./gprof/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -12430,6 +12878,7 @@ maybe-TAGS-gprof: TAGS-gprof
 
 TAGS-gprof: \
     configure-gprof 
+	@$(unstage)
 	@[ -f ./gprof/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -12456,6 +12905,7 @@ maybe-install-info-gprof: install-info-gprof
 install-info-gprof: \
     configure-gprof \
     info-gprof 
+	@$(unstage)
 	@[ -f ./gprof/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -12481,6 +12931,7 @@ maybe-installcheck-gprof: installcheck-gprof
 
 installcheck-gprof: \
     configure-gprof 
+	@$(unstage)
 	@[ -f ./gprof/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -12505,6 +12956,7 @@ maybe-mostlyclean-gprof:
 maybe-mostlyclean-gprof: mostlyclean-gprof
 
 mostlyclean-gprof: 
+	@$(unstage)
 	@[ -f ./gprof/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -12529,6 +12981,7 @@ maybe-clean-gprof:
 maybe-clean-gprof: clean-gprof
 
 clean-gprof: 
+	@$(unstage)
 	@[ -f ./gprof/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -12553,6 +13006,7 @@ maybe-distclean-gprof:
 maybe-distclean-gprof: distclean-gprof
 
 distclean-gprof: 
+	@$(unstage)
 	@[ -f ./gprof/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -12577,6 +13031,7 @@ maybe-maintainer-clean-gprof:
 maybe-maintainer-clean-gprof: maintainer-clean-gprof
 
 maintainer-clean-gprof: 
+	@$(unstage)
 	@[ -f ./gprof/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -12602,6 +13057,7 @@ maybe-configure-gzip:
 @if gzip
 maybe-configure-gzip: configure-gzip
 configure-gzip: 
+	@$(unstage)
 	@test ! -f $(HOST_SUBDIR)/gzip/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gzip ; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -12631,6 +13087,7 @@ maybe-all-gzip:
 TARGET-gzip=all
 maybe-all-gzip: all-gzip
 all-gzip: configure-gzip
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -12647,6 +13104,7 @@ maybe-check-gzip:
 maybe-check-gzip: check-gzip
 
 check-gzip:
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -12661,6 +13119,7 @@ maybe-install-gzip:
 maybe-install-gzip: install-gzip
 
 install-gzip: installdirs
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -12678,6 +13137,7 @@ maybe-info-gzip: info-gzip
 
 info-gzip: \
     configure-gzip 
+	@$(unstage)
 	@[ -f ./gzip/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -12703,6 +13163,7 @@ maybe-dvi-gzip: dvi-gzip
 
 dvi-gzip: \
     configure-gzip 
+	@$(unstage)
 	@[ -f ./gzip/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -12728,6 +13189,7 @@ maybe-html-gzip: html-gzip
 
 html-gzip: \
     configure-gzip 
+	@$(unstage)
 	@[ -f ./gzip/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -12753,6 +13215,7 @@ maybe-TAGS-gzip: TAGS-gzip
 
 TAGS-gzip: \
     configure-gzip 
+	@$(unstage)
 	@[ -f ./gzip/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -12779,6 +13242,7 @@ maybe-install-info-gzip: install-info-gzip
 install-info-gzip: \
     configure-gzip \
     info-gzip 
+	@$(unstage)
 	@[ -f ./gzip/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -12804,6 +13268,7 @@ maybe-installcheck-gzip: installcheck-gzip
 
 installcheck-gzip: \
     configure-gzip 
+	@$(unstage)
 	@[ -f ./gzip/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -12828,6 +13293,7 @@ maybe-mostlyclean-gzip:
 maybe-mostlyclean-gzip: mostlyclean-gzip
 
 mostlyclean-gzip: 
+	@$(unstage)
 	@[ -f ./gzip/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -12852,6 +13318,7 @@ maybe-clean-gzip:
 maybe-clean-gzip: clean-gzip
 
 clean-gzip: 
+	@$(unstage)
 	@[ -f ./gzip/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -12876,6 +13343,7 @@ maybe-distclean-gzip:
 maybe-distclean-gzip: distclean-gzip
 
 distclean-gzip: 
+	@$(unstage)
 	@[ -f ./gzip/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -12900,6 +13368,7 @@ maybe-maintainer-clean-gzip:
 maybe-maintainer-clean-gzip: maintainer-clean-gzip
 
 maintainer-clean-gzip: 
+	@$(unstage)
 	@[ -f ./gzip/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -12925,6 +13394,7 @@ maybe-configure-hello:
 @if hello
 maybe-configure-hello: configure-hello
 configure-hello: 
+	@$(unstage)
 	@test ! -f $(HOST_SUBDIR)/hello/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/hello ; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -12954,6 +13424,7 @@ maybe-all-hello:
 TARGET-hello=all
 maybe-all-hello: all-hello
 all-hello: configure-hello
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -12970,6 +13441,7 @@ maybe-check-hello:
 maybe-check-hello: check-hello
 
 check-hello:
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -12984,6 +13456,7 @@ maybe-install-hello:
 maybe-install-hello: install-hello
 
 install-hello: installdirs
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -13001,6 +13474,7 @@ maybe-info-hello: info-hello
 
 info-hello: \
     configure-hello 
+	@$(unstage)
 	@[ -f ./hello/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -13026,6 +13500,7 @@ maybe-dvi-hello: dvi-hello
 
 dvi-hello: \
     configure-hello 
+	@$(unstage)
 	@[ -f ./hello/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -13051,6 +13526,7 @@ maybe-html-hello: html-hello
 
 html-hello: \
     configure-hello 
+	@$(unstage)
 	@[ -f ./hello/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -13076,6 +13552,7 @@ maybe-TAGS-hello: TAGS-hello
 
 TAGS-hello: \
     configure-hello 
+	@$(unstage)
 	@[ -f ./hello/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -13102,6 +13579,7 @@ maybe-install-info-hello: install-info-hello
 install-info-hello: \
     configure-hello \
     info-hello 
+	@$(unstage)
 	@[ -f ./hello/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -13127,6 +13605,7 @@ maybe-installcheck-hello: installcheck-hello
 
 installcheck-hello: \
     configure-hello 
+	@$(unstage)
 	@[ -f ./hello/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -13151,6 +13630,7 @@ maybe-mostlyclean-hello:
 maybe-mostlyclean-hello: mostlyclean-hello
 
 mostlyclean-hello: 
+	@$(unstage)
 	@[ -f ./hello/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -13175,6 +13655,7 @@ maybe-clean-hello:
 maybe-clean-hello: clean-hello
 
 clean-hello: 
+	@$(unstage)
 	@[ -f ./hello/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -13199,6 +13680,7 @@ maybe-distclean-hello:
 maybe-distclean-hello: distclean-hello
 
 distclean-hello: 
+	@$(unstage)
 	@[ -f ./hello/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -13223,6 +13705,7 @@ maybe-maintainer-clean-hello:
 maybe-maintainer-clean-hello: maintainer-clean-hello
 
 maintainer-clean-hello: 
+	@$(unstage)
 	@[ -f ./hello/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -13248,6 +13731,7 @@ maybe-configure-indent:
 @if indent
 maybe-configure-indent: configure-indent
 configure-indent: 
+	@$(unstage)
 	@test ! -f $(HOST_SUBDIR)/indent/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/indent ; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -13277,6 +13761,7 @@ maybe-all-indent:
 TARGET-indent=all
 maybe-all-indent: all-indent
 all-indent: configure-indent
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -13293,6 +13778,7 @@ maybe-check-indent:
 maybe-check-indent: check-indent
 
 check-indent:
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -13307,6 +13793,7 @@ maybe-install-indent:
 maybe-install-indent: install-indent
 
 install-indent: installdirs
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -13324,6 +13811,7 @@ maybe-info-indent: info-indent
 
 info-indent: \
     configure-indent 
+	@$(unstage)
 	@[ -f ./indent/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -13349,6 +13837,7 @@ maybe-dvi-indent: dvi-indent
 
 dvi-indent: \
     configure-indent 
+	@$(unstage)
 	@[ -f ./indent/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -13374,6 +13863,7 @@ maybe-html-indent: html-indent
 
 html-indent: \
     configure-indent 
+	@$(unstage)
 	@[ -f ./indent/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -13399,6 +13889,7 @@ maybe-TAGS-indent: TAGS-indent
 
 TAGS-indent: \
     configure-indent 
+	@$(unstage)
 	@[ -f ./indent/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -13425,6 +13916,7 @@ maybe-install-info-indent: install-info-indent
 install-info-indent: \
     configure-indent \
     info-indent 
+	@$(unstage)
 	@[ -f ./indent/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -13450,6 +13942,7 @@ maybe-installcheck-indent: installcheck-indent
 
 installcheck-indent: \
     configure-indent 
+	@$(unstage)
 	@[ -f ./indent/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -13474,6 +13967,7 @@ maybe-mostlyclean-indent:
 maybe-mostlyclean-indent: mostlyclean-indent
 
 mostlyclean-indent: 
+	@$(unstage)
 	@[ -f ./indent/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -13498,6 +13992,7 @@ maybe-clean-indent:
 maybe-clean-indent: clean-indent
 
 clean-indent: 
+	@$(unstage)
 	@[ -f ./indent/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -13522,6 +14017,7 @@ maybe-distclean-indent:
 maybe-distclean-indent: distclean-indent
 
 distclean-indent: 
+	@$(unstage)
 	@[ -f ./indent/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -13546,6 +14042,7 @@ maybe-maintainer-clean-indent:
 maybe-maintainer-clean-indent: maintainer-clean-indent
 
 maintainer-clean-indent: 
+	@$(unstage)
 	@[ -f ./indent/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -13598,7 +14095,7 @@ maybe-configure-stage1-intl:
 @if intl-bootstrap
 maybe-configure-stage1-intl: configure-stage1-intl
 configure-stage1-intl: 
-	@$(MAKE) stage1-start
+	@[ `cat stage_current` = stage1 ] || $(MAKE) stage1-start
 	@[ -f $(HOST_SUBDIR)/intl/Makefile ] && exit 0 || : ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -13622,7 +14119,7 @@ maybe-configure-stage2-intl:
 @if intl-bootstrap
 maybe-configure-stage2-intl: configure-stage2-intl
 configure-stage2-intl: 
-	@$(MAKE) stage2-start
+	@[ `cat stage_current` = stage2 ] || $(MAKE) stage2-start
 	@[ -f $(HOST_SUBDIR)/intl/Makefile ] && exit 0 || : ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -13647,7 +14144,7 @@ maybe-configure-stage3-intl:
 @if intl-bootstrap
 maybe-configure-stage3-intl: configure-stage3-intl
 configure-stage3-intl: 
-	@$(MAKE) stage3-start
+	@[ `cat stage_current` = stage3 ] || $(MAKE) stage3-start
 	@[ -f $(HOST_SUBDIR)/intl/Makefile ] && exit 0 || : ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -13672,7 +14169,7 @@ maybe-configure-stage4-intl:
 @if intl-bootstrap
 maybe-configure-stage4-intl: configure-stage4-intl
 configure-stage4-intl: 
-	@$(MAKE) stage4-start
+	@[ `cat stage_current` = stage4 ] || $(MAKE) stage4-start
 	@[ -f $(HOST_SUBDIR)/intl/Makefile ] && exit 0 || : ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -13697,7 +14194,7 @@ maybe-configure-stageprofile-intl:
 @if intl-bootstrap
 maybe-configure-stageprofile-intl: configure-stageprofile-intl
 configure-stageprofile-intl: 
-	@$(MAKE) stageprofile-start
+	@[ `cat stage_current` = stageprofile ] || $(MAKE) stageprofile-start
 	@[ -f $(HOST_SUBDIR)/intl/Makefile ] && exit 0 || : ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -13722,7 +14219,7 @@ maybe-configure-stagefeedback-intl:
 @if intl-bootstrap
 maybe-configure-stagefeedback-intl: configure-stagefeedback-intl
 configure-stagefeedback-intl: 
-	@$(MAKE) stagefeedback-start
+	@[ `cat stage_current` = stagefeedback ] || $(MAKE) stagefeedback-start
 	@[ -f $(HOST_SUBDIR)/intl/Makefile ] && exit 0 || : ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -13769,20 +14266,22 @@ maybe-clean-stage1-intl:
 @if intl-bootstrap
 maybe-all-stage1-intl: all-stage1-intl
 all-stage1: all-stage1-intl
+TARGET-stage1-intl = $(TARGET-intl)
 all-stage1-intl: configure-stage1-intl
-	@$(MAKE) stage1-start
+	@[ `cat stage_current` = stage1 ] || $(MAKE) stage1-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/intl && \
-	$(MAKE) $(FLAGS_TO_PASS)  CFLAGS="$(STAGE1_CFLAGS)" 
+	$(MAKE) $(FLAGS_TO_PASS)  CFLAGS="$(STAGE1_CFLAGS)"  \
+		$(TARGET-stage1-intl)
 
 maybe-clean-stage1-intl: clean-stage1-intl
 clean-stage1: clean-stage1-intl
 clean-stage1-intl:
 	@[ -f $(HOST_SUBDIR)/intl/Makefile ] || [ -f $(HOST_SUBDIR)/stage1-intl/Makefile ] \
 	  || exit 0 ; \
-	[ -f $(HOST_SUBDIR)/intl/Makefile ] || $(MAKE) stage1-start ; \
+	@[ `cat stage_current` = stage1 ] || $(MAKE) stage1-start
 	cd $(HOST_SUBDIR)/intl && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		CFLAGS="$(STAGE1_CFLAGS)"  clean
@@ -13796,21 +14295,23 @@ maybe-clean-stage2-intl:
 @if intl-bootstrap
 maybe-all-stage2-intl: all-stage2-intl
 all-stage2: all-stage2-intl
+TARGET-stage2-intl = $(TARGET-intl)
 all-stage2-intl: configure-stage2-intl
-	@$(MAKE) stage2-start
+	@[ `cat stage_current` = stage2 ] || $(MAKE) stage2-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/intl && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)  
+	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)   \
+		$(TARGET-stage2-intl)
 
 maybe-clean-stage2-intl: clean-stage2-intl
 clean-stage2: clean-stage2-intl
 clean-stage2-intl:
 	@[ -f $(HOST_SUBDIR)/intl/Makefile ] || [ -f $(HOST_SUBDIR)/stage2-intl/Makefile ] \
 	  || exit 0 ; \
-	[ -f $(HOST_SUBDIR)/intl/Makefile ] || $(MAKE) stage2-start ; \
+	@[ `cat stage_current` = stage2 ] || $(MAKE) stage2-start
 	cd $(HOST_SUBDIR)/intl && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -13825,21 +14326,23 @@ maybe-clean-stage3-intl:
 @if intl-bootstrap
 maybe-all-stage3-intl: all-stage3-intl
 all-stage3: all-stage3-intl
+TARGET-stage3-intl = $(TARGET-intl)
 all-stage3-intl: configure-stage3-intl
-	@$(MAKE) stage3-start
+	@[ `cat stage_current` = stage3 ] || $(MAKE) stage3-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/intl && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)  
+	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)   \
+		$(TARGET-stage3-intl)
 
 maybe-clean-stage3-intl: clean-stage3-intl
 clean-stage3: clean-stage3-intl
 clean-stage3-intl:
 	@[ -f $(HOST_SUBDIR)/intl/Makefile ] || [ -f $(HOST_SUBDIR)/stage3-intl/Makefile ] \
 	  || exit 0 ; \
-	[ -f $(HOST_SUBDIR)/intl/Makefile ] || $(MAKE) stage3-start ; \
+	@[ `cat stage_current` = stage3 ] || $(MAKE) stage3-start
 	cd $(HOST_SUBDIR)/intl && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -13854,21 +14357,23 @@ maybe-clean-stage4-intl:
 @if intl-bootstrap
 maybe-all-stage4-intl: all-stage4-intl
 all-stage4: all-stage4-intl
+TARGET-stage4-intl = $(TARGET-intl)
 all-stage4-intl: configure-stage4-intl
-	@$(MAKE) stage4-start
+	@[ `cat stage_current` = stage4 ] || $(MAKE) stage4-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/intl && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)  
+	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)   \
+		$(TARGET-stage4-intl)
 
 maybe-clean-stage4-intl: clean-stage4-intl
 clean-stage4: clean-stage4-intl
 clean-stage4-intl:
 	@[ -f $(HOST_SUBDIR)/intl/Makefile ] || [ -f $(HOST_SUBDIR)/stage4-intl/Makefile ] \
 	  || exit 0 ; \
-	[ -f $(HOST_SUBDIR)/intl/Makefile ] || $(MAKE) stage4-start ; \
+	@[ `cat stage_current` = stage4 ] || $(MAKE) stage4-start
 	cd $(HOST_SUBDIR)/intl && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -13883,21 +14388,23 @@ maybe-clean-stageprofile-intl:
 @if intl-bootstrap
 maybe-all-stageprofile-intl: all-stageprofile-intl
 all-stageprofile: all-stageprofile-intl
+TARGET-stageprofile-intl = $(TARGET-intl)
 all-stageprofile-intl: configure-stageprofile-intl
-	@$(MAKE) stageprofile-start
+	@[ `cat stage_current` = stageprofile ] || $(MAKE) stageprofile-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/intl && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" 
+	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-generate"  \
+		$(TARGET-stageprofile-intl)
 
 maybe-clean-stageprofile-intl: clean-stageprofile-intl
 clean-stageprofile: clean-stageprofile-intl
 clean-stageprofile-intl:
 	@[ -f $(HOST_SUBDIR)/intl/Makefile ] || [ -f $(HOST_SUBDIR)/stageprofile-intl/Makefile ] \
 	  || exit 0 ; \
-	[ -f $(HOST_SUBDIR)/intl/Makefile ] || $(MAKE) stageprofile-start ; \
+	@[ `cat stage_current` = stageprofile ] || $(MAKE) stageprofile-start
 	cd $(HOST_SUBDIR)/intl && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -13912,21 +14419,23 @@ maybe-clean-stagefeedback-intl:
 @if intl-bootstrap
 maybe-all-stagefeedback-intl: all-stagefeedback-intl
 all-stagefeedback: all-stagefeedback-intl
+TARGET-stagefeedback-intl = $(TARGET-intl)
 all-stagefeedback-intl: configure-stagefeedback-intl
-	@$(MAKE) stagefeedback-start
+	@[ `cat stage_current` = stagefeedback ] || $(MAKE) stagefeedback-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/intl && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-use" 
+	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-use"  \
+		$(TARGET-stagefeedback-intl)
 
 maybe-clean-stagefeedback-intl: clean-stagefeedback-intl
 clean-stagefeedback: clean-stagefeedback-intl
 clean-stagefeedback-intl:
 	@[ -f $(HOST_SUBDIR)/intl/Makefile ] || [ -f $(HOST_SUBDIR)/stagefeedback-intl/Makefile ] \
 	  || exit 0 ; \
-	[ -f $(HOST_SUBDIR)/intl/Makefile ] || $(MAKE) stagefeedback-start ; \
+	@[ `cat stage_current` = stagefeedback ] || $(MAKE) stagefeedback-start
 	cd $(HOST_SUBDIR)/intl && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -13943,6 +14452,7 @@ maybe-check-intl:
 maybe-check-intl: check-intl
 
 check-intl:
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -13957,6 +14467,7 @@ maybe-install-intl:
 maybe-install-intl: install-intl
 
 install-intl: installdirs
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -14221,6 +14732,7 @@ maybe-configure-tcl:
 @if tcl
 maybe-configure-tcl: configure-tcl
 configure-tcl: 
+	@$(unstage)
 	@test ! -f $(HOST_SUBDIR)/tcl/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/tcl ; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -14250,6 +14762,7 @@ maybe-all-tcl:
 TARGET-tcl=all
 maybe-all-tcl: all-tcl
 all-tcl: configure-tcl
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -14266,6 +14779,7 @@ maybe-check-tcl:
 maybe-check-tcl: check-tcl
 
 check-tcl:
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -14280,6 +14794,7 @@ maybe-install-tcl:
 maybe-install-tcl: install-tcl
 
 install-tcl: installdirs
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -14297,6 +14812,7 @@ maybe-info-tcl: info-tcl
 
 info-tcl: \
     configure-tcl 
+	@$(unstage)
 	@[ -f ./tcl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -14322,6 +14838,7 @@ maybe-dvi-tcl: dvi-tcl
 
 dvi-tcl: \
     configure-tcl 
+	@$(unstage)
 	@[ -f ./tcl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -14347,6 +14864,7 @@ maybe-html-tcl: html-tcl
 
 html-tcl: \
     configure-tcl 
+	@$(unstage)
 	@[ -f ./tcl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -14372,6 +14890,7 @@ maybe-TAGS-tcl: TAGS-tcl
 
 TAGS-tcl: \
     configure-tcl 
+	@$(unstage)
 	@[ -f ./tcl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -14398,6 +14917,7 @@ maybe-install-info-tcl: install-info-tcl
 install-info-tcl: \
     configure-tcl \
     info-tcl 
+	@$(unstage)
 	@[ -f ./tcl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -14423,6 +14943,7 @@ maybe-installcheck-tcl: installcheck-tcl
 
 installcheck-tcl: \
     configure-tcl 
+	@$(unstage)
 	@[ -f ./tcl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -14457,6 +14978,7 @@ maybe-clean-tcl:
 maybe-clean-tcl: clean-tcl
 
 clean-tcl: 
+	@$(unstage)
 	@[ -f ./tcl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -14481,6 +15003,7 @@ maybe-distclean-tcl:
 maybe-distclean-tcl: distclean-tcl
 
 distclean-tcl: 
+	@$(unstage)
 	@[ -f ./tcl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -14505,6 +15028,7 @@ maybe-maintainer-clean-tcl:
 maybe-maintainer-clean-tcl: maintainer-clean-tcl
 
 maintainer-clean-tcl: 
+	@$(unstage)
 	@[ -f ./tcl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -14530,6 +15054,7 @@ maybe-configure-itcl:
 @if itcl
 maybe-configure-itcl: configure-itcl
 configure-itcl: 
+	@$(unstage)
 	@test ! -f $(HOST_SUBDIR)/itcl/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/itcl ; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -14559,6 +15084,7 @@ maybe-all-itcl:
 TARGET-itcl=all
 maybe-all-itcl: all-itcl
 all-itcl: configure-itcl
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -14575,6 +15101,7 @@ maybe-check-itcl:
 maybe-check-itcl: check-itcl
 
 check-itcl:
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -14589,6 +15116,7 @@ maybe-install-itcl:
 maybe-install-itcl: install-itcl
 
 install-itcl: installdirs
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -14606,6 +15134,7 @@ maybe-info-itcl: info-itcl
 
 info-itcl: \
     configure-itcl 
+	@$(unstage)
 	@[ -f ./itcl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -14631,6 +15160,7 @@ maybe-dvi-itcl: dvi-itcl
 
 dvi-itcl: \
     configure-itcl 
+	@$(unstage)
 	@[ -f ./itcl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -14656,6 +15186,7 @@ maybe-html-itcl: html-itcl
 
 html-itcl: \
     configure-itcl 
+	@$(unstage)
 	@[ -f ./itcl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -14681,6 +15212,7 @@ maybe-TAGS-itcl: TAGS-itcl
 
 TAGS-itcl: \
     configure-itcl 
+	@$(unstage)
 	@[ -f ./itcl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -14707,6 +15239,7 @@ maybe-install-info-itcl: install-info-itcl
 install-info-itcl: \
     configure-itcl \
     info-itcl 
+	@$(unstage)
 	@[ -f ./itcl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -14732,6 +15265,7 @@ maybe-installcheck-itcl: installcheck-itcl
 
 installcheck-itcl: \
     configure-itcl 
+	@$(unstage)
 	@[ -f ./itcl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -14756,6 +15290,7 @@ maybe-mostlyclean-itcl:
 maybe-mostlyclean-itcl: mostlyclean-itcl
 
 mostlyclean-itcl: 
+	@$(unstage)
 	@[ -f ./itcl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -14780,6 +15315,7 @@ maybe-clean-itcl:
 maybe-clean-itcl: clean-itcl
 
 clean-itcl: 
+	@$(unstage)
 	@[ -f ./itcl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -14804,6 +15340,7 @@ maybe-distclean-itcl:
 maybe-distclean-itcl: distclean-itcl
 
 distclean-itcl: 
+	@$(unstage)
 	@[ -f ./itcl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -14828,6 +15365,7 @@ maybe-maintainer-clean-itcl:
 maybe-maintainer-clean-itcl: maintainer-clean-itcl
 
 maintainer-clean-itcl: 
+	@$(unstage)
 	@[ -f ./itcl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -14880,7 +15418,7 @@ maybe-configure-stage1-ld:
 @if ld-bootstrap
 maybe-configure-stage1-ld: configure-stage1-ld
 configure-stage1-ld: 
-	@$(MAKE) stage1-start
+	@[ `cat stage_current` = stage1 ] || $(MAKE) stage1-start
 	@[ -f $(HOST_SUBDIR)/ld/Makefile ] && exit 0 || : ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -14904,7 +15442,7 @@ maybe-configure-stage2-ld:
 @if ld-bootstrap
 maybe-configure-stage2-ld: configure-stage2-ld
 configure-stage2-ld: 
-	@$(MAKE) stage2-start
+	@[ `cat stage_current` = stage2 ] || $(MAKE) stage2-start
 	@[ -f $(HOST_SUBDIR)/ld/Makefile ] && exit 0 || : ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -14929,7 +15467,7 @@ maybe-configure-stage3-ld:
 @if ld-bootstrap
 maybe-configure-stage3-ld: configure-stage3-ld
 configure-stage3-ld: 
-	@$(MAKE) stage3-start
+	@[ `cat stage_current` = stage3 ] || $(MAKE) stage3-start
 	@[ -f $(HOST_SUBDIR)/ld/Makefile ] && exit 0 || : ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -14954,7 +15492,7 @@ maybe-configure-stage4-ld:
 @if ld-bootstrap
 maybe-configure-stage4-ld: configure-stage4-ld
 configure-stage4-ld: 
-	@$(MAKE) stage4-start
+	@[ `cat stage_current` = stage4 ] || $(MAKE) stage4-start
 	@[ -f $(HOST_SUBDIR)/ld/Makefile ] && exit 0 || : ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -14979,7 +15517,7 @@ maybe-configure-stageprofile-ld:
 @if ld-bootstrap
 maybe-configure-stageprofile-ld: configure-stageprofile-ld
 configure-stageprofile-ld: 
-	@$(MAKE) stageprofile-start
+	@[ `cat stage_current` = stageprofile ] || $(MAKE) stageprofile-start
 	@[ -f $(HOST_SUBDIR)/ld/Makefile ] && exit 0 || : ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -15004,7 +15542,7 @@ maybe-configure-stagefeedback-ld:
 @if ld-bootstrap
 maybe-configure-stagefeedback-ld: configure-stagefeedback-ld
 configure-stagefeedback-ld: 
-	@$(MAKE) stagefeedback-start
+	@[ `cat stage_current` = stagefeedback ] || $(MAKE) stagefeedback-start
 	@[ -f $(HOST_SUBDIR)/ld/Makefile ] && exit 0 || : ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -15051,20 +15589,22 @@ maybe-clean-stage1-ld:
 @if ld-bootstrap
 maybe-all-stage1-ld: all-stage1-ld
 all-stage1: all-stage1-ld
+TARGET-stage1-ld = $(TARGET-ld)
 all-stage1-ld: configure-stage1-ld
-	@$(MAKE) stage1-start
+	@[ `cat stage_current` = stage1 ] || $(MAKE) stage1-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/ld && \
-	$(MAKE) $(FLAGS_TO_PASS)  CFLAGS="$(STAGE1_CFLAGS)" 
+	$(MAKE) $(FLAGS_TO_PASS)  CFLAGS="$(STAGE1_CFLAGS)"  \
+		$(TARGET-stage1-ld)
 
 maybe-clean-stage1-ld: clean-stage1-ld
 clean-stage1: clean-stage1-ld
 clean-stage1-ld:
 	@[ -f $(HOST_SUBDIR)/ld/Makefile ] || [ -f $(HOST_SUBDIR)/stage1-ld/Makefile ] \
 	  || exit 0 ; \
-	[ -f $(HOST_SUBDIR)/ld/Makefile ] || $(MAKE) stage1-start ; \
+	@[ `cat stage_current` = stage1 ] || $(MAKE) stage1-start
 	cd $(HOST_SUBDIR)/ld && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		CFLAGS="$(STAGE1_CFLAGS)"  clean
@@ -15078,21 +15618,23 @@ maybe-clean-stage2-ld:
 @if ld-bootstrap
 maybe-all-stage2-ld: all-stage2-ld
 all-stage2: all-stage2-ld
+TARGET-stage2-ld = $(TARGET-ld)
 all-stage2-ld: configure-stage2-ld
-	@$(MAKE) stage2-start
+	@[ `cat stage_current` = stage2 ] || $(MAKE) stage2-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/ld && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)  
+	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)   \
+		$(TARGET-stage2-ld)
 
 maybe-clean-stage2-ld: clean-stage2-ld
 clean-stage2: clean-stage2-ld
 clean-stage2-ld:
 	@[ -f $(HOST_SUBDIR)/ld/Makefile ] || [ -f $(HOST_SUBDIR)/stage2-ld/Makefile ] \
 	  || exit 0 ; \
-	[ -f $(HOST_SUBDIR)/ld/Makefile ] || $(MAKE) stage2-start ; \
+	@[ `cat stage_current` = stage2 ] || $(MAKE) stage2-start
 	cd $(HOST_SUBDIR)/ld && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -15107,21 +15649,23 @@ maybe-clean-stage3-ld:
 @if ld-bootstrap
 maybe-all-stage3-ld: all-stage3-ld
 all-stage3: all-stage3-ld
+TARGET-stage3-ld = $(TARGET-ld)
 all-stage3-ld: configure-stage3-ld
-	@$(MAKE) stage3-start
+	@[ `cat stage_current` = stage3 ] || $(MAKE) stage3-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/ld && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)  
+	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)   \
+		$(TARGET-stage3-ld)
 
 maybe-clean-stage3-ld: clean-stage3-ld
 clean-stage3: clean-stage3-ld
 clean-stage3-ld:
 	@[ -f $(HOST_SUBDIR)/ld/Makefile ] || [ -f $(HOST_SUBDIR)/stage3-ld/Makefile ] \
 	  || exit 0 ; \
-	[ -f $(HOST_SUBDIR)/ld/Makefile ] || $(MAKE) stage3-start ; \
+	@[ `cat stage_current` = stage3 ] || $(MAKE) stage3-start
 	cd $(HOST_SUBDIR)/ld && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -15136,21 +15680,23 @@ maybe-clean-stage4-ld:
 @if ld-bootstrap
 maybe-all-stage4-ld: all-stage4-ld
 all-stage4: all-stage4-ld
+TARGET-stage4-ld = $(TARGET-ld)
 all-stage4-ld: configure-stage4-ld
-	@$(MAKE) stage4-start
+	@[ `cat stage_current` = stage4 ] || $(MAKE) stage4-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/ld && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)  
+	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)   \
+		$(TARGET-stage4-ld)
 
 maybe-clean-stage4-ld: clean-stage4-ld
 clean-stage4: clean-stage4-ld
 clean-stage4-ld:
 	@[ -f $(HOST_SUBDIR)/ld/Makefile ] || [ -f $(HOST_SUBDIR)/stage4-ld/Makefile ] \
 	  || exit 0 ; \
-	[ -f $(HOST_SUBDIR)/ld/Makefile ] || $(MAKE) stage4-start ; \
+	@[ `cat stage_current` = stage4 ] || $(MAKE) stage4-start
 	cd $(HOST_SUBDIR)/ld && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -15165,21 +15711,23 @@ maybe-clean-stageprofile-ld:
 @if ld-bootstrap
 maybe-all-stageprofile-ld: all-stageprofile-ld
 all-stageprofile: all-stageprofile-ld
+TARGET-stageprofile-ld = $(TARGET-ld)
 all-stageprofile-ld: configure-stageprofile-ld
-	@$(MAKE) stageprofile-start
+	@[ `cat stage_current` = stageprofile ] || $(MAKE) stageprofile-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/ld && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" 
+	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-generate"  \
+		$(TARGET-stageprofile-ld)
 
 maybe-clean-stageprofile-ld: clean-stageprofile-ld
 clean-stageprofile: clean-stageprofile-ld
 clean-stageprofile-ld:
 	@[ -f $(HOST_SUBDIR)/ld/Makefile ] || [ -f $(HOST_SUBDIR)/stageprofile-ld/Makefile ] \
 	  || exit 0 ; \
-	[ -f $(HOST_SUBDIR)/ld/Makefile ] || $(MAKE) stageprofile-start ; \
+	@[ `cat stage_current` = stageprofile ] || $(MAKE) stageprofile-start
 	cd $(HOST_SUBDIR)/ld && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -15194,21 +15742,23 @@ maybe-clean-stagefeedback-ld:
 @if ld-bootstrap
 maybe-all-stagefeedback-ld: all-stagefeedback-ld
 all-stagefeedback: all-stagefeedback-ld
+TARGET-stagefeedback-ld = $(TARGET-ld)
 all-stagefeedback-ld: configure-stagefeedback-ld
-	@$(MAKE) stagefeedback-start
+	@[ `cat stage_current` = stagefeedback ] || $(MAKE) stagefeedback-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/ld && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-use" 
+	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-use"  \
+		$(TARGET-stagefeedback-ld)
 
 maybe-clean-stagefeedback-ld: clean-stagefeedback-ld
 clean-stagefeedback: clean-stagefeedback-ld
 clean-stagefeedback-ld:
 	@[ -f $(HOST_SUBDIR)/ld/Makefile ] || [ -f $(HOST_SUBDIR)/stagefeedback-ld/Makefile ] \
 	  || exit 0 ; \
-	[ -f $(HOST_SUBDIR)/ld/Makefile ] || $(MAKE) stagefeedback-start ; \
+	@[ `cat stage_current` = stagefeedback ] || $(MAKE) stagefeedback-start
 	cd $(HOST_SUBDIR)/ld && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -15225,6 +15775,7 @@ maybe-check-ld:
 maybe-check-ld: check-ld
 
 check-ld:
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -15239,6 +15790,7 @@ maybe-install-ld:
 maybe-install-ld: install-ld
 
 install-ld: installdirs
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -15530,7 +16082,7 @@ maybe-configure-stage1-libcpp:
 @if libcpp-bootstrap
 maybe-configure-stage1-libcpp: configure-stage1-libcpp
 configure-stage1-libcpp: 
-	@$(MAKE) stage1-start
+	@[ `cat stage_current` = stage1 ] || $(MAKE) stage1-start
 	@[ -f $(HOST_SUBDIR)/libcpp/Makefile ] && exit 0 || : ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -15554,7 +16106,7 @@ maybe-configure-stage2-libcpp:
 @if libcpp-bootstrap
 maybe-configure-stage2-libcpp: configure-stage2-libcpp
 configure-stage2-libcpp: 
-	@$(MAKE) stage2-start
+	@[ `cat stage_current` = stage2 ] || $(MAKE) stage2-start
 	@[ -f $(HOST_SUBDIR)/libcpp/Makefile ] && exit 0 || : ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -15579,7 +16131,7 @@ maybe-configure-stage3-libcpp:
 @if libcpp-bootstrap
 maybe-configure-stage3-libcpp: configure-stage3-libcpp
 configure-stage3-libcpp: 
-	@$(MAKE) stage3-start
+	@[ `cat stage_current` = stage3 ] || $(MAKE) stage3-start
 	@[ -f $(HOST_SUBDIR)/libcpp/Makefile ] && exit 0 || : ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -15604,7 +16156,7 @@ maybe-configure-stage4-libcpp:
 @if libcpp-bootstrap
 maybe-configure-stage4-libcpp: configure-stage4-libcpp
 configure-stage4-libcpp: 
-	@$(MAKE) stage4-start
+	@[ `cat stage_current` = stage4 ] || $(MAKE) stage4-start
 	@[ -f $(HOST_SUBDIR)/libcpp/Makefile ] && exit 0 || : ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -15629,7 +16181,7 @@ maybe-configure-stageprofile-libcpp:
 @if libcpp-bootstrap
 maybe-configure-stageprofile-libcpp: configure-stageprofile-libcpp
 configure-stageprofile-libcpp: 
-	@$(MAKE) stageprofile-start
+	@[ `cat stage_current` = stageprofile ] || $(MAKE) stageprofile-start
 	@[ -f $(HOST_SUBDIR)/libcpp/Makefile ] && exit 0 || : ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -15654,7 +16206,7 @@ maybe-configure-stagefeedback-libcpp:
 @if libcpp-bootstrap
 maybe-configure-stagefeedback-libcpp: configure-stagefeedback-libcpp
 configure-stagefeedback-libcpp: 
-	@$(MAKE) stagefeedback-start
+	@[ `cat stage_current` = stagefeedback ] || $(MAKE) stagefeedback-start
 	@[ -f $(HOST_SUBDIR)/libcpp/Makefile ] && exit 0 || : ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -15701,20 +16253,22 @@ maybe-clean-stage1-libcpp:
 @if libcpp-bootstrap
 maybe-all-stage1-libcpp: all-stage1-libcpp
 all-stage1: all-stage1-libcpp
+TARGET-stage1-libcpp = $(TARGET-libcpp)
 all-stage1-libcpp: configure-stage1-libcpp
-	@$(MAKE) stage1-start
+	@[ `cat stage_current` = stage1 ] || $(MAKE) stage1-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/libcpp && \
-	$(MAKE) $(FLAGS_TO_PASS)  CFLAGS="$(STAGE1_CFLAGS)" 
+	$(MAKE) $(FLAGS_TO_PASS)  CFLAGS="$(STAGE1_CFLAGS)"  \
+		$(TARGET-stage1-libcpp)
 
 maybe-clean-stage1-libcpp: clean-stage1-libcpp
 clean-stage1: clean-stage1-libcpp
 clean-stage1-libcpp:
 	@[ -f $(HOST_SUBDIR)/libcpp/Makefile ] || [ -f $(HOST_SUBDIR)/stage1-libcpp/Makefile ] \
 	  || exit 0 ; \
-	[ -f $(HOST_SUBDIR)/libcpp/Makefile ] || $(MAKE) stage1-start ; \
+	@[ `cat stage_current` = stage1 ] || $(MAKE) stage1-start
 	cd $(HOST_SUBDIR)/libcpp && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		CFLAGS="$(STAGE1_CFLAGS)"  clean
@@ -15728,21 +16282,23 @@ maybe-clean-stage2-libcpp:
 @if libcpp-bootstrap
 maybe-all-stage2-libcpp: all-stage2-libcpp
 all-stage2: all-stage2-libcpp
+TARGET-stage2-libcpp = $(TARGET-libcpp)
 all-stage2-libcpp: configure-stage2-libcpp
-	@$(MAKE) stage2-start
+	@[ `cat stage_current` = stage2 ] || $(MAKE) stage2-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/libcpp && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)  
+	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)   \
+		$(TARGET-stage2-libcpp)
 
 maybe-clean-stage2-libcpp: clean-stage2-libcpp
 clean-stage2: clean-stage2-libcpp
 clean-stage2-libcpp:
 	@[ -f $(HOST_SUBDIR)/libcpp/Makefile ] || [ -f $(HOST_SUBDIR)/stage2-libcpp/Makefile ] \
 	  || exit 0 ; \
-	[ -f $(HOST_SUBDIR)/libcpp/Makefile ] || $(MAKE) stage2-start ; \
+	@[ `cat stage_current` = stage2 ] || $(MAKE) stage2-start
 	cd $(HOST_SUBDIR)/libcpp && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -15757,21 +16313,23 @@ maybe-clean-stage3-libcpp:
 @if libcpp-bootstrap
 maybe-all-stage3-libcpp: all-stage3-libcpp
 all-stage3: all-stage3-libcpp
+TARGET-stage3-libcpp = $(TARGET-libcpp)
 all-stage3-libcpp: configure-stage3-libcpp
-	@$(MAKE) stage3-start
+	@[ `cat stage_current` = stage3 ] || $(MAKE) stage3-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/libcpp && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)  
+	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)   \
+		$(TARGET-stage3-libcpp)
 
 maybe-clean-stage3-libcpp: clean-stage3-libcpp
 clean-stage3: clean-stage3-libcpp
 clean-stage3-libcpp:
 	@[ -f $(HOST_SUBDIR)/libcpp/Makefile ] || [ -f $(HOST_SUBDIR)/stage3-libcpp/Makefile ] \
 	  || exit 0 ; \
-	[ -f $(HOST_SUBDIR)/libcpp/Makefile ] || $(MAKE) stage3-start ; \
+	@[ `cat stage_current` = stage3 ] || $(MAKE) stage3-start
 	cd $(HOST_SUBDIR)/libcpp && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -15786,21 +16344,23 @@ maybe-clean-stage4-libcpp:
 @if libcpp-bootstrap
 maybe-all-stage4-libcpp: all-stage4-libcpp
 all-stage4: all-stage4-libcpp
+TARGET-stage4-libcpp = $(TARGET-libcpp)
 all-stage4-libcpp: configure-stage4-libcpp
-	@$(MAKE) stage4-start
+	@[ `cat stage_current` = stage4 ] || $(MAKE) stage4-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/libcpp && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)  
+	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)   \
+		$(TARGET-stage4-libcpp)
 
 maybe-clean-stage4-libcpp: clean-stage4-libcpp
 clean-stage4: clean-stage4-libcpp
 clean-stage4-libcpp:
 	@[ -f $(HOST_SUBDIR)/libcpp/Makefile ] || [ -f $(HOST_SUBDIR)/stage4-libcpp/Makefile ] \
 	  || exit 0 ; \
-	[ -f $(HOST_SUBDIR)/libcpp/Makefile ] || $(MAKE) stage4-start ; \
+	@[ `cat stage_current` = stage4 ] || $(MAKE) stage4-start
 	cd $(HOST_SUBDIR)/libcpp && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -15815,21 +16375,23 @@ maybe-clean-stageprofile-libcpp:
 @if libcpp-bootstrap
 maybe-all-stageprofile-libcpp: all-stageprofile-libcpp
 all-stageprofile: all-stageprofile-libcpp
+TARGET-stageprofile-libcpp = $(TARGET-libcpp)
 all-stageprofile-libcpp: configure-stageprofile-libcpp
-	@$(MAKE) stageprofile-start
+	@[ `cat stage_current` = stageprofile ] || $(MAKE) stageprofile-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/libcpp && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" 
+	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-generate"  \
+		$(TARGET-stageprofile-libcpp)
 
 maybe-clean-stageprofile-libcpp: clean-stageprofile-libcpp
 clean-stageprofile: clean-stageprofile-libcpp
 clean-stageprofile-libcpp:
 	@[ -f $(HOST_SUBDIR)/libcpp/Makefile ] || [ -f $(HOST_SUBDIR)/stageprofile-libcpp/Makefile ] \
 	  || exit 0 ; \
-	[ -f $(HOST_SUBDIR)/libcpp/Makefile ] || $(MAKE) stageprofile-start ; \
+	@[ `cat stage_current` = stageprofile ] || $(MAKE) stageprofile-start
 	cd $(HOST_SUBDIR)/libcpp && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -15844,21 +16406,23 @@ maybe-clean-stagefeedback-libcpp:
 @if libcpp-bootstrap
 maybe-all-stagefeedback-libcpp: all-stagefeedback-libcpp
 all-stagefeedback: all-stagefeedback-libcpp
+TARGET-stagefeedback-libcpp = $(TARGET-libcpp)
 all-stagefeedback-libcpp: configure-stagefeedback-libcpp
-	@$(MAKE) stagefeedback-start
+	@[ `cat stage_current` = stagefeedback ] || $(MAKE) stagefeedback-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/libcpp && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-use" 
+	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-use"  \
+		$(TARGET-stagefeedback-libcpp)
 
 maybe-clean-stagefeedback-libcpp: clean-stagefeedback-libcpp
 clean-stagefeedback: clean-stagefeedback-libcpp
 clean-stagefeedback-libcpp:
 	@[ -f $(HOST_SUBDIR)/libcpp/Makefile ] || [ -f $(HOST_SUBDIR)/stagefeedback-libcpp/Makefile ] \
 	  || exit 0 ; \
-	[ -f $(HOST_SUBDIR)/libcpp/Makefile ] || $(MAKE) stagefeedback-start ; \
+	@[ `cat stage_current` = stagefeedback ] || $(MAKE) stagefeedback-start
 	cd $(HOST_SUBDIR)/libcpp && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -15875,6 +16439,7 @@ maybe-check-libcpp:
 maybe-check-libcpp: check-libcpp
 
 check-libcpp:
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -15889,6 +16454,7 @@ maybe-install-libcpp:
 maybe-install-libcpp: install-libcpp
 
 install-libcpp: installdirs
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -16153,6 +16719,7 @@ maybe-configure-libgui:
 @if libgui
 maybe-configure-libgui: configure-libgui
 configure-libgui: 
+	@$(unstage)
 	@test ! -f $(HOST_SUBDIR)/libgui/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libgui ; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -16182,6 +16749,7 @@ maybe-all-libgui:
 TARGET-libgui=all
 maybe-all-libgui: all-libgui
 all-libgui: configure-libgui
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -16198,6 +16766,7 @@ maybe-check-libgui:
 maybe-check-libgui: check-libgui
 
 check-libgui:
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -16212,6 +16781,7 @@ maybe-install-libgui:
 maybe-install-libgui: install-libgui
 
 install-libgui: installdirs
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -16229,6 +16799,7 @@ maybe-info-libgui: info-libgui
 
 info-libgui: \
     configure-libgui 
+	@$(unstage)
 	@[ -f ./libgui/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -16254,6 +16825,7 @@ maybe-dvi-libgui: dvi-libgui
 
 dvi-libgui: \
     configure-libgui 
+	@$(unstage)
 	@[ -f ./libgui/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -16279,6 +16851,7 @@ maybe-html-libgui: html-libgui
 
 html-libgui: \
     configure-libgui 
+	@$(unstage)
 	@[ -f ./libgui/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -16304,6 +16877,7 @@ maybe-TAGS-libgui: TAGS-libgui
 
 TAGS-libgui: \
     configure-libgui 
+	@$(unstage)
 	@[ -f ./libgui/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -16330,6 +16904,7 @@ maybe-install-info-libgui: install-info-libgui
 install-info-libgui: \
     configure-libgui \
     info-libgui 
+	@$(unstage)
 	@[ -f ./libgui/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -16355,6 +16930,7 @@ maybe-installcheck-libgui: installcheck-libgui
 
 installcheck-libgui: \
     configure-libgui 
+	@$(unstage)
 	@[ -f ./libgui/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -16379,6 +16955,7 @@ maybe-mostlyclean-libgui:
 maybe-mostlyclean-libgui: mostlyclean-libgui
 
 mostlyclean-libgui: 
+	@$(unstage)
 	@[ -f ./libgui/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -16403,6 +16980,7 @@ maybe-clean-libgui:
 maybe-clean-libgui: clean-libgui
 
 clean-libgui: 
+	@$(unstage)
 	@[ -f ./libgui/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -16427,6 +17005,7 @@ maybe-distclean-libgui:
 maybe-distclean-libgui: distclean-libgui
 
 distclean-libgui: 
+	@$(unstage)
 	@[ -f ./libgui/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -16451,6 +17030,7 @@ maybe-maintainer-clean-libgui:
 maybe-maintainer-clean-libgui: maintainer-clean-libgui
 
 maintainer-clean-libgui: 
+	@$(unstage)
 	@[ -f ./libgui/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -16503,7 +17083,7 @@ maybe-configure-stage1-libiberty:
 @if libiberty-bootstrap
 maybe-configure-stage1-libiberty: configure-stage1-libiberty
 configure-stage1-libiberty: 
-	@$(MAKE) stage1-start
+	@[ `cat stage_current` = stage1 ] || $(MAKE) stage1-start
 	@[ -f $(HOST_SUBDIR)/libiberty/Makefile ] && exit 0 || : ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -16527,7 +17107,7 @@ maybe-configure-stage2-libiberty:
 @if libiberty-bootstrap
 maybe-configure-stage2-libiberty: configure-stage2-libiberty
 configure-stage2-libiberty: 
-	@$(MAKE) stage2-start
+	@[ `cat stage_current` = stage2 ] || $(MAKE) stage2-start
 	@[ -f $(HOST_SUBDIR)/libiberty/Makefile ] && exit 0 || : ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -16552,7 +17132,7 @@ maybe-configure-stage3-libiberty:
 @if libiberty-bootstrap
 maybe-configure-stage3-libiberty: configure-stage3-libiberty
 configure-stage3-libiberty: 
-	@$(MAKE) stage3-start
+	@[ `cat stage_current` = stage3 ] || $(MAKE) stage3-start
 	@[ -f $(HOST_SUBDIR)/libiberty/Makefile ] && exit 0 || : ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -16577,7 +17157,7 @@ maybe-configure-stage4-libiberty:
 @if libiberty-bootstrap
 maybe-configure-stage4-libiberty: configure-stage4-libiberty
 configure-stage4-libiberty: 
-	@$(MAKE) stage4-start
+	@[ `cat stage_current` = stage4 ] || $(MAKE) stage4-start
 	@[ -f $(HOST_SUBDIR)/libiberty/Makefile ] && exit 0 || : ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -16602,7 +17182,7 @@ maybe-configure-stageprofile-libiberty:
 @if libiberty-bootstrap
 maybe-configure-stageprofile-libiberty: configure-stageprofile-libiberty
 configure-stageprofile-libiberty: 
-	@$(MAKE) stageprofile-start
+	@[ `cat stage_current` = stageprofile ] || $(MAKE) stageprofile-start
 	@[ -f $(HOST_SUBDIR)/libiberty/Makefile ] && exit 0 || : ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -16627,7 +17207,7 @@ maybe-configure-stagefeedback-libiberty:
 @if libiberty-bootstrap
 maybe-configure-stagefeedback-libiberty: configure-stagefeedback-libiberty
 configure-stagefeedback-libiberty: 
-	@$(MAKE) stagefeedback-start
+	@[ `cat stage_current` = stagefeedback ] || $(MAKE) stagefeedback-start
 	@[ -f $(HOST_SUBDIR)/libiberty/Makefile ] && exit 0 || : ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -16674,20 +17254,22 @@ maybe-clean-stage1-libiberty:
 @if libiberty-bootstrap
 maybe-all-stage1-libiberty: all-stage1-libiberty
 all-stage1: all-stage1-libiberty
+TARGET-stage1-libiberty = $(TARGET-libiberty)
 all-stage1-libiberty: configure-stage1-libiberty
-	@$(MAKE) stage1-start
+	@[ `cat stage_current` = stage1 ] || $(MAKE) stage1-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/libiberty && \
-	$(MAKE) $(FLAGS_TO_PASS)  CFLAGS="$(STAGE1_CFLAGS)" 
+	$(MAKE) $(FLAGS_TO_PASS)  CFLAGS="$(STAGE1_CFLAGS)"  \
+		$(TARGET-stage1-libiberty)
 
 maybe-clean-stage1-libiberty: clean-stage1-libiberty
 clean-stage1: clean-stage1-libiberty
 clean-stage1-libiberty:
 	@[ -f $(HOST_SUBDIR)/libiberty/Makefile ] || [ -f $(HOST_SUBDIR)/stage1-libiberty/Makefile ] \
 	  || exit 0 ; \
-	[ -f $(HOST_SUBDIR)/libiberty/Makefile ] || $(MAKE) stage1-start ; \
+	@[ `cat stage_current` = stage1 ] || $(MAKE) stage1-start
 	cd $(HOST_SUBDIR)/libiberty && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		CFLAGS="$(STAGE1_CFLAGS)"  clean
@@ -16701,21 +17283,23 @@ maybe-clean-stage2-libiberty:
 @if libiberty-bootstrap
 maybe-all-stage2-libiberty: all-stage2-libiberty
 all-stage2: all-stage2-libiberty
+TARGET-stage2-libiberty = $(TARGET-libiberty)
 all-stage2-libiberty: configure-stage2-libiberty
-	@$(MAKE) stage2-start
+	@[ `cat stage_current` = stage2 ] || $(MAKE) stage2-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/libiberty && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)  
+	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)   \
+		$(TARGET-stage2-libiberty)
 
 maybe-clean-stage2-libiberty: clean-stage2-libiberty
 clean-stage2: clean-stage2-libiberty
 clean-stage2-libiberty:
 	@[ -f $(HOST_SUBDIR)/libiberty/Makefile ] || [ -f $(HOST_SUBDIR)/stage2-libiberty/Makefile ] \
 	  || exit 0 ; \
-	[ -f $(HOST_SUBDIR)/libiberty/Makefile ] || $(MAKE) stage2-start ; \
+	@[ `cat stage_current` = stage2 ] || $(MAKE) stage2-start
 	cd $(HOST_SUBDIR)/libiberty && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -16730,21 +17314,23 @@ maybe-clean-stage3-libiberty:
 @if libiberty-bootstrap
 maybe-all-stage3-libiberty: all-stage3-libiberty
 all-stage3: all-stage3-libiberty
+TARGET-stage3-libiberty = $(TARGET-libiberty)
 all-stage3-libiberty: configure-stage3-libiberty
-	@$(MAKE) stage3-start
+	@[ `cat stage_current` = stage3 ] || $(MAKE) stage3-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/libiberty && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)  
+	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)   \
+		$(TARGET-stage3-libiberty)
 
 maybe-clean-stage3-libiberty: clean-stage3-libiberty
 clean-stage3: clean-stage3-libiberty
 clean-stage3-libiberty:
 	@[ -f $(HOST_SUBDIR)/libiberty/Makefile ] || [ -f $(HOST_SUBDIR)/stage3-libiberty/Makefile ] \
 	  || exit 0 ; \
-	[ -f $(HOST_SUBDIR)/libiberty/Makefile ] || $(MAKE) stage3-start ; \
+	@[ `cat stage_current` = stage3 ] || $(MAKE) stage3-start
 	cd $(HOST_SUBDIR)/libiberty && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -16759,21 +17345,23 @@ maybe-clean-stage4-libiberty:
 @if libiberty-bootstrap
 maybe-all-stage4-libiberty: all-stage4-libiberty
 all-stage4: all-stage4-libiberty
+TARGET-stage4-libiberty = $(TARGET-libiberty)
 all-stage4-libiberty: configure-stage4-libiberty
-	@$(MAKE) stage4-start
+	@[ `cat stage_current` = stage4 ] || $(MAKE) stage4-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/libiberty && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)  
+	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)   \
+		$(TARGET-stage4-libiberty)
 
 maybe-clean-stage4-libiberty: clean-stage4-libiberty
 clean-stage4: clean-stage4-libiberty
 clean-stage4-libiberty:
 	@[ -f $(HOST_SUBDIR)/libiberty/Makefile ] || [ -f $(HOST_SUBDIR)/stage4-libiberty/Makefile ] \
 	  || exit 0 ; \
-	[ -f $(HOST_SUBDIR)/libiberty/Makefile ] || $(MAKE) stage4-start ; \
+	@[ `cat stage_current` = stage4 ] || $(MAKE) stage4-start
 	cd $(HOST_SUBDIR)/libiberty && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -16788,21 +17376,23 @@ maybe-clean-stageprofile-libiberty:
 @if libiberty-bootstrap
 maybe-all-stageprofile-libiberty: all-stageprofile-libiberty
 all-stageprofile: all-stageprofile-libiberty
+TARGET-stageprofile-libiberty = $(TARGET-libiberty)
 all-stageprofile-libiberty: configure-stageprofile-libiberty
-	@$(MAKE) stageprofile-start
+	@[ `cat stage_current` = stageprofile ] || $(MAKE) stageprofile-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/libiberty && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" 
+	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-generate"  \
+		$(TARGET-stageprofile-libiberty)
 
 maybe-clean-stageprofile-libiberty: clean-stageprofile-libiberty
 clean-stageprofile: clean-stageprofile-libiberty
 clean-stageprofile-libiberty:
 	@[ -f $(HOST_SUBDIR)/libiberty/Makefile ] || [ -f $(HOST_SUBDIR)/stageprofile-libiberty/Makefile ] \
 	  || exit 0 ; \
-	[ -f $(HOST_SUBDIR)/libiberty/Makefile ] || $(MAKE) stageprofile-start ; \
+	@[ `cat stage_current` = stageprofile ] || $(MAKE) stageprofile-start
 	cd $(HOST_SUBDIR)/libiberty && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -16817,21 +17407,23 @@ maybe-clean-stagefeedback-libiberty:
 @if libiberty-bootstrap
 maybe-all-stagefeedback-libiberty: all-stagefeedback-libiberty
 all-stagefeedback: all-stagefeedback-libiberty
+TARGET-stagefeedback-libiberty = $(TARGET-libiberty)
 all-stagefeedback-libiberty: configure-stagefeedback-libiberty
-	@$(MAKE) stagefeedback-start
+	@[ `cat stage_current` = stagefeedback ] || $(MAKE) stagefeedback-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/libiberty && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-use" 
+	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-use"  \
+		$(TARGET-stagefeedback-libiberty)
 
 maybe-clean-stagefeedback-libiberty: clean-stagefeedback-libiberty
 clean-stagefeedback: clean-stagefeedback-libiberty
 clean-stagefeedback-libiberty:
 	@[ -f $(HOST_SUBDIR)/libiberty/Makefile ] || [ -f $(HOST_SUBDIR)/stagefeedback-libiberty/Makefile ] \
 	  || exit 0 ; \
-	[ -f $(HOST_SUBDIR)/libiberty/Makefile ] || $(MAKE) stagefeedback-start ; \
+	@[ `cat stage_current` = stagefeedback ] || $(MAKE) stagefeedback-start
 	cd $(HOST_SUBDIR)/libiberty && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -16848,6 +17440,7 @@ maybe-check-libiberty:
 maybe-check-libiberty: check-libiberty
 
 check-libiberty:
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -16862,6 +17455,7 @@ maybe-install-libiberty:
 maybe-install-libiberty: install-libiberty
 
 install-libiberty: installdirs
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -17126,6 +17720,7 @@ maybe-configure-libtool:
 @if libtool
 maybe-configure-libtool: configure-libtool
 configure-libtool: 
+	@$(unstage)
 	@test ! -f $(HOST_SUBDIR)/libtool/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libtool ; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -17155,6 +17750,7 @@ maybe-all-libtool:
 TARGET-libtool=all
 maybe-all-libtool: all-libtool
 all-libtool: configure-libtool
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -17171,6 +17767,7 @@ maybe-check-libtool:
 maybe-check-libtool: check-libtool
 
 check-libtool:
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -17185,6 +17782,7 @@ maybe-install-libtool:
 maybe-install-libtool: install-libtool
 
 install-libtool: installdirs
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -17202,6 +17800,7 @@ maybe-info-libtool: info-libtool
 
 info-libtool: \
     configure-libtool 
+	@$(unstage)
 	@[ -f ./libtool/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -17227,6 +17826,7 @@ maybe-dvi-libtool: dvi-libtool
 
 dvi-libtool: \
     configure-libtool 
+	@$(unstage)
 	@[ -f ./libtool/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -17252,6 +17852,7 @@ maybe-html-libtool: html-libtool
 
 html-libtool: \
     configure-libtool 
+	@$(unstage)
 	@[ -f ./libtool/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -17277,6 +17878,7 @@ maybe-TAGS-libtool: TAGS-libtool
 
 TAGS-libtool: \
     configure-libtool 
+	@$(unstage)
 	@[ -f ./libtool/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -17303,6 +17905,7 @@ maybe-install-info-libtool: install-info-libtool
 install-info-libtool: \
     configure-libtool \
     info-libtool 
+	@$(unstage)
 	@[ -f ./libtool/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -17328,6 +17931,7 @@ maybe-installcheck-libtool: installcheck-libtool
 
 installcheck-libtool: \
     configure-libtool 
+	@$(unstage)
 	@[ -f ./libtool/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -17352,6 +17956,7 @@ maybe-mostlyclean-libtool:
 maybe-mostlyclean-libtool: mostlyclean-libtool
 
 mostlyclean-libtool: 
+	@$(unstage)
 	@[ -f ./libtool/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -17376,6 +17981,7 @@ maybe-clean-libtool:
 maybe-clean-libtool: clean-libtool
 
 clean-libtool: 
+	@$(unstage)
 	@[ -f ./libtool/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -17400,6 +18006,7 @@ maybe-distclean-libtool:
 maybe-distclean-libtool: distclean-libtool
 
 distclean-libtool: 
+	@$(unstage)
 	@[ -f ./libtool/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -17424,6 +18031,7 @@ maybe-maintainer-clean-libtool:
 maybe-maintainer-clean-libtool: maintainer-clean-libtool
 
 maintainer-clean-libtool: 
+	@$(unstage)
 	@[ -f ./libtool/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -17449,6 +18057,7 @@ maybe-configure-m4:
 @if m4
 maybe-configure-m4: configure-m4
 configure-m4: 
+	@$(unstage)
 	@test ! -f $(HOST_SUBDIR)/m4/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/m4 ; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -17478,6 +18087,7 @@ maybe-all-m4:
 TARGET-m4=all
 maybe-all-m4: all-m4
 all-m4: configure-m4
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -17494,6 +18104,7 @@ maybe-check-m4:
 maybe-check-m4: check-m4
 
 check-m4:
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -17508,6 +18119,7 @@ maybe-install-m4:
 maybe-install-m4: install-m4
 
 install-m4: installdirs
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -17525,6 +18137,7 @@ maybe-info-m4: info-m4
 
 info-m4: \
     configure-m4 
+	@$(unstage)
 	@[ -f ./m4/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -17550,6 +18163,7 @@ maybe-dvi-m4: dvi-m4
 
 dvi-m4: \
     configure-m4 
+	@$(unstage)
 	@[ -f ./m4/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -17575,6 +18189,7 @@ maybe-html-m4: html-m4
 
 html-m4: \
     configure-m4 
+	@$(unstage)
 	@[ -f ./m4/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -17600,6 +18215,7 @@ maybe-TAGS-m4: TAGS-m4
 
 TAGS-m4: \
     configure-m4 
+	@$(unstage)
 	@[ -f ./m4/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -17626,6 +18242,7 @@ maybe-install-info-m4: install-info-m4
 install-info-m4: \
     configure-m4 \
     info-m4 
+	@$(unstage)
 	@[ -f ./m4/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -17651,6 +18268,7 @@ maybe-installcheck-m4: installcheck-m4
 
 installcheck-m4: \
     configure-m4 
+	@$(unstage)
 	@[ -f ./m4/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -17675,6 +18293,7 @@ maybe-mostlyclean-m4:
 maybe-mostlyclean-m4: mostlyclean-m4
 
 mostlyclean-m4: 
+	@$(unstage)
 	@[ -f ./m4/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -17699,6 +18318,7 @@ maybe-clean-m4:
 maybe-clean-m4: clean-m4
 
 clean-m4: 
+	@$(unstage)
 	@[ -f ./m4/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -17723,6 +18343,7 @@ maybe-distclean-m4:
 maybe-distclean-m4: distclean-m4
 
 distclean-m4: 
+	@$(unstage)
 	@[ -f ./m4/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -17747,6 +18368,7 @@ maybe-maintainer-clean-m4:
 maybe-maintainer-clean-m4: maintainer-clean-m4
 
 maintainer-clean-m4: 
+	@$(unstage)
 	@[ -f ./m4/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -17772,6 +18394,7 @@ maybe-configure-make:
 @if make
 maybe-configure-make: configure-make
 configure-make: 
+	@$(unstage)
 	@test ! -f $(HOST_SUBDIR)/make/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/make ; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -17801,6 +18424,7 @@ maybe-all-make:
 TARGET-make=all
 maybe-all-make: all-make
 all-make: configure-make
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -17817,6 +18441,7 @@ maybe-check-make:
 maybe-check-make: check-make
 
 check-make:
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -17831,6 +18456,7 @@ maybe-install-make:
 maybe-install-make: install-make
 
 install-make: installdirs
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -17848,6 +18474,7 @@ maybe-info-make: info-make
 
 info-make: \
     configure-make 
+	@$(unstage)
 	@[ -f ./make/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -17873,6 +18500,7 @@ maybe-dvi-make: dvi-make
 
 dvi-make: \
     configure-make 
+	@$(unstage)
 	@[ -f ./make/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -17898,6 +18526,7 @@ maybe-html-make: html-make
 
 html-make: \
     configure-make 
+	@$(unstage)
 	@[ -f ./make/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -17923,6 +18552,7 @@ maybe-TAGS-make: TAGS-make
 
 TAGS-make: \
     configure-make 
+	@$(unstage)
 	@[ -f ./make/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -17949,6 +18579,7 @@ maybe-install-info-make: install-info-make
 install-info-make: \
     configure-make \
     info-make 
+	@$(unstage)
 	@[ -f ./make/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -17974,6 +18605,7 @@ maybe-installcheck-make: installcheck-make
 
 installcheck-make: \
     configure-make 
+	@$(unstage)
 	@[ -f ./make/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -17998,6 +18630,7 @@ maybe-mostlyclean-make:
 maybe-mostlyclean-make: mostlyclean-make
 
 mostlyclean-make: 
+	@$(unstage)
 	@[ -f ./make/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -18022,6 +18655,7 @@ maybe-clean-make:
 maybe-clean-make: clean-make
 
 clean-make: 
+	@$(unstage)
 	@[ -f ./make/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -18046,6 +18680,7 @@ maybe-distclean-make:
 maybe-distclean-make: distclean-make
 
 distclean-make: 
+	@$(unstage)
 	@[ -f ./make/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -18070,6 +18705,7 @@ maybe-maintainer-clean-make:
 maybe-maintainer-clean-make: maintainer-clean-make
 
 maintainer-clean-make: 
+	@$(unstage)
 	@[ -f ./make/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -18095,6 +18731,7 @@ maybe-configure-mmalloc:
 @if mmalloc
 maybe-configure-mmalloc: configure-mmalloc
 configure-mmalloc: 
+	@$(unstage)
 	@test ! -f $(HOST_SUBDIR)/mmalloc/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mmalloc ; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -18124,6 +18761,7 @@ maybe-all-mmalloc:
 TARGET-mmalloc=all
 maybe-all-mmalloc: all-mmalloc
 all-mmalloc: configure-mmalloc
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -18149,6 +18787,7 @@ maybe-install-mmalloc:
 maybe-install-mmalloc: install-mmalloc
 
 install-mmalloc: installdirs
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -18166,6 +18805,7 @@ maybe-info-mmalloc: info-mmalloc
 
 info-mmalloc: \
     configure-mmalloc 
+	@$(unstage)
 	@[ -f ./mmalloc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -18191,6 +18831,7 @@ maybe-dvi-mmalloc: dvi-mmalloc
 
 dvi-mmalloc: \
     configure-mmalloc 
+	@$(unstage)
 	@[ -f ./mmalloc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -18216,6 +18857,7 @@ maybe-html-mmalloc: html-mmalloc
 
 html-mmalloc: \
     configure-mmalloc 
+	@$(unstage)
 	@[ -f ./mmalloc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -18241,6 +18883,7 @@ maybe-TAGS-mmalloc: TAGS-mmalloc
 
 TAGS-mmalloc: \
     configure-mmalloc 
+	@$(unstage)
 	@[ -f ./mmalloc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -18267,6 +18910,7 @@ maybe-install-info-mmalloc: install-info-mmalloc
 install-info-mmalloc: \
     configure-mmalloc \
     info-mmalloc 
+	@$(unstage)
 	@[ -f ./mmalloc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -18292,6 +18936,7 @@ maybe-installcheck-mmalloc: installcheck-mmalloc
 
 installcheck-mmalloc: \
     configure-mmalloc 
+	@$(unstage)
 	@[ -f ./mmalloc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -18316,6 +18961,7 @@ maybe-mostlyclean-mmalloc:
 maybe-mostlyclean-mmalloc: mostlyclean-mmalloc
 
 mostlyclean-mmalloc: 
+	@$(unstage)
 	@[ -f ./mmalloc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -18340,6 +18986,7 @@ maybe-clean-mmalloc:
 maybe-clean-mmalloc: clean-mmalloc
 
 clean-mmalloc: 
+	@$(unstage)
 	@[ -f ./mmalloc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -18364,6 +19011,7 @@ maybe-distclean-mmalloc:
 maybe-distclean-mmalloc: distclean-mmalloc
 
 distclean-mmalloc: 
+	@$(unstage)
 	@[ -f ./mmalloc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -18388,6 +19036,7 @@ maybe-maintainer-clean-mmalloc:
 maybe-maintainer-clean-mmalloc: maintainer-clean-mmalloc
 
 maintainer-clean-mmalloc: 
+	@$(unstage)
 	@[ -f ./mmalloc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -18413,6 +19062,7 @@ maybe-configure-patch:
 @if patch
 maybe-configure-patch: configure-patch
 configure-patch: 
+	@$(unstage)
 	@test ! -f $(HOST_SUBDIR)/patch/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/patch ; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -18442,6 +19092,7 @@ maybe-all-patch:
 TARGET-patch=all
 maybe-all-patch: all-patch
 all-patch: configure-patch
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -18458,6 +19109,7 @@ maybe-check-patch:
 maybe-check-patch: check-patch
 
 check-patch:
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -18472,6 +19124,7 @@ maybe-install-patch:
 maybe-install-patch: install-patch
 
 install-patch: installdirs
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -18489,6 +19142,7 @@ maybe-info-patch: info-patch
 
 info-patch: \
     configure-patch 
+	@$(unstage)
 	@[ -f ./patch/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -18514,6 +19168,7 @@ maybe-dvi-patch: dvi-patch
 
 dvi-patch: \
     configure-patch 
+	@$(unstage)
 	@[ -f ./patch/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -18539,6 +19194,7 @@ maybe-html-patch: html-patch
 
 html-patch: \
     configure-patch 
+	@$(unstage)
 	@[ -f ./patch/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -18564,6 +19220,7 @@ maybe-TAGS-patch: TAGS-patch
 
 TAGS-patch: \
     configure-patch 
+	@$(unstage)
 	@[ -f ./patch/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -18590,6 +19247,7 @@ maybe-install-info-patch: install-info-patch
 install-info-patch: \
     configure-patch \
     info-patch 
+	@$(unstage)
 	@[ -f ./patch/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -18615,6 +19273,7 @@ maybe-installcheck-patch: installcheck-patch
 
 installcheck-patch: \
     configure-patch 
+	@$(unstage)
 	@[ -f ./patch/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -18639,6 +19298,7 @@ maybe-mostlyclean-patch:
 maybe-mostlyclean-patch: mostlyclean-patch
 
 mostlyclean-patch: 
+	@$(unstage)
 	@[ -f ./patch/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -18663,6 +19323,7 @@ maybe-clean-patch:
 maybe-clean-patch: clean-patch
 
 clean-patch: 
+	@$(unstage)
 	@[ -f ./patch/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -18687,6 +19348,7 @@ maybe-distclean-patch:
 maybe-distclean-patch: distclean-patch
 
 distclean-patch: 
+	@$(unstage)
 	@[ -f ./patch/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -18711,6 +19373,7 @@ maybe-maintainer-clean-patch:
 maybe-maintainer-clean-patch: maintainer-clean-patch
 
 maintainer-clean-patch: 
+	@$(unstage)
 	@[ -f ./patch/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -18736,6 +19399,7 @@ maybe-configure-perl:
 @if perl
 maybe-configure-perl: configure-perl
 configure-perl: 
+	@$(unstage)
 	@test ! -f $(HOST_SUBDIR)/perl/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/perl ; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -18765,6 +19429,7 @@ maybe-all-perl:
 TARGET-perl=all
 maybe-all-perl: all-perl
 all-perl: configure-perl
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -18781,6 +19446,7 @@ maybe-check-perl:
 maybe-check-perl: check-perl
 
 check-perl:
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -18795,6 +19461,7 @@ maybe-install-perl:
 maybe-install-perl: install-perl
 
 install-perl: installdirs
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -18812,6 +19479,7 @@ maybe-info-perl: info-perl
 
 info-perl: \
     configure-perl 
+	@$(unstage)
 	@[ -f ./perl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -18837,6 +19505,7 @@ maybe-dvi-perl: dvi-perl
 
 dvi-perl: \
     configure-perl 
+	@$(unstage)
 	@[ -f ./perl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -18862,6 +19531,7 @@ maybe-html-perl: html-perl
 
 html-perl: \
     configure-perl 
+	@$(unstage)
 	@[ -f ./perl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -18887,6 +19557,7 @@ maybe-TAGS-perl: TAGS-perl
 
 TAGS-perl: \
     configure-perl 
+	@$(unstage)
 	@[ -f ./perl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -18913,6 +19584,7 @@ maybe-install-info-perl: install-info-perl
 install-info-perl: \
     configure-perl \
     info-perl 
+	@$(unstage)
 	@[ -f ./perl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -18938,6 +19610,7 @@ maybe-installcheck-perl: installcheck-perl
 
 installcheck-perl: \
     configure-perl 
+	@$(unstage)
 	@[ -f ./perl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -18962,6 +19635,7 @@ maybe-mostlyclean-perl:
 maybe-mostlyclean-perl: mostlyclean-perl
 
 mostlyclean-perl: 
+	@$(unstage)
 	@[ -f ./perl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -18986,6 +19660,7 @@ maybe-clean-perl:
 maybe-clean-perl: clean-perl
 
 clean-perl: 
+	@$(unstage)
 	@[ -f ./perl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -19010,6 +19685,7 @@ maybe-distclean-perl:
 maybe-distclean-perl: distclean-perl
 
 distclean-perl: 
+	@$(unstage)
 	@[ -f ./perl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -19034,6 +19710,7 @@ maybe-maintainer-clean-perl:
 maybe-maintainer-clean-perl: maintainer-clean-perl
 
 maintainer-clean-perl: 
+	@$(unstage)
 	@[ -f ./perl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -19059,6 +19736,7 @@ maybe-configure-prms:
 @if prms
 maybe-configure-prms: configure-prms
 configure-prms: 
+	@$(unstage)
 	@test ! -f $(HOST_SUBDIR)/prms/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/prms ; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -19088,6 +19766,7 @@ maybe-all-prms:
 TARGET-prms=all
 maybe-all-prms: all-prms
 all-prms: configure-prms
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -19104,6 +19783,7 @@ maybe-check-prms:
 maybe-check-prms: check-prms
 
 check-prms:
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -19118,6 +19798,7 @@ maybe-install-prms:
 maybe-install-prms: install-prms
 
 install-prms: installdirs
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -19135,6 +19816,7 @@ maybe-info-prms: info-prms
 
 info-prms: \
     configure-prms 
+	@$(unstage)
 	@[ -f ./prms/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -19160,6 +19842,7 @@ maybe-dvi-prms: dvi-prms
 
 dvi-prms: \
     configure-prms 
+	@$(unstage)
 	@[ -f ./prms/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -19185,6 +19868,7 @@ maybe-html-prms: html-prms
 
 html-prms: \
     configure-prms 
+	@$(unstage)
 	@[ -f ./prms/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -19210,6 +19894,7 @@ maybe-TAGS-prms: TAGS-prms
 
 TAGS-prms: \
     configure-prms 
+	@$(unstage)
 	@[ -f ./prms/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -19236,6 +19921,7 @@ maybe-install-info-prms: install-info-prms
 install-info-prms: \
     configure-prms \
     info-prms 
+	@$(unstage)
 	@[ -f ./prms/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -19261,6 +19947,7 @@ maybe-installcheck-prms: installcheck-prms
 
 installcheck-prms: \
     configure-prms 
+	@$(unstage)
 	@[ -f ./prms/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -19285,6 +19972,7 @@ maybe-mostlyclean-prms:
 maybe-mostlyclean-prms: mostlyclean-prms
 
 mostlyclean-prms: 
+	@$(unstage)
 	@[ -f ./prms/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -19309,6 +19997,7 @@ maybe-clean-prms:
 maybe-clean-prms: clean-prms
 
 clean-prms: 
+	@$(unstage)
 	@[ -f ./prms/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -19333,6 +20022,7 @@ maybe-distclean-prms:
 maybe-distclean-prms: distclean-prms
 
 distclean-prms: 
+	@$(unstage)
 	@[ -f ./prms/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -19357,6 +20047,7 @@ maybe-maintainer-clean-prms:
 maybe-maintainer-clean-prms: maintainer-clean-prms
 
 maintainer-clean-prms: 
+	@$(unstage)
 	@[ -f ./prms/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -19382,6 +20073,7 @@ maybe-configure-rcs:
 @if rcs
 maybe-configure-rcs: configure-rcs
 configure-rcs: 
+	@$(unstage)
 	@test ! -f $(HOST_SUBDIR)/rcs/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/rcs ; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -19411,6 +20103,7 @@ maybe-all-rcs:
 TARGET-rcs=all
 maybe-all-rcs: all-rcs
 all-rcs: configure-rcs
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -19427,6 +20120,7 @@ maybe-check-rcs:
 maybe-check-rcs: check-rcs
 
 check-rcs:
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -19441,6 +20135,7 @@ maybe-install-rcs:
 maybe-install-rcs: install-rcs
 
 install-rcs: installdirs
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -19458,6 +20153,7 @@ maybe-info-rcs: info-rcs
 
 info-rcs: \
     configure-rcs 
+	@$(unstage)
 	@[ -f ./rcs/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -19483,6 +20179,7 @@ maybe-dvi-rcs: dvi-rcs
 
 dvi-rcs: \
     configure-rcs 
+	@$(unstage)
 	@[ -f ./rcs/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -19508,6 +20205,7 @@ maybe-html-rcs: html-rcs
 
 html-rcs: \
     configure-rcs 
+	@$(unstage)
 	@[ -f ./rcs/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -19533,6 +20231,7 @@ maybe-TAGS-rcs: TAGS-rcs
 
 TAGS-rcs: \
     configure-rcs 
+	@$(unstage)
 	@[ -f ./rcs/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -19559,6 +20258,7 @@ maybe-install-info-rcs: install-info-rcs
 install-info-rcs: \
     configure-rcs \
     info-rcs 
+	@$(unstage)
 	@[ -f ./rcs/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -19584,6 +20284,7 @@ maybe-installcheck-rcs: installcheck-rcs
 
 installcheck-rcs: \
     configure-rcs 
+	@$(unstage)
 	@[ -f ./rcs/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -19608,6 +20309,7 @@ maybe-mostlyclean-rcs:
 maybe-mostlyclean-rcs: mostlyclean-rcs
 
 mostlyclean-rcs: 
+	@$(unstage)
 	@[ -f ./rcs/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -19632,6 +20334,7 @@ maybe-clean-rcs:
 maybe-clean-rcs: clean-rcs
 
 clean-rcs: 
+	@$(unstage)
 	@[ -f ./rcs/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -19656,6 +20359,7 @@ maybe-distclean-rcs:
 maybe-distclean-rcs: distclean-rcs
 
 distclean-rcs: 
+	@$(unstage)
 	@[ -f ./rcs/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -19680,6 +20384,7 @@ maybe-maintainer-clean-rcs:
 maybe-maintainer-clean-rcs: maintainer-clean-rcs
 
 maintainer-clean-rcs: 
+	@$(unstage)
 	@[ -f ./rcs/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -19705,6 +20410,7 @@ maybe-configure-readline:
 @if readline
 maybe-configure-readline: configure-readline
 configure-readline: 
+	@$(unstage)
 	@test ! -f $(HOST_SUBDIR)/readline/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/readline ; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -19734,6 +20440,7 @@ maybe-all-readline:
 TARGET-readline=all
 maybe-all-readline: all-readline
 all-readline: configure-readline
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -19750,6 +20457,7 @@ maybe-check-readline:
 maybe-check-readline: check-readline
 
 check-readline:
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -19764,6 +20472,7 @@ maybe-install-readline:
 maybe-install-readline: install-readline
 
 install-readline: installdirs
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -19781,6 +20490,7 @@ maybe-info-readline: info-readline
 
 info-readline: \
     configure-readline 
+	@$(unstage)
 	@[ -f ./readline/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -19806,6 +20516,7 @@ maybe-dvi-readline: dvi-readline
 
 dvi-readline: \
     configure-readline 
+	@$(unstage)
 	@[ -f ./readline/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -19831,6 +20542,7 @@ maybe-html-readline: html-readline
 
 html-readline: \
     configure-readline 
+	@$(unstage)
 	@[ -f ./readline/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -19856,6 +20568,7 @@ maybe-TAGS-readline: TAGS-readline
 
 TAGS-readline: \
     configure-readline 
+	@$(unstage)
 	@[ -f ./readline/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -19882,6 +20595,7 @@ maybe-install-info-readline: install-info-readline
 install-info-readline: \
     configure-readline \
     info-readline 
+	@$(unstage)
 	@[ -f ./readline/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -19907,6 +20621,7 @@ maybe-installcheck-readline: installcheck-readline
 
 installcheck-readline: \
     configure-readline 
+	@$(unstage)
 	@[ -f ./readline/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -19931,6 +20646,7 @@ maybe-mostlyclean-readline:
 maybe-mostlyclean-readline: mostlyclean-readline
 
 mostlyclean-readline: 
+	@$(unstage)
 	@[ -f ./readline/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -19955,6 +20671,7 @@ maybe-clean-readline:
 maybe-clean-readline: clean-readline
 
 clean-readline: 
+	@$(unstage)
 	@[ -f ./readline/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -19979,6 +20696,7 @@ maybe-distclean-readline:
 maybe-distclean-readline: distclean-readline
 
 distclean-readline: 
+	@$(unstage)
 	@[ -f ./readline/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -20003,6 +20721,7 @@ maybe-maintainer-clean-readline:
 maybe-maintainer-clean-readline: maintainer-clean-readline
 
 maintainer-clean-readline: 
+	@$(unstage)
 	@[ -f ./readline/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -20028,6 +20747,7 @@ maybe-configure-release:
 @if release
 maybe-configure-release: configure-release
 configure-release: 
+	@$(unstage)
 	@test ! -f $(HOST_SUBDIR)/release/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/release ; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -20057,6 +20777,7 @@ maybe-all-release:
 TARGET-release=all
 maybe-all-release: all-release
 all-release: configure-release
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -20094,6 +20815,7 @@ maybe-info-release: info-release
 
 info-release: \
     configure-release 
+	@$(unstage)
 	@[ -f ./release/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -20119,6 +20841,7 @@ maybe-dvi-release: dvi-release
 
 dvi-release: \
     configure-release 
+	@$(unstage)
 	@[ -f ./release/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -20144,6 +20867,7 @@ maybe-html-release: html-release
 
 html-release: \
     configure-release 
+	@$(unstage)
 	@[ -f ./release/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -20169,6 +20893,7 @@ maybe-TAGS-release: TAGS-release
 
 TAGS-release: \
     configure-release 
+	@$(unstage)
 	@[ -f ./release/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -20195,6 +20920,7 @@ maybe-install-info-release: install-info-release
 install-info-release: \
     configure-release \
     info-release 
+	@$(unstage)
 	@[ -f ./release/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -20220,6 +20946,7 @@ maybe-installcheck-release: installcheck-release
 
 installcheck-release: \
     configure-release 
+	@$(unstage)
 	@[ -f ./release/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -20244,6 +20971,7 @@ maybe-mostlyclean-release:
 maybe-mostlyclean-release: mostlyclean-release
 
 mostlyclean-release: 
+	@$(unstage)
 	@[ -f ./release/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -20268,6 +20996,7 @@ maybe-clean-release:
 maybe-clean-release: clean-release
 
 clean-release: 
+	@$(unstage)
 	@[ -f ./release/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -20292,6 +21021,7 @@ maybe-distclean-release:
 maybe-distclean-release: distclean-release
 
 distclean-release: 
+	@$(unstage)
 	@[ -f ./release/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -20316,6 +21046,7 @@ maybe-maintainer-clean-release:
 maybe-maintainer-clean-release: maintainer-clean-release
 
 maintainer-clean-release: 
+	@$(unstage)
 	@[ -f ./release/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -20341,6 +21072,7 @@ maybe-configure-recode:
 @if recode
 maybe-configure-recode: configure-recode
 configure-recode: 
+	@$(unstage)
 	@test ! -f $(HOST_SUBDIR)/recode/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/recode ; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -20370,6 +21102,7 @@ maybe-all-recode:
 TARGET-recode=all
 maybe-all-recode: all-recode
 all-recode: configure-recode
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -20386,6 +21119,7 @@ maybe-check-recode:
 maybe-check-recode: check-recode
 
 check-recode:
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -20400,6 +21134,7 @@ maybe-install-recode:
 maybe-install-recode: install-recode
 
 install-recode: installdirs
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -20417,6 +21152,7 @@ maybe-info-recode: info-recode
 
 info-recode: \
     configure-recode 
+	@$(unstage)
 	@[ -f ./recode/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -20442,6 +21178,7 @@ maybe-dvi-recode: dvi-recode
 
 dvi-recode: \
     configure-recode 
+	@$(unstage)
 	@[ -f ./recode/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -20467,6 +21204,7 @@ maybe-html-recode: html-recode
 
 html-recode: \
     configure-recode 
+	@$(unstage)
 	@[ -f ./recode/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -20492,6 +21230,7 @@ maybe-TAGS-recode: TAGS-recode
 
 TAGS-recode: \
     configure-recode 
+	@$(unstage)
 	@[ -f ./recode/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -20518,6 +21257,7 @@ maybe-install-info-recode: install-info-recode
 install-info-recode: \
     configure-recode \
     info-recode 
+	@$(unstage)
 	@[ -f ./recode/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -20543,6 +21283,7 @@ maybe-installcheck-recode: installcheck-recode
 
 installcheck-recode: \
     configure-recode 
+	@$(unstage)
 	@[ -f ./recode/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -20567,6 +21308,7 @@ maybe-mostlyclean-recode:
 maybe-mostlyclean-recode: mostlyclean-recode
 
 mostlyclean-recode: 
+	@$(unstage)
 	@[ -f ./recode/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -20591,6 +21333,7 @@ maybe-clean-recode:
 maybe-clean-recode: clean-recode
 
 clean-recode: 
+	@$(unstage)
 	@[ -f ./recode/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -20615,6 +21358,7 @@ maybe-distclean-recode:
 maybe-distclean-recode: distclean-recode
 
 distclean-recode: 
+	@$(unstage)
 	@[ -f ./recode/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -20639,6 +21383,7 @@ maybe-maintainer-clean-recode:
 maybe-maintainer-clean-recode: maintainer-clean-recode
 
 maintainer-clean-recode: 
+	@$(unstage)
 	@[ -f ./recode/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -20664,6 +21409,7 @@ maybe-configure-sed:
 @if sed
 maybe-configure-sed: configure-sed
 configure-sed: 
+	@$(unstage)
 	@test ! -f $(HOST_SUBDIR)/sed/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/sed ; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -20693,6 +21439,7 @@ maybe-all-sed:
 TARGET-sed=all
 maybe-all-sed: all-sed
 all-sed: configure-sed
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -20709,6 +21456,7 @@ maybe-check-sed:
 maybe-check-sed: check-sed
 
 check-sed:
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -20723,6 +21471,7 @@ maybe-install-sed:
 maybe-install-sed: install-sed
 
 install-sed: installdirs
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -20740,6 +21489,7 @@ maybe-info-sed: info-sed
 
 info-sed: \
     configure-sed 
+	@$(unstage)
 	@[ -f ./sed/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -20765,6 +21515,7 @@ maybe-dvi-sed: dvi-sed
 
 dvi-sed: \
     configure-sed 
+	@$(unstage)
 	@[ -f ./sed/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -20790,6 +21541,7 @@ maybe-html-sed: html-sed
 
 html-sed: \
     configure-sed 
+	@$(unstage)
 	@[ -f ./sed/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -20815,6 +21567,7 @@ maybe-TAGS-sed: TAGS-sed
 
 TAGS-sed: \
     configure-sed 
+	@$(unstage)
 	@[ -f ./sed/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -20841,6 +21594,7 @@ maybe-install-info-sed: install-info-sed
 install-info-sed: \
     configure-sed \
     info-sed 
+	@$(unstage)
 	@[ -f ./sed/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -20866,6 +21620,7 @@ maybe-installcheck-sed: installcheck-sed
 
 installcheck-sed: \
     configure-sed 
+	@$(unstage)
 	@[ -f ./sed/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -20890,6 +21645,7 @@ maybe-mostlyclean-sed:
 maybe-mostlyclean-sed: mostlyclean-sed
 
 mostlyclean-sed: 
+	@$(unstage)
 	@[ -f ./sed/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -20914,6 +21670,7 @@ maybe-clean-sed:
 maybe-clean-sed: clean-sed
 
 clean-sed: 
+	@$(unstage)
 	@[ -f ./sed/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -20938,6 +21695,7 @@ maybe-distclean-sed:
 maybe-distclean-sed: distclean-sed
 
 distclean-sed: 
+	@$(unstage)
 	@[ -f ./sed/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -20962,6 +21720,7 @@ maybe-maintainer-clean-sed:
 maybe-maintainer-clean-sed: maintainer-clean-sed
 
 maintainer-clean-sed: 
+	@$(unstage)
 	@[ -f ./sed/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -20987,6 +21746,7 @@ maybe-configure-send-pr:
 @if send-pr
 maybe-configure-send-pr: configure-send-pr
 configure-send-pr: 
+	@$(unstage)
 	@test ! -f $(HOST_SUBDIR)/send-pr/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/send-pr ; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -21016,6 +21776,7 @@ maybe-all-send-pr:
 TARGET-send-pr=all
 maybe-all-send-pr: all-send-pr
 all-send-pr: configure-send-pr
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -21032,6 +21793,7 @@ maybe-check-send-pr:
 maybe-check-send-pr: check-send-pr
 
 check-send-pr:
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -21046,6 +21808,7 @@ maybe-install-send-pr:
 maybe-install-send-pr: install-send-pr
 
 install-send-pr: installdirs
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -21063,6 +21826,7 @@ maybe-info-send-pr: info-send-pr
 
 info-send-pr: \
     configure-send-pr 
+	@$(unstage)
 	@[ -f ./send-pr/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -21088,6 +21852,7 @@ maybe-dvi-send-pr: dvi-send-pr
 
 dvi-send-pr: \
     configure-send-pr 
+	@$(unstage)
 	@[ -f ./send-pr/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -21113,6 +21878,7 @@ maybe-html-send-pr: html-send-pr
 
 html-send-pr: \
     configure-send-pr 
+	@$(unstage)
 	@[ -f ./send-pr/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -21138,6 +21904,7 @@ maybe-TAGS-send-pr: TAGS-send-pr
 
 TAGS-send-pr: \
     configure-send-pr 
+	@$(unstage)
 	@[ -f ./send-pr/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -21164,6 +21931,7 @@ maybe-install-info-send-pr: install-info-send-pr
 install-info-send-pr: \
     configure-send-pr \
     info-send-pr 
+	@$(unstage)
 	@[ -f ./send-pr/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -21189,6 +21957,7 @@ maybe-installcheck-send-pr: installcheck-send-pr
 
 installcheck-send-pr: \
     configure-send-pr 
+	@$(unstage)
 	@[ -f ./send-pr/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -21213,6 +21982,7 @@ maybe-mostlyclean-send-pr:
 maybe-mostlyclean-send-pr: mostlyclean-send-pr
 
 mostlyclean-send-pr: 
+	@$(unstage)
 	@[ -f ./send-pr/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -21237,6 +22007,7 @@ maybe-clean-send-pr:
 maybe-clean-send-pr: clean-send-pr
 
 clean-send-pr: 
+	@$(unstage)
 	@[ -f ./send-pr/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -21261,6 +22032,7 @@ maybe-distclean-send-pr:
 maybe-distclean-send-pr: distclean-send-pr
 
 distclean-send-pr: 
+	@$(unstage)
 	@[ -f ./send-pr/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -21285,6 +22057,7 @@ maybe-maintainer-clean-send-pr:
 maybe-maintainer-clean-send-pr: maintainer-clean-send-pr
 
 maintainer-clean-send-pr: 
+	@$(unstage)
 	@[ -f ./send-pr/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -21310,6 +22083,7 @@ maybe-configure-shellutils:
 @if shellutils
 maybe-configure-shellutils: configure-shellutils
 configure-shellutils: 
+	@$(unstage)
 	@test ! -f $(HOST_SUBDIR)/shellutils/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/shellutils ; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -21339,6 +22113,7 @@ maybe-all-shellutils:
 TARGET-shellutils=all
 maybe-all-shellutils: all-shellutils
 all-shellutils: configure-shellutils
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -21355,6 +22130,7 @@ maybe-check-shellutils:
 maybe-check-shellutils: check-shellutils
 
 check-shellutils:
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -21369,6 +22145,7 @@ maybe-install-shellutils:
 maybe-install-shellutils: install-shellutils
 
 install-shellutils: installdirs
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -21386,6 +22163,7 @@ maybe-info-shellutils: info-shellutils
 
 info-shellutils: \
     configure-shellutils 
+	@$(unstage)
 	@[ -f ./shellutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -21411,6 +22189,7 @@ maybe-dvi-shellutils: dvi-shellutils
 
 dvi-shellutils: \
     configure-shellutils 
+	@$(unstage)
 	@[ -f ./shellutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -21436,6 +22215,7 @@ maybe-html-shellutils: html-shellutils
 
 html-shellutils: \
     configure-shellutils 
+	@$(unstage)
 	@[ -f ./shellutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -21461,6 +22241,7 @@ maybe-TAGS-shellutils: TAGS-shellutils
 
 TAGS-shellutils: \
     configure-shellutils 
+	@$(unstage)
 	@[ -f ./shellutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -21487,6 +22268,7 @@ maybe-install-info-shellutils: install-info-shellutils
 install-info-shellutils: \
     configure-shellutils \
     info-shellutils 
+	@$(unstage)
 	@[ -f ./shellutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -21512,6 +22294,7 @@ maybe-installcheck-shellutils: installcheck-shellutils
 
 installcheck-shellutils: \
     configure-shellutils 
+	@$(unstage)
 	@[ -f ./shellutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -21536,6 +22319,7 @@ maybe-mostlyclean-shellutils:
 maybe-mostlyclean-shellutils: mostlyclean-shellutils
 
 mostlyclean-shellutils: 
+	@$(unstage)
 	@[ -f ./shellutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -21560,6 +22344,7 @@ maybe-clean-shellutils:
 maybe-clean-shellutils: clean-shellutils
 
 clean-shellutils: 
+	@$(unstage)
 	@[ -f ./shellutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -21584,6 +22369,7 @@ maybe-distclean-shellutils:
 maybe-distclean-shellutils: distclean-shellutils
 
 distclean-shellutils: 
+	@$(unstage)
 	@[ -f ./shellutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -21608,6 +22394,7 @@ maybe-maintainer-clean-shellutils:
 maybe-maintainer-clean-shellutils: maintainer-clean-shellutils
 
 maintainer-clean-shellutils: 
+	@$(unstage)
 	@[ -f ./shellutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -21633,6 +22420,7 @@ maybe-configure-sid:
 @if sid
 maybe-configure-sid: configure-sid
 configure-sid: 
+	@$(unstage)
 	@test ! -f $(HOST_SUBDIR)/sid/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/sid ; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -21662,6 +22450,7 @@ maybe-all-sid:
 TARGET-sid=all
 maybe-all-sid: all-sid
 all-sid: configure-sid
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -21678,6 +22467,7 @@ maybe-check-sid:
 maybe-check-sid: check-sid
 
 check-sid:
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -21692,6 +22482,7 @@ maybe-install-sid:
 maybe-install-sid: install-sid
 
 install-sid: installdirs
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -21709,6 +22500,7 @@ maybe-info-sid: info-sid
 
 info-sid: \
     configure-sid 
+	@$(unstage)
 	@[ -f ./sid/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -21734,6 +22526,7 @@ maybe-dvi-sid: dvi-sid
 
 dvi-sid: \
     configure-sid 
+	@$(unstage)
 	@[ -f ./sid/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -21759,6 +22552,7 @@ maybe-html-sid: html-sid
 
 html-sid: \
     configure-sid 
+	@$(unstage)
 	@[ -f ./sid/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -21784,6 +22578,7 @@ maybe-TAGS-sid: TAGS-sid
 
 TAGS-sid: \
     configure-sid 
+	@$(unstage)
 	@[ -f ./sid/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -21810,6 +22605,7 @@ maybe-install-info-sid: install-info-sid
 install-info-sid: \
     configure-sid \
     info-sid 
+	@$(unstage)
 	@[ -f ./sid/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -21835,6 +22631,7 @@ maybe-installcheck-sid: installcheck-sid
 
 installcheck-sid: \
     configure-sid 
+	@$(unstage)
 	@[ -f ./sid/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -21859,6 +22656,7 @@ maybe-mostlyclean-sid:
 maybe-mostlyclean-sid: mostlyclean-sid
 
 mostlyclean-sid: 
+	@$(unstage)
 	@[ -f ./sid/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -21883,6 +22681,7 @@ maybe-clean-sid:
 maybe-clean-sid: clean-sid
 
 clean-sid: 
+	@$(unstage)
 	@[ -f ./sid/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -21907,6 +22706,7 @@ maybe-distclean-sid:
 maybe-distclean-sid: distclean-sid
 
 distclean-sid: 
+	@$(unstage)
 	@[ -f ./sid/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -21931,6 +22731,7 @@ maybe-maintainer-clean-sid:
 maybe-maintainer-clean-sid: maintainer-clean-sid
 
 maintainer-clean-sid: 
+	@$(unstage)
 	@[ -f ./sid/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -21956,6 +22757,7 @@ maybe-configure-sim:
 @if sim
 maybe-configure-sim: configure-sim
 configure-sim: 
+	@$(unstage)
 	@test ! -f $(HOST_SUBDIR)/sim/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/sim ; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -21985,6 +22787,7 @@ maybe-all-sim:
 TARGET-sim=all
 maybe-all-sim: all-sim
 all-sim: configure-sim
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -22001,6 +22804,7 @@ maybe-check-sim:
 maybe-check-sim: check-sim
 
 check-sim:
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -22015,6 +22819,7 @@ maybe-install-sim:
 maybe-install-sim: install-sim
 
 install-sim: installdirs
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -22032,6 +22837,7 @@ maybe-info-sim: info-sim
 
 info-sim: \
     configure-sim 
+	@$(unstage)
 	@[ -f ./sim/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -22057,6 +22863,7 @@ maybe-dvi-sim: dvi-sim
 
 dvi-sim: \
     configure-sim 
+	@$(unstage)
 	@[ -f ./sim/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -22082,6 +22889,7 @@ maybe-html-sim: html-sim
 
 html-sim: \
     configure-sim 
+	@$(unstage)
 	@[ -f ./sim/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -22107,6 +22915,7 @@ maybe-TAGS-sim: TAGS-sim
 
 TAGS-sim: \
     configure-sim 
+	@$(unstage)
 	@[ -f ./sim/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -22133,6 +22942,7 @@ maybe-install-info-sim: install-info-sim
 install-info-sim: \
     configure-sim \
     info-sim 
+	@$(unstage)
 	@[ -f ./sim/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -22158,6 +22968,7 @@ maybe-installcheck-sim: installcheck-sim
 
 installcheck-sim: \
     configure-sim 
+	@$(unstage)
 	@[ -f ./sim/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -22182,6 +22993,7 @@ maybe-mostlyclean-sim:
 maybe-mostlyclean-sim: mostlyclean-sim
 
 mostlyclean-sim: 
+	@$(unstage)
 	@[ -f ./sim/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -22206,6 +23018,7 @@ maybe-clean-sim:
 maybe-clean-sim: clean-sim
 
 clean-sim: 
+	@$(unstage)
 	@[ -f ./sim/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -22230,6 +23043,7 @@ maybe-distclean-sim:
 maybe-distclean-sim: distclean-sim
 
 distclean-sim: 
+	@$(unstage)
 	@[ -f ./sim/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -22254,6 +23068,7 @@ maybe-maintainer-clean-sim:
 maybe-maintainer-clean-sim: maintainer-clean-sim
 
 maintainer-clean-sim: 
+	@$(unstage)
 	@[ -f ./sim/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -22279,6 +23094,7 @@ maybe-configure-tar:
 @if tar
 maybe-configure-tar: configure-tar
 configure-tar: 
+	@$(unstage)
 	@test ! -f $(HOST_SUBDIR)/tar/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/tar ; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -22308,6 +23124,7 @@ maybe-all-tar:
 TARGET-tar=all
 maybe-all-tar: all-tar
 all-tar: configure-tar
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -22324,6 +23141,7 @@ maybe-check-tar:
 maybe-check-tar: check-tar
 
 check-tar:
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -22338,6 +23156,7 @@ maybe-install-tar:
 maybe-install-tar: install-tar
 
 install-tar: installdirs
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -22355,6 +23174,7 @@ maybe-info-tar: info-tar
 
 info-tar: \
     configure-tar 
+	@$(unstage)
 	@[ -f ./tar/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -22380,6 +23200,7 @@ maybe-dvi-tar: dvi-tar
 
 dvi-tar: \
     configure-tar 
+	@$(unstage)
 	@[ -f ./tar/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -22405,6 +23226,7 @@ maybe-html-tar: html-tar
 
 html-tar: \
     configure-tar 
+	@$(unstage)
 	@[ -f ./tar/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -22430,6 +23252,7 @@ maybe-TAGS-tar: TAGS-tar
 
 TAGS-tar: \
     configure-tar 
+	@$(unstage)
 	@[ -f ./tar/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -22456,6 +23279,7 @@ maybe-install-info-tar: install-info-tar
 install-info-tar: \
     configure-tar \
     info-tar 
+	@$(unstage)
 	@[ -f ./tar/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -22481,6 +23305,7 @@ maybe-installcheck-tar: installcheck-tar
 
 installcheck-tar: \
     configure-tar 
+	@$(unstage)
 	@[ -f ./tar/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -22505,6 +23330,7 @@ maybe-mostlyclean-tar:
 maybe-mostlyclean-tar: mostlyclean-tar
 
 mostlyclean-tar: 
+	@$(unstage)
 	@[ -f ./tar/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -22529,6 +23355,7 @@ maybe-clean-tar:
 maybe-clean-tar: clean-tar
 
 clean-tar: 
+	@$(unstage)
 	@[ -f ./tar/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -22553,6 +23380,7 @@ maybe-distclean-tar:
 maybe-distclean-tar: distclean-tar
 
 distclean-tar: 
+	@$(unstage)
 	@[ -f ./tar/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -22577,6 +23405,7 @@ maybe-maintainer-clean-tar:
 maybe-maintainer-clean-tar: maintainer-clean-tar
 
 maintainer-clean-tar: 
+	@$(unstage)
 	@[ -f ./tar/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -22602,6 +23431,7 @@ maybe-configure-texinfo:
 @if texinfo
 maybe-configure-texinfo: configure-texinfo
 configure-texinfo: 
+	@$(unstage)
 	@test ! -f $(HOST_SUBDIR)/texinfo/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/texinfo ; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -22631,6 +23461,7 @@ maybe-all-texinfo:
 TARGET-texinfo=all
 maybe-all-texinfo: all-texinfo
 all-texinfo: configure-texinfo
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -22647,6 +23478,7 @@ maybe-check-texinfo:
 maybe-check-texinfo: check-texinfo
 
 check-texinfo:
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -22673,6 +23505,7 @@ maybe-info-texinfo: info-texinfo
 
 info-texinfo: \
     configure-texinfo 
+	@$(unstage)
 	@[ -f ./texinfo/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -22698,6 +23531,7 @@ maybe-dvi-texinfo: dvi-texinfo
 
 dvi-texinfo: \
     configure-texinfo 
+	@$(unstage)
 	@[ -f ./texinfo/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -22723,6 +23557,7 @@ maybe-html-texinfo: html-texinfo
 
 html-texinfo: \
     configure-texinfo 
+	@$(unstage)
 	@[ -f ./texinfo/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -22748,6 +23583,7 @@ maybe-TAGS-texinfo: TAGS-texinfo
 
 TAGS-texinfo: \
     configure-texinfo 
+	@$(unstage)
 	@[ -f ./texinfo/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -22774,6 +23610,7 @@ maybe-install-info-texinfo: install-info-texinfo
 install-info-texinfo: \
     configure-texinfo \
     info-texinfo 
+	@$(unstage)
 	@[ -f ./texinfo/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -22799,6 +23636,7 @@ maybe-installcheck-texinfo: installcheck-texinfo
 
 installcheck-texinfo: \
     configure-texinfo 
+	@$(unstage)
 	@[ -f ./texinfo/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -22823,6 +23661,7 @@ maybe-mostlyclean-texinfo:
 maybe-mostlyclean-texinfo: mostlyclean-texinfo
 
 mostlyclean-texinfo: 
+	@$(unstage)
 	@[ -f ./texinfo/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -22847,6 +23686,7 @@ maybe-clean-texinfo:
 maybe-clean-texinfo: clean-texinfo
 
 clean-texinfo: 
+	@$(unstage)
 	@[ -f ./texinfo/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -22871,6 +23711,7 @@ maybe-distclean-texinfo:
 maybe-distclean-texinfo: distclean-texinfo
 
 distclean-texinfo: 
+	@$(unstage)
 	@[ -f ./texinfo/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -22895,6 +23736,7 @@ maybe-maintainer-clean-texinfo:
 maybe-maintainer-clean-texinfo: maintainer-clean-texinfo
 
 maintainer-clean-texinfo: 
+	@$(unstage)
 	@[ -f ./texinfo/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -22920,6 +23762,7 @@ maybe-configure-textutils:
 @if textutils
 maybe-configure-textutils: configure-textutils
 configure-textutils: 
+	@$(unstage)
 	@test ! -f $(HOST_SUBDIR)/textutils/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/textutils ; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -22949,6 +23792,7 @@ maybe-all-textutils:
 TARGET-textutils=all
 maybe-all-textutils: all-textutils
 all-textutils: configure-textutils
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -22965,6 +23809,7 @@ maybe-check-textutils:
 maybe-check-textutils: check-textutils
 
 check-textutils:
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -22979,6 +23824,7 @@ maybe-install-textutils:
 maybe-install-textutils: install-textutils
 
 install-textutils: installdirs
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -22996,6 +23842,7 @@ maybe-info-textutils: info-textutils
 
 info-textutils: \
     configure-textutils 
+	@$(unstage)
 	@[ -f ./textutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -23021,6 +23868,7 @@ maybe-dvi-textutils: dvi-textutils
 
 dvi-textutils: \
     configure-textutils 
+	@$(unstage)
 	@[ -f ./textutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -23046,6 +23894,7 @@ maybe-html-textutils: html-textutils
 
 html-textutils: \
     configure-textutils 
+	@$(unstage)
 	@[ -f ./textutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -23071,6 +23920,7 @@ maybe-TAGS-textutils: TAGS-textutils
 
 TAGS-textutils: \
     configure-textutils 
+	@$(unstage)
 	@[ -f ./textutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -23097,6 +23947,7 @@ maybe-install-info-textutils: install-info-textutils
 install-info-textutils: \
     configure-textutils \
     info-textutils 
+	@$(unstage)
 	@[ -f ./textutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -23122,6 +23973,7 @@ maybe-installcheck-textutils: installcheck-textutils
 
 installcheck-textutils: \
     configure-textutils 
+	@$(unstage)
 	@[ -f ./textutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -23146,6 +23998,7 @@ maybe-mostlyclean-textutils:
 maybe-mostlyclean-textutils: mostlyclean-textutils
 
 mostlyclean-textutils: 
+	@$(unstage)
 	@[ -f ./textutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -23170,6 +24023,7 @@ maybe-clean-textutils:
 maybe-clean-textutils: clean-textutils
 
 clean-textutils: 
+	@$(unstage)
 	@[ -f ./textutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -23194,6 +24048,7 @@ maybe-distclean-textutils:
 maybe-distclean-textutils: distclean-textutils
 
 distclean-textutils: 
+	@$(unstage)
 	@[ -f ./textutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -23218,6 +24073,7 @@ maybe-maintainer-clean-textutils:
 maybe-maintainer-clean-textutils: maintainer-clean-textutils
 
 maintainer-clean-textutils: 
+	@$(unstage)
 	@[ -f ./textutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -23243,6 +24099,7 @@ maybe-configure-time:
 @if time
 maybe-configure-time: configure-time
 configure-time: 
+	@$(unstage)
 	@test ! -f $(HOST_SUBDIR)/time/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/time ; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -23272,6 +24129,7 @@ maybe-all-time:
 TARGET-time=all
 maybe-all-time: all-time
 all-time: configure-time
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -23288,6 +24146,7 @@ maybe-check-time:
 maybe-check-time: check-time
 
 check-time:
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -23302,6 +24161,7 @@ maybe-install-time:
 maybe-install-time: install-time
 
 install-time: installdirs
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -23319,6 +24179,7 @@ maybe-info-time: info-time
 
 info-time: \
     configure-time 
+	@$(unstage)
 	@[ -f ./time/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -23344,6 +24205,7 @@ maybe-dvi-time: dvi-time
 
 dvi-time: \
     configure-time 
+	@$(unstage)
 	@[ -f ./time/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -23369,6 +24231,7 @@ maybe-html-time: html-time
 
 html-time: \
     configure-time 
+	@$(unstage)
 	@[ -f ./time/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -23394,6 +24257,7 @@ maybe-TAGS-time: TAGS-time
 
 TAGS-time: \
     configure-time 
+	@$(unstage)
 	@[ -f ./time/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -23420,6 +24284,7 @@ maybe-install-info-time: install-info-time
 install-info-time: \
     configure-time \
     info-time 
+	@$(unstage)
 	@[ -f ./time/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -23445,6 +24310,7 @@ maybe-installcheck-time: installcheck-time
 
 installcheck-time: \
     configure-time 
+	@$(unstage)
 	@[ -f ./time/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -23469,6 +24335,7 @@ maybe-mostlyclean-time:
 maybe-mostlyclean-time: mostlyclean-time
 
 mostlyclean-time: 
+	@$(unstage)
 	@[ -f ./time/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -23493,6 +24360,7 @@ maybe-clean-time:
 maybe-clean-time: clean-time
 
 clean-time: 
+	@$(unstage)
 	@[ -f ./time/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -23517,6 +24385,7 @@ maybe-distclean-time:
 maybe-distclean-time: distclean-time
 
 distclean-time: 
+	@$(unstage)
 	@[ -f ./time/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -23541,6 +24410,7 @@ maybe-maintainer-clean-time:
 maybe-maintainer-clean-time: maintainer-clean-time
 
 maintainer-clean-time: 
+	@$(unstage)
 	@[ -f ./time/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -23566,6 +24436,7 @@ maybe-configure-uudecode:
 @if uudecode
 maybe-configure-uudecode: configure-uudecode
 configure-uudecode: 
+	@$(unstage)
 	@test ! -f $(HOST_SUBDIR)/uudecode/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/uudecode ; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -23595,6 +24466,7 @@ maybe-all-uudecode:
 TARGET-uudecode=all
 maybe-all-uudecode: all-uudecode
 all-uudecode: configure-uudecode
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -23611,6 +24483,7 @@ maybe-check-uudecode:
 maybe-check-uudecode: check-uudecode
 
 check-uudecode:
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -23625,6 +24498,7 @@ maybe-install-uudecode:
 maybe-install-uudecode: install-uudecode
 
 install-uudecode: installdirs
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -23642,6 +24516,7 @@ maybe-info-uudecode: info-uudecode
 
 info-uudecode: \
     configure-uudecode 
+	@$(unstage)
 	@[ -f ./uudecode/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -23667,6 +24542,7 @@ maybe-dvi-uudecode: dvi-uudecode
 
 dvi-uudecode: \
     configure-uudecode 
+	@$(unstage)
 	@[ -f ./uudecode/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -23692,6 +24568,7 @@ maybe-html-uudecode: html-uudecode
 
 html-uudecode: \
     configure-uudecode 
+	@$(unstage)
 	@[ -f ./uudecode/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -23717,6 +24594,7 @@ maybe-TAGS-uudecode: TAGS-uudecode
 
 TAGS-uudecode: \
     configure-uudecode 
+	@$(unstage)
 	@[ -f ./uudecode/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -23743,6 +24621,7 @@ maybe-install-info-uudecode: install-info-uudecode
 install-info-uudecode: \
     configure-uudecode \
     info-uudecode 
+	@$(unstage)
 	@[ -f ./uudecode/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -23768,6 +24647,7 @@ maybe-installcheck-uudecode: installcheck-uudecode
 
 installcheck-uudecode: \
     configure-uudecode 
+	@$(unstage)
 	@[ -f ./uudecode/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -23792,6 +24672,7 @@ maybe-mostlyclean-uudecode:
 maybe-mostlyclean-uudecode: mostlyclean-uudecode
 
 mostlyclean-uudecode: 
+	@$(unstage)
 	@[ -f ./uudecode/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -23816,6 +24697,7 @@ maybe-clean-uudecode:
 maybe-clean-uudecode: clean-uudecode
 
 clean-uudecode: 
+	@$(unstage)
 	@[ -f ./uudecode/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -23840,6 +24722,7 @@ maybe-distclean-uudecode:
 maybe-distclean-uudecode: distclean-uudecode
 
 distclean-uudecode: 
+	@$(unstage)
 	@[ -f ./uudecode/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -23864,6 +24747,7 @@ maybe-maintainer-clean-uudecode:
 maybe-maintainer-clean-uudecode: maintainer-clean-uudecode
 
 maintainer-clean-uudecode: 
+	@$(unstage)
 	@[ -f ./uudecode/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -23889,6 +24773,7 @@ maybe-configure-wdiff:
 @if wdiff
 maybe-configure-wdiff: configure-wdiff
 configure-wdiff: 
+	@$(unstage)
 	@test ! -f $(HOST_SUBDIR)/wdiff/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/wdiff ; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -23918,6 +24803,7 @@ maybe-all-wdiff:
 TARGET-wdiff=all
 maybe-all-wdiff: all-wdiff
 all-wdiff: configure-wdiff
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -23934,6 +24820,7 @@ maybe-check-wdiff:
 maybe-check-wdiff: check-wdiff
 
 check-wdiff:
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -23948,6 +24835,7 @@ maybe-install-wdiff:
 maybe-install-wdiff: install-wdiff
 
 install-wdiff: installdirs
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -23965,6 +24853,7 @@ maybe-info-wdiff: info-wdiff
 
 info-wdiff: \
     configure-wdiff 
+	@$(unstage)
 	@[ -f ./wdiff/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -23990,6 +24879,7 @@ maybe-dvi-wdiff: dvi-wdiff
 
 dvi-wdiff: \
     configure-wdiff 
+	@$(unstage)
 	@[ -f ./wdiff/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -24015,6 +24905,7 @@ maybe-html-wdiff: html-wdiff
 
 html-wdiff: \
     configure-wdiff 
+	@$(unstage)
 	@[ -f ./wdiff/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -24040,6 +24931,7 @@ maybe-TAGS-wdiff: TAGS-wdiff
 
 TAGS-wdiff: \
     configure-wdiff 
+	@$(unstage)
 	@[ -f ./wdiff/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -24066,6 +24958,7 @@ maybe-install-info-wdiff: install-info-wdiff
 install-info-wdiff: \
     configure-wdiff \
     info-wdiff 
+	@$(unstage)
 	@[ -f ./wdiff/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -24091,6 +24984,7 @@ maybe-installcheck-wdiff: installcheck-wdiff
 
 installcheck-wdiff: \
     configure-wdiff 
+	@$(unstage)
 	@[ -f ./wdiff/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -24115,6 +25009,7 @@ maybe-mostlyclean-wdiff:
 maybe-mostlyclean-wdiff: mostlyclean-wdiff
 
 mostlyclean-wdiff: 
+	@$(unstage)
 	@[ -f ./wdiff/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -24139,6 +25034,7 @@ maybe-clean-wdiff:
 maybe-clean-wdiff: clean-wdiff
 
 clean-wdiff: 
+	@$(unstage)
 	@[ -f ./wdiff/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -24163,6 +25059,7 @@ maybe-distclean-wdiff:
 maybe-distclean-wdiff: distclean-wdiff
 
 distclean-wdiff: 
+	@$(unstage)
 	@[ -f ./wdiff/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -24187,6 +25084,7 @@ maybe-maintainer-clean-wdiff:
 maybe-maintainer-clean-wdiff: maintainer-clean-wdiff
 
 maintainer-clean-wdiff: 
+	@$(unstage)
 	@[ -f ./wdiff/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -24212,6 +25110,7 @@ maybe-configure-zip:
 @if zip
 maybe-configure-zip: configure-zip
 configure-zip: 
+	@$(unstage)
 	@test ! -f $(HOST_SUBDIR)/zip/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zip ; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -24241,6 +25140,7 @@ maybe-all-zip:
 TARGET-zip=all
 maybe-all-zip: all-zip
 all-zip: configure-zip
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -24258,6 +25158,7 @@ maybe-check-zip: check-zip
 
 # This module is only tested in a native toolchain.
 check-zip:
+	@$(unstage)
 	@if [ '$(host)' = '$(target)' ] ; then \
 	  r=`${PWD_COMMAND}`; export r; \
 	  s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -24274,6 +25175,7 @@ maybe-install-zip:
 maybe-install-zip: install-zip
 
 install-zip: installdirs
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -24291,6 +25193,7 @@ maybe-info-zip: info-zip
 
 info-zip: \
     configure-zip 
+	@$(unstage)
 	@[ -f ./zip/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -24316,6 +25219,7 @@ maybe-dvi-zip: dvi-zip
 
 dvi-zip: \
     configure-zip 
+	@$(unstage)
 	@[ -f ./zip/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -24341,6 +25245,7 @@ maybe-html-zip: html-zip
 
 html-zip: \
     configure-zip 
+	@$(unstage)
 	@[ -f ./zip/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -24366,6 +25271,7 @@ maybe-TAGS-zip: TAGS-zip
 
 TAGS-zip: \
     configure-zip 
+	@$(unstage)
 	@[ -f ./zip/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -24392,6 +25298,7 @@ maybe-install-info-zip: install-info-zip
 install-info-zip: \
     configure-zip \
     info-zip 
+	@$(unstage)
 	@[ -f ./zip/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -24417,6 +25324,7 @@ maybe-installcheck-zip: installcheck-zip
 
 installcheck-zip: \
     configure-zip 
+	@$(unstage)
 	@[ -f ./zip/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -24441,6 +25349,7 @@ maybe-mostlyclean-zip:
 maybe-mostlyclean-zip: mostlyclean-zip
 
 mostlyclean-zip: 
+	@$(unstage)
 	@[ -f ./zip/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -24465,6 +25374,7 @@ maybe-clean-zip:
 maybe-clean-zip: clean-zip
 
 clean-zip: 
+	@$(unstage)
 	@[ -f ./zip/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -24489,6 +25399,7 @@ maybe-distclean-zip:
 maybe-distclean-zip: distclean-zip
 
 distclean-zip: 
+	@$(unstage)
 	@[ -f ./zip/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -24513,6 +25424,7 @@ maybe-maintainer-clean-zip:
 maybe-maintainer-clean-zip: maintainer-clean-zip
 
 maintainer-clean-zip: 
+	@$(unstage)
 	@[ -f ./zip/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -24565,7 +25477,7 @@ maybe-configure-stage1-zlib:
 @if zlib-bootstrap
 maybe-configure-stage1-zlib: configure-stage1-zlib
 configure-stage1-zlib: 
-	@$(MAKE) stage1-start
+	@[ `cat stage_current` = stage1 ] || $(MAKE) stage1-start
 	@[ -f $(HOST_SUBDIR)/zlib/Makefile ] && exit 0 || : ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -24589,7 +25501,7 @@ maybe-configure-stage2-zlib:
 @if zlib-bootstrap
 maybe-configure-stage2-zlib: configure-stage2-zlib
 configure-stage2-zlib: 
-	@$(MAKE) stage2-start
+	@[ `cat stage_current` = stage2 ] || $(MAKE) stage2-start
 	@[ -f $(HOST_SUBDIR)/zlib/Makefile ] && exit 0 || : ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -24614,7 +25526,7 @@ maybe-configure-stage3-zlib:
 @if zlib-bootstrap
 maybe-configure-stage3-zlib: configure-stage3-zlib
 configure-stage3-zlib: 
-	@$(MAKE) stage3-start
+	@[ `cat stage_current` = stage3 ] || $(MAKE) stage3-start
 	@[ -f $(HOST_SUBDIR)/zlib/Makefile ] && exit 0 || : ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -24639,7 +25551,7 @@ maybe-configure-stage4-zlib:
 @if zlib-bootstrap
 maybe-configure-stage4-zlib: configure-stage4-zlib
 configure-stage4-zlib: 
-	@$(MAKE) stage4-start
+	@[ `cat stage_current` = stage4 ] || $(MAKE) stage4-start
 	@[ -f $(HOST_SUBDIR)/zlib/Makefile ] && exit 0 || : ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -24664,7 +25576,7 @@ maybe-configure-stageprofile-zlib:
 @if zlib-bootstrap
 maybe-configure-stageprofile-zlib: configure-stageprofile-zlib
 configure-stageprofile-zlib: 
-	@$(MAKE) stageprofile-start
+	@[ `cat stage_current` = stageprofile ] || $(MAKE) stageprofile-start
 	@[ -f $(HOST_SUBDIR)/zlib/Makefile ] && exit 0 || : ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -24689,7 +25601,7 @@ maybe-configure-stagefeedback-zlib:
 @if zlib-bootstrap
 maybe-configure-stagefeedback-zlib: configure-stagefeedback-zlib
 configure-stagefeedback-zlib: 
-	@$(MAKE) stagefeedback-start
+	@[ `cat stage_current` = stagefeedback ] || $(MAKE) stagefeedback-start
 	@[ -f $(HOST_SUBDIR)/zlib/Makefile ] && exit 0 || : ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -24736,20 +25648,22 @@ maybe-clean-stage1-zlib:
 @if zlib-bootstrap
 maybe-all-stage1-zlib: all-stage1-zlib
 all-stage1: all-stage1-zlib
+TARGET-stage1-zlib = $(TARGET-zlib)
 all-stage1-zlib: configure-stage1-zlib
-	@$(MAKE) stage1-start
+	@[ `cat stage_current` = stage1 ] || $(MAKE) stage1-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/zlib && \
-	$(MAKE) $(FLAGS_TO_PASS)  CFLAGS="$(STAGE1_CFLAGS)" 
+	$(MAKE) $(FLAGS_TO_PASS)  CFLAGS="$(STAGE1_CFLAGS)"  \
+		$(TARGET-stage1-zlib)
 
 maybe-clean-stage1-zlib: clean-stage1-zlib
 clean-stage1: clean-stage1-zlib
 clean-stage1-zlib:
 	@[ -f $(HOST_SUBDIR)/zlib/Makefile ] || [ -f $(HOST_SUBDIR)/stage1-zlib/Makefile ] \
 	  || exit 0 ; \
-	[ -f $(HOST_SUBDIR)/zlib/Makefile ] || $(MAKE) stage1-start ; \
+	@[ `cat stage_current` = stage1 ] || $(MAKE) stage1-start
 	cd $(HOST_SUBDIR)/zlib && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		CFLAGS="$(STAGE1_CFLAGS)"  clean
@@ -24763,21 +25677,23 @@ maybe-clean-stage2-zlib:
 @if zlib-bootstrap
 maybe-all-stage2-zlib: all-stage2-zlib
 all-stage2: all-stage2-zlib
+TARGET-stage2-zlib = $(TARGET-zlib)
 all-stage2-zlib: configure-stage2-zlib
-	@$(MAKE) stage2-start
+	@[ `cat stage_current` = stage2 ] || $(MAKE) stage2-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/zlib && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)  
+	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)   \
+		$(TARGET-stage2-zlib)
 
 maybe-clean-stage2-zlib: clean-stage2-zlib
 clean-stage2: clean-stage2-zlib
 clean-stage2-zlib:
 	@[ -f $(HOST_SUBDIR)/zlib/Makefile ] || [ -f $(HOST_SUBDIR)/stage2-zlib/Makefile ] \
 	  || exit 0 ; \
-	[ -f $(HOST_SUBDIR)/zlib/Makefile ] || $(MAKE) stage2-start ; \
+	@[ `cat stage_current` = stage2 ] || $(MAKE) stage2-start
 	cd $(HOST_SUBDIR)/zlib && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -24792,21 +25708,23 @@ maybe-clean-stage3-zlib:
 @if zlib-bootstrap
 maybe-all-stage3-zlib: all-stage3-zlib
 all-stage3: all-stage3-zlib
+TARGET-stage3-zlib = $(TARGET-zlib)
 all-stage3-zlib: configure-stage3-zlib
-	@$(MAKE) stage3-start
+	@[ `cat stage_current` = stage3 ] || $(MAKE) stage3-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/zlib && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)  
+	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)   \
+		$(TARGET-stage3-zlib)
 
 maybe-clean-stage3-zlib: clean-stage3-zlib
 clean-stage3: clean-stage3-zlib
 clean-stage3-zlib:
 	@[ -f $(HOST_SUBDIR)/zlib/Makefile ] || [ -f $(HOST_SUBDIR)/stage3-zlib/Makefile ] \
 	  || exit 0 ; \
-	[ -f $(HOST_SUBDIR)/zlib/Makefile ] || $(MAKE) stage3-start ; \
+	@[ `cat stage_current` = stage3 ] || $(MAKE) stage3-start
 	cd $(HOST_SUBDIR)/zlib && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -24821,21 +25739,23 @@ maybe-clean-stage4-zlib:
 @if zlib-bootstrap
 maybe-all-stage4-zlib: all-stage4-zlib
 all-stage4: all-stage4-zlib
+TARGET-stage4-zlib = $(TARGET-zlib)
 all-stage4-zlib: configure-stage4-zlib
-	@$(MAKE) stage4-start
+	@[ `cat stage_current` = stage4 ] || $(MAKE) stage4-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/zlib && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)  
+	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)   \
+		$(TARGET-stage4-zlib)
 
 maybe-clean-stage4-zlib: clean-stage4-zlib
 clean-stage4: clean-stage4-zlib
 clean-stage4-zlib:
 	@[ -f $(HOST_SUBDIR)/zlib/Makefile ] || [ -f $(HOST_SUBDIR)/stage4-zlib/Makefile ] \
 	  || exit 0 ; \
-	[ -f $(HOST_SUBDIR)/zlib/Makefile ] || $(MAKE) stage4-start ; \
+	@[ `cat stage_current` = stage4 ] || $(MAKE) stage4-start
 	cd $(HOST_SUBDIR)/zlib && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -24850,21 +25770,23 @@ maybe-clean-stageprofile-zlib:
 @if zlib-bootstrap
 maybe-all-stageprofile-zlib: all-stageprofile-zlib
 all-stageprofile: all-stageprofile-zlib
+TARGET-stageprofile-zlib = $(TARGET-zlib)
 all-stageprofile-zlib: configure-stageprofile-zlib
-	@$(MAKE) stageprofile-start
+	@[ `cat stage_current` = stageprofile ] || $(MAKE) stageprofile-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/zlib && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" 
+	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-generate"  \
+		$(TARGET-stageprofile-zlib)
 
 maybe-clean-stageprofile-zlib: clean-stageprofile-zlib
 clean-stageprofile: clean-stageprofile-zlib
 clean-stageprofile-zlib:
 	@[ -f $(HOST_SUBDIR)/zlib/Makefile ] || [ -f $(HOST_SUBDIR)/stageprofile-zlib/Makefile ] \
 	  || exit 0 ; \
-	[ -f $(HOST_SUBDIR)/zlib/Makefile ] || $(MAKE) stageprofile-start ; \
+	@[ `cat stage_current` = stageprofile ] || $(MAKE) stageprofile-start
 	cd $(HOST_SUBDIR)/zlib && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -24879,21 +25801,23 @@ maybe-clean-stagefeedback-zlib:
 @if zlib-bootstrap
 maybe-all-stagefeedback-zlib: all-stagefeedback-zlib
 all-stagefeedback: all-stagefeedback-zlib
+TARGET-stagefeedback-zlib = $(TARGET-zlib)
 all-stagefeedback-zlib: configure-stagefeedback-zlib
-	@$(MAKE) stagefeedback-start
+	@[ `cat stage_current` = stagefeedback ] || $(MAKE) stagefeedback-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/zlib && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-use" 
+	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-use"  \
+		$(TARGET-stagefeedback-zlib)
 
 maybe-clean-stagefeedback-zlib: clean-stagefeedback-zlib
 clean-stagefeedback: clean-stagefeedback-zlib
 clean-stagefeedback-zlib:
 	@[ -f $(HOST_SUBDIR)/zlib/Makefile ] || [ -f $(HOST_SUBDIR)/stagefeedback-zlib/Makefile ] \
 	  || exit 0 ; \
-	[ -f $(HOST_SUBDIR)/zlib/Makefile ] || $(MAKE) stagefeedback-start ; \
+	@[ `cat stage_current` = stagefeedback ] || $(MAKE) stagefeedback-start
 	cd $(HOST_SUBDIR)/zlib && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -25178,6 +26102,7 @@ maybe-configure-gdb:
 @if gdb
 maybe-configure-gdb: configure-gdb
 configure-gdb: 
+	@$(unstage)
 	@test ! -f $(HOST_SUBDIR)/gdb/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gdb ; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -25207,6 +26132,7 @@ maybe-all-gdb:
 TARGET-gdb=all
 maybe-all-gdb: all-gdb
 all-gdb: configure-gdb
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -25223,6 +26149,7 @@ maybe-check-gdb:
 maybe-check-gdb: check-gdb
 
 check-gdb:
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -25237,6 +26164,7 @@ maybe-install-gdb:
 maybe-install-gdb: install-gdb
 
 install-gdb: installdirs
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -25254,6 +26182,7 @@ maybe-info-gdb: info-gdb
 
 info-gdb: \
     configure-gdb 
+	@$(unstage)
 	@[ -f ./gdb/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -25279,6 +26208,7 @@ maybe-dvi-gdb: dvi-gdb
 
 dvi-gdb: \
     configure-gdb 
+	@$(unstage)
 	@[ -f ./gdb/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -25304,6 +26234,7 @@ maybe-html-gdb: html-gdb
 
 html-gdb: \
     configure-gdb 
+	@$(unstage)
 	@[ -f ./gdb/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -25329,6 +26260,7 @@ maybe-TAGS-gdb: TAGS-gdb
 
 TAGS-gdb: \
     configure-gdb 
+	@$(unstage)
 	@[ -f ./gdb/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -25355,6 +26287,7 @@ maybe-install-info-gdb: install-info-gdb
 install-info-gdb: \
     configure-gdb \
     info-gdb 
+	@$(unstage)
 	@[ -f ./gdb/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -25380,6 +26313,7 @@ maybe-installcheck-gdb: installcheck-gdb
 
 installcheck-gdb: \
     configure-gdb 
+	@$(unstage)
 	@[ -f ./gdb/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -25404,6 +26338,7 @@ maybe-mostlyclean-gdb:
 maybe-mostlyclean-gdb: mostlyclean-gdb
 
 mostlyclean-gdb: 
+	@$(unstage)
 	@[ -f ./gdb/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -25428,6 +26363,7 @@ maybe-clean-gdb:
 maybe-clean-gdb: clean-gdb
 
 clean-gdb: 
+	@$(unstage)
 	@[ -f ./gdb/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -25452,6 +26388,7 @@ maybe-distclean-gdb:
 maybe-distclean-gdb: distclean-gdb
 
 distclean-gdb: 
+	@$(unstage)
 	@[ -f ./gdb/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -25476,6 +26413,7 @@ maybe-maintainer-clean-gdb:
 maybe-maintainer-clean-gdb: maintainer-clean-gdb
 
 maintainer-clean-gdb: 
+	@$(unstage)
 	@[ -f ./gdb/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -25501,6 +26439,7 @@ maybe-configure-expect:
 @if expect
 maybe-configure-expect: configure-expect
 configure-expect: 
+	@$(unstage)
 	@test ! -f $(HOST_SUBDIR)/expect/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/expect ; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -25530,6 +26469,7 @@ maybe-all-expect:
 TARGET-expect=all
 maybe-all-expect: all-expect
 all-expect: configure-expect
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -25546,6 +26486,7 @@ maybe-check-expect:
 maybe-check-expect: check-expect
 
 check-expect:
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -25560,6 +26501,7 @@ maybe-install-expect:
 maybe-install-expect: install-expect
 
 install-expect: installdirs
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -25577,6 +26519,7 @@ maybe-info-expect: info-expect
 
 info-expect: \
     configure-expect 
+	@$(unstage)
 	@[ -f ./expect/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -25602,6 +26545,7 @@ maybe-dvi-expect: dvi-expect
 
 dvi-expect: \
     configure-expect 
+	@$(unstage)
 	@[ -f ./expect/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -25627,6 +26571,7 @@ maybe-html-expect: html-expect
 
 html-expect: \
     configure-expect 
+	@$(unstage)
 	@[ -f ./expect/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -25652,6 +26597,7 @@ maybe-TAGS-expect: TAGS-expect
 
 TAGS-expect: \
     configure-expect 
+	@$(unstage)
 	@[ -f ./expect/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -25678,6 +26624,7 @@ maybe-install-info-expect: install-info-expect
 install-info-expect: \
     configure-expect \
     info-expect 
+	@$(unstage)
 	@[ -f ./expect/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -25703,6 +26650,7 @@ maybe-installcheck-expect: installcheck-expect
 
 installcheck-expect: \
     configure-expect 
+	@$(unstage)
 	@[ -f ./expect/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -25727,6 +26675,7 @@ maybe-mostlyclean-expect:
 maybe-mostlyclean-expect: mostlyclean-expect
 
 mostlyclean-expect: 
+	@$(unstage)
 	@[ -f ./expect/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -25751,6 +26700,7 @@ maybe-clean-expect:
 maybe-clean-expect: clean-expect
 
 clean-expect: 
+	@$(unstage)
 	@[ -f ./expect/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -25775,6 +26725,7 @@ maybe-distclean-expect:
 maybe-distclean-expect: distclean-expect
 
 distclean-expect: 
+	@$(unstage)
 	@[ -f ./expect/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -25799,6 +26750,7 @@ maybe-maintainer-clean-expect:
 maybe-maintainer-clean-expect: maintainer-clean-expect
 
 maintainer-clean-expect: 
+	@$(unstage)
 	@[ -f ./expect/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -25824,6 +26776,7 @@ maybe-configure-guile:
 @if guile
 maybe-configure-guile: configure-guile
 configure-guile: 
+	@$(unstage)
 	@test ! -f $(HOST_SUBDIR)/guile/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/guile ; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -25853,6 +26806,7 @@ maybe-all-guile:
 TARGET-guile=all
 maybe-all-guile: all-guile
 all-guile: configure-guile
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -25869,6 +26823,7 @@ maybe-check-guile:
 maybe-check-guile: check-guile
 
 check-guile:
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -25883,6 +26838,7 @@ maybe-install-guile:
 maybe-install-guile: install-guile
 
 install-guile: installdirs
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -25900,6 +26856,7 @@ maybe-info-guile: info-guile
 
 info-guile: \
     configure-guile 
+	@$(unstage)
 	@[ -f ./guile/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -25925,6 +26882,7 @@ maybe-dvi-guile: dvi-guile
 
 dvi-guile: \
     configure-guile 
+	@$(unstage)
 	@[ -f ./guile/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -25950,6 +26908,7 @@ maybe-html-guile: html-guile
 
 html-guile: \
     configure-guile 
+	@$(unstage)
 	@[ -f ./guile/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -25975,6 +26934,7 @@ maybe-TAGS-guile: TAGS-guile
 
 TAGS-guile: \
     configure-guile 
+	@$(unstage)
 	@[ -f ./guile/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -26001,6 +26961,7 @@ maybe-install-info-guile: install-info-guile
 install-info-guile: \
     configure-guile \
     info-guile 
+	@$(unstage)
 	@[ -f ./guile/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -26026,6 +26987,7 @@ maybe-installcheck-guile: installcheck-guile
 
 installcheck-guile: \
     configure-guile 
+	@$(unstage)
 	@[ -f ./guile/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -26050,6 +27012,7 @@ maybe-mostlyclean-guile:
 maybe-mostlyclean-guile: mostlyclean-guile
 
 mostlyclean-guile: 
+	@$(unstage)
 	@[ -f ./guile/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -26074,6 +27037,7 @@ maybe-clean-guile:
 maybe-clean-guile: clean-guile
 
 clean-guile: 
+	@$(unstage)
 	@[ -f ./guile/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -26098,6 +27062,7 @@ maybe-distclean-guile:
 maybe-distclean-guile: distclean-guile
 
 distclean-guile: 
+	@$(unstage)
 	@[ -f ./guile/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -26122,6 +27087,7 @@ maybe-maintainer-clean-guile:
 maybe-maintainer-clean-guile: maintainer-clean-guile
 
 maintainer-clean-guile: 
+	@$(unstage)
 	@[ -f ./guile/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -26147,6 +27113,7 @@ maybe-configure-tk:
 @if tk
 maybe-configure-tk: configure-tk
 configure-tk: 
+	@$(unstage)
 	@test ! -f $(HOST_SUBDIR)/tk/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/tk ; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -26176,6 +27143,7 @@ maybe-all-tk:
 TARGET-tk=all
 maybe-all-tk: all-tk
 all-tk: configure-tk
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -26192,6 +27160,7 @@ maybe-check-tk:
 maybe-check-tk: check-tk
 
 check-tk:
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -26206,6 +27175,7 @@ maybe-install-tk:
 maybe-install-tk: install-tk
 
 install-tk: installdirs
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -26223,6 +27193,7 @@ maybe-info-tk: info-tk
 
 info-tk: \
     configure-tk 
+	@$(unstage)
 	@[ -f ./tk/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -26248,6 +27219,7 @@ maybe-dvi-tk: dvi-tk
 
 dvi-tk: \
     configure-tk 
+	@$(unstage)
 	@[ -f ./tk/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -26273,6 +27245,7 @@ maybe-html-tk: html-tk
 
 html-tk: \
     configure-tk 
+	@$(unstage)
 	@[ -f ./tk/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -26298,6 +27271,7 @@ maybe-TAGS-tk: TAGS-tk
 
 TAGS-tk: \
     configure-tk 
+	@$(unstage)
 	@[ -f ./tk/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -26324,6 +27298,7 @@ maybe-install-info-tk: install-info-tk
 install-info-tk: \
     configure-tk \
     info-tk 
+	@$(unstage)
 	@[ -f ./tk/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -26349,6 +27324,7 @@ maybe-installcheck-tk: installcheck-tk
 
 installcheck-tk: \
     configure-tk 
+	@$(unstage)
 	@[ -f ./tk/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -26373,6 +27349,7 @@ maybe-mostlyclean-tk:
 maybe-mostlyclean-tk: mostlyclean-tk
 
 mostlyclean-tk: 
+	@$(unstage)
 	@[ -f ./tk/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -26397,6 +27374,7 @@ maybe-clean-tk:
 maybe-clean-tk: clean-tk
 
 clean-tk: 
+	@$(unstage)
 	@[ -f ./tk/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -26421,6 +27399,7 @@ maybe-distclean-tk:
 maybe-distclean-tk: distclean-tk
 
 distclean-tk: 
+	@$(unstage)
 	@[ -f ./tk/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -26445,6 +27424,7 @@ maybe-maintainer-clean-tk:
 maybe-maintainer-clean-tk: maintainer-clean-tk
 
 maintainer-clean-tk: 
+	@$(unstage)
 	@[ -f ./tk/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -26470,6 +27450,7 @@ maybe-configure-libtermcap:
 @if libtermcap
 maybe-configure-libtermcap: configure-libtermcap
 configure-libtermcap: 
+	@$(unstage)
 	@test ! -f $(HOST_SUBDIR)/libtermcap/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libtermcap ; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -26499,6 +27480,7 @@ maybe-all-libtermcap:
 TARGET-libtermcap=all
 maybe-all-libtermcap: all-libtermcap
 all-libtermcap: configure-libtermcap
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -26524,6 +27506,7 @@ maybe-install-libtermcap:
 maybe-install-libtermcap: install-libtermcap
 
 install-libtermcap: installdirs
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -26541,6 +27524,7 @@ maybe-info-libtermcap: info-libtermcap
 
 info-libtermcap: \
     configure-libtermcap 
+	@$(unstage)
 	@[ -f ./libtermcap/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -26566,6 +27550,7 @@ maybe-dvi-libtermcap: dvi-libtermcap
 
 dvi-libtermcap: \
     configure-libtermcap 
+	@$(unstage)
 	@[ -f ./libtermcap/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -26591,6 +27576,7 @@ maybe-html-libtermcap: html-libtermcap
 
 html-libtermcap: \
     configure-libtermcap 
+	@$(unstage)
 	@[ -f ./libtermcap/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -26616,6 +27602,7 @@ maybe-TAGS-libtermcap: TAGS-libtermcap
 
 TAGS-libtermcap: \
     configure-libtermcap 
+	@$(unstage)
 	@[ -f ./libtermcap/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -26642,6 +27629,7 @@ maybe-install-info-libtermcap: install-info-libtermcap
 install-info-libtermcap: \
     configure-libtermcap \
     info-libtermcap 
+	@$(unstage)
 	@[ -f ./libtermcap/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -26667,6 +27655,7 @@ maybe-installcheck-libtermcap: installcheck-libtermcap
 
 installcheck-libtermcap: \
     configure-libtermcap 
+	@$(unstage)
 	@[ -f ./libtermcap/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -26732,6 +27721,7 @@ maybe-configure-utils:
 @if utils
 maybe-configure-utils: configure-utils
 configure-utils: 
+	@$(unstage)
 	@test ! -f $(HOST_SUBDIR)/utils/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/utils ; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -26761,6 +27751,7 @@ maybe-all-utils:
 TARGET-utils=all
 maybe-all-utils: all-utils
 all-utils: configure-utils
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -26786,6 +27777,7 @@ maybe-install-utils:
 maybe-install-utils: install-utils
 
 install-utils: installdirs
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -26803,6 +27795,7 @@ maybe-info-utils: info-utils
 
 info-utils: \
     configure-utils 
+	@$(unstage)
 	@[ -f ./utils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -26828,6 +27821,7 @@ maybe-dvi-utils: dvi-utils
 
 dvi-utils: \
     configure-utils 
+	@$(unstage)
 	@[ -f ./utils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -26853,6 +27847,7 @@ maybe-html-utils: html-utils
 
 html-utils: \
     configure-utils 
+	@$(unstage)
 	@[ -f ./utils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -26878,6 +27873,7 @@ maybe-TAGS-utils: TAGS-utils
 
 TAGS-utils: \
     configure-utils 
+	@$(unstage)
 	@[ -f ./utils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -26904,6 +27900,7 @@ maybe-install-info-utils: install-info-utils
 install-info-utils: \
     configure-utils \
     info-utils 
+	@$(unstage)
 	@[ -f ./utils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -26929,6 +27926,7 @@ maybe-installcheck-utils: installcheck-utils
 
 installcheck-utils: \
     configure-utils 
+	@$(unstage)
 	@[ -f ./utils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -26953,6 +27951,7 @@ maybe-mostlyclean-utils:
 maybe-mostlyclean-utils: mostlyclean-utils
 
 mostlyclean-utils: 
+	@$(unstage)
 	@[ -f ./utils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -26977,6 +27976,7 @@ maybe-clean-utils:
 maybe-clean-utils: clean-utils
 
 clean-utils: 
+	@$(unstage)
 	@[ -f ./utils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -27001,6 +28001,7 @@ maybe-distclean-utils:
 maybe-distclean-utils: distclean-utils
 
 distclean-utils: 
+	@$(unstage)
 	@[ -f ./utils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -27025,6 +28026,7 @@ maybe-maintainer-clean-utils:
 maybe-maintainer-clean-utils: maintainer-clean-utils
 
 maintainer-clean-utils: 
+	@$(unstage)
 	@[ -f ./utils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -27050,6 +28052,7 @@ maybe-configure-gnattools:
 @if gnattools
 maybe-configure-gnattools: configure-gnattools
 configure-gnattools: 
+	@$(unstage)
 	@test ! -f $(HOST_SUBDIR)/gnattools/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gnattools ; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -27079,6 +28082,7 @@ maybe-all-gnattools:
 TARGET-gnattools=all
 maybe-all-gnattools: all-gnattools
 all-gnattools: configure-gnattools
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -27095,6 +28099,7 @@ maybe-check-gnattools:
 maybe-check-gnattools: check-gnattools
 
 check-gnattools:
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -27109,6 +28114,7 @@ maybe-install-gnattools:
 maybe-install-gnattools: install-gnattools
 
 install-gnattools: installdirs
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -27126,6 +28132,7 @@ maybe-info-gnattools: info-gnattools
 
 info-gnattools: \
     configure-gnattools 
+	@$(unstage)
 	@[ -f ./gnattools/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -27151,6 +28158,7 @@ maybe-dvi-gnattools: dvi-gnattools
 
 dvi-gnattools: \
     configure-gnattools 
+	@$(unstage)
 	@[ -f ./gnattools/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -27176,6 +28184,7 @@ maybe-html-gnattools: html-gnattools
 
 html-gnattools: \
     configure-gnattools 
+	@$(unstage)
 	@[ -f ./gnattools/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -27201,6 +28210,7 @@ maybe-TAGS-gnattools: TAGS-gnattools
 
 TAGS-gnattools: \
     configure-gnattools 
+	@$(unstage)
 	@[ -f ./gnattools/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -27227,6 +28237,7 @@ maybe-install-info-gnattools: install-info-gnattools
 install-info-gnattools: \
     configure-gnattools \
     info-gnattools 
+	@$(unstage)
 	@[ -f ./gnattools/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -27252,6 +28263,7 @@ maybe-installcheck-gnattools: installcheck-gnattools
 
 installcheck-gnattools: \
     configure-gnattools 
+	@$(unstage)
 	@[ -f ./gnattools/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -27276,6 +28288,7 @@ maybe-mostlyclean-gnattools:
 maybe-mostlyclean-gnattools: mostlyclean-gnattools
 
 mostlyclean-gnattools: 
+	@$(unstage)
 	@[ -f ./gnattools/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -27300,6 +28313,7 @@ maybe-clean-gnattools:
 maybe-clean-gnattools: clean-gnattools
 
 clean-gnattools: 
+	@$(unstage)
 	@[ -f ./gnattools/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -27324,6 +28338,7 @@ maybe-distclean-gnattools:
 maybe-distclean-gnattools: distclean-gnattools
 
 distclean-gnattools: 
+	@$(unstage)
 	@[ -f ./gnattools/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -27348,6 +28363,7 @@ maybe-maintainer-clean-gnattools:
 maybe-maintainer-clean-gnattools: maintainer-clean-gnattools
 
 maintainer-clean-gnattools: 
+	@$(unstage)
 	@[ -f ./gnattools/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -27388,6 +28404,7 @@ maybe-configure-target-libstdc++-v3:
 @if target-libstdc++-v3
 maybe-configure-target-libstdc++-v3: configure-target-libstdc++-v3
 configure-target-libstdc++-v3: $(TARGET_SUBDIR)/libstdc++-v3/multilib.out
+	@$(unstage)
 	@test ! -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3 ; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -27418,6 +28435,7 @@ maybe-all-target-libstdc++-v3:
 TARGET-target-libstdc++-v3=all
 maybe-all-target-libstdc++-v3: all-target-libstdc++-v3
 all-target-libstdc++-v3: configure-target-libstdc++-v3
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(RAW_CXX_TARGET_EXPORTS) \
@@ -27435,6 +28453,7 @@ maybe-check-target-libstdc++-v3:
 maybe-check-target-libstdc++-v3: check-target-libstdc++-v3
 
 check-target-libstdc++-v3:
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(RAW_CXX_TARGET_EXPORTS) \
@@ -27449,6 +28468,7 @@ maybe-install-target-libstdc++-v3:
 maybe-install-target-libstdc++-v3: install-target-libstdc++-v3
 
 install-target-libstdc++-v3: installdirs
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(RAW_CXX_TARGET_EXPORTS) \
@@ -27466,6 +28486,7 @@ maybe-info-target-libstdc++-v3: info-target-libstdc++-v3
 
 info-target-libstdc++-v3: \
     configure-target-libstdc++-v3 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -27491,6 +28512,7 @@ maybe-dvi-target-libstdc++-v3: dvi-target-libstdc++-v3
 
 dvi-target-libstdc++-v3: \
     configure-target-libstdc++-v3 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -27516,6 +28538,7 @@ maybe-html-target-libstdc++-v3: html-target-libstdc++-v3
 
 html-target-libstdc++-v3: \
     configure-target-libstdc++-v3 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -27541,6 +28564,7 @@ maybe-TAGS-target-libstdc++-v3: TAGS-target-libstdc++-v3
 
 TAGS-target-libstdc++-v3: \
     configure-target-libstdc++-v3 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -27567,6 +28591,7 @@ maybe-install-info-target-libstdc++-v3: install-info-target-libstdc++-v3
 install-info-target-libstdc++-v3: \
     configure-target-libstdc++-v3 \
     info-target-libstdc++-v3 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -27592,6 +28617,7 @@ maybe-installcheck-target-libstdc++-v3: installcheck-target-libstdc++-v3
 
 installcheck-target-libstdc++-v3: \
     configure-target-libstdc++-v3 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -27616,6 +28642,7 @@ maybe-mostlyclean-target-libstdc++-v3:
 maybe-mostlyclean-target-libstdc++-v3: mostlyclean-target-libstdc++-v3
 
 mostlyclean-target-libstdc++-v3: 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -27640,6 +28667,7 @@ maybe-clean-target-libstdc++-v3:
 maybe-clean-target-libstdc++-v3: clean-target-libstdc++-v3
 
 clean-target-libstdc++-v3: 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -27664,6 +28692,7 @@ maybe-distclean-target-libstdc++-v3:
 maybe-distclean-target-libstdc++-v3: distclean-target-libstdc++-v3
 
 distclean-target-libstdc++-v3: 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -27688,6 +28717,7 @@ maybe-maintainer-clean-target-libstdc++-v3:
 maybe-maintainer-clean-target-libstdc++-v3: maintainer-clean-target-libstdc++-v3
 
 maintainer-clean-target-libstdc++-v3: 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -27723,6 +28753,7 @@ maybe-configure-target-libmudflap:
 @if target-libmudflap
 maybe-configure-target-libmudflap: configure-target-libmudflap
 configure-target-libmudflap: $(TARGET_SUBDIR)/libmudflap/multilib.out
+	@$(unstage)
 	@test ! -f $(TARGET_SUBDIR)/libmudflap/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libmudflap ; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -27753,6 +28784,7 @@ maybe-all-target-libmudflap:
 TARGET-target-libmudflap=all
 maybe-all-target-libmudflap: all-target-libmudflap
 all-target-libmudflap: configure-target-libmudflap
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
@@ -27770,6 +28802,7 @@ maybe-check-target-libmudflap:
 maybe-check-target-libmudflap: check-target-libmudflap
 
 check-target-libmudflap:
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
@@ -27784,6 +28817,7 @@ maybe-install-target-libmudflap:
 maybe-install-target-libmudflap: install-target-libmudflap
 
 install-target-libmudflap: installdirs
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
@@ -27801,6 +28835,7 @@ maybe-info-target-libmudflap: info-target-libmudflap
 
 info-target-libmudflap: \
     configure-target-libmudflap 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -27826,6 +28861,7 @@ maybe-dvi-target-libmudflap: dvi-target-libmudflap
 
 dvi-target-libmudflap: \
     configure-target-libmudflap 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -27851,6 +28887,7 @@ maybe-html-target-libmudflap: html-target-libmudflap
 
 html-target-libmudflap: \
     configure-target-libmudflap 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -27876,6 +28913,7 @@ maybe-TAGS-target-libmudflap: TAGS-target-libmudflap
 
 TAGS-target-libmudflap: \
     configure-target-libmudflap 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -27902,6 +28940,7 @@ maybe-install-info-target-libmudflap: install-info-target-libmudflap
 install-info-target-libmudflap: \
     configure-target-libmudflap \
     info-target-libmudflap 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -27927,6 +28966,7 @@ maybe-installcheck-target-libmudflap: installcheck-target-libmudflap
 
 installcheck-target-libmudflap: \
     configure-target-libmudflap 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -27951,6 +28991,7 @@ maybe-mostlyclean-target-libmudflap:
 maybe-mostlyclean-target-libmudflap: mostlyclean-target-libmudflap
 
 mostlyclean-target-libmudflap: 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -27975,6 +29016,7 @@ maybe-clean-target-libmudflap:
 maybe-clean-target-libmudflap: clean-target-libmudflap
 
 clean-target-libmudflap: 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -27999,6 +29041,7 @@ maybe-distclean-target-libmudflap:
 maybe-distclean-target-libmudflap: distclean-target-libmudflap
 
 distclean-target-libmudflap: 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -28023,6 +29066,7 @@ maybe-maintainer-clean-target-libmudflap:
 maybe-maintainer-clean-target-libmudflap: maintainer-clean-target-libmudflap
 
 maintainer-clean-target-libmudflap: 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -28058,6 +29102,7 @@ maybe-configure-target-libssp:
 @if target-libssp
 maybe-configure-target-libssp: configure-target-libssp
 configure-target-libssp: $(TARGET_SUBDIR)/libssp/multilib.out
+	@$(unstage)
 	@test ! -f $(TARGET_SUBDIR)/libssp/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libssp ; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -28088,6 +29133,7 @@ maybe-all-target-libssp:
 TARGET-target-libssp=all
 maybe-all-target-libssp: all-target-libssp
 all-target-libssp: configure-target-libssp
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
@@ -28105,6 +29151,7 @@ maybe-check-target-libssp:
 maybe-check-target-libssp: check-target-libssp
 
 check-target-libssp:
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
@@ -28119,6 +29166,7 @@ maybe-install-target-libssp:
 maybe-install-target-libssp: install-target-libssp
 
 install-target-libssp: installdirs
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
@@ -28136,6 +29184,7 @@ maybe-info-target-libssp: info-target-libssp
 
 info-target-libssp: \
     configure-target-libssp 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -28161,6 +29210,7 @@ maybe-dvi-target-libssp: dvi-target-libssp
 
 dvi-target-libssp: \
     configure-target-libssp 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -28186,6 +29236,7 @@ maybe-html-target-libssp: html-target-libssp
 
 html-target-libssp: \
     configure-target-libssp 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -28211,6 +29262,7 @@ maybe-TAGS-target-libssp: TAGS-target-libssp
 
 TAGS-target-libssp: \
     configure-target-libssp 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -28237,6 +29289,7 @@ maybe-install-info-target-libssp: install-info-target-libssp
 install-info-target-libssp: \
     configure-target-libssp \
     info-target-libssp 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -28262,6 +29315,7 @@ maybe-installcheck-target-libssp: installcheck-target-libssp
 
 installcheck-target-libssp: \
     configure-target-libssp 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -28286,6 +29340,7 @@ maybe-mostlyclean-target-libssp:
 maybe-mostlyclean-target-libssp: mostlyclean-target-libssp
 
 mostlyclean-target-libssp: 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -28310,6 +29365,7 @@ maybe-clean-target-libssp:
 maybe-clean-target-libssp: clean-target-libssp
 
 clean-target-libssp: 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -28334,6 +29390,7 @@ maybe-distclean-target-libssp:
 maybe-distclean-target-libssp: distclean-target-libssp
 
 distclean-target-libssp: 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -28358,6 +29415,7 @@ maybe-maintainer-clean-target-libssp:
 maybe-maintainer-clean-target-libssp: maintainer-clean-target-libssp
 
 maintainer-clean-target-libssp: 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -28393,6 +29451,7 @@ maybe-configure-target-newlib:
 @if target-newlib
 maybe-configure-target-newlib: configure-target-newlib
 configure-target-newlib: $(TARGET_SUBDIR)/newlib/multilib.out
+	@$(unstage)
 	@test ! -f $(TARGET_SUBDIR)/newlib/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/newlib ; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -28423,6 +29482,7 @@ maybe-all-target-newlib:
 TARGET-target-newlib=all
 maybe-all-target-newlib: all-target-newlib
 all-target-newlib: configure-target-newlib
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
@@ -28440,6 +29500,7 @@ maybe-check-target-newlib:
 maybe-check-target-newlib: check-target-newlib
 
 check-target-newlib:
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
@@ -28454,6 +29515,7 @@ maybe-install-target-newlib:
 maybe-install-target-newlib: install-target-newlib
 
 install-target-newlib: installdirs
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
@@ -28471,6 +29533,7 @@ maybe-info-target-newlib: info-target-newlib
 
 info-target-newlib: \
     configure-target-newlib 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -28496,6 +29559,7 @@ maybe-dvi-target-newlib: dvi-target-newlib
 
 dvi-target-newlib: \
     configure-target-newlib 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -28521,6 +29585,7 @@ maybe-html-target-newlib: html-target-newlib
 
 html-target-newlib: \
     configure-target-newlib 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -28546,6 +29611,7 @@ maybe-TAGS-target-newlib: TAGS-target-newlib
 
 TAGS-target-newlib: \
     configure-target-newlib 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -28572,6 +29638,7 @@ maybe-install-info-target-newlib: install-info-target-newlib
 install-info-target-newlib: \
     configure-target-newlib \
     info-target-newlib 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -28597,6 +29664,7 @@ maybe-installcheck-target-newlib: installcheck-target-newlib
 
 installcheck-target-newlib: \
     configure-target-newlib 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -28621,6 +29689,7 @@ maybe-mostlyclean-target-newlib:
 maybe-mostlyclean-target-newlib: mostlyclean-target-newlib
 
 mostlyclean-target-newlib: 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -28645,6 +29714,7 @@ maybe-clean-target-newlib:
 maybe-clean-target-newlib: clean-target-newlib
 
 clean-target-newlib: 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -28669,6 +29739,7 @@ maybe-distclean-target-newlib:
 maybe-distclean-target-newlib: distclean-target-newlib
 
 distclean-target-newlib: 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -28693,6 +29764,7 @@ maybe-maintainer-clean-target-newlib:
 maybe-maintainer-clean-target-newlib: maintainer-clean-target-newlib
 
 maintainer-clean-target-newlib: 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -28728,6 +29800,7 @@ maybe-configure-target-libgfortran:
 @if target-libgfortran
 maybe-configure-target-libgfortran: configure-target-libgfortran
 configure-target-libgfortran: $(TARGET_SUBDIR)/libgfortran/multilib.out
+	@$(unstage)
 	@test ! -f $(TARGET_SUBDIR)/libgfortran/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgfortran ; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -28758,6 +29831,7 @@ maybe-all-target-libgfortran:
 TARGET-target-libgfortran=all
 maybe-all-target-libgfortran: all-target-libgfortran
 all-target-libgfortran: configure-target-libgfortran
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
@@ -28775,6 +29849,7 @@ maybe-check-target-libgfortran:
 maybe-check-target-libgfortran: check-target-libgfortran
 
 check-target-libgfortran:
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
@@ -28789,6 +29864,7 @@ maybe-install-target-libgfortran:
 maybe-install-target-libgfortran: install-target-libgfortran
 
 install-target-libgfortran: installdirs
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
@@ -28806,6 +29882,7 @@ maybe-info-target-libgfortran: info-target-libgfortran
 
 info-target-libgfortran: \
     configure-target-libgfortran 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -28831,6 +29908,7 @@ maybe-dvi-target-libgfortran: dvi-target-libgfortran
 
 dvi-target-libgfortran: \
     configure-target-libgfortran 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -28856,6 +29934,7 @@ maybe-html-target-libgfortran: html-target-libgfortran
 
 html-target-libgfortran: \
     configure-target-libgfortran 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -28881,6 +29960,7 @@ maybe-TAGS-target-libgfortran: TAGS-target-libgfortran
 
 TAGS-target-libgfortran: \
     configure-target-libgfortran 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -28907,6 +29987,7 @@ maybe-install-info-target-libgfortran: install-info-target-libgfortran
 install-info-target-libgfortran: \
     configure-target-libgfortran \
     info-target-libgfortran 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -28932,6 +30013,7 @@ maybe-installcheck-target-libgfortran: installcheck-target-libgfortran
 
 installcheck-target-libgfortran: \
     configure-target-libgfortran 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -28956,6 +30038,7 @@ maybe-mostlyclean-target-libgfortran:
 maybe-mostlyclean-target-libgfortran: mostlyclean-target-libgfortran
 
 mostlyclean-target-libgfortran: 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -28980,6 +30063,7 @@ maybe-clean-target-libgfortran:
 maybe-clean-target-libgfortran: clean-target-libgfortran
 
 clean-target-libgfortran: 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -29004,6 +30088,7 @@ maybe-distclean-target-libgfortran:
 maybe-distclean-target-libgfortran: distclean-target-libgfortran
 
 distclean-target-libgfortran: 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -29028,6 +30113,7 @@ maybe-maintainer-clean-target-libgfortran:
 maybe-maintainer-clean-target-libgfortran: maintainer-clean-target-libgfortran
 
 maintainer-clean-target-libgfortran: 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -29063,6 +30149,7 @@ maybe-configure-target-libobjc:
 @if target-libobjc
 maybe-configure-target-libobjc: configure-target-libobjc
 configure-target-libobjc: $(TARGET_SUBDIR)/libobjc/multilib.out
+	@$(unstage)
 	@test ! -f $(TARGET_SUBDIR)/libobjc/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libobjc ; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -29093,6 +30180,7 @@ maybe-all-target-libobjc:
 TARGET-target-libobjc=all
 maybe-all-target-libobjc: all-target-libobjc
 all-target-libobjc: configure-target-libobjc
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
@@ -29110,6 +30198,7 @@ maybe-check-target-libobjc:
 maybe-check-target-libobjc: check-target-libobjc
 
 check-target-libobjc:
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
@@ -29124,6 +30213,7 @@ maybe-install-target-libobjc:
 maybe-install-target-libobjc: install-target-libobjc
 
 install-target-libobjc: installdirs
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
@@ -29141,6 +30231,7 @@ maybe-info-target-libobjc: info-target-libobjc
 
 info-target-libobjc: \
     configure-target-libobjc 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -29166,6 +30257,7 @@ maybe-dvi-target-libobjc: dvi-target-libobjc
 
 dvi-target-libobjc: \
     configure-target-libobjc 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -29191,6 +30283,7 @@ maybe-html-target-libobjc: html-target-libobjc
 
 html-target-libobjc: \
     configure-target-libobjc 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -29216,6 +30309,7 @@ maybe-TAGS-target-libobjc: TAGS-target-libobjc
 
 TAGS-target-libobjc: \
     configure-target-libobjc 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -29242,6 +30336,7 @@ maybe-install-info-target-libobjc: install-info-target-libobjc
 install-info-target-libobjc: \
     configure-target-libobjc \
     info-target-libobjc 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -29267,6 +30362,7 @@ maybe-installcheck-target-libobjc: installcheck-target-libobjc
 
 installcheck-target-libobjc: \
     configure-target-libobjc 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -29291,6 +30387,7 @@ maybe-mostlyclean-target-libobjc:
 maybe-mostlyclean-target-libobjc: mostlyclean-target-libobjc
 
 mostlyclean-target-libobjc: 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -29315,6 +30412,7 @@ maybe-clean-target-libobjc:
 maybe-clean-target-libobjc: clean-target-libobjc
 
 clean-target-libobjc: 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -29339,6 +30437,7 @@ maybe-distclean-target-libobjc:
 maybe-distclean-target-libobjc: distclean-target-libobjc
 
 distclean-target-libobjc: 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -29363,6 +30462,7 @@ maybe-maintainer-clean-target-libobjc:
 maybe-maintainer-clean-target-libobjc: maintainer-clean-target-libobjc
 
 maintainer-clean-target-libobjc: 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -29398,6 +30498,7 @@ maybe-configure-target-libtermcap:
 @if target-libtermcap
 maybe-configure-target-libtermcap: configure-target-libtermcap
 configure-target-libtermcap: $(TARGET_SUBDIR)/libtermcap/multilib.out
+	@$(unstage)
 	@test ! -f $(TARGET_SUBDIR)/libtermcap/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libtermcap ; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -29428,6 +30529,7 @@ maybe-all-target-libtermcap:
 TARGET-target-libtermcap=all
 maybe-all-target-libtermcap: all-target-libtermcap
 all-target-libtermcap: configure-target-libtermcap
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
@@ -29455,6 +30557,7 @@ maybe-install-target-libtermcap:
 maybe-install-target-libtermcap: install-target-libtermcap
 
 install-target-libtermcap: installdirs
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
@@ -29472,6 +30575,7 @@ maybe-info-target-libtermcap: info-target-libtermcap
 
 info-target-libtermcap: \
     configure-target-libtermcap 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/libtermcap/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -29497,6 +30601,7 @@ maybe-dvi-target-libtermcap: dvi-target-libtermcap
 
 dvi-target-libtermcap: \
     configure-target-libtermcap 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/libtermcap/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -29522,6 +30627,7 @@ maybe-html-target-libtermcap: html-target-libtermcap
 
 html-target-libtermcap: \
     configure-target-libtermcap 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/libtermcap/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -29547,6 +30653,7 @@ maybe-TAGS-target-libtermcap: TAGS-target-libtermcap
 
 TAGS-target-libtermcap: \
     configure-target-libtermcap 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/libtermcap/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -29573,6 +30680,7 @@ maybe-install-info-target-libtermcap: install-info-target-libtermcap
 install-info-target-libtermcap: \
     configure-target-libtermcap \
     info-target-libtermcap 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/libtermcap/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -29598,6 +30706,7 @@ maybe-installcheck-target-libtermcap: installcheck-target-libtermcap
 
 installcheck-target-libtermcap: \
     configure-target-libtermcap 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/libtermcap/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -29673,6 +30782,7 @@ maybe-configure-target-winsup:
 @if target-winsup
 maybe-configure-target-winsup: configure-target-winsup
 configure-target-winsup: $(TARGET_SUBDIR)/winsup/multilib.out
+	@$(unstage)
 	@test ! -f $(TARGET_SUBDIR)/winsup/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/winsup ; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -29703,6 +30813,7 @@ maybe-all-target-winsup:
 TARGET-target-winsup=all
 maybe-all-target-winsup: all-target-winsup
 all-target-winsup: configure-target-winsup
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
@@ -29720,6 +30831,7 @@ maybe-check-target-winsup:
 maybe-check-target-winsup: check-target-winsup
 
 check-target-winsup:
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
@@ -29734,6 +30846,7 @@ maybe-install-target-winsup:
 maybe-install-target-winsup: install-target-winsup
 
 install-target-winsup: installdirs
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
@@ -29751,6 +30864,7 @@ maybe-info-target-winsup: info-target-winsup
 
 info-target-winsup: \
     configure-target-winsup 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -29776,6 +30890,7 @@ maybe-dvi-target-winsup: dvi-target-winsup
 
 dvi-target-winsup: \
     configure-target-winsup 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -29801,6 +30916,7 @@ maybe-html-target-winsup: html-target-winsup
 
 html-target-winsup: \
     configure-target-winsup 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -29826,6 +30942,7 @@ maybe-TAGS-target-winsup: TAGS-target-winsup
 
 TAGS-target-winsup: \
     configure-target-winsup 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -29852,6 +30969,7 @@ maybe-install-info-target-winsup: install-info-target-winsup
 install-info-target-winsup: \
     configure-target-winsup \
     info-target-winsup 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -29877,6 +30995,7 @@ maybe-installcheck-target-winsup: installcheck-target-winsup
 
 installcheck-target-winsup: \
     configure-target-winsup 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -29901,6 +31020,7 @@ maybe-mostlyclean-target-winsup:
 maybe-mostlyclean-target-winsup: mostlyclean-target-winsup
 
 mostlyclean-target-winsup: 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -29925,6 +31045,7 @@ maybe-clean-target-winsup:
 maybe-clean-target-winsup: clean-target-winsup
 
 clean-target-winsup: 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -29949,6 +31070,7 @@ maybe-distclean-target-winsup:
 maybe-distclean-target-winsup: distclean-target-winsup
 
 distclean-target-winsup: 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -29973,6 +31095,7 @@ maybe-maintainer-clean-target-winsup:
 maybe-maintainer-clean-target-winsup: maintainer-clean-target-winsup
 
 maintainer-clean-target-winsup: 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -30008,6 +31131,7 @@ maybe-configure-target-libgloss:
 @if target-libgloss
 maybe-configure-target-libgloss: configure-target-libgloss
 configure-target-libgloss: $(TARGET_SUBDIR)/libgloss/multilib.out
+	@$(unstage)
 	@test ! -f $(TARGET_SUBDIR)/libgloss/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgloss ; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -30038,6 +31162,7 @@ maybe-all-target-libgloss:
 TARGET-target-libgloss=all
 maybe-all-target-libgloss: all-target-libgloss
 all-target-libgloss: configure-target-libgloss
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
@@ -30065,6 +31190,7 @@ maybe-install-target-libgloss:
 maybe-install-target-libgloss: install-target-libgloss
 
 install-target-libgloss: installdirs
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
@@ -30082,6 +31208,7 @@ maybe-info-target-libgloss: info-target-libgloss
 
 info-target-libgloss: \
     configure-target-libgloss 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -30107,6 +31234,7 @@ maybe-dvi-target-libgloss: dvi-target-libgloss
 
 dvi-target-libgloss: \
     configure-target-libgloss 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -30132,6 +31260,7 @@ maybe-html-target-libgloss: html-target-libgloss
 
 html-target-libgloss: \
     configure-target-libgloss 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -30157,6 +31286,7 @@ maybe-TAGS-target-libgloss: TAGS-target-libgloss
 
 TAGS-target-libgloss: \
     configure-target-libgloss 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -30183,6 +31313,7 @@ maybe-install-info-target-libgloss: install-info-target-libgloss
 install-info-target-libgloss: \
     configure-target-libgloss \
     info-target-libgloss 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -30208,6 +31339,7 @@ maybe-installcheck-target-libgloss: installcheck-target-libgloss
 
 installcheck-target-libgloss: \
     configure-target-libgloss 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -30232,6 +31364,7 @@ maybe-mostlyclean-target-libgloss:
 maybe-mostlyclean-target-libgloss: mostlyclean-target-libgloss
 
 mostlyclean-target-libgloss: 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -30256,6 +31389,7 @@ maybe-clean-target-libgloss:
 maybe-clean-target-libgloss: clean-target-libgloss
 
 clean-target-libgloss: 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -30280,6 +31414,7 @@ maybe-distclean-target-libgloss:
 maybe-distclean-target-libgloss: distclean-target-libgloss
 
 distclean-target-libgloss: 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -30304,6 +31439,7 @@ maybe-maintainer-clean-target-libgloss:
 maybe-maintainer-clean-target-libgloss: maintainer-clean-target-libgloss
 
 maintainer-clean-target-libgloss: 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -30339,6 +31475,7 @@ maybe-configure-target-libiberty:
 @if target-libiberty
 maybe-configure-target-libiberty: configure-target-libiberty
 configure-target-libiberty: $(TARGET_SUBDIR)/libiberty/multilib.out
+	@$(unstage)
 	@test ! -f $(TARGET_SUBDIR)/libiberty/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libiberty ; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -30369,6 +31506,7 @@ maybe-all-target-libiberty:
 TARGET-target-libiberty=all
 maybe-all-target-libiberty: all-target-libiberty
 all-target-libiberty: configure-target-libiberty
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
@@ -30386,6 +31524,7 @@ maybe-check-target-libiberty:
 maybe-check-target-libiberty: check-target-libiberty
 
 check-target-libiberty:
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
@@ -30400,6 +31539,7 @@ maybe-install-target-libiberty:
 maybe-install-target-libiberty: install-target-libiberty
 
 install-target-libiberty: installdirs
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
@@ -30417,6 +31557,7 @@ maybe-info-target-libiberty: info-target-libiberty
 
 info-target-libiberty: \
     configure-target-libiberty 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/libiberty/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -30442,6 +31583,7 @@ maybe-dvi-target-libiberty: dvi-target-libiberty
 
 dvi-target-libiberty: \
     configure-target-libiberty 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/libiberty/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -30467,6 +31609,7 @@ maybe-html-target-libiberty: html-target-libiberty
 
 html-target-libiberty: \
     configure-target-libiberty 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/libiberty/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -30492,6 +31635,7 @@ maybe-TAGS-target-libiberty: TAGS-target-libiberty
 
 TAGS-target-libiberty: \
     configure-target-libiberty 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/libiberty/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -30518,6 +31662,7 @@ maybe-install-info-target-libiberty: install-info-target-libiberty
 install-info-target-libiberty: \
     configure-target-libiberty \
     info-target-libiberty 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/libiberty/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -30543,6 +31688,7 @@ maybe-installcheck-target-libiberty: installcheck-target-libiberty
 
 installcheck-target-libiberty: \
     configure-target-libiberty 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/libiberty/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -30567,6 +31713,7 @@ maybe-mostlyclean-target-libiberty:
 maybe-mostlyclean-target-libiberty: mostlyclean-target-libiberty
 
 mostlyclean-target-libiberty: 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/libiberty/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -30591,6 +31738,7 @@ maybe-clean-target-libiberty:
 maybe-clean-target-libiberty: clean-target-libiberty
 
 clean-target-libiberty: 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/libiberty/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -30615,6 +31763,7 @@ maybe-distclean-target-libiberty:
 maybe-distclean-target-libiberty: distclean-target-libiberty
 
 distclean-target-libiberty: 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/libiberty/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -30639,6 +31788,7 @@ maybe-maintainer-clean-target-libiberty:
 maybe-maintainer-clean-target-libiberty: maintainer-clean-target-libiberty
 
 maintainer-clean-target-libiberty: 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/libiberty/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -30674,6 +31824,7 @@ maybe-configure-target-gperf:
 @if target-gperf
 maybe-configure-target-gperf: configure-target-gperf
 configure-target-gperf: $(TARGET_SUBDIR)/gperf/multilib.out
+	@$(unstage)
 	@test ! -f $(TARGET_SUBDIR)/gperf/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/gperf ; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -30704,6 +31855,7 @@ maybe-all-target-gperf:
 TARGET-target-gperf=all
 maybe-all-target-gperf: all-target-gperf
 all-target-gperf: configure-target-gperf
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
@@ -30721,6 +31873,7 @@ maybe-check-target-gperf:
 maybe-check-target-gperf: check-target-gperf
 
 check-target-gperf:
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
@@ -30735,6 +31888,7 @@ maybe-install-target-gperf:
 maybe-install-target-gperf: install-target-gperf
 
 install-target-gperf: installdirs
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
@@ -30752,6 +31906,7 @@ maybe-info-target-gperf: info-target-gperf
 
 info-target-gperf: \
     configure-target-gperf 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/gperf/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -30777,6 +31932,7 @@ maybe-dvi-target-gperf: dvi-target-gperf
 
 dvi-target-gperf: \
     configure-target-gperf 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/gperf/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -30802,6 +31958,7 @@ maybe-html-target-gperf: html-target-gperf
 
 html-target-gperf: \
     configure-target-gperf 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/gperf/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -30827,6 +31984,7 @@ maybe-TAGS-target-gperf: TAGS-target-gperf
 
 TAGS-target-gperf: \
     configure-target-gperf 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/gperf/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -30853,6 +32011,7 @@ maybe-install-info-target-gperf: install-info-target-gperf
 install-info-target-gperf: \
     configure-target-gperf \
     info-target-gperf 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/gperf/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -30878,6 +32037,7 @@ maybe-installcheck-target-gperf: installcheck-target-gperf
 
 installcheck-target-gperf: \
     configure-target-gperf 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/gperf/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -30902,6 +32062,7 @@ maybe-mostlyclean-target-gperf:
 maybe-mostlyclean-target-gperf: mostlyclean-target-gperf
 
 mostlyclean-target-gperf: 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/gperf/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -30926,6 +32087,7 @@ maybe-clean-target-gperf:
 maybe-clean-target-gperf: clean-target-gperf
 
 clean-target-gperf: 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/gperf/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -30950,6 +32112,7 @@ maybe-distclean-target-gperf:
 maybe-distclean-target-gperf: distclean-target-gperf
 
 distclean-target-gperf: 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/gperf/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -30974,6 +32137,7 @@ maybe-maintainer-clean-target-gperf:
 maybe-maintainer-clean-target-gperf: maintainer-clean-target-gperf
 
 maintainer-clean-target-gperf: 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/gperf/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -31009,6 +32173,7 @@ maybe-configure-target-examples:
 @if target-examples
 maybe-configure-target-examples: configure-target-examples
 configure-target-examples: $(TARGET_SUBDIR)/examples/multilib.out
+	@$(unstage)
 	@test ! -f $(TARGET_SUBDIR)/examples/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/examples ; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -31039,6 +32204,7 @@ maybe-all-target-examples:
 TARGET-target-examples=all
 maybe-all-target-examples: all-target-examples
 all-target-examples: configure-target-examples
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
@@ -31079,6 +32245,7 @@ maybe-info-target-examples: info-target-examples
 
 info-target-examples: \
     configure-target-examples 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/examples/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -31104,6 +32271,7 @@ maybe-dvi-target-examples: dvi-target-examples
 
 dvi-target-examples: \
     configure-target-examples 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/examples/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -31129,6 +32297,7 @@ maybe-html-target-examples: html-target-examples
 
 html-target-examples: \
     configure-target-examples 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/examples/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -31154,6 +32323,7 @@ maybe-TAGS-target-examples: TAGS-target-examples
 
 TAGS-target-examples: \
     configure-target-examples 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/examples/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -31180,6 +32350,7 @@ maybe-install-info-target-examples: install-info-target-examples
 install-info-target-examples: \
     configure-target-examples \
     info-target-examples 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/examples/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -31205,6 +32376,7 @@ maybe-installcheck-target-examples: installcheck-target-examples
 
 installcheck-target-examples: \
     configure-target-examples 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/examples/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -31229,6 +32401,7 @@ maybe-mostlyclean-target-examples:
 maybe-mostlyclean-target-examples: mostlyclean-target-examples
 
 mostlyclean-target-examples: 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/examples/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -31253,6 +32426,7 @@ maybe-clean-target-examples:
 maybe-clean-target-examples: clean-target-examples
 
 clean-target-examples: 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/examples/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -31277,6 +32451,7 @@ maybe-distclean-target-examples:
 maybe-distclean-target-examples: distclean-target-examples
 
 distclean-target-examples: 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/examples/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -31301,6 +32476,7 @@ maybe-maintainer-clean-target-examples:
 maybe-maintainer-clean-target-examples: maintainer-clean-target-examples
 
 maintainer-clean-target-examples: 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/examples/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -31336,6 +32512,7 @@ maybe-configure-target-libffi:
 @if target-libffi
 maybe-configure-target-libffi: configure-target-libffi
 configure-target-libffi: $(TARGET_SUBDIR)/libffi/multilib.out
+	@$(unstage)
 	@test ! -f $(TARGET_SUBDIR)/libffi/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libffi ; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -31366,6 +32543,7 @@ maybe-all-target-libffi:
 TARGET-target-libffi=all
 maybe-all-target-libffi: all-target-libffi
 all-target-libffi: configure-target-libffi
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
@@ -31383,6 +32561,7 @@ maybe-check-target-libffi:
 maybe-check-target-libffi: check-target-libffi
 
 check-target-libffi:
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
@@ -31397,6 +32576,7 @@ maybe-install-target-libffi:
 maybe-install-target-libffi: install-target-libffi
 
 install-target-libffi: installdirs
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
@@ -31414,6 +32594,7 @@ maybe-info-target-libffi: info-target-libffi
 
 info-target-libffi: \
     configure-target-libffi 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -31439,6 +32620,7 @@ maybe-dvi-target-libffi: dvi-target-libffi
 
 dvi-target-libffi: \
     configure-target-libffi 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -31464,6 +32646,7 @@ maybe-html-target-libffi: html-target-libffi
 
 html-target-libffi: \
     configure-target-libffi 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -31489,6 +32672,7 @@ maybe-TAGS-target-libffi: TAGS-target-libffi
 
 TAGS-target-libffi: \
     configure-target-libffi 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -31515,6 +32699,7 @@ maybe-install-info-target-libffi: install-info-target-libffi
 install-info-target-libffi: \
     configure-target-libffi \
     info-target-libffi 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -31540,6 +32725,7 @@ maybe-installcheck-target-libffi: installcheck-target-libffi
 
 installcheck-target-libffi: \
     configure-target-libffi 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -31564,6 +32750,7 @@ maybe-mostlyclean-target-libffi:
 maybe-mostlyclean-target-libffi: mostlyclean-target-libffi
 
 mostlyclean-target-libffi: 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -31588,6 +32775,7 @@ maybe-clean-target-libffi:
 maybe-clean-target-libffi: clean-target-libffi
 
 clean-target-libffi: 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -31612,6 +32800,7 @@ maybe-distclean-target-libffi:
 maybe-distclean-target-libffi: distclean-target-libffi
 
 distclean-target-libffi: 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -31636,6 +32825,7 @@ maybe-maintainer-clean-target-libffi:
 maybe-maintainer-clean-target-libffi: maintainer-clean-target-libffi
 
 maintainer-clean-target-libffi: 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -31671,6 +32861,7 @@ maybe-configure-target-libjava:
 @if target-libjava
 maybe-configure-target-libjava: configure-target-libjava
 configure-target-libjava: $(TARGET_SUBDIR)/libjava/multilib.out
+	@$(unstage)
 	@test ! -f $(TARGET_SUBDIR)/libjava/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libjava ; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -31701,6 +32892,7 @@ maybe-all-target-libjava:
 TARGET-target-libjava=all
 maybe-all-target-libjava: all-target-libjava
 all-target-libjava: configure-target-libjava
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(RAW_CXX_TARGET_EXPORTS) \
@@ -31718,6 +32910,7 @@ maybe-check-target-libjava:
 maybe-check-target-libjava: check-target-libjava
 
 check-target-libjava:
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(RAW_CXX_TARGET_EXPORTS) \
@@ -31732,6 +32925,7 @@ maybe-install-target-libjava:
 maybe-install-target-libjava: install-target-libjava
 
 install-target-libjava: installdirs
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(RAW_CXX_TARGET_EXPORTS) \
@@ -31749,6 +32943,7 @@ maybe-info-target-libjava: info-target-libjava
 
 info-target-libjava: \
     configure-target-libjava 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -31774,6 +32969,7 @@ maybe-dvi-target-libjava: dvi-target-libjava
 
 dvi-target-libjava: \
     configure-target-libjava 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -31799,6 +32995,7 @@ maybe-html-target-libjava: html-target-libjava
 
 html-target-libjava: \
     configure-target-libjava 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -31824,6 +33021,7 @@ maybe-TAGS-target-libjava: TAGS-target-libjava
 
 TAGS-target-libjava: \
     configure-target-libjava 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -31850,6 +33048,7 @@ maybe-install-info-target-libjava: install-info-target-libjava
 install-info-target-libjava: \
     configure-target-libjava \
     info-target-libjava 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -31875,6 +33074,7 @@ maybe-installcheck-target-libjava: installcheck-target-libjava
 
 installcheck-target-libjava: \
     configure-target-libjava 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -31899,6 +33099,7 @@ maybe-mostlyclean-target-libjava:
 maybe-mostlyclean-target-libjava: mostlyclean-target-libjava
 
 mostlyclean-target-libjava: 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -31923,6 +33124,7 @@ maybe-clean-target-libjava:
 maybe-clean-target-libjava: clean-target-libjava
 
 clean-target-libjava: 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -31947,6 +33149,7 @@ maybe-distclean-target-libjava:
 maybe-distclean-target-libjava: distclean-target-libjava
 
 distclean-target-libjava: 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -31971,6 +33174,7 @@ maybe-maintainer-clean-target-libjava:
 maybe-maintainer-clean-target-libjava: maintainer-clean-target-libjava
 
 maintainer-clean-target-libjava: 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -32006,6 +33210,7 @@ maybe-configure-target-zlib:
 @if target-zlib
 maybe-configure-target-zlib: configure-target-zlib
 configure-target-zlib: $(TARGET_SUBDIR)/zlib/multilib.out
+	@$(unstage)
 	@test ! -f $(TARGET_SUBDIR)/zlib/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/zlib ; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -32036,6 +33241,7 @@ maybe-all-target-zlib:
 TARGET-target-zlib=all
 maybe-all-target-zlib: all-target-zlib
 all-target-zlib: configure-target-zlib
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
@@ -32053,6 +33259,7 @@ maybe-check-target-zlib:
 maybe-check-target-zlib: check-target-zlib
 
 check-target-zlib:
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
@@ -32067,6 +33274,7 @@ maybe-install-target-zlib:
 maybe-install-target-zlib: install-target-zlib
 
 install-target-zlib: installdirs
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
@@ -32084,6 +33292,7 @@ maybe-info-target-zlib: info-target-zlib
 
 info-target-zlib: \
     configure-target-zlib 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -32109,6 +33318,7 @@ maybe-dvi-target-zlib: dvi-target-zlib
 
 dvi-target-zlib: \
     configure-target-zlib 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -32134,6 +33344,7 @@ maybe-html-target-zlib: html-target-zlib
 
 html-target-zlib: \
     configure-target-zlib 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -32159,6 +33370,7 @@ maybe-TAGS-target-zlib: TAGS-target-zlib
 
 TAGS-target-zlib: \
     configure-target-zlib 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -32185,6 +33397,7 @@ maybe-install-info-target-zlib: install-info-target-zlib
 install-info-target-zlib: \
     configure-target-zlib \
     info-target-zlib 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -32210,6 +33423,7 @@ maybe-installcheck-target-zlib: installcheck-target-zlib
 
 installcheck-target-zlib: \
     configure-target-zlib 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -32234,6 +33448,7 @@ maybe-mostlyclean-target-zlib:
 maybe-mostlyclean-target-zlib: mostlyclean-target-zlib
 
 mostlyclean-target-zlib: 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -32258,6 +33473,7 @@ maybe-clean-target-zlib:
 maybe-clean-target-zlib: clean-target-zlib
 
 clean-target-zlib: 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -32282,6 +33498,7 @@ maybe-distclean-target-zlib:
 maybe-distclean-target-zlib: distclean-target-zlib
 
 distclean-target-zlib: 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -32306,6 +33523,7 @@ maybe-maintainer-clean-target-zlib:
 maybe-maintainer-clean-target-zlib: maintainer-clean-target-zlib
 
 maintainer-clean-target-zlib: 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -32341,6 +33559,7 @@ maybe-configure-target-boehm-gc:
 @if target-boehm-gc
 maybe-configure-target-boehm-gc: configure-target-boehm-gc
 configure-target-boehm-gc: $(TARGET_SUBDIR)/boehm-gc/multilib.out
+	@$(unstage)
 	@test ! -f $(TARGET_SUBDIR)/boehm-gc/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/boehm-gc ; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -32371,6 +33590,7 @@ maybe-all-target-boehm-gc:
 TARGET-target-boehm-gc=all
 maybe-all-target-boehm-gc: all-target-boehm-gc
 all-target-boehm-gc: configure-target-boehm-gc
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
@@ -32388,6 +33608,7 @@ maybe-check-target-boehm-gc:
 maybe-check-target-boehm-gc: check-target-boehm-gc
 
 check-target-boehm-gc:
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
@@ -32402,6 +33623,7 @@ maybe-install-target-boehm-gc:
 maybe-install-target-boehm-gc: install-target-boehm-gc
 
 install-target-boehm-gc: installdirs
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
@@ -32419,6 +33641,7 @@ maybe-info-target-boehm-gc: info-target-boehm-gc
 
 info-target-boehm-gc: \
     configure-target-boehm-gc 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -32444,6 +33667,7 @@ maybe-dvi-target-boehm-gc: dvi-target-boehm-gc
 
 dvi-target-boehm-gc: \
     configure-target-boehm-gc 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -32469,6 +33693,7 @@ maybe-html-target-boehm-gc: html-target-boehm-gc
 
 html-target-boehm-gc: \
     configure-target-boehm-gc 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -32494,6 +33719,7 @@ maybe-TAGS-target-boehm-gc: TAGS-target-boehm-gc
 
 TAGS-target-boehm-gc: \
     configure-target-boehm-gc 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -32520,6 +33746,7 @@ maybe-install-info-target-boehm-gc: install-info-target-boehm-gc
 install-info-target-boehm-gc: \
     configure-target-boehm-gc \
     info-target-boehm-gc 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -32545,6 +33772,7 @@ maybe-installcheck-target-boehm-gc: installcheck-target-boehm-gc
 
 installcheck-target-boehm-gc: \
     configure-target-boehm-gc 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -32569,6 +33797,7 @@ maybe-mostlyclean-target-boehm-gc:
 maybe-mostlyclean-target-boehm-gc: mostlyclean-target-boehm-gc
 
 mostlyclean-target-boehm-gc: 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -32593,6 +33822,7 @@ maybe-clean-target-boehm-gc:
 maybe-clean-target-boehm-gc: clean-target-boehm-gc
 
 clean-target-boehm-gc: 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -32617,6 +33847,7 @@ maybe-distclean-target-boehm-gc:
 maybe-distclean-target-boehm-gc: distclean-target-boehm-gc
 
 distclean-target-boehm-gc: 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -32641,6 +33872,7 @@ maybe-maintainer-clean-target-boehm-gc:
 maybe-maintainer-clean-target-boehm-gc: maintainer-clean-target-boehm-gc
 
 maintainer-clean-target-boehm-gc: 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -32676,6 +33908,7 @@ maybe-configure-target-qthreads:
 @if target-qthreads
 maybe-configure-target-qthreads: configure-target-qthreads
 configure-target-qthreads: $(TARGET_SUBDIR)/qthreads/multilib.out
+	@$(unstage)
 	@test ! -f $(TARGET_SUBDIR)/qthreads/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/qthreads ; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -32706,6 +33939,7 @@ maybe-all-target-qthreads:
 TARGET-target-qthreads=all
 maybe-all-target-qthreads: all-target-qthreads
 all-target-qthreads: configure-target-qthreads
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
@@ -32723,6 +33957,7 @@ maybe-check-target-qthreads:
 maybe-check-target-qthreads: check-target-qthreads
 
 check-target-qthreads:
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
@@ -32737,6 +33972,7 @@ maybe-install-target-qthreads:
 maybe-install-target-qthreads: install-target-qthreads
 
 install-target-qthreads: installdirs
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
@@ -32754,6 +33990,7 @@ maybe-info-target-qthreads: info-target-qthreads
 
 info-target-qthreads: \
     configure-target-qthreads 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/qthreads/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -32779,6 +34016,7 @@ maybe-dvi-target-qthreads: dvi-target-qthreads
 
 dvi-target-qthreads: \
     configure-target-qthreads 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/qthreads/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -32804,6 +34042,7 @@ maybe-html-target-qthreads: html-target-qthreads
 
 html-target-qthreads: \
     configure-target-qthreads 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/qthreads/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -32829,6 +34068,7 @@ maybe-TAGS-target-qthreads: TAGS-target-qthreads
 
 TAGS-target-qthreads: \
     configure-target-qthreads 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/qthreads/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -32855,6 +34095,7 @@ maybe-install-info-target-qthreads: install-info-target-qthreads
 install-info-target-qthreads: \
     configure-target-qthreads \
     info-target-qthreads 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/qthreads/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -32880,6 +34121,7 @@ maybe-installcheck-target-qthreads: installcheck-target-qthreads
 
 installcheck-target-qthreads: \
     configure-target-qthreads 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/qthreads/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -32904,6 +34146,7 @@ maybe-mostlyclean-target-qthreads:
 maybe-mostlyclean-target-qthreads: mostlyclean-target-qthreads
 
 mostlyclean-target-qthreads: 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/qthreads/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -32928,6 +34171,7 @@ maybe-clean-target-qthreads:
 maybe-clean-target-qthreads: clean-target-qthreads
 
 clean-target-qthreads: 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/qthreads/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -32952,6 +34196,7 @@ maybe-distclean-target-qthreads:
 maybe-distclean-target-qthreads: distclean-target-qthreads
 
 distclean-target-qthreads: 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/qthreads/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -32976,6 +34221,7 @@ maybe-maintainer-clean-target-qthreads:
 maybe-maintainer-clean-target-qthreads: maintainer-clean-target-qthreads
 
 maintainer-clean-target-qthreads: 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/qthreads/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -33011,6 +34257,7 @@ maybe-configure-target-rda:
 @if target-rda
 maybe-configure-target-rda: configure-target-rda
 configure-target-rda: $(TARGET_SUBDIR)/rda/multilib.out
+	@$(unstage)
 	@test ! -f $(TARGET_SUBDIR)/rda/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/rda ; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -33041,6 +34288,7 @@ maybe-all-target-rda:
 TARGET-target-rda=all
 maybe-all-target-rda: all-target-rda
 all-target-rda: configure-target-rda
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
@@ -33058,6 +34306,7 @@ maybe-check-target-rda:
 maybe-check-target-rda: check-target-rda
 
 check-target-rda:
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
@@ -33072,6 +34321,7 @@ maybe-install-target-rda:
 maybe-install-target-rda: install-target-rda
 
 install-target-rda: installdirs
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
@@ -33089,6 +34339,7 @@ maybe-info-target-rda: info-target-rda
 
 info-target-rda: \
     configure-target-rda 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -33114,6 +34365,7 @@ maybe-dvi-target-rda: dvi-target-rda
 
 dvi-target-rda: \
     configure-target-rda 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -33139,6 +34391,7 @@ maybe-html-target-rda: html-target-rda
 
 html-target-rda: \
     configure-target-rda 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -33164,6 +34417,7 @@ maybe-TAGS-target-rda: TAGS-target-rda
 
 TAGS-target-rda: \
     configure-target-rda 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -33190,6 +34444,7 @@ maybe-install-info-target-rda: install-info-target-rda
 install-info-target-rda: \
     configure-target-rda \
     info-target-rda 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -33215,6 +34470,7 @@ maybe-installcheck-target-rda: installcheck-target-rda
 
 installcheck-target-rda: \
     configure-target-rda 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -33239,6 +34495,7 @@ maybe-mostlyclean-target-rda:
 maybe-mostlyclean-target-rda: mostlyclean-target-rda
 
 mostlyclean-target-rda: 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -33263,6 +34520,7 @@ maybe-clean-target-rda:
 maybe-clean-target-rda: clean-target-rda
 
 clean-target-rda: 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -33287,6 +34545,7 @@ maybe-distclean-target-rda:
 maybe-distclean-target-rda: distclean-target-rda
 
 distclean-target-rda: 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -33311,6 +34570,7 @@ maybe-maintainer-clean-target-rda:
 maybe-maintainer-clean-target-rda: maintainer-clean-target-rda
 
 maintainer-clean-target-rda: 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -33346,6 +34606,7 @@ maybe-configure-target-libada:
 @if target-libada
 maybe-configure-target-libada: configure-target-libada
 configure-target-libada: $(TARGET_SUBDIR)/libada/multilib.out
+	@$(unstage)
 	@test ! -f $(TARGET_SUBDIR)/libada/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libada ; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -33376,6 +34637,7 @@ maybe-all-target-libada:
 TARGET-target-libada=all
 maybe-all-target-libada: all-target-libada
 all-target-libada: configure-target-libada
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
@@ -33393,6 +34655,7 @@ maybe-check-target-libada:
 maybe-check-target-libada: check-target-libada
 
 check-target-libada:
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
@@ -33407,6 +34670,7 @@ maybe-install-target-libada:
 maybe-install-target-libada: install-target-libada
 
 install-target-libada: installdirs
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
@@ -33424,6 +34688,7 @@ maybe-info-target-libada: info-target-libada
 
 info-target-libada: \
     configure-target-libada 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -33449,6 +34714,7 @@ maybe-dvi-target-libada: dvi-target-libada
 
 dvi-target-libada: \
     configure-target-libada 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -33474,6 +34740,7 @@ maybe-html-target-libada: html-target-libada
 
 html-target-libada: \
     configure-target-libada 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -33499,6 +34766,7 @@ maybe-TAGS-target-libada: TAGS-target-libada
 
 TAGS-target-libada: \
     configure-target-libada 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -33525,6 +34793,7 @@ maybe-install-info-target-libada: install-info-target-libada
 install-info-target-libada: \
     configure-target-libada \
     info-target-libada 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -33550,6 +34819,7 @@ maybe-installcheck-target-libada: installcheck-target-libada
 
 installcheck-target-libada: \
     configure-target-libada 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -33574,6 +34844,7 @@ maybe-mostlyclean-target-libada:
 maybe-mostlyclean-target-libada: mostlyclean-target-libada
 
 mostlyclean-target-libada: 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -33598,6 +34869,7 @@ maybe-clean-target-libada:
 maybe-clean-target-libada: clean-target-libada
 
 clean-target-libada: 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -33622,6 +34894,7 @@ maybe-distclean-target-libada:
 maybe-distclean-target-libada: distclean-target-libada
 
 distclean-target-libada: 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -33646,6 +34919,7 @@ maybe-maintainer-clean-target-libada:
 maybe-maintainer-clean-target-libada: maintainer-clean-target-libada
 
 maintainer-clean-target-libada: 
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -33783,17 +35057,23 @@ gcc-no-fixedincludes:
 # stage_last instead tracks the stage that was built last.  These targets
 # are dummy when toplevel bootstrap is not active.
 
-.PHONY: unstage
-unstage:
+# While making host and target tools, symlinks to the final stage must be
+# there, so $(MAKE) $(unstage) should be run at various points.  To avoid
+# excessive recursive invocations of make, we "inline" them using a variable.
+
+unstage = :
+stage = :
+
 @if gcc-bootstrap
-	@[ -f stage_current ] || $(MAKE) `cat stage_last`-start
+unstage = [ -f stage_current ] || $(MAKE) `cat stage_last`-start
+stage = $(MAKE) `cat stage_current`-end
 @endif gcc-bootstrap
 
-.PHONY: stage
+.PHONY: unstage stage
+unstage:
+	@$(unstage)
 stage:
-@if gcc-bootstrap
-	@$(MAKE) `cat stage_current`-end
-@endif gcc-bootstrap
+	@$(stage)
 
 # We name the build directories for the various stages "stage1-gcc",
 # "stage2-gcc","stage3-gcc", etc.
@@ -33806,19 +35086,6 @@ stage:
 # mv on platforms where symlinks to directories do not work or are not
 # reliable.
 
-# At the end of the bootstrap, a symlink to 'stage3-gcc' named 'gcc' must
-# be kept, so that libraries can find it.  Ick!
-
-# It would be best to preinstall gcc into a staging area (and in the
-# future, gather there all prebootstrap packages).  This would allow
-# assemblers and linkers can be bootstrapped as well as the compiler
-# (both in a combined tree, or separately).  This however requires some
-# change to the gcc driver, again in order to avoid comparison failures.
-
-# Bugs: This is crippled when doing parallel make, the `make all-host'
-# and `make all-target' phases can be parallelized.
-
-
 # 'touch' doesn't work right on some platforms.
 STAMP = echo timestamp > 
 
@@ -33970,7 +35237,8 @@ stage1-bubble::
 	@if test -f stage1-lean  ; then \
 	  echo Skipping rebuild of stage1 ; \
 	else \
-	  $(MAKE) $(RECURSE_FLAGS_TO_PASS) NOTPARALLEL= all-stage1; \
+	  $(MAKE) stage1-start; \
+	  $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stage1; \
 	fi
 
 .PHONY: all-stage1 clean-stage1
@@ -34153,7 +35421,8 @@ stage2-bubble:: stage1-bubble
 	@if test -f stage2-lean || test -f stage1-lean  ; then \
 	  echo Skipping rebuild of stage2 ; \
 	else \
-	  $(MAKE) $(RECURSE_FLAGS_TO_PASS) NOTPARALLEL= all-stage2; \
+	  $(MAKE) stage2-start; \
+	  $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stage2; \
 	fi
 
 .PHONY: all-stage2 clean-stage2
@@ -34166,7 +35435,8 @@ do-clean: clean-stage2
 
 
 .PHONY: bootstrap2
-bootstrap2: stage2-bubble  all
+bootstrap2: stage2-bubble
+	$(MAKE) $(RECURSE_FLAGS_TO_PASS) all
 
 
 # Rules to wipe a stage and all the following ones, also used for cleanstrap
@@ -34340,7 +35610,8 @@ stage3-bubble:: stage2-bubble
 	@if test -f stage3-lean || test -f stage2-lean  ; then \
 	  echo Skipping rebuild of stage3 ; \
 	else \
-	  $(MAKE) $(RECURSE_FLAGS_TO_PASS) NOTPARALLEL= all-stage3; \
+	  $(MAKE) stage3-start; \
+	  $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stage3; \
 	fi
 
 .PHONY: all-stage3 clean-stage3
@@ -34365,7 +35636,14 @@ compare:
 	for file in $${files} ; do \
 	  f1=$$r/stage2-gcc/$$file; f2=$$r/stage3-gcc/$$file; \
 	  @do_compare@ > /dev/null 2>&1; \
-	  test $$? -eq 1 && echo $$file differs >> .bad_compare || true; \
+	  if test $$? -eq 1; then \
+	    case $$file in \
+	      ./cc*-checksum$(objext) | ./libgcc/* ) \
+	        echo warning: $$file differs ;; \
+	      *) \
+	        echo $$file differs >> .bad_compare ;; \
+	    esac ; \
+	  fi ; \
 	done ; \
 	if [ -f .bad_compare ]; then \
 	  echo "Bootstrap comparison failure!"; \
@@ -34380,7 +35658,9 @@ compare:
 
 
 .PHONY: bootstrap
-bootstrap: stage3-bubble compare all
+bootstrap: stage3-bubble
+	$(MAKE) compare
+	$(MAKE) $(RECURSE_FLAGS_TO_PASS) all
 
 
 # Rules to wipe a stage and all the following ones, also used for cleanstrap
@@ -34557,7 +35837,8 @@ stage4-bubble:: stage3-bubble
 	@if test -f stage4-lean || test -f stage3-lean  ; then \
 	  echo Skipping rebuild of stage4 ; \
 	else \
-	  $(MAKE) $(RECURSE_FLAGS_TO_PASS) NOTPARALLEL= all-stage4; \
+	  $(MAKE) stage4-start; \
+	  $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stage4; \
 	fi
 
 .PHONY: all-stage4 clean-stage4
@@ -34582,7 +35863,14 @@ compare3:
 	for file in $${files} ; do \
 	  f1=$$r/stage3-gcc/$$file; f2=$$r/stage4-gcc/$$file; \
 	  @do_compare@ > /dev/null 2>&1; \
-	  test $$? -eq 1 && echo $$file differs >> .bad_compare || true; \
+	  if test $$? -eq 1; then \
+	    case $$file in \
+	      ./cc*-checksum$(objext) | ./libgcc/* ) \
+	        echo warning: $$file differs ;; \
+	      *) \
+	        echo $$file differs >> .bad_compare ;; \
+	    esac ; \
+	  fi ; \
 	done ; \
 	if [ -f .bad_compare ]; then \
 	  echo "Bootstrap comparison failure!"; \
@@ -34597,7 +35885,9 @@ compare3:
 
 
 .PHONY: bootstrap4
-bootstrap4: stage4-bubble compare3 all
+bootstrap4: stage4-bubble
+	$(MAKE) compare3
+	$(MAKE) $(RECURSE_FLAGS_TO_PASS) all
 
 
 # Rules to wipe a stage and all the following ones, also used for cleanstrap
@@ -34770,7 +36060,8 @@ stageprofile-bubble:: stage1-bubble
 	@if test -f stageprofile-lean || test -f stage1-lean  ; then \
 	  echo Skipping rebuild of stageprofile ; \
 	else \
-	  $(MAKE) $(RECURSE_FLAGS_TO_PASS) NOTPARALLEL= all-stageprofile; \
+	  $(MAKE) stageprofile-start; \
+	  $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stageprofile; \
 	fi
 
 .PHONY: all-stageprofile clean-stageprofile
@@ -34953,7 +36244,8 @@ stagefeedback-bubble:: stageprofile-bubble
 	@if test -f stagefeedback-lean || test -f stageprofile-lean  ; then \
 	  echo Skipping rebuild of stagefeedback ; \
 	else \
-	  $(MAKE) $(RECURSE_FLAGS_TO_PASS) NOTPARALLEL= all-stagefeedback; \
+	  $(MAKE) stagefeedback-start; \
+	  $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stagefeedback; \
 	fi
 
 .PHONY: all-stagefeedback clean-stagefeedback
@@ -34966,7 +36258,8 @@ do-clean: clean-stagefeedback
 
 
 .PHONY: profiledbootstrap
-profiledbootstrap: stagefeedback-bubble  all
+profiledbootstrap: stagefeedback-bubble
+	$(MAKE) $(RECURSE_FLAGS_TO_PASS) all
 
 
 # Rules to wipe a stage and all the following ones, also used for cleanstrap
@@ -34995,8 +36288,6 @@ stagefeedback-start::
 	done
 
 @if gcc-bootstrap
-NOTPARALLEL = .NOTPARALLEL
-$(NOTPARALLEL):
 do-distclean: distclean-stage1
 @endif gcc-bootstrap
 
diff --git a/Makefile.tpl b/Makefile.tpl
index 2413c0fa300..889552d6e95 100644
--- a/Makefile.tpl
+++ b/Makefile.tpl
@@ -158,11 +158,13 @@ HOST_EXPORTS = \
 	TOPLEVEL_CONFIGURE_ARGUMENTS="$(TOPLEVEL_CONFIGURE_ARGUMENTS)"; export TOPLEVEL_CONFIGURE_ARGUMENTS; \
 	GMPLIBS="$(HOST_GMPLIBS)"; export GMPLIBS; \
 	GMPINC="$(HOST_GMPINC)"; export GMPINC; \
+@if gcc-bootstrap
+	$(RPATH_ENVVAR)=`echo "$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); \
+@endif gcc-bootstrap
 	$(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR);
 
 # Similar, for later GCC stages.
 POSTSTAGE1_HOST_EXPORTS = \
-	$(RPATH_ENVVAR)=`echo "$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); \
 	$(HOST_EXPORTS) \
 	CC="$(STAGE_CC_WRAPPER) $$r/$(HOST_SUBDIR)/prev-gcc/xgcc$(exeext) \
 	  -B$$r/$(HOST_SUBDIR)/prev-gcc/ -B$(build_tooldir)/bin/"; export CC; \
@@ -566,7 +568,7 @@ PICFLAG_FOR_TARGET =
 
 # The first rule in the file had better be this one.  Don't put any above it.
 # This lives here to allow makefile fragments to contain dependencies.
-@default_target@:
+all:
 
 #### host and target specific makefile fragments come in here.
 @target_makefile_frag@
@@ -698,7 +700,26 @@ configure-target: [+
 
 # The target built for a native non-bootstrap build.
 .PHONY: all
-all: unstage all-host all-target stage
+all:
+@if gcc-bootstrap
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	if [ ! -f stage_last ]; then \
+	  $(MAKE) $(RECURSE_FLAGS_TO_PASS) bootstrap; \
+	fi
+@endif gcc-bootstrap
+	@$(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	if [ -f stage_last ]; then \
+	  $(MAKE) $(TARGET_FLAGS_TO_PASS) all-host; \
+	else \
+	  $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-host; \
+	fi
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(MAKE) $(RECURSE_FLAGS_TO_PASS) all-target
+	@$(stage)
 
 .PHONY: all-build
 all-build: [+
@@ -722,7 +743,12 @@ all-target: [+
 # but it may do additional work as well).
 [+ FOR recursive_targets +]
 .PHONY: do-[+make_target+]
-do-[+make_target+]: unstage [+make_target+]-host [+make_target+]-target stage
+do-[+make_target+]:
+	@$(unstage)
+	@$(MAKE) $(RECURSE_FLAGS_TO_PASS) [+make_target+]-host \
+	  [+make_target+]-target
+	@$(stage)
+
 
 .PHONY: [+make_target+]-host
 [+make_target+]-host: [+
@@ -802,13 +828,22 @@ clean-target-libgcc:
 check: do-check
 
 # Only include modules actually being configured and built.
-do-check: unstage [+
+.PHONY: check-host
+check-host: [+
   FOR host_modules +] \
     maybe-check-[+module+][+
-  ENDFOR host_modules +][+
+  ENDFOR host_modules +]
+
+.PHONY: check-target
+check-target: [+
   FOR target_modules +] \
     maybe-check-target-[+module+][+
-  ENDFOR target_modules +] stage
+  ENDFOR target_modules +]
+
+do-check:
+	@$(unstage)
+	@$(MAKE) $(RECURSE_FLAGS_TO_PASS) check-host check-target
+	@$(stage)
 
 # Automated reporting of test results.
 
@@ -834,7 +869,10 @@ mail-report-with-warnings.log: warning.log
 # Installation targets.
 
 .PHONY: install uninstall
-install: installdirs install-host install-target
+install:
+	@$(unstage)
+	@$(MAKE) $(RECURSE_FLAGS_TO_PASS) installdirs install-host install-target
+	@$(stage)
 
 .PHONY: install-host-nogcc
 install-host-nogcc: [+
@@ -915,7 +953,8 @@ maybe-configure-[+prefix+][+module+]:
 maybe-configure-[+prefix+][+module+]: configure-[+prefix+][+module+]
 configure-[+prefix+][+module+]: [+deps+]
 	@[+ IF bootstrap +]test -f stage_last && exit 0; \
-	[+ ENDIF bootstrap +]test ! -f [+subdir+]/[+module+]/Makefile || exit 0; \
+	[+ ELSE bootstrap +]$(unstage)
+	@[+ ENDIF bootstrap +]test ! -f [+subdir+]/[+module+]/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs [+subdir+]/[+module+] ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -942,7 +981,7 @@ maybe-configure-stage[+id+]-[+prefix+][+module+]:
 @if [+module+]-bootstrap
 maybe-configure-stage[+id+]-[+prefix+][+module+]: configure-stage[+id+]-[+prefix+][+module+]
 configure-stage[+id+]-[+prefix+][+module+]: [+deps+]
-	@$(MAKE) stage[+id+]-start
+	@[ `cat stage_current` = stage[+id+] ] || $(MAKE) stage[+id+]-start
 	@[ -f [+subdir+]/[+module+]/Makefile ] && exit 0 || : ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -974,7 +1013,8 @@ TARGET-[+prefix+][+module+]=[+
 maybe-all-[+prefix+][+module+]: all-[+prefix+][+module+]
 all-[+prefix+][+module+]: configure-[+prefix+][+module+]
 	@[+ IF bootstrap +]test -f stage_last && exit 0; \
-	[+ ENDIF bootstrap +]r=`${PWD_COMMAND}`; export r; \
+	[+ ELSE bootstrap +]$(unstage)
+	@[+ ENDIF bootstrap +]r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	[+exports+] \
 	(cd [+subdir+]/[+module+] && \
@@ -990,8 +1030,9 @@ maybe-clean-stage[+id+]-[+prefix+][+module+]:
 @if [+module+]-bootstrap
 maybe-all-stage[+id+]-[+prefix+][+module+]: all-stage[+id+]-[+prefix+][+module+]
 all-stage[+id+]: all-stage[+id+]-[+prefix+][+module+]
+TARGET-stage[+id+]-[+prefix+][+module+] = $(TARGET-[+prefix+][+module+])
 all-stage[+id+]-[+prefix+][+module+]: configure-stage[+id+]-[+prefix+][+module+]
-	@$(MAKE) stage[+id+]-start
+	@[ `cat stage_current` = stage[+id+] ] || $(MAKE) stage[+id+]-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	[+exports+][+ IF prev +] \
@@ -999,14 +1040,15 @@ all-stage[+id+]-[+prefix+][+module+]: configure-stage[+id+]-[+prefix+][+module+]
 	cd [+subdir+]/[+module+] && \
 	$(MAKE) [+args+] [+ IF prev
 		+][+poststage1_args+][+ ENDIF prev
-		+] [+stage_make_flags+] [+extra_make_flags+]
+		+] [+stage_make_flags+] [+extra_make_flags+] \
+		$(TARGET-stage[+id+]-[+prefix+][+module+])
 
 maybe-clean-stage[+id+]-[+prefix+][+module+]: clean-stage[+id+]-[+prefix+][+module+]
 clean-stage[+id+]: clean-stage[+id+]-[+prefix+][+module+]
 clean-stage[+id+]-[+prefix+][+module+]:
 	@[ -f [+subdir+]/[+module+]/Makefile ] || [ -f [+subdir+]/stage[+id+]-[+module+]/Makefile ] \
 	  || exit 0 ; \
-	[ -f [+subdir+]/[+module+]/Makefile ] || $(MAKE) stage[+id+]-start ; \
+	@[ `cat stage_current` = stage[+id+] ] || $(MAKE) stage[+id+]-start
 	cd [+subdir+]/[+module+] && \
 	$(MAKE) [+args+] [+ IF prev +] \
 		[+poststage1_args+] [+ ENDIF prev +] \
@@ -1051,6 +1093,7 @@ check-[+module+]:
 [+ ELIF no_check_cross +]
 # This module is only tested in a native toolchain.
 check-[+module+]:
+	@$(unstage)
 	@if [ '$(host)' = '$(target)' ] ; then \
 	  r=`${PWD_COMMAND}`; export r; \
 	  s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -1060,6 +1103,7 @@ check-[+module+]:
 	fi
 [+ ELSE check +]
 check-[+module+]:
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -1076,6 +1120,7 @@ maybe-install-[+module+]: install-[+module+]
 install-[+module+]:
 [+ ELSE install +]
 install-[+module+]: installdirs
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -1098,7 +1143,8 @@ maybe-[+make_target+]-[+module+]: [+make_target+]-[+module+]
   FOR depend +]\
     [+depend+]-[+module+] [+
   ENDFOR depend +]
-	@[ -f ./[+module+]/Makefile ] || exit 0; \
+	@[+ IF bootstrap +][+ ELSE +]$(unstage)
+	@[+ ENDIF bootstrap +][ -f ./[+module+]/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -1160,6 +1206,7 @@ maybe-check-target-[+module+]: check-target-[+module+]
 check-target-[+module+]:
 [+ ELSE check +]
 check-target-[+module+]:
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \[+
 IF raw_cxx +]
@@ -1185,6 +1232,7 @@ maybe-install-target-[+module+]: install-target-[+module+]
 install-target-[+module+]:
 [+ ELSE install +]
 install-target-[+module+]: installdirs
+	@$(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \[+
 IF raw_cxx +]
@@ -1211,6 +1259,7 @@ maybe-[+make_target+]-target-[+module+]: [+make_target+]-target-[+module+]
   FOR depend +]\
     [+depend+]-target-[+module+] [+
   ENDFOR depend +]
+	@$(unstage)
 	@[ -f $(TARGET_SUBDIR)/[+module+]/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \[+
@@ -1352,17 +1401,23 @@ gcc-no-fixedincludes:
 # stage_last instead tracks the stage that was built last.  These targets
 # are dummy when toplevel bootstrap is not active.
 
-.PHONY: unstage
-unstage:
+# While making host and target tools, symlinks to the final stage must be
+# there, so $(MAKE) $(unstage) should be run at various points.  To avoid
+# excessive recursive invocations of make, we "inline" them using a variable.
+
+unstage = :
+stage = :
+
 @if gcc-bootstrap
-	@[ -f stage_current ] || $(MAKE) `cat stage_last`-start
+unstage = [ -f stage_current ] || $(MAKE) `cat stage_last`-start
+stage = $(MAKE) `cat stage_current`-end
 @endif gcc-bootstrap
 
-.PHONY: stage
+.PHONY: unstage stage
+unstage:
+	@$(unstage)
 stage:
-@if gcc-bootstrap
-	@$(MAKE) `cat stage_current`-end
-@endif gcc-bootstrap
+	@$(stage)
 
 # We name the build directories for the various stages "stage1-gcc",
 # "stage2-gcc","stage3-gcc", etc.
@@ -1375,19 +1430,6 @@ stage:
 # mv on platforms where symlinks to directories do not work or are not
 # reliable.
 
-# At the end of the bootstrap, a symlink to 'stage3-gcc' named 'gcc' must
-# be kept, so that libraries can find it.  Ick!
-
-# It would be best to preinstall gcc into a staging area (and in the
-# future, gather there all prebootstrap packages).  This would allow
-# assemblers and linkers can be bootstrapped as well as the compiler
-# (both in a combined tree, or separately).  This however requires some
-# change to the gcc driver, again in order to avoid comparison failures.
-
-# Bugs: This is crippled when doing parallel make, the `make all-host'
-# and `make all-target' phases can be parallelized.
-
-
 # 'touch' doesn't work right on some platforms.
 STAMP = echo timestamp > 
 
@@ -1472,7 +1514,8 @@ stage[+id+]-bubble:: [+ IF prev +]stage[+prev+]-bubble[+ ENDIF +][+IF lean +]
 	  IF prev +]|| test -f stage[+prev+]-lean [+ ENDIF prev +] ; then \
 	  echo Skipping rebuild of stage[+id+] ; \
 	else \
-	  $(MAKE) $(RECURSE_FLAGS_TO_PASS) NOTPARALLEL= all-stage[+id+]; \
+	  $(MAKE) stage[+id+]-start; \
+	  $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stage[+id+]; \
 	fi
 
 .PHONY: all-stage[+id+] clean-stage[+id+]
@@ -1497,7 +1540,14 @@ do-clean: clean-stage[+id+]
 	for file in $${files} ; do \
 	  f1=$$r/stage[+prev+]-gcc/$$file; f2=$$r/stage[+id+]-gcc/$$file; \
 	  @do_compare@ > /dev/null 2>&1; \
-	  test $$? -eq 1 && echo $$file differs >> .bad_compare || true; \
+	  if test $$? -eq 1; then \
+	    case $$file in \
+	      ./cc*-checksum$(objext) | ./libgcc/* ) \
+	        echo warning: $$file differs ;; \
+	      *) \
+	        echo $$file differs >> .bad_compare ;; \
+	    esac ; \
+	  fi ; \
 	done ; \
 	if [ -f .bad_compare ]; then \
 	  echo "Bootstrap comparison failure!"; \
@@ -1512,7 +1562,9 @@ do-clean: clean-stage[+id+]
 
 [+ IF bootstrap-target +]
 .PHONY: [+bootstrap-target+]
-[+bootstrap-target+]: stage[+id+]-bubble [+compare-target+] all
+[+bootstrap-target+]: stage[+id+]-bubble
+	[+ IF compare-target +]$(MAKE) [+compare-target+]
+	[+ ENDIF compare-target +]$(MAKE) $(RECURSE_FLAGS_TO_PASS) all
 [+ ENDIF bootstrap-target +]
 
 # Rules to wipe a stage and all the following ones, also used for cleanstrap
@@ -1545,8 +1597,6 @@ stagefeedback-start::
 	done
 
 @if gcc-bootstrap
-NOTPARALLEL = .NOTPARALLEL
-$(NOTPARALLEL):
 do-distclean: distclean-stage1
 @endif gcc-bootstrap
 
diff --git a/configure b/configure
index 2101f6b00de..6b666684967 100755
--- a/configure
+++ b/configure
@@ -3194,19 +3194,15 @@ esac
 case "$enable_bootstrap" in
   yes)
     bootstrap_lean='#'
-    default_target=bootstrap
     bootstrap_suffix=bootstrap ;;
   lean)
     bootstrap_lean=''
-    default_target=bootstrap
     bootstrap_suffix=bootstrap ;;
   no)
-    default_target=all
     bootstrap_suffix=no-bootstrap ;;
 esac
 
 
-
 for module in ${build_configdirs} ; do
   if test -z "${no_recursion}" \
      && test -f ${build_subdir}/${module}/Makefile; then
@@ -3521,7 +3517,7 @@ test -n "$target_alias" && ncn_target_tool_prefix=$target_alias-
     # Extract the first word of "${ncn_tool_prefix}${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_tool_prefix}${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3525: checking for $ac_word" >&5
+echo "configure:3521: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3552,7 +3548,7 @@ fi
     # Extract the first word of "${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3556: checking for $ac_word" >&5
+echo "configure:3552: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3596,7 +3592,7 @@ fi
     # Extract the first word of "${ncn_tool_prefix}${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_tool_prefix}${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3600: checking for $ac_word" >&5
+echo "configure:3596: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3627,7 +3623,7 @@ fi
     # Extract the first word of "${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3631: checking for $ac_word" >&5
+echo "configure:3627: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3671,7 +3667,7 @@ fi
     # Extract the first word of "${ncn_tool_prefix}${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_tool_prefix}${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3675: checking for $ac_word" >&5
+echo "configure:3671: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3702,7 +3698,7 @@ fi
     # Extract the first word of "${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3706: checking for $ac_word" >&5
+echo "configure:3702: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3746,7 +3742,7 @@ fi
     # Extract the first word of "${ncn_tool_prefix}${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_tool_prefix}${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3750: checking for $ac_word" >&5
+echo "configure:3746: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_LD'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3777,7 +3773,7 @@ fi
     # Extract the first word of "${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3781: checking for $ac_word" >&5
+echo "configure:3777: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_LD'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3821,7 +3817,7 @@ fi
     # Extract the first word of "${ncn_tool_prefix}${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_tool_prefix}${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3825: checking for $ac_word" >&5
+echo "configure:3821: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_NM'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3852,7 +3848,7 @@ fi
     # Extract the first word of "${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3856: checking for $ac_word" >&5
+echo "configure:3852: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_NM'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3896,7 +3892,7 @@ fi
     # Extract the first word of "${ncn_tool_prefix}${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_tool_prefix}${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3900: checking for $ac_word" >&5
+echo "configure:3896: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3927,7 +3923,7 @@ fi
     # Extract the first word of "${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3931: checking for $ac_word" >&5
+echo "configure:3927: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3966,7 +3962,7 @@ fi
     # Extract the first word of "${ncn_tool_prefix}${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_tool_prefix}${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3970: checking for $ac_word" >&5
+echo "configure:3966: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_WINDRES'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3997,7 +3993,7 @@ fi
     # Extract the first word of "${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4001: checking for $ac_word" >&5
+echo "configure:3997: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_WINDRES'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4041,7 +4037,7 @@ fi
     # Extract the first word of "${ncn_tool_prefix}${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_tool_prefix}${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4045: checking for $ac_word" >&5
+echo "configure:4041: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_OBJCOPY'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4072,7 +4068,7 @@ fi
     # Extract the first word of "${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4076: checking for $ac_word" >&5
+echo "configure:4072: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_OBJCOPY'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4116,7 +4112,7 @@ fi
     # Extract the first word of "${ncn_tool_prefix}${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_tool_prefix}${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4120: checking for $ac_word" >&5
+echo "configure:4116: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4147,7 +4143,7 @@ fi
     # Extract the first word of "${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4151: checking for $ac_word" >&5
+echo "configure:4147: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4199,7 +4195,7 @@ fi
     # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4203: checking for $ac_word" >&5
+echo "configure:4199: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AR_FOR_TARGET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4230,7 +4226,7 @@ fi
     # Extract the first word of "${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4234: checking for $ac_word" >&5
+echo "configure:4230: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AR_FOR_TARGET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4274,7 +4270,7 @@ fi
     # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4278: checking for $ac_word" >&5
+echo "configure:4274: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AS_FOR_TARGET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4305,7 +4301,7 @@ fi
     # Extract the first word of "${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4309: checking for $ac_word" >&5
+echo "configure:4305: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AS_FOR_TARGET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4349,7 +4345,7 @@ fi
     # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4353: checking for $ac_word" >&5
+echo "configure:4349: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC_FOR_TARGET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4380,7 +4376,7 @@ fi
     # Extract the first word of "${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4384: checking for $ac_word" >&5
+echo "configure:4380: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC_FOR_TARGET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4424,7 +4420,7 @@ fi
     # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4428: checking for $ac_word" >&5
+echo "configure:4424: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CXX_FOR_TARGET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4455,7 +4451,7 @@ fi
     # Extract the first word of "${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4459: checking for $ac_word" >&5
+echo "configure:4455: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CXX_FOR_TARGET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4499,7 +4495,7 @@ fi
     # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4503: checking for $ac_word" >&5
+echo "configure:4499: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL_FOR_TARGET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4530,7 +4526,7 @@ fi
     # Extract the first word of "${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4534: checking for $ac_word" >&5
+echo "configure:4530: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL_FOR_TARGET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4574,7 +4570,7 @@ fi
     # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4578: checking for $ac_word" >&5
+echo "configure:4574: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_GCC_FOR_TARGET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4605,7 +4601,7 @@ fi
     # Extract the first word of "${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4609: checking for $ac_word" >&5
+echo "configure:4605: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_GCC_FOR_TARGET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4644,7 +4640,7 @@ fi
     # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4648: checking for $ac_word" >&5
+echo "configure:4644: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_GCJ_FOR_TARGET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4675,7 +4671,7 @@ fi
     # Extract the first word of "${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4679: checking for $ac_word" >&5
+echo "configure:4675: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_GCJ_FOR_TARGET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4719,7 +4715,7 @@ fi
     # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4723: checking for $ac_word" >&5
+echo "configure:4719: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_GFORTRAN_FOR_TARGET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4750,7 +4746,7 @@ fi
     # Extract the first word of "${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4754: checking for $ac_word" >&5
+echo "configure:4750: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_GFORTRAN_FOR_TARGET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4794,7 +4790,7 @@ fi
     # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4798: checking for $ac_word" >&5
+echo "configure:4794: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_LD_FOR_TARGET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4825,7 +4821,7 @@ fi
     # Extract the first word of "${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4829: checking for $ac_word" >&5
+echo "configure:4825: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_LD_FOR_TARGET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4869,7 +4865,7 @@ fi
     # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4873: checking for $ac_word" >&5
+echo "configure:4869: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_LIPO_FOR_TARGET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4900,7 +4896,7 @@ fi
     # Extract the first word of "${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4904: checking for $ac_word" >&5
+echo "configure:4900: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_LIPO_FOR_TARGET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4944,7 +4940,7 @@ fi
     # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4948: checking for $ac_word" >&5
+echo "configure:4944: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_NM_FOR_TARGET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4975,7 +4971,7 @@ fi
     # Extract the first word of "${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4979: checking for $ac_word" >&5
+echo "configure:4975: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_NM_FOR_TARGET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5019,7 +5015,7 @@ fi
     # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5023: checking for $ac_word" >&5
+echo "configure:5019: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB_FOR_TARGET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5050,7 +5046,7 @@ fi
     # Extract the first word of "${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5054: checking for $ac_word" >&5
+echo "configure:5050: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB_FOR_TARGET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5089,7 +5085,7 @@ fi
     # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5093: checking for $ac_word" >&5
+echo "configure:5089: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_STRIP_FOR_TARGET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5120,7 +5116,7 @@ fi
     # Extract the first word of "${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5124: checking for $ac_word" >&5
+echo "configure:5120: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_STRIP_FOR_TARGET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5164,7 +5160,7 @@ fi
     # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5168: checking for $ac_word" >&5
+echo "configure:5164: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_WINDRES_FOR_TARGET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5195,7 +5191,7 @@ fi
     # Extract the first word of "${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5199: checking for $ac_word" >&5
+echo "configure:5195: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_WINDRES_FOR_TARGET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5302,7 +5298,7 @@ RANLIB_FOR_TARGET=${RANLIB_FOR_TARGET}${extra_ranlibflags_for_target}
 NM_FOR_TARGET=${NM_FOR_TARGET}${extra_nmflags_for_target}
 
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:5306: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:5302: checking whether to enable maintainer-specific portions of Makefiles" >&5
 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval="$enable_maintainer_mode"
@@ -5349,7 +5345,7 @@ esac
 # gcc for stageN-gcc and stagePREV-gcc for stage(N-1).  In case this is not
 # possible, however, we can resort to mv.
 echo $ac_n "checking if symbolic links between directories work""... $ac_c" 1>&6
-echo "configure:5353: checking if symbolic links between directories work" >&5
+echo "configure:5349: checking if symbolic links between directories work" >&5
 if eval "test \"`echo '$''{'gcc_cv_prog_ln_s_dir'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5580,7 +5576,6 @@ s%@CONFIGURED_FLEX@%$CONFIGURED_FLEX%g
 s%@CONFIGURED_LEX@%$CONFIGURED_LEX%g
 s%@CONFIGURED_MAKEINFO@%$CONFIGURED_MAKEINFO%g
 s%@bootstrap_lean@%$bootstrap_lean%g
-s%@default_target@%$default_target%g
 /@serialization_dependencies@/r $serialization_dependencies
 s%@serialization_dependencies@%%g
 /@host_makefile_frag@/r $host_makefile_frag
diff --git a/configure.in b/configure.in
index fc0e8038cae..4633c2c5922 100644
--- a/configure.in
+++ b/configure.in
@@ -1780,18 +1780,14 @@ esac
 case "$enable_bootstrap" in
   yes)
     bootstrap_lean='#'
-    default_target=bootstrap
     bootstrap_suffix=bootstrap ;;
   lean)
     bootstrap_lean=''
-    default_target=bootstrap
     bootstrap_suffix=bootstrap ;;
   no)
-    default_target=all
     bootstrap_suffix=no-bootstrap ;;
 esac
 AC_SUBST(bootstrap_lean)
-AC_SUBST(default_target)
 
 for module in ${build_configdirs} ; do
   if test -z "${no_recursion}" \