PR target/24342

[pf3gnuchains/gcc-fork.git] / Makefile.in
diff --git a/Makefile.in b/Makefile.in

index 0de1a3c..b010437 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -133,7 +133,8 @@ HOST_CONFIGARGS = @host_configargs@
  # with srcdir=..
  HOST_SUBDIR = @host_subdir@
  # This is the list of variables to export in the environment when
-# configuring subdirectories for the host system.
+# configuring subdirectories for the host system.  We need to pass
+# some to the GCC configure because of its hybrid host/target nature.
  HOST_EXPORTS = \
         $(BASE_EXPORTS) \
         CC="$(CC)"; export CC; \
@@ -152,6 +153,13 @@ HOST_EXPORTS = \
         WINDRES="$(WINDRES)"; export WINDRES; \
         OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
         OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
+       AR_FOR_TARGET="$(AR_FOR_TARGET)"; export AR_FOR_TARGET; \
+       AS_FOR_TARGET="$(AS_FOR_TARGET)"; export AS_FOR_TARGET; \
+       GCC_FOR_TARGET="$(GCC_FOR_TARGET)"; export GCC_FOR_TARGET; \
+       LD_FOR_TARGET="$(LD_FOR_TARGET)"; export LD_FOR_TARGET; \
+       NM_FOR_TARGET="$(NM_FOR_TARGET)"; export NM_FOR_TARGET; \
+       OBJDUMP_FOR_TARGET="$(OBJDUMP_FOR_TARGET)"; export OBJDUMP_FOR_TARGET; \
+       RANLIB_FOR_TARGET="$(RANLIB_FOR_TARGET)"; export RANLIB_FOR_TARGET; \
         TOPLEVEL_CONFIGURE_ARGUMENTS="$(TOPLEVEL_CONFIGURE_ARGUMENTS)"; export TOPLEVEL_CONFIGURE_ARGUMENTS; \
         GMPLIBS="$(HOST_GMPLIBS)"; export GMPLIBS; \
         GMPINC="$(HOST_GMPINC)"; export GMPINC; \
@@ -183,7 +191,7 @@ TARGET_CONFIGARGS = @target_configargs@ --with-target-subdir="$(TARGET_SUBDIR)"
  BASE_TARGET_EXPORTS = \
         $(BASE_EXPORTS) \
         AR="$(AR_FOR_TARGET)"; export AR; \
-       AS="$(AS_FOR_TARGET)"; export AS; \
+       AS="$(COMPILER_AS_FOR_TARGET)"; export AS; \
         CC="$(CC_FOR_TARGET)"; export CC; \
         CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
         CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
@@ -192,10 +200,10 @@ BASE_TARGET_EXPORTS = \
         GCJ="$(GCJ_FOR_TARGET)"; export GCJ; \
         GFORTRAN="$(GFORTRAN_FOR_TARGET)"; export GFORTRAN; \
         DLLTOOL="$(DLLTOOL_FOR_TARGET)"; export DLLTOOL; \
-       LD="$(LD_FOR_TARGET)"; export LD; \
+       LD="$(COMPILER_LD_FOR_TARGET)"; export LD; \
         LDFLAGS="$(LDFLAGS_FOR_TARGET)"; export LDFLAGS; \
         LIPO="$(LIPO_FOR_TARGET)"; export LIPO; \
-       NM="$(NM_FOR_TARGET)"; export NM; \
+       NM="$(COMPILER_NM_FOR_TARGET)"; export NM; \
         OBJDUMP="$(OBJDUMP_FOR_TARGET)"; export OBJDUMP; \
         RANLIB="$(RANLIB_FOR_TARGET)"; export RANLIB; \
         STRIP="$(STRIP_FOR_TARGET)"; export STRIP; \
@@ -244,48 +252,16 @@ BUILD_PREFIX_1 = @BUILD_PREFIX_1@
  # Flags to pass to stage2 and later makes.  They are defined
  # here so that they can be overridden by Makefile fragments.
  BOOT_CFLAGS= -g -O2
+BOOT_LDFLAGS=
  
-CONFIGURED_BISON = @CONFIGURED_BISON@
-BISON = `if [ -f $$r/$(BUILD_SUBDIR)/bison/tests/bison ] ; then \
-           echo $$r/$(BUILD_SUBDIR)/bison/tests/bison ; \
-        else \
-           echo ${CONFIGURED_BISON} ; \
-        fi`
-
-CONFIGURED_YACC = @CONFIGURED_YACC@
-YACC = `if [ -f $$r/$(BUILD_SUBDIR)/bison/tests/bison ] ; then \
-           echo $$r/$(BUILD_SUBDIR)/bison/tests/bison -y ; \
-       elif [ -f $$r/$(BUILD_SUBDIR)/byacc/byacc ] ; then \
-           echo $$r/$(BUILD_SUBDIR)/byacc/byacc ; \
-       else \
-           echo ${CONFIGURED_YACC} ; \
-       fi`
-
-CONFIGURED_FLEX = @CONFIGURED_FLEX@
-FLEX = `if [ -f $$r/$(BUILD_SUBDIR)/flex/flex ] ; \
-       then echo $$r/$(BUILD_SUBDIR)/flex/flex ; \
-       else echo ${CONFIGURED_FLEX} ; fi`
-
-CONFIGURED_LEX = @CONFIGURED_LEX@
-LEX = `if [ -f $$r/$(BUILD_SUBDIR)/flex/flex ] ; \
-       then echo $$r/$(BUILD_SUBDIR)/flex/flex ; \
-       else echo ${CONFIGURED_LEX} ; fi`
-
-CONFIGURED_M4 = @CONFIGURED_M4@
-M4 = `if [ -f $$r/$(BUILD_SUBDIR)/m4/m4 ] ; \
-       then echo $$r/$(BUILD_SUBDIR)/m4/m4 ; \
-       else echo ${CONFIGURED_M4} ; fi`
-
-# For an installed makeinfo, we require it to be from texinfo 4.2 or
-# higher, else we use the "missing" dummy.  We also pass the subdirectory
-# makeinfo even if only the Makefile is there, because Texinfo builds its
-# manual when made, and it requires its own version.
-CONFIGURED_MAKEINFO = @CONFIGURED_MAKEINFO@
-MAKEINFO = `if [ -f $$r/$(BUILD_SUBDIR)/texinfo/makeinfo/Makefile ] ; \
-       then echo $$r/$(BUILD_SUBDIR)/texinfo/makeinfo/makeinfo ; \
-       else if (${CONFIGURED_MAKEINFO} --version \
-         | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[2-9]|[5-9])') >/dev/null 2>&1; \
-        then echo ${CONFIGURED_MAKEINFO}; else echo $$s/missing makeinfo; fi; fi`
+BISON = @BISON@
+YACC = @YACC@
+FLEX = @FLEX@
+LEX = @LEX@
+M4 = @M4@
+MAKEINFO = @MAKEINFO@
+EXPECT = @EXPECT@
+RUNTEST = @RUNTEST@
  
  # This just becomes part of the MAKEINFO definition passed down to
  # sub-makes.  It lets flags be given on the command line while still
@@ -293,43 +269,28 @@ MAKEINFO = `if [ -f $$r/$(BUILD_SUBDIR)/texinfo/makeinfo/Makefile ] ; \
  # (Default to avoid splitting info files by setting the threshold high.)
  MAKEINFOFLAGS = --split-size=5000000
  
-# FIXME: expect may become a build tool?
-EXPECT = `if [ -f $$r/$(HOST_SUBDIR)/expect/expect ] ; \
-       then echo $$r/$(HOST_SUBDIR)/expect/expect ; \
-       else echo expect ; fi`
-
-RUNTEST = `if [ -f $$s/dejagnu/runtest ] ; \
-       then echo $$s/dejagnu/runtest ; \
-       else echo runtest ; fi`
-
  # ---------------------------------------------
  # Programs producing files for the HOST machine
  # ---------------------------------------------
  
  AS = @AS@
-
  AR = @AR@
  AR_FLAGS = rc
-
  CC = @CC@
-CFLAGS = @CFLAGS@
-LIBCFLAGS = $(CFLAGS)
-
  CXX = @CXX@
-CXXFLAGS = @CXXFLAGS@
-LIBCXXFLAGS = $(CXXFLAGS) -fno-implicit-templates
-
  DLLTOOL = @DLLTOOL@
-
-NM = @NM@
-
  LD = @LD@
-LDFLAGS = 
-
+LIPO = @LIPO@
+NM = @NM@
  RANLIB = @RANLIB@
-
+STRIP = @STRIP@
  WINDRES = @WINDRES@
  
+CFLAGS = @CFLAGS@
+LDFLAGS = 
+LIBCFLAGS = $(CFLAGS)
+CXXFLAGS = @CXXFLAGS@
+LIBCXXFLAGS = $(CXXFLAGS) -fno-implicit-templates
  PICFLAG = 
  
  # -----------------------------------------------
@@ -339,242 +300,42 @@ PICFLAG =
  FLAGS_FOR_TARGET = @FLAGS_FOR_TARGET@
  
  AR_FOR_TARGET=@AR_FOR_TARGET@
-CONFIGURED_AR_FOR_TARGET=@CONFIGURED_AR_FOR_TARGET@
-USUAL_AR_FOR_TARGET = ` \
-  if [ -f $$r/$(HOST_SUBDIR)/binutils/ar ] ; then \
-    echo $$r/$(HOST_SUBDIR)/binutils/ar ; \
-  else \
-    if [ '$(host)' = '$(target)' ] ; then \
-      echo $(AR); \
-    else \
-      echo $(CONFIGURED_AR_FOR_TARGET) ; \
-    fi; \
-  fi`
-
  AS_FOR_TARGET=@AS_FOR_TARGET@
-CONFIGURED_AS_FOR_TARGET=@CONFIGURED_AS_FOR_TARGET@
-USUAL_AS_FOR_TARGET = ` \
-  if [ -f $$r/$(HOST_SUBDIR)/gas/as-new ] ; then \
-    echo $$r/$(HOST_SUBDIR)/gas/as-new ; \
-  elif [ -f $$r/$(HOST_SUBDIR)/gcc/as ]; then \
-    echo $$r/$(HOST_SUBDIR)/gcc/as ; \
-  else \
-    if [ '$(host)' = '$(target)' ] ; then \
-      echo $(AS); \
-    else \
-      echo $(CONFIGURED_AS_FOR_TARGET) ; \
-    fi; \
-  fi`
-
  CC_FOR_TARGET=$(STAGE_CC_WRAPPER) @CC_FOR_TARGET@ $(FLAGS_FOR_TARGET)
-CONFIGURED_CC_FOR_TARGET=@CONFIGURED_CC_FOR_TARGET@
-USUAL_CC_FOR_TARGET = ` \
-  if [ -f $$r/$(HOST_SUBDIR)/gcc/xgcc ] ; then \
-    echo $$r/$(HOST_SUBDIR)/gcc/xgcc -B$$r/$(HOST_SUBDIR)/gcc/ ; \
-  else \
-    if [ '$(host)' = '$(target)' ] ; then \
-      echo $(CC); \
-    else \
-      echo $(CONFIGURED_CC_FOR_TARGET) ; \
-    fi; \
-  fi`
-
-# During gcc bootstrap, if we use some random cc for stage1 then
-# CFLAGS will be just -g.  We want to ensure that TARGET libraries
-# (which we know are built with gcc) are built with optimizations so
-# prepend -O2 when setting CFLAGS_FOR_TARGET.
-CFLAGS_FOR_TARGET = -O2 $(CFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET)
-SYSROOT_CFLAGS_FOR_TARGET = @SYSROOT_CFLAGS_FOR_TARGET@
  
  # If GCC_FOR_TARGET is not overriden on the command line, then this
  # variable is passed down to the gcc Makefile, where it is used to
  # build libgcc2.a.  We define it here so that it can itself be
  # overridden on the command line.
-GCC_FOR_TARGET=@GCC_FOR_TARGET@
-CONFIGURED_GCC_FOR_TARGET=@CONFIGURED_GCC_FOR_TARGET@
-USUAL_GCC_FOR_TARGET = $(STAGE_CC_WRAPPER) \
-  $$r/$(HOST_SUBDIR)/gcc/xgcc -B$$r/$(HOST_SUBDIR)/gcc/ $(FLAGS_FOR_TARGET)
-LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET)
-
+GCC_FOR_TARGET=$(STAGE_CC_WRAPPER) @GCC_FOR_TARGET@ $(FLAGS_FOR_TARGET)
  CXX_FOR_TARGET=$(STAGE_CC_WRAPPER) @CXX_FOR_TARGET@ $(FLAGS_FOR_TARGET)
-CONFIGURED_CXX_FOR_TARGET=@CONFIGURED_CXX_FOR_TARGET@
-USUAL_CXX_FOR_TARGET = ` \
-  if [ -f $$r/$(HOST_SUBDIR)/gcc/g++ ] ; then \
-    (echo $$r/$(HOST_SUBDIR)/gcc/g++ -B$$r/$(HOST_SUBDIR)/gcc -nostdinc++; \
-    test ! -f $$r/$(TARGET_SUBDIR)/libstdc++-v3/scripts/testsuite_flags || $(SHELL) $$r/$(TARGET_SUBDIR)/libstdc++-v3/scripts/testsuite_flags --build-includes; \
-    echo -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src/.libs) | tr '\015\012' '  '; \
-  else \
-    if [ '$(host)' = '$(target)' ] ; then \
-      echo $(CXX); \
-    else \
-      echo $(CONFIGURED_CXX_FOR_TARGET) ; \
-    fi; \
-  fi`
-
  RAW_CXX_FOR_TARGET=$(STAGE_CC_WRAPPER) @RAW_CXX_FOR_TARGET@ $(FLAGS_FOR_TARGET)
-USUAL_RAW_CXX_FOR_TARGET = ` \
-  if [ -f $$r/$(HOST_SUBDIR)/gcc/xgcc ] ; then \
-    echo $$r/$(HOST_SUBDIR)/gcc/xgcc -shared-libgcc -B$$r/$(HOST_SUBDIR)/gcc -nostdinc++ -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src/.libs; \
-  else \
-    if [ '$(host)' = '$(target)' ] ; then \
-      echo $(CXX); \
-    else \
-      echo $(CONFIGURED_CXX_FOR_TARGET) ; \
-    fi; \
-  fi`
-
-CXXFLAGS_FOR_TARGET = $(CXXFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET)
-LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates
-
  GCJ_FOR_TARGET=$(STAGE_CC_WRAPPER) @GCJ_FOR_TARGET@ $(FLAGS_FOR_TARGET)
-CONFIGURED_GCJ_FOR_TARGET=@CONFIGURED_GCJ_FOR_TARGET@
-USUAL_GCJ_FOR_TARGET = ` \
-  if [ -f $$r/$(HOST_SUBDIR)/gcc/gcj ] ; then \
-    echo $$r/$(HOST_SUBDIR)/gcc/gcj -B$$r/$(HOST_SUBDIR)/gcc ; \
-  else \
-    if [ '$(host)' = '$(target)' ] ; then \
-      echo $(GCJ); \
-    else \
-      echo $(CONFIGURED_GCJ_FOR_TARGET) ; \
-    fi; \
-  fi`
-
  GFORTRAN_FOR_TARGET=$(STAGE_CC_WRAPPER) @GFORTRAN_FOR_TARGET@ $(FLAGS_FOR_TARGET)
-CONFIGURED_GFORTRAN_FOR_TARGET=@CONFIGURED_GFORTRAN_FOR_TARGET@
-USUAL_GFORTRAN_FOR_TARGET = ` \
-  if [ -f $$r/$(HOST_SUBDIR)/gcc/gfortran ] ; then \
-    echo $$r/$(HOST_SUBDIR)/gcc/gfortran -B$$r/$(HOST_SUBDIR)/gcc ; \
-  else \
-    if [ '$(host)' = '$(target)' ] ; then \
-      echo $(GFORTRAN); \
-    else \
-      echo $(CONFIGURED_GFORTRAN_FOR_TARGET) ; \
-    fi; \
-  fi`
-
-
  DLLTOOL_FOR_TARGET=@DLLTOOL_FOR_TARGET@
-CONFIGURED_DLLTOOL_FOR_TARGET=@CONFIGURED_DLLTOOL_FOR_TARGET@
-USUAL_DLLTOOL_FOR_TARGET = ` \
-  if [ -f $$r/$(HOST_SUBDIR)/binutils/dlltool ] ; then \
-    echo $$r/$(HOST_SUBDIR)/binutils/dlltool ; \
-  else \
-    if [ '$(host)' = '$(target)' ] ; then \
-      echo $(DLLTOOL); \
-    else \
-      echo $(CONFIGURED_DLLTOOL_FOR_TARGET) ; \
-    fi; \
-  fi`
-
  LD_FOR_TARGET=@LD_FOR_TARGET@
-CONFIGURED_LD_FOR_TARGET=@CONFIGURED_LD_FOR_TARGET@
-USUAL_LD_FOR_TARGET = ` \
-  if [ -f $$r/$(HOST_SUBDIR)/ld/ld-new ] ; then \
-    echo $$r/$(HOST_SUBDIR)/ld/ld-new ; \
-  elif [ -f $$r/$(HOST_SUBDIR)/gcc/collect-ld ]; then \
-    echo $$r/$(HOST_SUBDIR)/gcc/collect-ld ; \
-  else \
-    if [ '$(host)' = '$(target)' ] ; then \
-      echo $(LD); \
-    else \
-      echo $(CONFIGURED_LD_FOR_TARGET) ; \
-    fi; \
-  fi`
-
-LDFLAGS_FOR_TARGET = 
  
  LIPO_FOR_TARGET=@LIPO_FOR_TARGET@
-CONFIGURED_LIPO_FOR_TARGET=@CONFIGURED_LIPO_FOR_TARGET@
-USUAL_LIPO_FOR_TARGET = ` \
-  if [ '$(host)' = '$(target)' ] ; then \
-    if [ x'$(LIPO)' != x ]; then \
-       echo $(LIPO); \
-    else \
-       echo lipo; \
-    fi; \
-  else \
-    echo $(CONFIGURED_LIPO_FOR_TARGET) ; \
-  fi`
-
  NM_FOR_TARGET=@NM_FOR_TARGET@
-CONFIGURED_NM_FOR_TARGET=@CONFIGURED_NM_FOR_TARGET@
-USUAL_NM_FOR_TARGET = ` \
-  if [ -f $$r/$(HOST_SUBDIR)/binutils/nm-new ] ; then \
-    echo $$r/$(HOST_SUBDIR)/binutils/nm-new ; \
-  elif [ -f $$r/$(HOST_SUBDIR)/gcc/nm ]; then \
-    echo $$r/$(HOST_SUBDIR)/gcc/nm ; \
-  else \
-    if [ '$(host)' = '$(target)' ] ; then \
-      echo $(NM); \
-    else \
-      echo $(CONFIGURED_NM_FOR_TARGET) ; \
-    fi; \
-  fi`
-
  OBJDUMP_FOR_TARGET=@OBJDUMP_FOR_TARGET@
-CONFIGURED_OBJDUMP_FOR_TARGET=@CONFIGURED_OBJDUMP_FOR_TARGET@
-USUAL_OBJDUMP_FOR_TARGET = ` \
-  if [ -f $$r/$(HOST_SUBDIR)/binutils/objdump ] ; then \
-    echo $$r/$(HOST_SUBDIR)/binutils/objdump ; \
-  else \
-    if [ '$(host)' = '$(target)' ] ; then \
-      if [ x'$(OBJDUMP)' != x ]; then \
-         echo $(OBJDUMP); \
-      else \
-         echo objdump; \
-      fi; \
-    else \
-      echo $(CONFIGURED_OBJDUMP_FOR_TARGET) ; \
-    fi; \
-  fi`
-
  RANLIB_FOR_TARGET=@RANLIB_FOR_TARGET@
-CONFIGURED_RANLIB_FOR_TARGET=@CONFIGURED_RANLIB_FOR_TARGET@
-USUAL_RANLIB_FOR_TARGET = ` \
-  if [ -f $$r/$(HOST_SUBDIR)/binutils/ranlib ] ; then \
-    echo $$r/$(HOST_SUBDIR)/binutils/ranlib ; \
-  else \
-    if [ '$(host)' = '$(target)' ] ; then \
-      if [ x'$(RANLIB)' != x ]; then \
-         echo $(RANLIB); \
-      else \
-         echo ranlib; \
-      fi; \
-    else \
-      echo $(CONFIGURED_RANLIB_FOR_TARGET) ; \
-    fi; \
-  fi`
-
  STRIP_FOR_TARGET=@STRIP_FOR_TARGET@
-CONFIGURED_STRIP_FOR_TARGET=@CONFIGURED_STRIP_FOR_TARGET@
-USUAL_STRIP_FOR_TARGET = ` \
-  if [ -f $$r/$(HOST_SUBDIR)/binutils/strip ] ; then \
-    echo $$r/$(HOST_SUBDIR)/binutils/strip ; \
-  else \
-    if [ '$(host)' = '$(target)' ] ; then \
-      if [ x'$(STRIP)' != x ]; then \
-         echo $(STRIP); \
-      else \
-         echo strip; \
-      fi; \
-    else \
-      echo $(CONFIGURED_STRIP_FOR_TARGET) ; \
-    fi; \
-  fi`
-
  WINDRES_FOR_TARGET=@WINDRES_FOR_TARGET@
-CONFIGURED_WINDRES_FOR_TARGET=@CONFIGURED_WINDRES_FOR_TARGET@
-USUAL_WINDRES_FOR_TARGET = ` \
-  if [ -f $$r/$(HOST_SUBDIR)/binutils/windres ] ; then \
-    echo $$r/$(HOST_SUBDIR)/binutils/windres ; \
-  else \
-    if [ '$(host)' = '$(target)' ] ; then \
-      echo $(WINDRES); \
-    else \
-      echo $(CONFIGURED_WINDRES_FOR_TARGET) ; \
-    fi; \
-  fi`
  
+COMPILER_AS_FOR_TARGET=@COMPILER_AS_FOR_TARGET@
+COMPILER_LD_FOR_TARGET=@COMPILER_LD_FOR_TARGET@
+COMPILER_NM_FOR_TARGET=@COMPILER_NM_FOR_TARGET@
+
+# During gcc bootstrap, if we use some random cc for stage1 then
+# CFLAGS will be just -g.  We want to ensure that TARGET libraries
+# (which we know are built with gcc) are built with optimizations so
+# prepend -O2 when setting CFLAGS_FOR_TARGET.
+CFLAGS_FOR_TARGET = -O2 $(CFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET)
+SYSROOT_CFLAGS_FOR_TARGET = @SYSROOT_CFLAGS_FOR_TARGET@
+CXXFLAGS_FOR_TARGET = $(CXXFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET)
+LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET)
+LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates
+LDFLAGS_FOR_TARGET = 
  PICFLAG_FOR_TARGET = 
  
  # ------------------------------------
@@ -672,6 +433,8 @@ BASE_FLAGS_TO_PASS = \
         "SHELL=$(SHELL)" \
         "YACC=$(YACC)" \
         "AR_FLAGS=$(AR_FLAGS)" \
+       "BOOT_CFLAGS=$(BOOT_CFLAGS)" \
+       "BOOT_LDFLAGS=$(BOOT_LDFLAGS)" \
         "CFLAGS=$(CFLAGS)" \
         "CXXFLAGS=$(CXXFLAGS)" \
         "LDFLAGS=$(LDFLAGS)" \
@@ -712,8 +475,10 @@ EXTRA_HOST_FLAGS = \
         'CXX=$(CXX)' \
         'DLLTOOL=$(DLLTOOL)' \
         'LD=$(LD)' \
+       'LIPO=$(LIPO)' \
         'NM=$(NM)' \
         'RANLIB=$(RANLIB)' \
+       'STRIP=$(STRIP)' \
         'WINDRES=$(WINDRES)'
  
  FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)
@@ -731,21 +496,22 @@ X11_FLAGS_TO_PASS = \
         'X11_EXTRA_LIBS=$(X11_EXTRA_LIBS)'
  
  # Flags to pass down to makes which are built with the target environment.
-# The double $ decreases the length of the command line; the variables
-# are set in BASE_FLAGS_TO_PASS, and the sub-make will expand them.
+# The double $ decreases the length of the command line; those variables
+# are set in BASE_FLAGS_TO_PASS, and the sub-make will expand them.  The
+# COMPILER_ prefixed variables are not passed down so we expand them here.
  EXTRA_TARGET_FLAGS = \
         'AR=$$(AR_FOR_TARGET)' \
-       'AS=$$(AS_FOR_TARGET)' \
+       'AS=$(COMPILER_AS_FOR_TARGET)' \
         'CC=$$(CC_FOR_TARGET)' \
         'CFLAGS=$$(CFLAGS_FOR_TARGET)' \
         'CXX=$$(CXX_FOR_TARGET)' \
         'CXXFLAGS=$$(CXXFLAGS_FOR_TARGET)' \
         'DLLTOOL=$$(DLLTOOL_FOR_TARGET)' \
-       'LD=$$(LD_FOR_TARGET)' \
+       'LD=$(COMPILER_LD_FOR_TARGET)' \
         'LDFLAGS=$$(LDFLAGS_FOR_TARGET)' \
         'LIBCFLAGS=$$(LIBCFLAGS_FOR_TARGET)' \
         'LIBCXXFLAGS=$$(LIBCXXFLAGS_FOR_TARGET)' \
-       'NM=$$(NM_FOR_TARGET)' \
+       'NM=$(COMPILER_NM_FOR_TARGET)' \
         'OBJDUMP=$$(OBJDUMP_FOR_TARGET)' \
         'RANLIB=$$(RANLIB_FOR_TARGET)' \
         'WINDRES=$$(WINDRES_FOR_TARGET)'
@@ -810,6 +576,7 @@ configure-host:  \
      maybe-configure-itcl \
      maybe-configure-ld \
      maybe-configure-libcpp \
+    maybe-configure-libdecnumber \
      maybe-configure-libgui \
      maybe-configure-libiberty \
      maybe-configure-libtool \
@@ -869,29 +636,19 @@ configure-target:  \
  .PHONY: all
  all:
  @if gcc-bootstrap
+       [ -f stage_final ] || echo stage3 > stage_final
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       if [ ! -f stage_last ]; then \
-         $(MAKE) $(RECURSE_FLAGS_TO_PASS) bootstrap; \
-       fi
+       $(MAKE) $(RECURSE_FLAGS_TO_PASS) `cat stage_final`-bubble
  @endif gcc-bootstrap
-       @$(unstage)
-@if gcc-no-bootstrap
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-prebootstrap
-@endif gcc-no-bootstrap
+       @: $(MAKE); $(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; \
+         $(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target; \
         else \
-         $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-host; \
+         $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-host all-target; \
         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:  \
@@ -938,6 +695,7 @@ all-host:  \
      maybe-all-itcl \
      maybe-all-ld \
      maybe-all-libcpp \
+    maybe-all-libdecnumber \
      maybe-all-libgui \
      maybe-all-libiberty \
      maybe-all-libtool \
@@ -1000,10 +758,11 @@ all-target:  \
  
  .PHONY: do-info
  do-info:
-       @$(unstage)
-       @$(MAKE) $(RECURSE_FLAGS_TO_PASS) info-host \
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(MAKE) $(RECURSE_FLAGS_TO_PASS) info-host \
           info-target
-       @$(stage)
  
  
  .PHONY: info-host
@@ -1042,6 +801,7 @@ info-host:  \
      maybe-info-itcl \
      maybe-info-ld \
      maybe-info-libcpp \
+    maybe-info-libdecnumber \
      maybe-info-libgui \
      maybe-info-libiberty \
      maybe-info-libtool \
@@ -1100,10 +860,11 @@ info-target:  \
  
  .PHONY: do-dvi
  do-dvi:
-       @$(unstage)
-       @$(MAKE) $(RECURSE_FLAGS_TO_PASS) dvi-host \
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(MAKE) $(RECURSE_FLAGS_TO_PASS) dvi-host \
           dvi-target
-       @$(stage)
  
  
  .PHONY: dvi-host
@@ -1142,6 +903,7 @@ dvi-host:  \
      maybe-dvi-itcl \
      maybe-dvi-ld \
      maybe-dvi-libcpp \
+    maybe-dvi-libdecnumber \
      maybe-dvi-libgui \
      maybe-dvi-libiberty \
      maybe-dvi-libtool \
@@ -1200,10 +962,11 @@ dvi-target:  \
  
  .PHONY: do-html
  do-html:
-       @$(unstage)
-       @$(MAKE) $(RECURSE_FLAGS_TO_PASS) html-host \
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(MAKE) $(RECURSE_FLAGS_TO_PASS) html-host \
           html-target
-       @$(stage)
  
  
  .PHONY: html-host
@@ -1242,6 +1005,7 @@ html-host:  \
      maybe-html-itcl \
      maybe-html-ld \
      maybe-html-libcpp \
+    maybe-html-libdecnumber \
      maybe-html-libgui \
      maybe-html-libiberty \
      maybe-html-libtool \
@@ -1300,10 +1064,11 @@ html-target:  \
  
  .PHONY: do-TAGS
  do-TAGS:
-       @$(unstage)
-       @$(MAKE) $(RECURSE_FLAGS_TO_PASS) TAGS-host \
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(MAKE) $(RECURSE_FLAGS_TO_PASS) TAGS-host \
           TAGS-target
-       @$(stage)
  
  
  .PHONY: TAGS-host
@@ -1342,6 +1107,7 @@ TAGS-host:  \
      maybe-TAGS-itcl \
      maybe-TAGS-ld \
      maybe-TAGS-libcpp \
+    maybe-TAGS-libdecnumber \
      maybe-TAGS-libgui \
      maybe-TAGS-libiberty \
      maybe-TAGS-libtool \
@@ -1400,10 +1166,11 @@ TAGS-target:  \
  
  .PHONY: do-install-info
  do-install-info:
-       @$(unstage)
-       @$(MAKE) $(RECURSE_FLAGS_TO_PASS) install-info-host \
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(MAKE) $(RECURSE_FLAGS_TO_PASS) install-info-host \
           install-info-target
-       @$(stage)
  
  
  .PHONY: install-info-host
@@ -1442,6 +1209,7 @@ install-info-host:  \
      maybe-install-info-itcl \
      maybe-install-info-ld \
      maybe-install-info-libcpp \
+    maybe-install-info-libdecnumber \
      maybe-install-info-libgui \
      maybe-install-info-libiberty \
      maybe-install-info-libtool \
@@ -1500,10 +1268,11 @@ install-info-target:  \
  
  .PHONY: do-installcheck
  do-installcheck:
-       @$(unstage)
-       @$(MAKE) $(RECURSE_FLAGS_TO_PASS) installcheck-host \
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(MAKE) $(RECURSE_FLAGS_TO_PASS) installcheck-host \
           installcheck-target
-       @$(stage)
  
  
  .PHONY: installcheck-host
@@ -1542,6 +1311,7 @@ installcheck-host:  \
      maybe-installcheck-itcl \
      maybe-installcheck-ld \
      maybe-installcheck-libcpp \
+    maybe-installcheck-libdecnumber \
      maybe-installcheck-libgui \
      maybe-installcheck-libiberty \
      maybe-installcheck-libtool \
@@ -1600,10 +1370,11 @@ installcheck-target:  \
  
  .PHONY: do-mostlyclean
  do-mostlyclean:
-       @$(unstage)
-       @$(MAKE) $(RECURSE_FLAGS_TO_PASS) mostlyclean-host \
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(MAKE) $(RECURSE_FLAGS_TO_PASS) mostlyclean-host \
           mostlyclean-target
-       @$(stage)
  
  
  .PHONY: mostlyclean-host
@@ -1642,6 +1413,7 @@ mostlyclean-host:  \
      maybe-mostlyclean-itcl \
      maybe-mostlyclean-ld \
      maybe-mostlyclean-libcpp \
+    maybe-mostlyclean-libdecnumber \
      maybe-mostlyclean-libgui \
      maybe-mostlyclean-libiberty \
      maybe-mostlyclean-libtool \
@@ -1700,10 +1472,11 @@ mostlyclean-target:  \
  
  .PHONY: do-clean
  do-clean:
-       @$(unstage)
-       @$(MAKE) $(RECURSE_FLAGS_TO_PASS) clean-host \
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(MAKE) $(RECURSE_FLAGS_TO_PASS) clean-host \
           clean-target
-       @$(stage)
  
  
  .PHONY: clean-host
@@ -1742,6 +1515,7 @@ clean-host:  \
      maybe-clean-itcl \
      maybe-clean-ld \
      maybe-clean-libcpp \
+    maybe-clean-libdecnumber \
      maybe-clean-libgui \
      maybe-clean-libiberty \
      maybe-clean-libtool \
@@ -1800,10 +1574,11 @@ clean-target:  \
  
  .PHONY: do-distclean
  do-distclean:
-       @$(unstage)
-       @$(MAKE) $(RECURSE_FLAGS_TO_PASS) distclean-host \
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(MAKE) $(RECURSE_FLAGS_TO_PASS) distclean-host \
           distclean-target
-       @$(stage)
  
  
  .PHONY: distclean-host
@@ -1842,6 +1617,7 @@ distclean-host:  \
      maybe-distclean-itcl \
      maybe-distclean-ld \
      maybe-distclean-libcpp \
+    maybe-distclean-libdecnumber \
      maybe-distclean-libgui \
      maybe-distclean-libiberty \
      maybe-distclean-libtool \
@@ -1900,10 +1676,11 @@ distclean-target:  \
  
  .PHONY: do-maintainer-clean
  do-maintainer-clean:
-       @$(unstage)
-       @$(MAKE) $(RECURSE_FLAGS_TO_PASS) maintainer-clean-host \
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(MAKE) $(RECURSE_FLAGS_TO_PASS) maintainer-clean-host \
           maintainer-clean-target
-       @$(stage)
  
  
  .PHONY: maintainer-clean-host
@@ -1942,6 +1719,7 @@ maintainer-clean-host:  \
      maybe-maintainer-clean-itcl \
      maybe-maintainer-clean-ld \
      maybe-maintainer-clean-libcpp \
+    maybe-maintainer-clean-libdecnumber \
      maybe-maintainer-clean-libgui \
      maybe-maintainer-clean-libiberty \
      maybe-maintainer-clean-libtool \
@@ -2024,7 +1802,7 @@ local-clean:
  
  local-distclean:
         -rm -f Makefile config.status config.cache mh-frag mt-frag
-       -rm -f multilib.out multilib.tmp maybedep.tmp serdep.tmp
+       -rm -f maybedep.tmp serdep.tmp
         -if [ "$(TARGET_SUBDIR)" != "." ]; then \
           rm -rf $(TARGET_SUBDIR); \
         else true; fi
@@ -2049,14 +1827,10 @@ maintainer-clean: local-maintainer-clean do-maintainer-clean local-clean
  maintainer-clean: local-distclean
  realclean: maintainer-clean
  
-# Extra dependency for clean-target, owing to the mixed nature of gcc
+# Extra dependency for clean-target, owing to the mixed nature of gcc.
  clean-target: clean-target-libgcc
  clean-target-libgcc:
-       test ! -d gcc/libgcc || \
-       (cd gcc/libgcc && find . -type d -print) | \
-       while read d; do rm -f gcc/$$d/libgcc.a || : ; done
-       -rm -rf gcc/libgcc
-       -rm -f gcc/stmp-dirs
+       test ! -d gcc || (cd gcc && $(MAKE) $@)
  
  # Check target.
  
@@ -2100,6 +1874,7 @@ check-host:  \
      maybe-check-itcl \
      maybe-check-ld \
      maybe-check-libcpp \
+    maybe-check-libdecnumber \
      maybe-check-libgui \
      maybe-check-libiberty \
      maybe-check-libtool \
@@ -2157,9 +1932,10 @@ check-target:  \
      maybe-check-target-libada
  
  do-check:
-       @$(unstage)
-       @$(MAKE) $(RECURSE_FLAGS_TO_PASS) check-host check-target
-       @$(stage)
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(MAKE) $(RECURSE_FLAGS_TO_PASS) check-host check-target
  
  # Automated reporting of test results.
  
@@ -2186,9 +1962,10 @@ mail-report-with-warnings.log: warning.log
  
  .PHONY: install uninstall
  install:
-       @$(unstage)
-       @$(MAKE) $(RECURSE_FLAGS_TO_PASS) installdirs install-host install-target
-       @$(stage)
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(MAKE) $(RECURSE_FLAGS_TO_PASS) installdirs install-host install-target
  
  .PHONY: install-host-nogcc
  install-host-nogcc:  \
@@ -2225,6 +2002,7 @@ install-host-nogcc:  \
      maybe-install-itcl \
      maybe-install-ld \
      maybe-install-libcpp \
+    maybe-install-libdecnumber \
      maybe-install-libgui \
      maybe-install-libiberty \
      maybe-install-libtool \
@@ -2295,6 +2073,7 @@ install-host:  \
      maybe-install-itcl \
      maybe-install-ld \
      maybe-install-libcpp \
+    maybe-install-libdecnumber \
      maybe-install-libgui \
      maybe-install-libiberty \
      maybe-install-libtool \
@@ -2358,6 +2137,7 @@ uninstall:
  install.all: install-no-fixedincludes
         @if [ -f ./gcc/Makefile ] ; then \
                 r=`${PWD_COMMAND}` ; export r ; \
+               s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
                 $(HOST_EXPORTS) \
                 (cd ./gcc && \
                 $(MAKE) $(FLAGS_TO_PASS) install-headers) ; \
@@ -2418,8 +2198,8 @@ TAGS: do-TAGS
  maybe-configure-build-libiberty:
  @if build-libiberty
  maybe-configure-build-libiberty: configure-build-libiberty
-configure-build-libiberty: 
-       @$(unstage)
+configure-build-libiberty:
+       @: $(MAKE); $(unstage)
         @test ! -f $(BUILD_SUBDIR)/libiberty/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/libiberty ; \
         r=`${PWD_COMMAND}`; export r; \
@@ -2450,7 +2230,7 @@ maybe-all-build-libiberty:
  TARGET-build-libiberty=all
  maybe-all-build-libiberty: all-build-libiberty
  all-build-libiberty: configure-build-libiberty
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(BUILD_EXPORTS) \
@@ -2466,8 +2246,8 @@ all-build-libiberty: configure-build-libiberty
  maybe-configure-build-bison:
  @if build-bison
  maybe-configure-build-bison: configure-build-bison
-configure-build-bison: 
-       @$(unstage)
+configure-build-bison:
+       @: $(MAKE); $(unstage)
         @test ! -f $(BUILD_SUBDIR)/bison/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/bison ; \
         r=`${PWD_COMMAND}`; export r; \
@@ -2498,7 +2278,7 @@ maybe-all-build-bison:
  TARGET-build-bison=all
  maybe-all-build-bison: all-build-bison
  all-build-bison: configure-build-bison
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(BUILD_EXPORTS) \
@@ -2514,8 +2294,8 @@ all-build-bison: configure-build-bison
  maybe-configure-build-byacc:
  @if build-byacc
  maybe-configure-build-byacc: configure-build-byacc
-configure-build-byacc: 
-       @$(unstage)
+configure-build-byacc:
+       @: $(MAKE); $(unstage)
         @test ! -f $(BUILD_SUBDIR)/byacc/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/byacc ; \
         r=`${PWD_COMMAND}`; export r; \
@@ -2546,7 +2326,7 @@ maybe-all-build-byacc:
  TARGET-build-byacc=all
  maybe-all-build-byacc: all-build-byacc
  all-build-byacc: configure-build-byacc
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(BUILD_EXPORTS) \
@@ -2562,8 +2342,8 @@ all-build-byacc: configure-build-byacc
  maybe-configure-build-flex:
  @if build-flex
  maybe-configure-build-flex: configure-build-flex
-configure-build-flex: 
-       @$(unstage)
+configure-build-flex:
+       @: $(MAKE); $(unstage)
         @test ! -f $(BUILD_SUBDIR)/flex/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/flex ; \
         r=`${PWD_COMMAND}`; export r; \
@@ -2594,7 +2374,7 @@ maybe-all-build-flex:
  TARGET-build-flex=all
  maybe-all-build-flex: all-build-flex
  all-build-flex: configure-build-flex
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(BUILD_EXPORTS) \
@@ -2610,8 +2390,8 @@ all-build-flex: configure-build-flex
  maybe-configure-build-m4:
  @if build-m4
  maybe-configure-build-m4: configure-build-m4
-configure-build-m4: 
-       @$(unstage)
+configure-build-m4:
+       @: $(MAKE); $(unstage)
         @test ! -f $(BUILD_SUBDIR)/m4/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/m4 ; \
         r=`${PWD_COMMAND}`; export r; \
@@ -2642,7 +2422,7 @@ maybe-all-build-m4:
  TARGET-build-m4=all
  maybe-all-build-m4: all-build-m4
  all-build-m4: configure-build-m4
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(BUILD_EXPORTS) \
@@ -2658,8 +2438,8 @@ all-build-m4: configure-build-m4
  maybe-configure-build-texinfo:
  @if build-texinfo
  maybe-configure-build-texinfo: configure-build-texinfo
-configure-build-texinfo: 
-       @$(unstage)
+configure-build-texinfo:
+       @: $(MAKE); $(unstage)
         @test ! -f $(BUILD_SUBDIR)/texinfo/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/texinfo ; \
         r=`${PWD_COMMAND}`; export r; \
@@ -2690,7 +2470,7 @@ maybe-all-build-texinfo:
  TARGET-build-texinfo=all
  maybe-all-build-texinfo: all-build-texinfo
  all-build-texinfo: configure-build-texinfo
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(BUILD_EXPORTS) \
@@ -2706,8 +2486,8 @@ all-build-texinfo: configure-build-texinfo
  maybe-configure-build-fixincludes:
  @if build-fixincludes
  maybe-configure-build-fixincludes: configure-build-fixincludes
-configure-build-fixincludes: 
-       @$(unstage)
+configure-build-fixincludes:
+       @: $(MAKE); $(unstage)
         @test ! -f $(BUILD_SUBDIR)/fixincludes/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/fixincludes ; \
         r=`${PWD_COMMAND}`; export r; \
@@ -2738,7 +2518,7 @@ maybe-all-build-fixincludes:
  TARGET-build-fixincludes=all
  maybe-all-build-fixincludes: all-build-fixincludes
  all-build-fixincludes: configure-build-fixincludes
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(BUILD_EXPORTS) \
@@ -2759,8 +2539,8 @@ all-build-fixincludes: configure-build-fixincludes
  maybe-configure-ash:
  @if ash
  maybe-configure-ash: configure-ash
-configure-ash: 
-       @$(unstage)
+configure-ash:
+       @: $(MAKE); $(unstage)
         @test ! -f $(HOST_SUBDIR)/ash/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ash ; \
         r=`${PWD_COMMAND}`; export r; \
@@ -2790,7 +2570,7 @@ maybe-all-ash:
  TARGET-ash=all
  maybe-all-ash: all-ash
  all-ash: configure-ash
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -2807,7 +2587,7 @@ maybe-check-ash:
  maybe-check-ash: check-ash
  
  check-ash:
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -2822,7 +2602,7 @@ maybe-install-ash:
  maybe-install-ash: install-ash
  
  install-ash: installdirs
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -2840,7 +2620,7 @@ maybe-info-ash: info-ash
  
  info-ash: \
      configure-ash 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./ash/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -2866,7 +2646,7 @@ maybe-dvi-ash: dvi-ash
  
  dvi-ash: \
      configure-ash 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./ash/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -2892,7 +2672,7 @@ maybe-html-ash: html-ash
  
  html-ash: \
      configure-ash 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./ash/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -2918,7 +2698,7 @@ maybe-TAGS-ash: TAGS-ash
  
  TAGS-ash: \
      configure-ash 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./ash/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -2945,7 +2725,7 @@ maybe-install-info-ash: install-info-ash
  install-info-ash: \
      configure-ash \
      info-ash 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./ash/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -2971,7 +2751,7 @@ maybe-installcheck-ash: installcheck-ash
  
  installcheck-ash: \
      configure-ash 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./ash/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -2996,7 +2776,7 @@ maybe-mostlyclean-ash:
  maybe-mostlyclean-ash: mostlyclean-ash
  
  mostlyclean-ash: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./ash/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -3021,7 +2801,7 @@ maybe-clean-ash:
  maybe-clean-ash: clean-ash
  
  clean-ash: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./ash/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -3046,7 +2826,7 @@ maybe-distclean-ash:
  maybe-distclean-ash: distclean-ash
  
  distclean-ash: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./ash/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -3071,7 +2851,7 @@ maybe-maintainer-clean-ash:
  maybe-maintainer-clean-ash: maintainer-clean-ash
  
  maintainer-clean-ash: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./ash/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -3096,8 +2876,8 @@ maintainer-clean-ash:
  maybe-configure-autoconf:
  @if autoconf
  maybe-configure-autoconf: configure-autoconf
-configure-autoconf: 
-       @$(unstage)
+configure-autoconf:
+       @: $(MAKE); $(unstage)
         @test ! -f $(HOST_SUBDIR)/autoconf/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/autoconf ; \
         r=`${PWD_COMMAND}`; export r; \
@@ -3127,7 +2907,7 @@ maybe-all-autoconf:
  TARGET-autoconf=all
  maybe-all-autoconf: all-autoconf
  all-autoconf: configure-autoconf
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -3144,7 +2924,7 @@ maybe-check-autoconf:
  maybe-check-autoconf: check-autoconf
  
  check-autoconf:
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -3159,7 +2939,7 @@ maybe-install-autoconf:
  maybe-install-autoconf: install-autoconf
  
  install-autoconf: installdirs
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -3177,7 +2957,7 @@ maybe-info-autoconf: info-autoconf
  
  info-autoconf: \
      configure-autoconf 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./autoconf/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -3203,7 +2983,7 @@ maybe-dvi-autoconf: dvi-autoconf
  
  dvi-autoconf: \
      configure-autoconf 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./autoconf/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -3229,7 +3009,7 @@ maybe-html-autoconf: html-autoconf
  
  html-autoconf: \
      configure-autoconf 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./autoconf/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -3255,7 +3035,7 @@ maybe-TAGS-autoconf: TAGS-autoconf
  
  TAGS-autoconf: \
      configure-autoconf 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./autoconf/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -3282,7 +3062,7 @@ maybe-install-info-autoconf: install-info-autoconf
  install-info-autoconf: \
      configure-autoconf \
      info-autoconf 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./autoconf/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -3308,7 +3088,7 @@ maybe-installcheck-autoconf: installcheck-autoconf
  
  installcheck-autoconf: \
      configure-autoconf 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./autoconf/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -3333,7 +3113,7 @@ maybe-mostlyclean-autoconf:
  maybe-mostlyclean-autoconf: mostlyclean-autoconf
  
  mostlyclean-autoconf: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./autoconf/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -3358,7 +3138,7 @@ maybe-clean-autoconf:
  maybe-clean-autoconf: clean-autoconf
  
  clean-autoconf: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./autoconf/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -3383,7 +3163,7 @@ maybe-distclean-autoconf:
  maybe-distclean-autoconf: distclean-autoconf
  
  distclean-autoconf: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./autoconf/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -3408,7 +3188,7 @@ maybe-maintainer-clean-autoconf:
  maybe-maintainer-clean-autoconf: maintainer-clean-autoconf
  
  maintainer-clean-autoconf: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./autoconf/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -3433,8 +3213,8 @@ maintainer-clean-autoconf:
  maybe-configure-automake:
  @if automake
  maybe-configure-automake: configure-automake
-configure-automake: 
-       @$(unstage)
+configure-automake:
+       @: $(MAKE); $(unstage)
         @test ! -f $(HOST_SUBDIR)/automake/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/automake ; \
         r=`${PWD_COMMAND}`; export r; \
@@ -3464,7 +3244,7 @@ maybe-all-automake:
  TARGET-automake=all
  maybe-all-automake: all-automake
  all-automake: configure-automake
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -3481,7 +3261,7 @@ maybe-check-automake:
  maybe-check-automake: check-automake
  
  check-automake:
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -3496,7 +3276,7 @@ maybe-install-automake:
  maybe-install-automake: install-automake
  
  install-automake: installdirs
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -3514,7 +3294,7 @@ maybe-info-automake: info-automake
  
  info-automake: \
      configure-automake 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./automake/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -3540,7 +3320,7 @@ maybe-dvi-automake: dvi-automake
  
  dvi-automake: \
      configure-automake 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./automake/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -3566,7 +3346,7 @@ maybe-html-automake: html-automake
  
  html-automake: \
      configure-automake 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./automake/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -3592,7 +3372,7 @@ maybe-TAGS-automake: TAGS-automake
  
  TAGS-automake: \
      configure-automake 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./automake/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -3619,7 +3399,7 @@ maybe-install-info-automake: install-info-automake
  install-info-automake: \
      configure-automake \
      info-automake 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./automake/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -3645,7 +3425,7 @@ maybe-installcheck-automake: installcheck-automake
  
  installcheck-automake: \
      configure-automake 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./automake/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -3670,7 +3450,7 @@ maybe-mostlyclean-automake:
  maybe-mostlyclean-automake: mostlyclean-automake
  
  mostlyclean-automake: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./automake/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -3695,7 +3475,7 @@ maybe-clean-automake:
  maybe-clean-automake: clean-automake
  
  clean-automake: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./automake/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -3720,7 +3500,7 @@ maybe-distclean-automake:
  maybe-distclean-automake: distclean-automake
  
  distclean-automake: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./automake/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -3745,7 +3525,7 @@ maybe-maintainer-clean-automake:
  maybe-maintainer-clean-automake: maintainer-clean-automake
  
  maintainer-clean-automake: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./automake/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -3770,8 +3550,8 @@ maintainer-clean-automake:
  maybe-configure-bash:
  @if bash
  maybe-configure-bash: configure-bash
-configure-bash: 
-       @$(unstage)
+configure-bash:
+       @: $(MAKE); $(unstage)
         @test ! -f $(HOST_SUBDIR)/bash/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bash ; \
         r=`${PWD_COMMAND}`; export r; \
@@ -3801,7 +3581,7 @@ maybe-all-bash:
  TARGET-bash=all
  maybe-all-bash: all-bash
  all-bash: configure-bash
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -3818,7 +3598,7 @@ maybe-check-bash:
  maybe-check-bash: check-bash
  
  check-bash:
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -3833,7 +3613,7 @@ maybe-install-bash:
  maybe-install-bash: install-bash
  
  install-bash: installdirs
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -3851,7 +3631,7 @@ maybe-info-bash: info-bash
  
  info-bash: \
      configure-bash 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./bash/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -3877,7 +3657,7 @@ maybe-dvi-bash: dvi-bash
  
  dvi-bash: \
      configure-bash 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./bash/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -3903,7 +3683,7 @@ maybe-html-bash: html-bash
  
  html-bash: \
      configure-bash 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./bash/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -3929,7 +3709,7 @@ maybe-TAGS-bash: TAGS-bash
  
  TAGS-bash: \
      configure-bash 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./bash/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -3956,7 +3736,7 @@ maybe-install-info-bash: install-info-bash
  install-info-bash: \
      configure-bash \
      info-bash 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./bash/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -3982,7 +3762,7 @@ maybe-installcheck-bash: installcheck-bash
  
  installcheck-bash: \
      configure-bash 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./bash/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -4007,7 +3787,7 @@ maybe-mostlyclean-bash:
  maybe-mostlyclean-bash: mostlyclean-bash
  
  mostlyclean-bash: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./bash/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -4032,7 +3812,7 @@ maybe-clean-bash:
  maybe-clean-bash: clean-bash
  
  clean-bash: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./bash/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -4057,7 +3837,7 @@ maybe-distclean-bash:
  maybe-distclean-bash: distclean-bash
  
  distclean-bash: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./bash/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -4082,7 +3862,7 @@ maybe-maintainer-clean-bash:
  maybe-maintainer-clean-bash: maintainer-clean-bash
  
  maintainer-clean-bash: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./bash/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -4107,7 +3887,7 @@ maintainer-clean-bash:
  maybe-configure-bfd:
  @if bfd
  maybe-configure-bfd: configure-bfd
-configure-bfd: 
+configure-bfd:
         @test -f stage_last && exit 0; \
         test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \
@@ -4134,13 +3914,13 @@ configure-bfd:
  maybe-configure-stage1-bfd:
  @if bfd-bootstrap
  maybe-configure-stage1-bfd: configure-stage1-bfd
-configure-stage1-bfd: 
+configure-stage1-bfd:
         @[ `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; \
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd
+       test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \
         $(HOST_EXPORTS) \
         echo Configuring stage 1 in $(HOST_SUBDIR)/bfd ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \
         cd $(HOST_SUBDIR)/bfd || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -4158,14 +3938,14 @@ configure-stage1-bfd:
  maybe-configure-stage2-bfd:
  @if bfd-bootstrap
  maybe-configure-stage2-bfd: configure-stage2-bfd
-configure-stage2-bfd: 
+configure-stage2-bfd:
         @[ `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; \
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd
+       test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS) \
         echo Configuring stage 2 in $(HOST_SUBDIR)/bfd ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \
         cd $(HOST_SUBDIR)/bfd || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -4183,14 +3963,14 @@ configure-stage2-bfd:
  maybe-configure-stage3-bfd:
  @if bfd-bootstrap
  maybe-configure-stage3-bfd: configure-stage3-bfd
-configure-stage3-bfd: 
+configure-stage3-bfd:
         @[ `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; \
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd
+       test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS) \
         echo Configuring stage 3 in $(HOST_SUBDIR)/bfd ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \
         cd $(HOST_SUBDIR)/bfd || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -4208,14 +3988,14 @@ configure-stage3-bfd:
  maybe-configure-stage4-bfd:
  @if bfd-bootstrap
  maybe-configure-stage4-bfd: configure-stage4-bfd
-configure-stage4-bfd: 
+configure-stage4-bfd:
         @[ `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; \
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd
+       test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS) \
         echo Configuring stage 4 in $(HOST_SUBDIR)/bfd ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \
         cd $(HOST_SUBDIR)/bfd || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -4233,14 +4013,14 @@ configure-stage4-bfd:
  maybe-configure-stageprofile-bfd:
  @if bfd-bootstrap
  maybe-configure-stageprofile-bfd: configure-stageprofile-bfd
-configure-stageprofile-bfd: 
+configure-stageprofile-bfd:
         @[ `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; \
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd
+       test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS) \
         echo Configuring stage profile in $(HOST_SUBDIR)/bfd ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \
         cd $(HOST_SUBDIR)/bfd || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -4258,14 +4038,14 @@ configure-stageprofile-bfd:
  maybe-configure-stagefeedback-bfd:
  @if bfd-bootstrap
  maybe-configure-stagefeedback-bfd: configure-stagefeedback-bfd
-configure-stagefeedback-bfd: 
+configure-stagefeedback-bfd:
         @[ `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; \
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd
+       test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS) \
         echo Configuring stage feedback in $(HOST_SUBDIR)/bfd ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \
         cd $(HOST_SUBDIR)/bfd || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -4492,7 +4272,7 @@ maybe-check-bfd:
  maybe-check-bfd: check-bfd
  
  check-bfd:
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -4507,7 +4287,7 @@ maybe-install-bfd:
  maybe-install-bfd: install-bfd
  
  install-bfd: installdirs
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -4771,7 +4551,7 @@ maintainer-clean-bfd:
  maybe-configure-opcodes:
  @if opcodes
  maybe-configure-opcodes: configure-opcodes
-configure-opcodes: 
+configure-opcodes:
         @test -f stage_last && exit 0; \
         test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \
@@ -4798,13 +4578,13 @@ configure-opcodes:
  maybe-configure-stage1-opcodes:
  @if opcodes-bootstrap
  maybe-configure-stage1-opcodes: configure-stage1-opcodes
-configure-stage1-opcodes: 
+configure-stage1-opcodes:
         @[ `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; \
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes
+       test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \
         $(HOST_EXPORTS) \
         echo Configuring stage 1 in $(HOST_SUBDIR)/opcodes ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \
         cd $(HOST_SUBDIR)/opcodes || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -4822,14 +4602,14 @@ configure-stage1-opcodes:
  maybe-configure-stage2-opcodes:
  @if opcodes-bootstrap
  maybe-configure-stage2-opcodes: configure-stage2-opcodes
-configure-stage2-opcodes: 
+configure-stage2-opcodes:
         @[ `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; \
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes
+       test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS) \
         echo Configuring stage 2 in $(HOST_SUBDIR)/opcodes ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \
         cd $(HOST_SUBDIR)/opcodes || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -4847,14 +4627,14 @@ configure-stage2-opcodes:
  maybe-configure-stage3-opcodes:
  @if opcodes-bootstrap
  maybe-configure-stage3-opcodes: configure-stage3-opcodes
-configure-stage3-opcodes: 
+configure-stage3-opcodes:
         @[ `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; \
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes
+       test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS) \
         echo Configuring stage 3 in $(HOST_SUBDIR)/opcodes ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \
         cd $(HOST_SUBDIR)/opcodes || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -4872,14 +4652,14 @@ configure-stage3-opcodes:
  maybe-configure-stage4-opcodes:
  @if opcodes-bootstrap
  maybe-configure-stage4-opcodes: configure-stage4-opcodes
-configure-stage4-opcodes: 
+configure-stage4-opcodes:
         @[ `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; \
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes
+       test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS) \
         echo Configuring stage 4 in $(HOST_SUBDIR)/opcodes ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \
         cd $(HOST_SUBDIR)/opcodes || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -4897,14 +4677,14 @@ configure-stage4-opcodes:
  maybe-configure-stageprofile-opcodes:
  @if opcodes-bootstrap
  maybe-configure-stageprofile-opcodes: configure-stageprofile-opcodes
-configure-stageprofile-opcodes: 
+configure-stageprofile-opcodes:
         @[ `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; \
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes
+       test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS) \
         echo Configuring stage profile in $(HOST_SUBDIR)/opcodes ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \
         cd $(HOST_SUBDIR)/opcodes || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -4922,14 +4702,14 @@ configure-stageprofile-opcodes:
  maybe-configure-stagefeedback-opcodes:
  @if opcodes-bootstrap
  maybe-configure-stagefeedback-opcodes: configure-stagefeedback-opcodes
-configure-stagefeedback-opcodes: 
+configure-stagefeedback-opcodes:
         @[ `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; \
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes
+       test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS) \
         echo Configuring stage feedback in $(HOST_SUBDIR)/opcodes ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \
         cd $(HOST_SUBDIR)/opcodes || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -5156,7 +4936,7 @@ maybe-check-opcodes:
  maybe-check-opcodes: check-opcodes
  
  check-opcodes:
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -5171,7 +4951,7 @@ maybe-install-opcodes:
  maybe-install-opcodes: install-opcodes
  
  install-opcodes: installdirs
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -5435,7 +5215,7 @@ maintainer-clean-opcodes:
  maybe-configure-binutils:
  @if binutils
  maybe-configure-binutils: configure-binutils
-configure-binutils: 
+configure-binutils:
         @test -f stage_last && exit 0; \
         test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \
@@ -5462,13 +5242,13 @@ configure-binutils:
  maybe-configure-stage1-binutils:
  @if binutils-bootstrap
  maybe-configure-stage1-binutils: configure-stage1-binutils
-configure-stage1-binutils: 
+configure-stage1-binutils:
         @[ `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; \
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils
+       test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \
         $(HOST_EXPORTS) \
         echo Configuring stage 1 in $(HOST_SUBDIR)/binutils ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \
         cd $(HOST_SUBDIR)/binutils || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -5486,14 +5266,14 @@ configure-stage1-binutils:
  maybe-configure-stage2-binutils:
  @if binutils-bootstrap
  maybe-configure-stage2-binutils: configure-stage2-binutils
-configure-stage2-binutils: 
+configure-stage2-binutils:
         @[ `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; \
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils
+       test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS) \
         echo Configuring stage 2 in $(HOST_SUBDIR)/binutils ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \
         cd $(HOST_SUBDIR)/binutils || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -5511,14 +5291,14 @@ configure-stage2-binutils:
  maybe-configure-stage3-binutils:
  @if binutils-bootstrap
  maybe-configure-stage3-binutils: configure-stage3-binutils
-configure-stage3-binutils: 
+configure-stage3-binutils:
         @[ `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; \
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils
+       test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS) \
         echo Configuring stage 3 in $(HOST_SUBDIR)/binutils ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \
         cd $(HOST_SUBDIR)/binutils || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -5536,14 +5316,14 @@ configure-stage3-binutils:
  maybe-configure-stage4-binutils:
  @if binutils-bootstrap
  maybe-configure-stage4-binutils: configure-stage4-binutils
-configure-stage4-binutils: 
+configure-stage4-binutils:
         @[ `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; \
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils
+       test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS) \
         echo Configuring stage 4 in $(HOST_SUBDIR)/binutils ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \
         cd $(HOST_SUBDIR)/binutils || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -5561,14 +5341,14 @@ configure-stage4-binutils:
  maybe-configure-stageprofile-binutils:
  @if binutils-bootstrap
  maybe-configure-stageprofile-binutils: configure-stageprofile-binutils
-configure-stageprofile-binutils: 
+configure-stageprofile-binutils:
         @[ `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; \
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils
+       test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS) \
         echo Configuring stage profile in $(HOST_SUBDIR)/binutils ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \
         cd $(HOST_SUBDIR)/binutils || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -5586,14 +5366,14 @@ configure-stageprofile-binutils:
  maybe-configure-stagefeedback-binutils:
  @if binutils-bootstrap
  maybe-configure-stagefeedback-binutils: configure-stagefeedback-binutils
-configure-stagefeedback-binutils: 
+configure-stagefeedback-binutils:
         @[ `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; \
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils
+       test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS) \
         echo Configuring stage feedback in $(HOST_SUBDIR)/binutils ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \
         cd $(HOST_SUBDIR)/binutils || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -5820,7 +5600,7 @@ maybe-check-binutils:
  maybe-check-binutils: check-binutils
  
  check-binutils:
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -5835,7 +5615,7 @@ maybe-install-binutils:
  maybe-install-binutils: install-binutils
  
  install-binutils: installdirs
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -6099,8 +5879,8 @@ maintainer-clean-binutils:
  maybe-configure-bison:
  @if bison
  maybe-configure-bison: configure-bison
-configure-bison: 
-       @$(unstage)
+configure-bison:
+       @: $(MAKE); $(unstage)
         @test ! -f $(HOST_SUBDIR)/bison/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bison ; \
         r=`${PWD_COMMAND}`; export r; \
@@ -6130,7 +5910,7 @@ maybe-all-bison:
  TARGET-bison=all
  maybe-all-bison: all-bison
  all-bison: configure-bison
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -6148,7 +5928,7 @@ maybe-check-bison: check-bison
  
  # This module is only tested in a native toolchain.
  check-bison:
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @if [ '$(host)' = '$(target)' ] ; then \
           r=`${PWD_COMMAND}`; export r; \
           s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -6165,7 +5945,7 @@ maybe-install-bison:
  maybe-install-bison: install-bison
  
  install-bison: installdirs
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -6183,7 +5963,7 @@ maybe-info-bison: info-bison
  
  info-bison: \
      configure-bison 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./bison/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -6209,7 +5989,7 @@ maybe-dvi-bison: dvi-bison
  
  dvi-bison: \
      configure-bison 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./bison/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -6235,7 +6015,7 @@ maybe-html-bison: html-bison
  
  html-bison: \
      configure-bison 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./bison/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -6261,7 +6041,7 @@ maybe-TAGS-bison: TAGS-bison
  
  TAGS-bison: \
      configure-bison 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./bison/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -6288,7 +6068,7 @@ maybe-install-info-bison: install-info-bison
  install-info-bison: \
      configure-bison \
      info-bison 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./bison/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -6314,7 +6094,7 @@ maybe-installcheck-bison: installcheck-bison
  
  installcheck-bison: \
      configure-bison 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./bison/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -6339,7 +6119,7 @@ maybe-mostlyclean-bison:
  maybe-mostlyclean-bison: mostlyclean-bison
  
  mostlyclean-bison: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./bison/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -6364,7 +6144,7 @@ maybe-clean-bison:
  maybe-clean-bison: clean-bison
  
  clean-bison: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./bison/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -6389,7 +6169,7 @@ maybe-distclean-bison:
  maybe-distclean-bison: distclean-bison
  
  distclean-bison: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./bison/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -6414,7 +6194,7 @@ maybe-maintainer-clean-bison:
  maybe-maintainer-clean-bison: maintainer-clean-bison
  
  maintainer-clean-bison: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./bison/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -6439,8 +6219,8 @@ maintainer-clean-bison:
  maybe-configure-byacc:
  @if byacc
  maybe-configure-byacc: configure-byacc
-configure-byacc: 
-       @$(unstage)
+configure-byacc:
+       @: $(MAKE); $(unstage)
         @test ! -f $(HOST_SUBDIR)/byacc/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/byacc ; \
         r=`${PWD_COMMAND}`; export r; \
@@ -6470,7 +6250,7 @@ maybe-all-byacc:
  TARGET-byacc=all
  maybe-all-byacc: all-byacc
  all-byacc: configure-byacc
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -6488,7 +6268,7 @@ maybe-check-byacc: check-byacc
  
  # This module is only tested in a native toolchain.
  check-byacc:
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @if [ '$(host)' = '$(target)' ] ; then \
           r=`${PWD_COMMAND}`; export r; \
           s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -6505,7 +6285,7 @@ maybe-install-byacc:
  maybe-install-byacc: install-byacc
  
  install-byacc: installdirs
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -6523,7 +6303,7 @@ maybe-info-byacc: info-byacc
  
  info-byacc: \
      configure-byacc 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./byacc/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -6549,7 +6329,7 @@ maybe-dvi-byacc: dvi-byacc
  
  dvi-byacc: \
      configure-byacc 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./byacc/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -6575,7 +6355,7 @@ maybe-html-byacc: html-byacc
  
  html-byacc: \
      configure-byacc 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./byacc/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -6601,7 +6381,7 @@ maybe-TAGS-byacc: TAGS-byacc
  
  TAGS-byacc: \
      configure-byacc 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./byacc/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -6628,7 +6408,7 @@ maybe-install-info-byacc: install-info-byacc
  install-info-byacc: \
      configure-byacc \
      info-byacc 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./byacc/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -6654,7 +6434,7 @@ maybe-installcheck-byacc: installcheck-byacc
  
  installcheck-byacc: \
      configure-byacc 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./byacc/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -6679,7 +6459,7 @@ maybe-mostlyclean-byacc:
  maybe-mostlyclean-byacc: mostlyclean-byacc
  
  mostlyclean-byacc: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./byacc/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -6704,7 +6484,7 @@ maybe-clean-byacc:
  maybe-clean-byacc: clean-byacc
  
  clean-byacc: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./byacc/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -6729,7 +6509,7 @@ maybe-distclean-byacc:
  maybe-distclean-byacc: distclean-byacc
  
  distclean-byacc: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./byacc/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -6754,7 +6534,7 @@ maybe-maintainer-clean-byacc:
  maybe-maintainer-clean-byacc: maintainer-clean-byacc
  
  maintainer-clean-byacc: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./byacc/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -6779,8 +6559,8 @@ maintainer-clean-byacc:
  maybe-configure-bzip2:
  @if bzip2
  maybe-configure-bzip2: configure-bzip2
-configure-bzip2: 
-       @$(unstage)
+configure-bzip2:
+       @: $(MAKE); $(unstage)
         @test ! -f $(HOST_SUBDIR)/bzip2/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bzip2 ; \
         r=`${PWD_COMMAND}`; export r; \
@@ -6810,7 +6590,7 @@ maybe-all-bzip2:
  TARGET-bzip2=all
  maybe-all-bzip2: all-bzip2
  all-bzip2: configure-bzip2
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -6827,7 +6607,7 @@ maybe-check-bzip2:
  maybe-check-bzip2: check-bzip2
  
  check-bzip2:
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -6842,7 +6622,7 @@ maybe-install-bzip2:
  maybe-install-bzip2: install-bzip2
  
  install-bzip2: installdirs
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -6860,7 +6640,7 @@ maybe-info-bzip2: info-bzip2
  
  info-bzip2: \
      configure-bzip2 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./bzip2/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -6886,7 +6666,7 @@ maybe-dvi-bzip2: dvi-bzip2
  
  dvi-bzip2: \
      configure-bzip2 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./bzip2/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -6912,7 +6692,7 @@ maybe-html-bzip2: html-bzip2
  
  html-bzip2: \
      configure-bzip2 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./bzip2/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -6938,7 +6718,7 @@ maybe-TAGS-bzip2: TAGS-bzip2
  
  TAGS-bzip2: \
      configure-bzip2 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./bzip2/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -6965,7 +6745,7 @@ maybe-install-info-bzip2: install-info-bzip2
  install-info-bzip2: \
      configure-bzip2 \
      info-bzip2 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./bzip2/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -6991,7 +6771,7 @@ maybe-installcheck-bzip2: installcheck-bzip2
  
  installcheck-bzip2: \
      configure-bzip2 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./bzip2/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -7016,7 +6796,7 @@ maybe-mostlyclean-bzip2:
  maybe-mostlyclean-bzip2: mostlyclean-bzip2
  
  mostlyclean-bzip2: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./bzip2/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -7041,7 +6821,7 @@ maybe-clean-bzip2:
  maybe-clean-bzip2: clean-bzip2
  
  clean-bzip2: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./bzip2/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -7066,7 +6846,7 @@ maybe-distclean-bzip2:
  maybe-distclean-bzip2: distclean-bzip2
  
  distclean-bzip2: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./bzip2/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -7091,7 +6871,7 @@ maybe-maintainer-clean-bzip2:
  maybe-maintainer-clean-bzip2: maintainer-clean-bzip2
  
  maintainer-clean-bzip2: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./bzip2/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -7116,8 +6896,8 @@ maintainer-clean-bzip2:
  maybe-configure-dejagnu:
  @if dejagnu
  maybe-configure-dejagnu: configure-dejagnu
-configure-dejagnu: 
-       @$(unstage)
+configure-dejagnu:
+       @: $(MAKE); $(unstage)
         @test ! -f $(HOST_SUBDIR)/dejagnu/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/dejagnu ; \
         r=`${PWD_COMMAND}`; export r; \
@@ -7147,7 +6927,7 @@ maybe-all-dejagnu:
  TARGET-dejagnu=all
  maybe-all-dejagnu: all-dejagnu
  all-dejagnu: configure-dejagnu
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -7164,7 +6944,7 @@ maybe-check-dejagnu:
  maybe-check-dejagnu: check-dejagnu
  
  check-dejagnu:
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -7179,7 +6959,7 @@ maybe-install-dejagnu:
  maybe-install-dejagnu: install-dejagnu
  
  install-dejagnu: installdirs
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -7197,7 +6977,7 @@ maybe-info-dejagnu: info-dejagnu
  
  info-dejagnu: \
      configure-dejagnu 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./dejagnu/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -7223,7 +7003,7 @@ maybe-dvi-dejagnu: dvi-dejagnu
  
  dvi-dejagnu: \
      configure-dejagnu 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./dejagnu/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -7249,7 +7029,7 @@ maybe-html-dejagnu: html-dejagnu
  
  html-dejagnu: \
      configure-dejagnu 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./dejagnu/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -7275,7 +7055,7 @@ maybe-TAGS-dejagnu: TAGS-dejagnu
  
  TAGS-dejagnu: \
      configure-dejagnu 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./dejagnu/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -7302,7 +7082,7 @@ maybe-install-info-dejagnu: install-info-dejagnu
  install-info-dejagnu: \
      configure-dejagnu \
      info-dejagnu 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./dejagnu/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -7328,7 +7108,7 @@ maybe-installcheck-dejagnu: installcheck-dejagnu
  
  installcheck-dejagnu: \
      configure-dejagnu 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./dejagnu/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -7353,7 +7133,7 @@ maybe-mostlyclean-dejagnu:
  maybe-mostlyclean-dejagnu: mostlyclean-dejagnu
  
  mostlyclean-dejagnu: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./dejagnu/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -7378,7 +7158,7 @@ maybe-clean-dejagnu:
  maybe-clean-dejagnu: clean-dejagnu
  
  clean-dejagnu: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./dejagnu/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -7403,7 +7183,7 @@ maybe-distclean-dejagnu:
  maybe-distclean-dejagnu: distclean-dejagnu
  
  distclean-dejagnu: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./dejagnu/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -7428,7 +7208,7 @@ maybe-maintainer-clean-dejagnu:
  maybe-maintainer-clean-dejagnu: maintainer-clean-dejagnu
  
  maintainer-clean-dejagnu: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./dejagnu/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -7453,8 +7233,8 @@ maintainer-clean-dejagnu:
  maybe-configure-diff:
  @if diff
  maybe-configure-diff: configure-diff
-configure-diff: 
-       @$(unstage)
+configure-diff:
+       @: $(MAKE); $(unstage)
         @test ! -f $(HOST_SUBDIR)/diff/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/diff ; \
         r=`${PWD_COMMAND}`; export r; \
@@ -7484,7 +7264,7 @@ maybe-all-diff:
  TARGET-diff=all
  maybe-all-diff: all-diff
  all-diff: configure-diff
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -7501,7 +7281,7 @@ maybe-check-diff:
  maybe-check-diff: check-diff
  
  check-diff:
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -7516,7 +7296,7 @@ maybe-install-diff:
  maybe-install-diff: install-diff
  
  install-diff: installdirs
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -7534,7 +7314,7 @@ maybe-info-diff: info-diff
  
  info-diff: \
      configure-diff 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./diff/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -7560,7 +7340,7 @@ maybe-dvi-diff: dvi-diff
  
  dvi-diff: \
      configure-diff 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./diff/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -7586,7 +7366,7 @@ maybe-html-diff: html-diff
  
  html-diff: \
      configure-diff 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./diff/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -7612,7 +7392,7 @@ maybe-TAGS-diff: TAGS-diff
  
  TAGS-diff: \
      configure-diff 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./diff/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -7639,7 +7419,7 @@ maybe-install-info-diff: install-info-diff
  install-info-diff: \
      configure-diff \
      info-diff 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./diff/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -7665,7 +7445,7 @@ maybe-installcheck-diff: installcheck-diff
  
  installcheck-diff: \
      configure-diff 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./diff/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -7690,7 +7470,7 @@ maybe-mostlyclean-diff:
  maybe-mostlyclean-diff: mostlyclean-diff
  
  mostlyclean-diff: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./diff/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -7715,7 +7495,7 @@ maybe-clean-diff:
  maybe-clean-diff: clean-diff
  
  clean-diff: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./diff/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -7740,7 +7520,7 @@ maybe-distclean-diff:
  maybe-distclean-diff: distclean-diff
  
  distclean-diff: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./diff/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -7765,7 +7545,7 @@ maybe-maintainer-clean-diff:
  maybe-maintainer-clean-diff: maintainer-clean-diff
  
  maintainer-clean-diff: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./diff/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -7790,8 +7570,8 @@ maintainer-clean-diff:
  maybe-configure-dosutils:
  @if dosutils
  maybe-configure-dosutils: configure-dosutils
-configure-dosutils: 
-       @$(unstage)
+configure-dosutils:
+       @: $(MAKE); $(unstage)
         @test ! -f $(HOST_SUBDIR)/dosutils/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/dosutils ; \
         r=`${PWD_COMMAND}`; export r; \
@@ -7821,7 +7601,7 @@ maybe-all-dosutils:
  TARGET-dosutils=all
  maybe-all-dosutils: all-dosutils
  all-dosutils: configure-dosutils
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -7847,7 +7627,7 @@ maybe-install-dosutils:
  maybe-install-dosutils: install-dosutils
  
  install-dosutils: installdirs
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -7865,7 +7645,7 @@ maybe-info-dosutils: info-dosutils
  
  info-dosutils: \
      configure-dosutils 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./dosutils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -7891,7 +7671,7 @@ maybe-dvi-dosutils: dvi-dosutils
  
  dvi-dosutils: \
      configure-dosutils 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./dosutils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -7917,7 +7697,7 @@ maybe-html-dosutils: html-dosutils
  
  html-dosutils: \
      configure-dosutils 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./dosutils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -7943,7 +7723,7 @@ maybe-TAGS-dosutils: TAGS-dosutils
  
  TAGS-dosutils: \
      configure-dosutils 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./dosutils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -7970,7 +7750,7 @@ maybe-install-info-dosutils: install-info-dosutils
  install-info-dosutils: \
      configure-dosutils \
      info-dosutils 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./dosutils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -7996,7 +7776,7 @@ maybe-installcheck-dosutils: installcheck-dosutils
  
  installcheck-dosutils: \
      configure-dosutils 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./dosutils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8021,7 +7801,7 @@ maybe-mostlyclean-dosutils:
  maybe-mostlyclean-dosutils: mostlyclean-dosutils
  
  mostlyclean-dosutils: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./dosutils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8046,7 +7826,7 @@ maybe-clean-dosutils:
  maybe-clean-dosutils: clean-dosutils
  
  clean-dosutils: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./dosutils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8071,7 +7851,7 @@ maybe-distclean-dosutils:
  maybe-distclean-dosutils: distclean-dosutils
  
  distclean-dosutils: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./dosutils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8096,7 +7876,7 @@ maybe-maintainer-clean-dosutils:
  maybe-maintainer-clean-dosutils: maintainer-clean-dosutils
  
  maintainer-clean-dosutils: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./dosutils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8121,8 +7901,8 @@ maintainer-clean-dosutils:
  maybe-configure-etc:
  @if etc
  maybe-configure-etc: configure-etc
-configure-etc: 
-       @$(unstage)
+configure-etc:
+       @: $(MAKE); $(unstage)
         @test ! -f $(HOST_SUBDIR)/etc/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/etc ; \
         r=`${PWD_COMMAND}`; export r; \
@@ -8152,7 +7932,7 @@ maybe-all-etc:
  TARGET-etc=all
  maybe-all-etc: all-etc
  all-etc: configure-etc
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -8169,7 +7949,7 @@ maybe-check-etc:
  maybe-check-etc: check-etc
  
  check-etc:
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -8184,7 +7964,7 @@ maybe-install-etc:
  maybe-install-etc: install-etc
  
  install-etc: installdirs
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -8202,7 +7982,7 @@ maybe-info-etc: info-etc
  
  info-etc: \
      configure-etc 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./etc/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8228,7 +8008,7 @@ maybe-dvi-etc: dvi-etc
  
  dvi-etc: \
      configure-etc 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./etc/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8254,7 +8034,7 @@ maybe-html-etc: html-etc
  
  html-etc: \
      configure-etc 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./etc/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8280,7 +8060,7 @@ maybe-TAGS-etc: TAGS-etc
  
  TAGS-etc: \
      configure-etc 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./etc/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8307,7 +8087,7 @@ maybe-install-info-etc: install-info-etc
  install-info-etc: \
      configure-etc \
      info-etc 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./etc/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8333,7 +8113,7 @@ maybe-installcheck-etc: installcheck-etc
  
  installcheck-etc: \
      configure-etc 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./etc/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8358,7 +8138,7 @@ maybe-mostlyclean-etc:
  maybe-mostlyclean-etc: mostlyclean-etc
  
  mostlyclean-etc: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./etc/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8383,7 +8163,7 @@ maybe-clean-etc:
  maybe-clean-etc: clean-etc
  
  clean-etc: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./etc/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8408,7 +8188,7 @@ maybe-distclean-etc:
  maybe-distclean-etc: distclean-etc
  
  distclean-etc: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./etc/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8433,7 +8213,7 @@ maybe-maintainer-clean-etc:
  maybe-maintainer-clean-etc: maintainer-clean-etc
  
  maintainer-clean-etc: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./etc/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8458,8 +8238,8 @@ maintainer-clean-etc:
  maybe-configure-fastjar:
  @if fastjar
  maybe-configure-fastjar: configure-fastjar
-configure-fastjar: 
-       @$(unstage)
+configure-fastjar:
+       @: $(MAKE); $(unstage)
         @test ! -f $(HOST_SUBDIR)/fastjar/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/fastjar ; \
         r=`${PWD_COMMAND}`; export r; \
@@ -8489,7 +8269,7 @@ maybe-all-fastjar:
  TARGET-fastjar=all
  maybe-all-fastjar: all-fastjar
  all-fastjar: configure-fastjar
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -8507,7 +8287,7 @@ maybe-check-fastjar: check-fastjar
  
  # This module is only tested in a native toolchain.
  check-fastjar:
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @if [ '$(host)' = '$(target)' ] ; then \
           r=`${PWD_COMMAND}`; export r; \
           s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8524,7 +8304,7 @@ maybe-install-fastjar:
  maybe-install-fastjar: install-fastjar
  
  install-fastjar: installdirs
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -8542,7 +8322,7 @@ maybe-info-fastjar: info-fastjar
  
  info-fastjar: \
      configure-fastjar 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./fastjar/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8568,7 +8348,7 @@ maybe-dvi-fastjar: dvi-fastjar
  
  dvi-fastjar: \
      configure-fastjar 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./fastjar/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8594,7 +8374,7 @@ maybe-html-fastjar: html-fastjar
  
  html-fastjar: \
      configure-fastjar 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./fastjar/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8620,7 +8400,7 @@ maybe-TAGS-fastjar: TAGS-fastjar
  
  TAGS-fastjar: \
      configure-fastjar 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./fastjar/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8647,7 +8427,7 @@ maybe-install-info-fastjar: install-info-fastjar
  install-info-fastjar: \
      configure-fastjar \
      info-fastjar 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./fastjar/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8673,7 +8453,7 @@ maybe-installcheck-fastjar: installcheck-fastjar
  
  installcheck-fastjar: \
      configure-fastjar 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./fastjar/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8698,7 +8478,7 @@ maybe-mostlyclean-fastjar:
  maybe-mostlyclean-fastjar: mostlyclean-fastjar
  
  mostlyclean-fastjar: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./fastjar/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8723,7 +8503,7 @@ maybe-clean-fastjar:
  maybe-clean-fastjar: clean-fastjar
  
  clean-fastjar: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./fastjar/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8748,7 +8528,7 @@ maybe-distclean-fastjar:
  maybe-distclean-fastjar: distclean-fastjar
  
  distclean-fastjar: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./fastjar/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8773,7 +8553,7 @@ maybe-maintainer-clean-fastjar:
  maybe-maintainer-clean-fastjar: maintainer-clean-fastjar
  
  maintainer-clean-fastjar: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./fastjar/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8798,8 +8578,8 @@ maintainer-clean-fastjar:
  maybe-configure-fileutils:
  @if fileutils
  maybe-configure-fileutils: configure-fileutils
-configure-fileutils: 
-       @$(unstage)
+configure-fileutils:
+       @: $(MAKE); $(unstage)
         @test ! -f $(HOST_SUBDIR)/fileutils/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/fileutils ; \
         r=`${PWD_COMMAND}`; export r; \
@@ -8829,7 +8609,7 @@ maybe-all-fileutils:
  TARGET-fileutils=all
  maybe-all-fileutils: all-fileutils
  all-fileutils: configure-fileutils
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -8846,7 +8626,7 @@ maybe-check-fileutils:
  maybe-check-fileutils: check-fileutils
  
  check-fileutils:
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -8861,7 +8641,7 @@ maybe-install-fileutils:
  maybe-install-fileutils: install-fileutils
  
  install-fileutils: installdirs
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -8879,7 +8659,7 @@ maybe-info-fileutils: info-fileutils
  
  info-fileutils: \
      configure-fileutils 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./fileutils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8905,7 +8685,7 @@ maybe-dvi-fileutils: dvi-fileutils
  
  dvi-fileutils: \
      configure-fileutils 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./fileutils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8931,7 +8711,7 @@ maybe-html-fileutils: html-fileutils
  
  html-fileutils: \
      configure-fileutils 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./fileutils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8957,7 +8737,7 @@ maybe-TAGS-fileutils: TAGS-fileutils
  
  TAGS-fileutils: \
      configure-fileutils 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./fileutils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8984,7 +8764,7 @@ maybe-install-info-fileutils: install-info-fileutils
  install-info-fileutils: \
      configure-fileutils \
      info-fileutils 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./fileutils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -9010,7 +8790,7 @@ maybe-installcheck-fileutils: installcheck-fileutils
  
  installcheck-fileutils: \
      configure-fileutils 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./fileutils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -9035,7 +8815,7 @@ maybe-mostlyclean-fileutils:
  maybe-mostlyclean-fileutils: mostlyclean-fileutils
  
  mostlyclean-fileutils: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./fileutils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -9060,7 +8840,7 @@ maybe-clean-fileutils:
  maybe-clean-fileutils: clean-fileutils
  
  clean-fileutils: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./fileutils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -9085,7 +8865,7 @@ maybe-distclean-fileutils:
  maybe-distclean-fileutils: distclean-fileutils
  
  distclean-fileutils: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./fileutils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -9110,7 +8890,7 @@ maybe-maintainer-clean-fileutils:
  maybe-maintainer-clean-fileutils: maintainer-clean-fileutils
  
  maintainer-clean-fileutils: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./fileutils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -9135,8 +8915,8 @@ maintainer-clean-fileutils:
  maybe-configure-findutils:
  @if findutils
  maybe-configure-findutils: configure-findutils
-configure-findutils: 
-       @$(unstage)
+configure-findutils:
+       @: $(MAKE); $(unstage)
         @test ! -f $(HOST_SUBDIR)/findutils/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/findutils ; \
         r=`${PWD_COMMAND}`; export r; \
@@ -9166,7 +8946,7 @@ maybe-all-findutils:
  TARGET-findutils=all
  maybe-all-findutils: all-findutils
  all-findutils: configure-findutils
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -9183,7 +8963,7 @@ maybe-check-findutils:
  maybe-check-findutils: check-findutils
  
  check-findutils:
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -9198,7 +8978,7 @@ maybe-install-findutils:
  maybe-install-findutils: install-findutils
  
  install-findutils: installdirs
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -9216,7 +8996,7 @@ maybe-info-findutils: info-findutils
  
  info-findutils: \
      configure-findutils 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./findutils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -9242,7 +9022,7 @@ maybe-dvi-findutils: dvi-findutils
  
  dvi-findutils: \
      configure-findutils 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./findutils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -9268,7 +9048,7 @@ maybe-html-findutils: html-findutils
  
  html-findutils: \
      configure-findutils 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./findutils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -9294,7 +9074,7 @@ maybe-TAGS-findutils: TAGS-findutils
  
  TAGS-findutils: \
      configure-findutils 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./findutils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -9321,7 +9101,7 @@ maybe-install-info-findutils: install-info-findutils
  install-info-findutils: \
      configure-findutils \
      info-findutils 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./findutils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -9347,7 +9127,7 @@ maybe-installcheck-findutils: installcheck-findutils
  
  installcheck-findutils: \
      configure-findutils 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./findutils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -9372,7 +9152,7 @@ maybe-mostlyclean-findutils:
  maybe-mostlyclean-findutils: mostlyclean-findutils
  
  mostlyclean-findutils: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./findutils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -9397,7 +9177,7 @@ maybe-clean-findutils:
  maybe-clean-findutils: clean-findutils
  
  clean-findutils: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./findutils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -9422,7 +9202,7 @@ maybe-distclean-findutils:
  maybe-distclean-findutils: distclean-findutils
  
  distclean-findutils: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./findutils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -9447,7 +9227,7 @@ maybe-maintainer-clean-findutils:
  maybe-maintainer-clean-findutils: maintainer-clean-findutils
  
  maintainer-clean-findutils: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./findutils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -9472,8 +9252,8 @@ maintainer-clean-findutils:
  maybe-configure-find:
  @if find
  maybe-configure-find: configure-find
-configure-find: 
-       @$(unstage)
+configure-find:
+       @: $(MAKE); $(unstage)
         @test ! -f $(HOST_SUBDIR)/find/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/find ; \
         r=`${PWD_COMMAND}`; export r; \
@@ -9503,7 +9283,7 @@ maybe-all-find:
  TARGET-find=all
  maybe-all-find: all-find
  all-find: configure-find
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -9520,7 +9300,7 @@ maybe-check-find:
  maybe-check-find: check-find
  
  check-find:
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -9535,7 +9315,7 @@ maybe-install-find:
  maybe-install-find: install-find
  
  install-find: installdirs
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -9553,7 +9333,7 @@ maybe-info-find: info-find
  
  info-find: \
      configure-find 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./find/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -9579,7 +9359,7 @@ maybe-dvi-find: dvi-find
  
  dvi-find: \
      configure-find 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./find/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -9605,7 +9385,7 @@ maybe-html-find: html-find
  
  html-find: \
      configure-find 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./find/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -9631,7 +9411,7 @@ maybe-TAGS-find: TAGS-find
  
  TAGS-find: \
      configure-find 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./find/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -9658,7 +9438,7 @@ maybe-install-info-find: install-info-find
  install-info-find: \
      configure-find \
      info-find 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./find/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -9684,7 +9464,7 @@ maybe-installcheck-find: installcheck-find
  
  installcheck-find: \
      configure-find 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./find/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -9709,7 +9489,7 @@ maybe-mostlyclean-find:
  maybe-mostlyclean-find: mostlyclean-find
  
  mostlyclean-find: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./find/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -9734,7 +9514,7 @@ maybe-clean-find:
  maybe-clean-find: clean-find
  
  clean-find: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./find/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -9759,7 +9539,7 @@ maybe-distclean-find:
  maybe-distclean-find: distclean-find
  
  distclean-find: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./find/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -9784,7 +9564,7 @@ maybe-maintainer-clean-find:
  maybe-maintainer-clean-find: maintainer-clean-find
  
  maintainer-clean-find: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./find/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -9809,8 +9589,8 @@ maintainer-clean-find:
  maybe-configure-fixincludes:
  @if fixincludes
  maybe-configure-fixincludes: configure-fixincludes
-configure-fixincludes: 
-       @$(unstage)
+configure-fixincludes:
+       @: $(MAKE); $(unstage)
         @test ! -f $(HOST_SUBDIR)/fixincludes/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/fixincludes ; \
         r=`${PWD_COMMAND}`; export r; \
@@ -9840,7 +9620,7 @@ maybe-all-fixincludes:
  TARGET-fixincludes=all
  maybe-all-fixincludes: all-fixincludes
  all-fixincludes: configure-fixincludes
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -9857,7 +9637,7 @@ maybe-check-fixincludes:
  maybe-check-fixincludes: check-fixincludes
  
  check-fixincludes:
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -9872,7 +9652,7 @@ maybe-install-fixincludes:
  maybe-install-fixincludes: install-fixincludes
  
  install-fixincludes: installdirs
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -9910,7 +9690,7 @@ maybe-html-fixincludes: html-fixincludes
  
  html-fixincludes: \
      configure-fixincludes 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./fixincludes/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -9965,7 +9745,7 @@ maybe-mostlyclean-fixincludes:
  maybe-mostlyclean-fixincludes: mostlyclean-fixincludes
  
  mostlyclean-fixincludes: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./fixincludes/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -9990,7 +9770,7 @@ maybe-clean-fixincludes:
  maybe-clean-fixincludes: clean-fixincludes
  
  clean-fixincludes: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./fixincludes/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -10015,7 +9795,7 @@ maybe-distclean-fixincludes:
  maybe-distclean-fixincludes: distclean-fixincludes
  
  distclean-fixincludes: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./fixincludes/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -10040,7 +9820,7 @@ maybe-maintainer-clean-fixincludes:
  maybe-maintainer-clean-fixincludes: maintainer-clean-fixincludes
  
  maintainer-clean-fixincludes: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./fixincludes/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -10065,8 +9845,8 @@ maintainer-clean-fixincludes:
  maybe-configure-flex:
  @if flex
  maybe-configure-flex: configure-flex
-configure-flex: 
-       @$(unstage)
+configure-flex:
+       @: $(MAKE); $(unstage)
         @test ! -f $(HOST_SUBDIR)/flex/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/flex ; \
         r=`${PWD_COMMAND}`; export r; \
@@ -10096,7 +9876,7 @@ maybe-all-flex:
  TARGET-flex=all
  maybe-all-flex: all-flex
  all-flex: configure-flex
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -10114,7 +9894,7 @@ maybe-check-flex: check-flex
  
  # This module is only tested in a native toolchain.
  check-flex:
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @if [ '$(host)' = '$(target)' ] ; then \
           r=`${PWD_COMMAND}`; export r; \
           s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -10131,7 +9911,7 @@ maybe-install-flex:
  maybe-install-flex: install-flex
  
  install-flex: installdirs
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -10149,7 +9929,7 @@ maybe-info-flex: info-flex
  
  info-flex: \
      configure-flex 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./flex/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -10175,7 +9955,7 @@ maybe-dvi-flex: dvi-flex
  
  dvi-flex: \
      configure-flex 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./flex/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -10201,7 +9981,7 @@ maybe-html-flex: html-flex
  
  html-flex: \
      configure-flex 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./flex/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -10227,7 +10007,7 @@ maybe-TAGS-flex: TAGS-flex
  
  TAGS-flex: \
      configure-flex 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./flex/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -10254,7 +10034,7 @@ maybe-install-info-flex: install-info-flex
  install-info-flex: \
      configure-flex \
      info-flex 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./flex/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -10280,7 +10060,7 @@ maybe-installcheck-flex: installcheck-flex
  
  installcheck-flex: \
      configure-flex 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./flex/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -10305,7 +10085,7 @@ maybe-mostlyclean-flex:
  maybe-mostlyclean-flex: mostlyclean-flex
  
  mostlyclean-flex: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./flex/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -10330,7 +10110,7 @@ maybe-clean-flex:
  maybe-clean-flex: clean-flex
  
  clean-flex: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./flex/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -10355,7 +10135,7 @@ maybe-distclean-flex:
  maybe-distclean-flex: distclean-flex
  
  distclean-flex: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./flex/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -10380,7 +10160,7 @@ maybe-maintainer-clean-flex:
  maybe-maintainer-clean-flex: maintainer-clean-flex
  
  maintainer-clean-flex: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./flex/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -10405,7 +10185,7 @@ maintainer-clean-flex:
  maybe-configure-gas:
  @if gas
  maybe-configure-gas: configure-gas
-configure-gas: 
+configure-gas:
         @test -f stage_last && exit 0; \
         test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \
@@ -10432,13 +10212,13 @@ configure-gas:
  maybe-configure-stage1-gas:
  @if gas-bootstrap
  maybe-configure-stage1-gas: configure-stage1-gas
-configure-stage1-gas: 
+configure-stage1-gas:
         @[ `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; \
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas
+       test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \
         $(HOST_EXPORTS) \
         echo Configuring stage 1 in $(HOST_SUBDIR)/gas ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \
         cd $(HOST_SUBDIR)/gas || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -10456,14 +10236,14 @@ configure-stage1-gas:
  maybe-configure-stage2-gas:
  @if gas-bootstrap
  maybe-configure-stage2-gas: configure-stage2-gas
-configure-stage2-gas: 
+configure-stage2-gas:
         @[ `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; \
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas
+       test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS) \
         echo Configuring stage 2 in $(HOST_SUBDIR)/gas ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \
         cd $(HOST_SUBDIR)/gas || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -10481,14 +10261,14 @@ configure-stage2-gas:
  maybe-configure-stage3-gas:
  @if gas-bootstrap
  maybe-configure-stage3-gas: configure-stage3-gas
-configure-stage3-gas: 
+configure-stage3-gas:
         @[ `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; \
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas
+       test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS) \
         echo Configuring stage 3 in $(HOST_SUBDIR)/gas ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \
         cd $(HOST_SUBDIR)/gas || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -10506,14 +10286,14 @@ configure-stage3-gas:
  maybe-configure-stage4-gas:
  @if gas-bootstrap
  maybe-configure-stage4-gas: configure-stage4-gas
-configure-stage4-gas: 
+configure-stage4-gas:
         @[ `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; \
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas
+       test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS) \
         echo Configuring stage 4 in $(HOST_SUBDIR)/gas ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \
         cd $(HOST_SUBDIR)/gas || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -10531,14 +10311,14 @@ configure-stage4-gas:
  maybe-configure-stageprofile-gas:
  @if gas-bootstrap
  maybe-configure-stageprofile-gas: configure-stageprofile-gas
-configure-stageprofile-gas: 
+configure-stageprofile-gas:
         @[ `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; \
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas
+       test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS) \
         echo Configuring stage profile in $(HOST_SUBDIR)/gas ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \
         cd $(HOST_SUBDIR)/gas || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -10556,14 +10336,14 @@ configure-stageprofile-gas:
  maybe-configure-stagefeedback-gas:
  @if gas-bootstrap
  maybe-configure-stagefeedback-gas: configure-stagefeedback-gas
-configure-stagefeedback-gas: 
+configure-stagefeedback-gas:
         @[ `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; \
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas
+       test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS) \
         echo Configuring stage feedback in $(HOST_SUBDIR)/gas ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \
         cd $(HOST_SUBDIR)/gas || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -10790,7 +10570,7 @@ maybe-check-gas:
  maybe-check-gas: check-gas
  
  check-gas:
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -10805,7 +10585,7 @@ maybe-install-gas:
  maybe-install-gas: install-gas
  
  install-gas: installdirs
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -11069,7 +10849,7 @@ maintainer-clean-gas:
  maybe-configure-gcc:
  @if gcc
  maybe-configure-gcc: configure-gcc
-configure-gcc: 
+configure-gcc:
         @test -f stage_last && exit 0; \
         test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \
@@ -11096,13 +10876,13 @@ configure-gcc:
  maybe-configure-stage1-gcc:
  @if gcc-bootstrap
  maybe-configure-stage1-gcc: configure-stage1-gcc
-configure-stage1-gcc: 
+configure-stage1-gcc:
         @[ `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; \
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc
+       test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \
         $(HOST_EXPORTS) \
         echo Configuring stage 1 in $(HOST_SUBDIR)/gcc ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \
         cd $(HOST_SUBDIR)/gcc || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -11120,14 +10900,14 @@ configure-stage1-gcc:
  maybe-configure-stage2-gcc:
  @if gcc-bootstrap
  maybe-configure-stage2-gcc: configure-stage2-gcc
-configure-stage2-gcc: 
+configure-stage2-gcc:
         @[ `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; \
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc
+       test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS) \
         echo Configuring stage 2 in $(HOST_SUBDIR)/gcc ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \
         cd $(HOST_SUBDIR)/gcc || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -11145,14 +10925,14 @@ configure-stage2-gcc:
  maybe-configure-stage3-gcc:
  @if gcc-bootstrap
  maybe-configure-stage3-gcc: configure-stage3-gcc
-configure-stage3-gcc: 
+configure-stage3-gcc:
         @[ `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; \
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc
+       test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS) \
         echo Configuring stage 3 in $(HOST_SUBDIR)/gcc ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \
         cd $(HOST_SUBDIR)/gcc || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -11170,14 +10950,14 @@ configure-stage3-gcc:
  maybe-configure-stage4-gcc:
  @if gcc-bootstrap
  maybe-configure-stage4-gcc: configure-stage4-gcc
-configure-stage4-gcc: 
+configure-stage4-gcc:
         @[ `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; \
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc
+       test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS) \
         echo Configuring stage 4 in $(HOST_SUBDIR)/gcc ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \
         cd $(HOST_SUBDIR)/gcc || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -11195,14 +10975,14 @@ configure-stage4-gcc:
  maybe-configure-stageprofile-gcc:
  @if gcc-bootstrap
  maybe-configure-stageprofile-gcc: configure-stageprofile-gcc
-configure-stageprofile-gcc: 
+configure-stageprofile-gcc:
         @[ `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; \
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc
+       test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS) \
         echo Configuring stage profile in $(HOST_SUBDIR)/gcc ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \
         cd $(HOST_SUBDIR)/gcc || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -11220,14 +11000,14 @@ configure-stageprofile-gcc:
  maybe-configure-stagefeedback-gcc:
  @if gcc-bootstrap
  maybe-configure-stagefeedback-gcc: configure-stagefeedback-gcc
-configure-stagefeedback-gcc: 
+configure-stagefeedback-gcc:
         @[ `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; \
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc
+       test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS) \
         echo Configuring stage feedback in $(HOST_SUBDIR)/gcc ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \
         cd $(HOST_SUBDIR)/gcc || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -11248,7 +11028,7 @@ configure-stagefeedback-gcc:
  .PHONY: all-gcc maybe-all-gcc
  maybe-all-gcc:
  @if gcc
-TARGET-gcc=`if [ -f gcc/stage_last ]; then echo quickstrap ; else echo all; fi`
+TARGET-gcc=`if [ -f stage_last ]; then echo quickstrap ; else echo all; fi`
  maybe-all-gcc: all-gcc
  all-gcc: configure-gcc
         @test -f stage_last && exit 0; \
@@ -11454,7 +11234,7 @@ maybe-check-gcc:
  maybe-check-gcc: check-gcc
  
  check-gcc:
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -11469,7 +11249,7 @@ maybe-install-gcc:
  maybe-install-gcc: install-gcc
  
  install-gcc: installdirs
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -11733,8 +11513,8 @@ maintainer-clean-gcc:
  maybe-configure-gawk:
  @if gawk
  maybe-configure-gawk: configure-gawk
-configure-gawk: 
-       @$(unstage)
+configure-gawk:
+       @: $(MAKE); $(unstage)
         @test ! -f $(HOST_SUBDIR)/gawk/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gawk ; \
         r=`${PWD_COMMAND}`; export r; \
@@ -11764,7 +11544,7 @@ maybe-all-gawk:
  TARGET-gawk=all
  maybe-all-gawk: all-gawk
  all-gawk: configure-gawk
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -11781,7 +11561,7 @@ maybe-check-gawk:
  maybe-check-gawk: check-gawk
  
  check-gawk:
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -11796,7 +11576,7 @@ maybe-install-gawk:
  maybe-install-gawk: install-gawk
  
  install-gawk: installdirs
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -11814,7 +11594,7 @@ maybe-info-gawk: info-gawk
  
  info-gawk: \
      configure-gawk 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./gawk/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -11840,7 +11620,7 @@ maybe-dvi-gawk: dvi-gawk
  
  dvi-gawk: \
      configure-gawk 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./gawk/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -11866,7 +11646,7 @@ maybe-html-gawk: html-gawk
  
  html-gawk: \
      configure-gawk 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./gawk/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -11892,7 +11672,7 @@ maybe-TAGS-gawk: TAGS-gawk
  
  TAGS-gawk: \
      configure-gawk 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./gawk/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -11919,7 +11699,7 @@ maybe-install-info-gawk: install-info-gawk
  install-info-gawk: \
      configure-gawk \
      info-gawk 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./gawk/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -11945,7 +11725,7 @@ maybe-installcheck-gawk: installcheck-gawk
  
  installcheck-gawk: \
      configure-gawk 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./gawk/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -11970,7 +11750,7 @@ maybe-mostlyclean-gawk:
  maybe-mostlyclean-gawk: mostlyclean-gawk
  
  mostlyclean-gawk: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./gawk/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -11995,7 +11775,7 @@ maybe-clean-gawk:
  maybe-clean-gawk: clean-gawk
  
  clean-gawk: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./gawk/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -12020,7 +11800,7 @@ maybe-distclean-gawk:
  maybe-distclean-gawk: distclean-gawk
  
  distclean-gawk: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./gawk/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -12045,7 +11825,7 @@ maybe-maintainer-clean-gawk:
  maybe-maintainer-clean-gawk: maintainer-clean-gawk
  
  maintainer-clean-gawk: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./gawk/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -12070,8 +11850,8 @@ maintainer-clean-gawk:
  maybe-configure-gettext:
  @if gettext
  maybe-configure-gettext: configure-gettext
-configure-gettext: 
-       @$(unstage)
+configure-gettext:
+       @: $(MAKE); $(unstage)
         @test ! -f $(HOST_SUBDIR)/gettext/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gettext ; \
         r=`${PWD_COMMAND}`; export r; \
@@ -12101,7 +11881,7 @@ maybe-all-gettext:
  TARGET-gettext=all
  maybe-all-gettext: all-gettext
  all-gettext: configure-gettext
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -12118,7 +11898,7 @@ maybe-check-gettext:
  maybe-check-gettext: check-gettext
  
  check-gettext:
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -12133,7 +11913,7 @@ maybe-install-gettext:
  maybe-install-gettext: install-gettext
  
  install-gettext: installdirs
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -12151,7 +11931,7 @@ maybe-info-gettext: info-gettext
  
  info-gettext: \
      configure-gettext 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./gettext/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -12177,7 +11957,7 @@ maybe-dvi-gettext: dvi-gettext
  
  dvi-gettext: \
      configure-gettext 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./gettext/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -12203,7 +11983,7 @@ maybe-html-gettext: html-gettext
  
  html-gettext: \
      configure-gettext 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./gettext/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -12229,7 +12009,7 @@ maybe-TAGS-gettext: TAGS-gettext
  
  TAGS-gettext: \
      configure-gettext 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./gettext/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -12256,7 +12036,7 @@ maybe-install-info-gettext: install-info-gettext
  install-info-gettext: \
      configure-gettext \
      info-gettext 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./gettext/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -12282,7 +12062,7 @@ maybe-installcheck-gettext: installcheck-gettext
  
  installcheck-gettext: \
      configure-gettext 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./gettext/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -12307,7 +12087,7 @@ maybe-mostlyclean-gettext:
  maybe-mostlyclean-gettext: mostlyclean-gettext
  
  mostlyclean-gettext: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./gettext/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -12332,7 +12112,7 @@ maybe-clean-gettext:
  maybe-clean-gettext: clean-gettext
  
  clean-gettext: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./gettext/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -12357,7 +12137,7 @@ maybe-distclean-gettext:
  maybe-distclean-gettext: distclean-gettext
  
  distclean-gettext: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./gettext/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -12382,7 +12162,7 @@ maybe-maintainer-clean-gettext:
  maybe-maintainer-clean-gettext: maintainer-clean-gettext
  
  maintainer-clean-gettext: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./gettext/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -12407,8 +12187,8 @@ maintainer-clean-gettext:
  maybe-configure-gnuserv:
  @if gnuserv
  maybe-configure-gnuserv: configure-gnuserv
-configure-gnuserv: 
-       @$(unstage)
+configure-gnuserv:
+       @: $(MAKE); $(unstage)
         @test ! -f $(HOST_SUBDIR)/gnuserv/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gnuserv ; \
         r=`${PWD_COMMAND}`; export r; \
@@ -12438,7 +12218,7 @@ maybe-all-gnuserv:
  TARGET-gnuserv=all
  maybe-all-gnuserv: all-gnuserv
  all-gnuserv: configure-gnuserv
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -12455,7 +12235,7 @@ maybe-check-gnuserv:
  maybe-check-gnuserv: check-gnuserv
  
  check-gnuserv:
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -12470,7 +12250,7 @@ maybe-install-gnuserv:
  maybe-install-gnuserv: install-gnuserv
  
  install-gnuserv: installdirs
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -12488,7 +12268,7 @@ maybe-info-gnuserv: info-gnuserv
  
  info-gnuserv: \
      configure-gnuserv 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./gnuserv/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -12514,7 +12294,7 @@ maybe-dvi-gnuserv: dvi-gnuserv
  
  dvi-gnuserv: \
      configure-gnuserv 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./gnuserv/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -12540,7 +12320,7 @@ maybe-html-gnuserv: html-gnuserv
  
  html-gnuserv: \
      configure-gnuserv 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./gnuserv/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -12566,7 +12346,7 @@ maybe-TAGS-gnuserv: TAGS-gnuserv
  
  TAGS-gnuserv: \
      configure-gnuserv 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./gnuserv/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -12593,7 +12373,7 @@ maybe-install-info-gnuserv: install-info-gnuserv
  install-info-gnuserv: \
      configure-gnuserv \
      info-gnuserv 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./gnuserv/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -12619,7 +12399,7 @@ maybe-installcheck-gnuserv: installcheck-gnuserv
  
  installcheck-gnuserv: \
      configure-gnuserv 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./gnuserv/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -12644,7 +12424,7 @@ maybe-mostlyclean-gnuserv:
  maybe-mostlyclean-gnuserv: mostlyclean-gnuserv
  
  mostlyclean-gnuserv: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./gnuserv/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -12669,7 +12449,7 @@ maybe-clean-gnuserv:
  maybe-clean-gnuserv: clean-gnuserv
  
  clean-gnuserv: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./gnuserv/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -12694,7 +12474,7 @@ maybe-distclean-gnuserv:
  maybe-distclean-gnuserv: distclean-gnuserv
  
  distclean-gnuserv: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./gnuserv/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -12719,7 +12499,7 @@ maybe-maintainer-clean-gnuserv:
  maybe-maintainer-clean-gnuserv: maintainer-clean-gnuserv
  
  maintainer-clean-gnuserv: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./gnuserv/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -12744,8 +12524,8 @@ maintainer-clean-gnuserv:
  maybe-configure-gprof:
  @if gprof
  maybe-configure-gprof: configure-gprof
-configure-gprof: 
-       @$(unstage)
+configure-gprof:
+       @: $(MAKE); $(unstage)
         @test ! -f $(HOST_SUBDIR)/gprof/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gprof ; \
         r=`${PWD_COMMAND}`; export r; \
@@ -12775,7 +12555,7 @@ maybe-all-gprof:
  TARGET-gprof=all
  maybe-all-gprof: all-gprof
  all-gprof: configure-gprof
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -12792,7 +12572,7 @@ maybe-check-gprof:
  maybe-check-gprof: check-gprof
  
  check-gprof:
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -12807,7 +12587,7 @@ maybe-install-gprof:
  maybe-install-gprof: install-gprof
  
  install-gprof: installdirs
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -12825,7 +12605,7 @@ maybe-info-gprof: info-gprof
  
  info-gprof: \
      configure-gprof 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./gprof/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -12851,7 +12631,7 @@ maybe-dvi-gprof: dvi-gprof
  
  dvi-gprof: \
      configure-gprof 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./gprof/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -12877,7 +12657,7 @@ maybe-html-gprof: html-gprof
  
  html-gprof: \
      configure-gprof 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./gprof/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -12903,7 +12683,7 @@ maybe-TAGS-gprof: TAGS-gprof
  
  TAGS-gprof: \
      configure-gprof 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./gprof/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -12930,7 +12710,7 @@ maybe-install-info-gprof: install-info-gprof
  install-info-gprof: \
      configure-gprof \
      info-gprof 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./gprof/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -12956,7 +12736,7 @@ maybe-installcheck-gprof: installcheck-gprof
  
  installcheck-gprof: \
      configure-gprof 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./gprof/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -12981,7 +12761,7 @@ maybe-mostlyclean-gprof:
  maybe-mostlyclean-gprof: mostlyclean-gprof
  
  mostlyclean-gprof: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./gprof/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -13006,7 +12786,7 @@ maybe-clean-gprof:
  maybe-clean-gprof: clean-gprof
  
  clean-gprof: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./gprof/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -13031,7 +12811,7 @@ maybe-distclean-gprof:
  maybe-distclean-gprof: distclean-gprof
  
  distclean-gprof: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./gprof/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -13056,7 +12836,7 @@ maybe-maintainer-clean-gprof:
  maybe-maintainer-clean-gprof: maintainer-clean-gprof
  
  maintainer-clean-gprof: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./gprof/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -13081,8 +12861,8 @@ maintainer-clean-gprof:
  maybe-configure-gzip:
  @if gzip
  maybe-configure-gzip: configure-gzip
-configure-gzip: 
-       @$(unstage)
+configure-gzip:
+       @: $(MAKE); $(unstage)
         @test ! -f $(HOST_SUBDIR)/gzip/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gzip ; \
         r=`${PWD_COMMAND}`; export r; \
@@ -13112,7 +12892,7 @@ maybe-all-gzip:
  TARGET-gzip=all
  maybe-all-gzip: all-gzip
  all-gzip: configure-gzip
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -13129,7 +12909,7 @@ maybe-check-gzip:
  maybe-check-gzip: check-gzip
  
  check-gzip:
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -13144,7 +12924,7 @@ maybe-install-gzip:
  maybe-install-gzip: install-gzip
  
  install-gzip: installdirs
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -13162,7 +12942,7 @@ maybe-info-gzip: info-gzip
  
  info-gzip: \
      configure-gzip 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./gzip/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -13188,7 +12968,7 @@ maybe-dvi-gzip: dvi-gzip
  
  dvi-gzip: \
      configure-gzip 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./gzip/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -13214,7 +12994,7 @@ maybe-html-gzip: html-gzip
  
  html-gzip: \
      configure-gzip 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./gzip/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -13240,7 +13020,7 @@ maybe-TAGS-gzip: TAGS-gzip
  
  TAGS-gzip: \
      configure-gzip 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./gzip/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -13267,7 +13047,7 @@ maybe-install-info-gzip: install-info-gzip
  install-info-gzip: \
      configure-gzip \
      info-gzip 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./gzip/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -13293,7 +13073,7 @@ maybe-installcheck-gzip: installcheck-gzip
  
  installcheck-gzip: \
      configure-gzip 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./gzip/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -13318,7 +13098,7 @@ maybe-mostlyclean-gzip:
  maybe-mostlyclean-gzip: mostlyclean-gzip
  
  mostlyclean-gzip: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./gzip/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -13343,7 +13123,7 @@ maybe-clean-gzip:
  maybe-clean-gzip: clean-gzip
  
  clean-gzip: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./gzip/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -13368,7 +13148,7 @@ maybe-distclean-gzip:
  maybe-distclean-gzip: distclean-gzip
  
  distclean-gzip: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./gzip/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -13393,7 +13173,7 @@ maybe-maintainer-clean-gzip:
  maybe-maintainer-clean-gzip: maintainer-clean-gzip
  
  maintainer-clean-gzip: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./gzip/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -13418,8 +13198,8 @@ maintainer-clean-gzip:
  maybe-configure-hello:
  @if hello
  maybe-configure-hello: configure-hello
-configure-hello: 
-       @$(unstage)
+configure-hello:
+       @: $(MAKE); $(unstage)
         @test ! -f $(HOST_SUBDIR)/hello/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/hello ; \
         r=`${PWD_COMMAND}`; export r; \
@@ -13449,7 +13229,7 @@ maybe-all-hello:
  TARGET-hello=all
  maybe-all-hello: all-hello
  all-hello: configure-hello
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -13466,7 +13246,7 @@ maybe-check-hello:
  maybe-check-hello: check-hello
  
  check-hello:
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -13481,7 +13261,7 @@ maybe-install-hello:
  maybe-install-hello: install-hello
  
  install-hello: installdirs
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -13499,7 +13279,7 @@ maybe-info-hello: info-hello
  
  info-hello: \
      configure-hello 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./hello/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -13525,7 +13305,7 @@ maybe-dvi-hello: dvi-hello
  
  dvi-hello: \
      configure-hello 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./hello/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -13551,7 +13331,7 @@ maybe-html-hello: html-hello
  
  html-hello: \
      configure-hello 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./hello/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -13577,7 +13357,7 @@ maybe-TAGS-hello: TAGS-hello
  
  TAGS-hello: \
      configure-hello 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./hello/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -13604,7 +13384,7 @@ maybe-install-info-hello: install-info-hello
  install-info-hello: \
      configure-hello \
      info-hello 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./hello/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -13630,7 +13410,7 @@ maybe-installcheck-hello: installcheck-hello
  
  installcheck-hello: \
      configure-hello 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./hello/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -13655,7 +13435,7 @@ maybe-mostlyclean-hello:
  maybe-mostlyclean-hello: mostlyclean-hello
  
  mostlyclean-hello: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./hello/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -13680,7 +13460,7 @@ maybe-clean-hello:
  maybe-clean-hello: clean-hello
  
  clean-hello: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./hello/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -13705,7 +13485,7 @@ maybe-distclean-hello:
  maybe-distclean-hello: distclean-hello
  
  distclean-hello: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./hello/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -13730,7 +13510,7 @@ maybe-maintainer-clean-hello:
  maybe-maintainer-clean-hello: maintainer-clean-hello
  
  maintainer-clean-hello: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./hello/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -13755,8 +13535,8 @@ maintainer-clean-hello:
  maybe-configure-indent:
  @if indent
  maybe-configure-indent: configure-indent
-configure-indent: 
-       @$(unstage)
+configure-indent:
+       @: $(MAKE); $(unstage)
         @test ! -f $(HOST_SUBDIR)/indent/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/indent ; \
         r=`${PWD_COMMAND}`; export r; \
@@ -13786,7 +13566,7 @@ maybe-all-indent:
  TARGET-indent=all
  maybe-all-indent: all-indent
  all-indent: configure-indent
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -13803,7 +13583,7 @@ maybe-check-indent:
  maybe-check-indent: check-indent
  
  check-indent:
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -13818,7 +13598,7 @@ maybe-install-indent:
  maybe-install-indent: install-indent
  
  install-indent: installdirs
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -13836,7 +13616,7 @@ maybe-info-indent: info-indent
  
  info-indent: \
      configure-indent 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./indent/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -13862,7 +13642,7 @@ maybe-dvi-indent: dvi-indent
  
  dvi-indent: \
      configure-indent 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./indent/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -13888,7 +13668,7 @@ maybe-html-indent: html-indent
  
  html-indent: \
      configure-indent 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./indent/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -13914,7 +13694,7 @@ maybe-TAGS-indent: TAGS-indent
  
  TAGS-indent: \
      configure-indent 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./indent/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -13941,7 +13721,7 @@ maybe-install-info-indent: install-info-indent
  install-info-indent: \
      configure-indent \
      info-indent 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./indent/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -13967,7 +13747,7 @@ maybe-installcheck-indent: installcheck-indent
  
  installcheck-indent: \
      configure-indent 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./indent/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -13992,7 +13772,7 @@ maybe-mostlyclean-indent:
  maybe-mostlyclean-indent: mostlyclean-indent
  
  mostlyclean-indent: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./indent/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -14017,7 +13797,7 @@ maybe-clean-indent:
  maybe-clean-indent: clean-indent
  
  clean-indent: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./indent/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -14042,7 +13822,7 @@ maybe-distclean-indent:
  maybe-distclean-indent: distclean-indent
  
  distclean-indent: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./indent/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -14067,7 +13847,7 @@ maybe-maintainer-clean-indent:
  maybe-maintainer-clean-indent: maintainer-clean-indent
  
  maintainer-clean-indent: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./indent/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -14092,7 +13872,7 @@ maintainer-clean-indent:
  maybe-configure-intl:
  @if intl
  maybe-configure-intl: configure-intl
-configure-intl: 
+configure-intl:
         @test -f stage_last && exit 0; \
         test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \
@@ -14119,13 +13899,13 @@ configure-intl:
  maybe-configure-stage1-intl:
  @if intl-bootstrap
  maybe-configure-stage1-intl: configure-stage1-intl
-configure-stage1-intl: 
+configure-stage1-intl:
         @[ `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; \
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl
+       test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \
         $(HOST_EXPORTS) \
         echo Configuring stage 1 in $(HOST_SUBDIR)/intl ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \
         cd $(HOST_SUBDIR)/intl || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -14143,14 +13923,14 @@ configure-stage1-intl:
  maybe-configure-stage2-intl:
  @if intl-bootstrap
  maybe-configure-stage2-intl: configure-stage2-intl
-configure-stage2-intl: 
+configure-stage2-intl:
         @[ `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; \
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl
+       test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS) \
         echo Configuring stage 2 in $(HOST_SUBDIR)/intl ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \
         cd $(HOST_SUBDIR)/intl || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -14168,14 +13948,14 @@ configure-stage2-intl:
  maybe-configure-stage3-intl:
  @if intl-bootstrap
  maybe-configure-stage3-intl: configure-stage3-intl
-configure-stage3-intl: 
+configure-stage3-intl:
         @[ `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; \
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl
+       test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS) \
         echo Configuring stage 3 in $(HOST_SUBDIR)/intl ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \
         cd $(HOST_SUBDIR)/intl || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -14193,14 +13973,14 @@ configure-stage3-intl:
  maybe-configure-stage4-intl:
  @if intl-bootstrap
  maybe-configure-stage4-intl: configure-stage4-intl
-configure-stage4-intl: 
+configure-stage4-intl:
         @[ `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; \
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl
+       test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS) \
         echo Configuring stage 4 in $(HOST_SUBDIR)/intl ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \
         cd $(HOST_SUBDIR)/intl || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -14218,14 +13998,14 @@ configure-stage4-intl:
  maybe-configure-stageprofile-intl:
  @if intl-bootstrap
  maybe-configure-stageprofile-intl: configure-stageprofile-intl
-configure-stageprofile-intl: 
+configure-stageprofile-intl:
         @[ `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; \
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl
+       test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS) \
         echo Configuring stage profile in $(HOST_SUBDIR)/intl ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \
         cd $(HOST_SUBDIR)/intl || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -14243,14 +14023,14 @@ configure-stageprofile-intl:
  maybe-configure-stagefeedback-intl:
  @if intl-bootstrap
  maybe-configure-stagefeedback-intl: configure-stagefeedback-intl
-configure-stagefeedback-intl: 
+configure-stagefeedback-intl:
         @[ `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; \
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl
+       test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS) \
         echo Configuring stage feedback in $(HOST_SUBDIR)/intl ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \
         cd $(HOST_SUBDIR)/intl || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -14477,7 +14257,7 @@ maybe-check-intl:
  maybe-check-intl: check-intl
  
  check-intl:
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -14492,7 +14272,7 @@ maybe-install-intl:
  maybe-install-intl: install-intl
  
  install-intl: installdirs
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -14756,8 +14536,8 @@ maintainer-clean-intl:
  maybe-configure-tcl:
  @if tcl
  maybe-configure-tcl: configure-tcl
-configure-tcl: 
-       @$(unstage)
+configure-tcl:
+       @: $(MAKE); $(unstage)
         @test ! -f $(HOST_SUBDIR)/tcl/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/tcl ; \
         r=`${PWD_COMMAND}`; export r; \
@@ -14787,7 +14567,7 @@ maybe-all-tcl:
  TARGET-tcl=all
  maybe-all-tcl: all-tcl
  all-tcl: configure-tcl
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -14804,7 +14584,7 @@ maybe-check-tcl:
  maybe-check-tcl: check-tcl
  
  check-tcl:
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -14819,7 +14599,7 @@ maybe-install-tcl:
  maybe-install-tcl: install-tcl
  
  install-tcl: installdirs
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -14837,7 +14617,7 @@ maybe-info-tcl: info-tcl
  
  info-tcl: \
      configure-tcl 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./tcl/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -14863,7 +14643,7 @@ maybe-dvi-tcl: dvi-tcl
  
  dvi-tcl: \
      configure-tcl 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./tcl/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -14889,7 +14669,7 @@ maybe-html-tcl: html-tcl
  
  html-tcl: \
      configure-tcl 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./tcl/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -14915,7 +14695,7 @@ maybe-TAGS-tcl: TAGS-tcl
  
  TAGS-tcl: \
      configure-tcl 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./tcl/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -14942,7 +14722,7 @@ maybe-install-info-tcl: install-info-tcl
  install-info-tcl: \
      configure-tcl \
      info-tcl 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./tcl/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -14968,7 +14748,7 @@ maybe-installcheck-tcl: installcheck-tcl
  
  installcheck-tcl: \
      configure-tcl 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./tcl/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -15003,7 +14783,7 @@ maybe-clean-tcl:
  maybe-clean-tcl: clean-tcl
  
  clean-tcl: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./tcl/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -15028,7 +14808,7 @@ maybe-distclean-tcl:
  maybe-distclean-tcl: distclean-tcl
  
  distclean-tcl: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./tcl/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -15053,7 +14833,7 @@ maybe-maintainer-clean-tcl:
  maybe-maintainer-clean-tcl: maintainer-clean-tcl
  
  maintainer-clean-tcl: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./tcl/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -15078,8 +14858,8 @@ maintainer-clean-tcl:
  maybe-configure-itcl:
  @if itcl
  maybe-configure-itcl: configure-itcl
-configure-itcl: 
-       @$(unstage)
+configure-itcl:
+       @: $(MAKE); $(unstage)
         @test ! -f $(HOST_SUBDIR)/itcl/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/itcl ; \
         r=`${PWD_COMMAND}`; export r; \
@@ -15109,7 +14889,7 @@ maybe-all-itcl:
  TARGET-itcl=all
  maybe-all-itcl: all-itcl
  all-itcl: configure-itcl
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -15126,7 +14906,7 @@ maybe-check-itcl:
  maybe-check-itcl: check-itcl
  
  check-itcl:
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -15141,7 +14921,7 @@ maybe-install-itcl:
  maybe-install-itcl: install-itcl
  
  install-itcl: installdirs
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -15159,7 +14939,7 @@ maybe-info-itcl: info-itcl
  
  info-itcl: \
      configure-itcl 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./itcl/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -15185,7 +14965,7 @@ maybe-dvi-itcl: dvi-itcl
  
  dvi-itcl: \
      configure-itcl 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./itcl/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -15211,7 +14991,7 @@ maybe-html-itcl: html-itcl
  
  html-itcl: \
      configure-itcl 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./itcl/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -15237,7 +15017,7 @@ maybe-TAGS-itcl: TAGS-itcl
  
  TAGS-itcl: \
      configure-itcl 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./itcl/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -15264,7 +15044,7 @@ maybe-install-info-itcl: install-info-itcl
  install-info-itcl: \
      configure-itcl \
      info-itcl 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./itcl/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -15290,7 +15070,7 @@ maybe-installcheck-itcl: installcheck-itcl
  
  installcheck-itcl: \
      configure-itcl 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./itcl/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -15315,7 +15095,7 @@ maybe-mostlyclean-itcl:
  maybe-mostlyclean-itcl: mostlyclean-itcl
  
  mostlyclean-itcl: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./itcl/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -15340,7 +15120,7 @@ maybe-clean-itcl:
  maybe-clean-itcl: clean-itcl
  
  clean-itcl: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./itcl/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -15365,7 +15145,7 @@ maybe-distclean-itcl:
  maybe-distclean-itcl: distclean-itcl
  
  distclean-itcl: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./itcl/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -15390,7 +15170,7 @@ maybe-maintainer-clean-itcl:
  maybe-maintainer-clean-itcl: maintainer-clean-itcl
  
  maintainer-clean-itcl: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./itcl/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -15415,7 +15195,7 @@ maintainer-clean-itcl:
  maybe-configure-ld:
  @if ld
  maybe-configure-ld: configure-ld
-configure-ld: 
+configure-ld:
         @test -f stage_last && exit 0; \
         test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \
@@ -15442,13 +15222,13 @@ configure-ld:
  maybe-configure-stage1-ld:
  @if ld-bootstrap
  maybe-configure-stage1-ld: configure-stage1-ld
-configure-stage1-ld: 
+configure-stage1-ld:
         @[ `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; \
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld
+       test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \
         $(HOST_EXPORTS) \
         echo Configuring stage 1 in $(HOST_SUBDIR)/ld ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \
         cd $(HOST_SUBDIR)/ld || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -15466,14 +15246,14 @@ configure-stage1-ld:
  maybe-configure-stage2-ld:
  @if ld-bootstrap
  maybe-configure-stage2-ld: configure-stage2-ld
-configure-stage2-ld: 
+configure-stage2-ld:
         @[ `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; \
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld
+       test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS) \
         echo Configuring stage 2 in $(HOST_SUBDIR)/ld ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \
         cd $(HOST_SUBDIR)/ld || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -15491,14 +15271,14 @@ configure-stage2-ld:
  maybe-configure-stage3-ld:
  @if ld-bootstrap
  maybe-configure-stage3-ld: configure-stage3-ld
-configure-stage3-ld: 
+configure-stage3-ld:
         @[ `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; \
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld
+       test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS) \
         echo Configuring stage 3 in $(HOST_SUBDIR)/ld ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \
         cd $(HOST_SUBDIR)/ld || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -15516,14 +15296,14 @@ configure-stage3-ld:
  maybe-configure-stage4-ld:
  @if ld-bootstrap
  maybe-configure-stage4-ld: configure-stage4-ld
-configure-stage4-ld: 
+configure-stage4-ld:
         @[ `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; \
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld
+       test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS) \
         echo Configuring stage 4 in $(HOST_SUBDIR)/ld ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \
         cd $(HOST_SUBDIR)/ld || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -15541,14 +15321,14 @@ configure-stage4-ld:
  maybe-configure-stageprofile-ld:
  @if ld-bootstrap
  maybe-configure-stageprofile-ld: configure-stageprofile-ld
-configure-stageprofile-ld: 
+configure-stageprofile-ld:
         @[ `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; \
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld
+       test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS) \
         echo Configuring stage profile in $(HOST_SUBDIR)/ld ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \
         cd $(HOST_SUBDIR)/ld || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -15566,14 +15346,14 @@ configure-stageprofile-ld:
  maybe-configure-stagefeedback-ld:
  @if ld-bootstrap
  maybe-configure-stagefeedback-ld: configure-stagefeedback-ld
-configure-stagefeedback-ld: 
+configure-stagefeedback-ld:
         @[ `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; \
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld
+       test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS) \
         echo Configuring stage feedback in $(HOST_SUBDIR)/ld ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \
         cd $(HOST_SUBDIR)/ld || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -15800,7 +15580,7 @@ maybe-check-ld:
  maybe-check-ld: check-ld
  
  check-ld:
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -15815,7 +15595,7 @@ maybe-install-ld:
  maybe-install-ld: install-ld
  
  install-ld: installdirs
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -16079,7 +15859,7 @@ maintainer-clean-ld:
  maybe-configure-libcpp:
  @if libcpp
  maybe-configure-libcpp: configure-libcpp
-configure-libcpp: 
+configure-libcpp:
         @test -f stage_last && exit 0; \
         test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \
@@ -16106,13 +15886,13 @@ configure-libcpp:
  maybe-configure-stage1-libcpp:
  @if libcpp-bootstrap
  maybe-configure-stage1-libcpp: configure-stage1-libcpp
-configure-stage1-libcpp: 
+configure-stage1-libcpp:
         @[ `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; \
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp
+       test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \
         $(HOST_EXPORTS) \
         echo Configuring stage 1 in $(HOST_SUBDIR)/libcpp ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \
         cd $(HOST_SUBDIR)/libcpp || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -16130,14 +15910,14 @@ configure-stage1-libcpp:
  maybe-configure-stage2-libcpp:
  @if libcpp-bootstrap
  maybe-configure-stage2-libcpp: configure-stage2-libcpp
-configure-stage2-libcpp: 
+configure-stage2-libcpp:
         @[ `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; \
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp
+       test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS) \
         echo Configuring stage 2 in $(HOST_SUBDIR)/libcpp ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \
         cd $(HOST_SUBDIR)/libcpp || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -16155,14 +15935,14 @@ configure-stage2-libcpp:
  maybe-configure-stage3-libcpp:
  @if libcpp-bootstrap
  maybe-configure-stage3-libcpp: configure-stage3-libcpp
-configure-stage3-libcpp: 
+configure-stage3-libcpp:
         @[ `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; \
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp
+       test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS) \
         echo Configuring stage 3 in $(HOST_SUBDIR)/libcpp ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \
         cd $(HOST_SUBDIR)/libcpp || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -16180,14 +15960,14 @@ configure-stage3-libcpp:
  maybe-configure-stage4-libcpp:
  @if libcpp-bootstrap
  maybe-configure-stage4-libcpp: configure-stage4-libcpp
-configure-stage4-libcpp: 
+configure-stage4-libcpp:
         @[ `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; \
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp
+       test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS) \
         echo Configuring stage 4 in $(HOST_SUBDIR)/libcpp ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \
         cd $(HOST_SUBDIR)/libcpp || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -16205,14 +15985,14 @@ configure-stage4-libcpp:
  maybe-configure-stageprofile-libcpp:
  @if libcpp-bootstrap
  maybe-configure-stageprofile-libcpp: configure-stageprofile-libcpp
-configure-stageprofile-libcpp: 
+configure-stageprofile-libcpp:
         @[ `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; \
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp
+       test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS) \
         echo Configuring stage profile in $(HOST_SUBDIR)/libcpp ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \
         cd $(HOST_SUBDIR)/libcpp || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -16230,14 +16010,14 @@ configure-stageprofile-libcpp:
  maybe-configure-stagefeedback-libcpp:
  @if libcpp-bootstrap
  maybe-configure-stagefeedback-libcpp: configure-stagefeedback-libcpp
-configure-stagefeedback-libcpp: 
+configure-stagefeedback-libcpp:
         @[ `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; \
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp
+       test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS) \
         echo Configuring stage feedback in $(HOST_SUBDIR)/libcpp ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \
         cd $(HOST_SUBDIR)/libcpp || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -16464,7 +16244,7 @@ maybe-check-libcpp:
  maybe-check-libcpp: check-libcpp
  
  check-libcpp:
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -16479,7 +16259,7 @@ maybe-install-libcpp:
  maybe-install-libcpp: install-libcpp
  
  install-libcpp: installdirs
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -16739,12 +16519,676 @@ maintainer-clean-libcpp:
  
  
  
+.PHONY: configure-libdecnumber maybe-configure-libdecnumber
+maybe-configure-libdecnumber:
+@if libdecnumber
+maybe-configure-libdecnumber: configure-libdecnumber
+configure-libdecnumber:
+       @test -f stage_last && exit 0; \
+       test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       echo Configuring in $(HOST_SUBDIR)/libdecnumber; \
+       cd "$(HOST_SUBDIR)/libdecnumber" || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/libdecnumber/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/libdecnumber"; \
+       libsrcdir="$$s/libdecnumber"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
+         || exit 1
+@endif libdecnumber
+
+
+
+.PHONY: configure-stage1-libdecnumber maybe-configure-stage1-libdecnumber
+maybe-configure-stage1-libdecnumber:
+@if libdecnumber-bootstrap
+maybe-configure-stage1-libdecnumber: configure-stage1-libdecnumber
+configure-stage1-libdecnumber:
+       @[ `cat stage_current` = stage1 ] || $(MAKE) stage1-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber
+       test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \
+       $(HOST_EXPORTS) \
+       echo Configuring stage 1 in $(HOST_SUBDIR)/libdecnumber ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \
+       cd $(HOST_SUBDIR)/libdecnumber || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/libdecnumber/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/libdecnumber"; \
+       libsrcdir="$$s/libdecnumber"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         --disable-intermodule           --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" 
+@endif libdecnumber-bootstrap
+
+.PHONY: configure-stage2-libdecnumber maybe-configure-stage2-libdecnumber
+maybe-configure-stage2-libdecnumber:
+@if libdecnumber-bootstrap
+maybe-configure-stage2-libdecnumber: configure-stage2-libdecnumber
+configure-stage2-libdecnumber:
+       @[ `cat stage_current` = stage2 ] || $(MAKE) stage2-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber
+       test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       echo Configuring stage 2 in $(HOST_SUBDIR)/libdecnumber ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \
+       cd $(HOST_SUBDIR)/libdecnumber || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/libdecnumber/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/libdecnumber"; \
+       libsrcdir="$$s/libdecnumber"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+@endif libdecnumber-bootstrap
+
+.PHONY: configure-stage3-libdecnumber maybe-configure-stage3-libdecnumber
+maybe-configure-stage3-libdecnumber:
+@if libdecnumber-bootstrap
+maybe-configure-stage3-libdecnumber: configure-stage3-libdecnumber
+configure-stage3-libdecnumber:
+       @[ `cat stage_current` = stage3 ] || $(MAKE) stage3-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber
+       test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       echo Configuring stage 3 in $(HOST_SUBDIR)/libdecnumber ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \
+       cd $(HOST_SUBDIR)/libdecnumber || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/libdecnumber/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/libdecnumber"; \
+       libsrcdir="$$s/libdecnumber"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+@endif libdecnumber-bootstrap
+
+.PHONY: configure-stage4-libdecnumber maybe-configure-stage4-libdecnumber
+maybe-configure-stage4-libdecnumber:
+@if libdecnumber-bootstrap
+maybe-configure-stage4-libdecnumber: configure-stage4-libdecnumber
+configure-stage4-libdecnumber:
+       @[ `cat stage_current` = stage4 ] || $(MAKE) stage4-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber
+       test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       echo Configuring stage 4 in $(HOST_SUBDIR)/libdecnumber ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \
+       cd $(HOST_SUBDIR)/libdecnumber || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/libdecnumber/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/libdecnumber"; \
+       libsrcdir="$$s/libdecnumber"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+@endif libdecnumber-bootstrap
+
+.PHONY: configure-stageprofile-libdecnumber maybe-configure-stageprofile-libdecnumber
+maybe-configure-stageprofile-libdecnumber:
+@if libdecnumber-bootstrap
+maybe-configure-stageprofile-libdecnumber: configure-stageprofile-libdecnumber
+configure-stageprofile-libdecnumber:
+       @[ `cat stage_current` = stageprofile ] || $(MAKE) stageprofile-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber
+       test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       echo Configuring stage profile in $(HOST_SUBDIR)/libdecnumber ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \
+       cd $(HOST_SUBDIR)/libdecnumber || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/libdecnumber/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/libdecnumber"; \
+       libsrcdir="$$s/libdecnumber"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+@endif libdecnumber-bootstrap
+
+.PHONY: configure-stagefeedback-libdecnumber maybe-configure-stagefeedback-libdecnumber
+maybe-configure-stagefeedback-libdecnumber:
+@if libdecnumber-bootstrap
+maybe-configure-stagefeedback-libdecnumber: configure-stagefeedback-libdecnumber
+configure-stagefeedback-libdecnumber:
+       @[ `cat stage_current` = stagefeedback ] || $(MAKE) stagefeedback-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber
+       test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       echo Configuring stage feedback in $(HOST_SUBDIR)/libdecnumber ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \
+       cd $(HOST_SUBDIR)/libdecnumber || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/libdecnumber/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/libdecnumber"; \
+       libsrcdir="$$s/libdecnumber"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+@endif libdecnumber-bootstrap
+
+
+
+
+
+.PHONY: all-libdecnumber maybe-all-libdecnumber
+maybe-all-libdecnumber:
+@if libdecnumber
+TARGET-libdecnumber=all
+maybe-all-libdecnumber: all-libdecnumber
+all-libdecnumber: configure-libdecnumber
+       @test -f stage_last && exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       (cd $(HOST_SUBDIR)/libdecnumber && \
+         $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-libdecnumber))
+@endif libdecnumber
+
+
+
+.PHONY: all-stage1-libdecnumber maybe-all-stage1-libdecnumber
+.PHONY: clean-stage1-libdecnumber maybe-clean-stage1-libdecnumber
+maybe-all-stage1-libdecnumber:
+maybe-clean-stage1-libdecnumber:
+@if libdecnumber-bootstrap
+maybe-all-stage1-libdecnumber: all-stage1-libdecnumber
+all-stage1: all-stage1-libdecnumber
+TARGET-stage1-libdecnumber = $(TARGET-libdecnumber)
+all-stage1-libdecnumber: configure-stage1-libdecnumber
+       @[ `cat stage_current` = stage1 ] || $(MAKE) stage1-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       cd $(HOST_SUBDIR)/libdecnumber && \
+       $(MAKE) $(FLAGS_TO_PASS)  CFLAGS="$(STAGE1_CFLAGS)"  \
+               $(TARGET-stage1-libdecnumber)
+
+maybe-clean-stage1-libdecnumber: clean-stage1-libdecnumber
+clean-stage1: clean-stage1-libdecnumber
+clean-stage1-libdecnumber:
+       @[ -f $(HOST_SUBDIR)/libdecnumber/Makefile ] || [ -f $(HOST_SUBDIR)/stage1-libdecnumber/Makefile ] \
+         || exit 0 ; \
+       @[ `cat stage_current` = stage1 ] || $(MAKE) stage1-start
+       cd $(HOST_SUBDIR)/libdecnumber && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               CFLAGS="$(STAGE1_CFLAGS)"  clean
+@endif libdecnumber-bootstrap
+
+
+.PHONY: all-stage2-libdecnumber maybe-all-stage2-libdecnumber
+.PHONY: clean-stage2-libdecnumber maybe-clean-stage2-libdecnumber
+maybe-all-stage2-libdecnumber:
+maybe-clean-stage2-libdecnumber:
+@if libdecnumber-bootstrap
+maybe-all-stage2-libdecnumber: all-stage2-libdecnumber
+all-stage2: all-stage2-libdecnumber
+TARGET-stage2-libdecnumber = $(TARGET-libdecnumber)
+all-stage2-libdecnumber: configure-stage2-libdecnumber
+       @[ `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)/libdecnumber && \
+       $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)   \
+               $(TARGET-stage2-libdecnumber)
+
+maybe-clean-stage2-libdecnumber: clean-stage2-libdecnumber
+clean-stage2: clean-stage2-libdecnumber
+clean-stage2-libdecnumber:
+       @[ -f $(HOST_SUBDIR)/libdecnumber/Makefile ] || [ -f $(HOST_SUBDIR)/stage2-libdecnumber/Makefile ] \
+         || exit 0 ; \
+       @[ `cat stage_current` = stage2 ] || $(MAKE) stage2-start
+       cd $(HOST_SUBDIR)/libdecnumber && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                 clean
+@endif libdecnumber-bootstrap
+
+
+.PHONY: all-stage3-libdecnumber maybe-all-stage3-libdecnumber
+.PHONY: clean-stage3-libdecnumber maybe-clean-stage3-libdecnumber
+maybe-all-stage3-libdecnumber:
+maybe-clean-stage3-libdecnumber:
+@if libdecnumber-bootstrap
+maybe-all-stage3-libdecnumber: all-stage3-libdecnumber
+all-stage3: all-stage3-libdecnumber
+TARGET-stage3-libdecnumber = $(TARGET-libdecnumber)
+all-stage3-libdecnumber: configure-stage3-libdecnumber
+       @[ `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)/libdecnumber && \
+       $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)   \
+               $(TARGET-stage3-libdecnumber)
+
+maybe-clean-stage3-libdecnumber: clean-stage3-libdecnumber
+clean-stage3: clean-stage3-libdecnumber
+clean-stage3-libdecnumber:
+       @[ -f $(HOST_SUBDIR)/libdecnumber/Makefile ] || [ -f $(HOST_SUBDIR)/stage3-libdecnumber/Makefile ] \
+         || exit 0 ; \
+       @[ `cat stage_current` = stage3 ] || $(MAKE) stage3-start
+       cd $(HOST_SUBDIR)/libdecnumber && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                 clean
+@endif libdecnumber-bootstrap
+
+
+.PHONY: all-stage4-libdecnumber maybe-all-stage4-libdecnumber
+.PHONY: clean-stage4-libdecnumber maybe-clean-stage4-libdecnumber
+maybe-all-stage4-libdecnumber:
+maybe-clean-stage4-libdecnumber:
+@if libdecnumber-bootstrap
+maybe-all-stage4-libdecnumber: all-stage4-libdecnumber
+all-stage4: all-stage4-libdecnumber
+TARGET-stage4-libdecnumber = $(TARGET-libdecnumber)
+all-stage4-libdecnumber: configure-stage4-libdecnumber
+       @[ `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)/libdecnumber && \
+       $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)   \
+               $(TARGET-stage4-libdecnumber)
+
+maybe-clean-stage4-libdecnumber: clean-stage4-libdecnumber
+clean-stage4: clean-stage4-libdecnumber
+clean-stage4-libdecnumber:
+       @[ -f $(HOST_SUBDIR)/libdecnumber/Makefile ] || [ -f $(HOST_SUBDIR)/stage4-libdecnumber/Makefile ] \
+         || exit 0 ; \
+       @[ `cat stage_current` = stage4 ] || $(MAKE) stage4-start
+       cd $(HOST_SUBDIR)/libdecnumber && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                 clean
+@endif libdecnumber-bootstrap
+
+
+.PHONY: all-stageprofile-libdecnumber maybe-all-stageprofile-libdecnumber
+.PHONY: clean-stageprofile-libdecnumber maybe-clean-stageprofile-libdecnumber
+maybe-all-stageprofile-libdecnumber:
+maybe-clean-stageprofile-libdecnumber:
+@if libdecnumber-bootstrap
+maybe-all-stageprofile-libdecnumber: all-stageprofile-libdecnumber
+all-stageprofile: all-stageprofile-libdecnumber
+TARGET-stageprofile-libdecnumber = $(TARGET-libdecnumber)
+all-stageprofile-libdecnumber: configure-stageprofile-libdecnumber
+       @[ `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)/libdecnumber && \
+       $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-generate"  \
+               $(TARGET-stageprofile-libdecnumber)
+
+maybe-clean-stageprofile-libdecnumber: clean-stageprofile-libdecnumber
+clean-stageprofile: clean-stageprofile-libdecnumber
+clean-stageprofile-libdecnumber:
+       @[ -f $(HOST_SUBDIR)/libdecnumber/Makefile ] || [ -f $(HOST_SUBDIR)/stageprofile-libdecnumber/Makefile ] \
+         || exit 0 ; \
+       @[ `cat stage_current` = stageprofile ] || $(MAKE) stageprofile-start
+       cd $(HOST_SUBDIR)/libdecnumber && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-generate"  clean
+@endif libdecnumber-bootstrap
+
+
+.PHONY: all-stagefeedback-libdecnumber maybe-all-stagefeedback-libdecnumber
+.PHONY: clean-stagefeedback-libdecnumber maybe-clean-stagefeedback-libdecnumber
+maybe-all-stagefeedback-libdecnumber:
+maybe-clean-stagefeedback-libdecnumber:
+@if libdecnumber-bootstrap
+maybe-all-stagefeedback-libdecnumber: all-stagefeedback-libdecnumber
+all-stagefeedback: all-stagefeedback-libdecnumber
+TARGET-stagefeedback-libdecnumber = $(TARGET-libdecnumber)
+all-stagefeedback-libdecnumber: configure-stagefeedback-libdecnumber
+       @[ `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)/libdecnumber && \
+       $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-use"  \
+               $(TARGET-stagefeedback-libdecnumber)
+
+maybe-clean-stagefeedback-libdecnumber: clean-stagefeedback-libdecnumber
+clean-stagefeedback: clean-stagefeedback-libdecnumber
+clean-stagefeedback-libdecnumber:
+       @[ -f $(HOST_SUBDIR)/libdecnumber/Makefile ] || [ -f $(HOST_SUBDIR)/stagefeedback-libdecnumber/Makefile ] \
+         || exit 0 ; \
+       @[ `cat stage_current` = stagefeedback ] || $(MAKE) stagefeedback-start
+       cd $(HOST_SUBDIR)/libdecnumber && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-use"  clean
+@endif libdecnumber-bootstrap
+
+
+
+
+
+.PHONY: check-libdecnumber maybe-check-libdecnumber
+maybe-check-libdecnumber:
+@if libdecnumber
+maybe-check-libdecnumber: check-libdecnumber
+
+check-libdecnumber:
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       (cd $(HOST_SUBDIR)/libdecnumber && \
+         $(MAKE) $(FLAGS_TO_PASS)  check)
+
+@endif libdecnumber
+
+.PHONY: install-libdecnumber maybe-install-libdecnumber
+maybe-install-libdecnumber:
+@if libdecnumber
+maybe-install-libdecnumber: install-libdecnumber
+
+install-libdecnumber: installdirs
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       (cd $(HOST_SUBDIR)/libdecnumber && \
+         $(MAKE) $(FLAGS_TO_PASS)  install)
+
+@endif libdecnumber
+
+# Other targets (info, dvi, etc.)
+
+.PHONY: maybe-info-libdecnumber info-libdecnumber
+maybe-info-libdecnumber:
+@if libdecnumber
+maybe-info-libdecnumber: info-libdecnumber
+
+info-libdecnumber: \
+    configure-libdecnumber 
+       @[ -f ./libdecnumber/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing info in libdecnumber" ; \
+       (cd $(HOST_SUBDIR)/libdecnumber && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 info) \
+         || exit 1
+
+@endif libdecnumber
+
+.PHONY: maybe-dvi-libdecnumber dvi-libdecnumber
+maybe-dvi-libdecnumber:
+@if libdecnumber
+maybe-dvi-libdecnumber: dvi-libdecnumber
+
+dvi-libdecnumber: \
+    configure-libdecnumber 
+       @[ -f ./libdecnumber/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing dvi in libdecnumber" ; \
+       (cd $(HOST_SUBDIR)/libdecnumber && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 dvi) \
+         || exit 1
+
+@endif libdecnumber
+
+.PHONY: maybe-html-libdecnumber html-libdecnumber
+maybe-html-libdecnumber:
+@if libdecnumber
+maybe-html-libdecnumber: html-libdecnumber
+
+html-libdecnumber: \
+    configure-libdecnumber 
+       @[ -f ./libdecnumber/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing html in libdecnumber" ; \
+       (cd $(HOST_SUBDIR)/libdecnumber && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 html) \
+         || exit 1
+
+@endif libdecnumber
+
+.PHONY: maybe-TAGS-libdecnumber TAGS-libdecnumber
+maybe-TAGS-libdecnumber:
+@if libdecnumber
+maybe-TAGS-libdecnumber: TAGS-libdecnumber
+
+TAGS-libdecnumber: \
+    configure-libdecnumber 
+       @[ -f ./libdecnumber/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing TAGS in libdecnumber" ; \
+       (cd $(HOST_SUBDIR)/libdecnumber && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 TAGS) \
+         || exit 1
+
+@endif libdecnumber
+
+.PHONY: maybe-install-info-libdecnumber install-info-libdecnumber
+maybe-install-info-libdecnumber:
+@if libdecnumber
+maybe-install-info-libdecnumber: install-info-libdecnumber
+
+install-info-libdecnumber: \
+    configure-libdecnumber \
+    info-libdecnumber 
+       @[ -f ./libdecnumber/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing install-info in libdecnumber" ; \
+       (cd $(HOST_SUBDIR)/libdecnumber && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 install-info) \
+         || exit 1
+
+@endif libdecnumber
+
+.PHONY: maybe-installcheck-libdecnumber installcheck-libdecnumber
+maybe-installcheck-libdecnumber:
+@if libdecnumber
+maybe-installcheck-libdecnumber: installcheck-libdecnumber
+
+installcheck-libdecnumber: \
+    configure-libdecnumber 
+       @[ -f ./libdecnumber/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing installcheck in libdecnumber" ; \
+       (cd $(HOST_SUBDIR)/libdecnumber && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 installcheck) \
+         || exit 1
+
+@endif libdecnumber
+
+.PHONY: maybe-mostlyclean-libdecnumber mostlyclean-libdecnumber
+maybe-mostlyclean-libdecnumber:
+@if libdecnumber
+maybe-mostlyclean-libdecnumber: mostlyclean-libdecnumber
+
+mostlyclean-libdecnumber: 
+       @[ -f ./libdecnumber/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing mostlyclean in libdecnumber" ; \
+       (cd $(HOST_SUBDIR)/libdecnumber && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 mostlyclean) \
+         || exit 1
+
+@endif libdecnumber
+
+.PHONY: maybe-clean-libdecnumber clean-libdecnumber
+maybe-clean-libdecnumber:
+@if libdecnumber
+maybe-clean-libdecnumber: clean-libdecnumber
+
+clean-libdecnumber: 
+       @[ -f ./libdecnumber/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing clean in libdecnumber" ; \
+       (cd $(HOST_SUBDIR)/libdecnumber && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 clean) \
+         || exit 1
+
+@endif libdecnumber
+
+.PHONY: maybe-distclean-libdecnumber distclean-libdecnumber
+maybe-distclean-libdecnumber:
+@if libdecnumber
+maybe-distclean-libdecnumber: distclean-libdecnumber
+
+distclean-libdecnumber: 
+       @[ -f ./libdecnumber/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing distclean in libdecnumber" ; \
+       (cd $(HOST_SUBDIR)/libdecnumber && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 distclean) \
+         || exit 1
+
+@endif libdecnumber
+
+.PHONY: maybe-maintainer-clean-libdecnumber maintainer-clean-libdecnumber
+maybe-maintainer-clean-libdecnumber:
+@if libdecnumber
+maybe-maintainer-clean-libdecnumber: maintainer-clean-libdecnumber
+
+maintainer-clean-libdecnumber: 
+       @[ -f ./libdecnumber/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing maintainer-clean in libdecnumber" ; \
+       (cd $(HOST_SUBDIR)/libdecnumber && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 maintainer-clean) \
+         || exit 1
+
+@endif libdecnumber
+
+
+
  .PHONY: configure-libgui maybe-configure-libgui
  maybe-configure-libgui:
  @if libgui
  maybe-configure-libgui: configure-libgui
-configure-libgui: 
-       @$(unstage)
+configure-libgui:
+       @: $(MAKE); $(unstage)
         @test ! -f $(HOST_SUBDIR)/libgui/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libgui ; \
         r=`${PWD_COMMAND}`; export r; \
@@ -16774,7 +17218,7 @@ maybe-all-libgui:
  TARGET-libgui=all
  maybe-all-libgui: all-libgui
  all-libgui: configure-libgui
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -16791,7 +17235,7 @@ maybe-check-libgui:
  maybe-check-libgui: check-libgui
  
  check-libgui:
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -16806,7 +17250,7 @@ maybe-install-libgui:
  maybe-install-libgui: install-libgui
  
  install-libgui: installdirs
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -16824,7 +17268,7 @@ maybe-info-libgui: info-libgui
  
  info-libgui: \
      configure-libgui 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./libgui/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -16850,7 +17294,7 @@ maybe-dvi-libgui: dvi-libgui
  
  dvi-libgui: \
      configure-libgui 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./libgui/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -16876,7 +17320,7 @@ maybe-html-libgui: html-libgui
  
  html-libgui: \
      configure-libgui 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./libgui/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -16902,7 +17346,7 @@ maybe-TAGS-libgui: TAGS-libgui
  
  TAGS-libgui: \
      configure-libgui 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./libgui/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -16929,7 +17373,7 @@ maybe-install-info-libgui: install-info-libgui
  install-info-libgui: \
      configure-libgui \
      info-libgui 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./libgui/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -16955,7 +17399,7 @@ maybe-installcheck-libgui: installcheck-libgui
  
  installcheck-libgui: \
      configure-libgui 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./libgui/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -16980,7 +17424,7 @@ maybe-mostlyclean-libgui:
  maybe-mostlyclean-libgui: mostlyclean-libgui
  
  mostlyclean-libgui: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./libgui/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -17005,7 +17449,7 @@ maybe-clean-libgui:
  maybe-clean-libgui: clean-libgui
  
  clean-libgui: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./libgui/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -17030,7 +17474,7 @@ maybe-distclean-libgui:
  maybe-distclean-libgui: distclean-libgui
  
  distclean-libgui: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./libgui/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -17055,7 +17499,7 @@ maybe-maintainer-clean-libgui:
  maybe-maintainer-clean-libgui: maintainer-clean-libgui
  
  maintainer-clean-libgui: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./libgui/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -17080,7 +17524,7 @@ maintainer-clean-libgui:
  maybe-configure-libiberty:
  @if libiberty
  maybe-configure-libiberty: configure-libiberty
-configure-libiberty: 
+configure-libiberty:
         @test -f stage_last && exit 0; \
         test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \
@@ -17107,13 +17551,13 @@ configure-libiberty:
  maybe-configure-stage1-libiberty:
  @if libiberty-bootstrap
  maybe-configure-stage1-libiberty: configure-stage1-libiberty
-configure-stage1-libiberty: 
+configure-stage1-libiberty:
         @[ `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; \
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty
+       test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \
         $(HOST_EXPORTS) \
         echo Configuring stage 1 in $(HOST_SUBDIR)/libiberty ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \
         cd $(HOST_SUBDIR)/libiberty || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -17131,14 +17575,14 @@ configure-stage1-libiberty:
  maybe-configure-stage2-libiberty:
  @if libiberty-bootstrap
  maybe-configure-stage2-libiberty: configure-stage2-libiberty
-configure-stage2-libiberty: 
+configure-stage2-libiberty:
         @[ `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; \
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty
+       test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS) \
         echo Configuring stage 2 in $(HOST_SUBDIR)/libiberty ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \
         cd $(HOST_SUBDIR)/libiberty || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -17156,14 +17600,14 @@ configure-stage2-libiberty:
  maybe-configure-stage3-libiberty:
  @if libiberty-bootstrap
  maybe-configure-stage3-libiberty: configure-stage3-libiberty
-configure-stage3-libiberty: 
+configure-stage3-libiberty:
         @[ `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; \
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty
+       test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS) \
         echo Configuring stage 3 in $(HOST_SUBDIR)/libiberty ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \
         cd $(HOST_SUBDIR)/libiberty || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -17181,14 +17625,14 @@ configure-stage3-libiberty:
  maybe-configure-stage4-libiberty:
  @if libiberty-bootstrap
  maybe-configure-stage4-libiberty: configure-stage4-libiberty
-configure-stage4-libiberty: 
+configure-stage4-libiberty:
         @[ `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; \
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty
+       test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS) \
         echo Configuring stage 4 in $(HOST_SUBDIR)/libiberty ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \
         cd $(HOST_SUBDIR)/libiberty || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -17206,14 +17650,14 @@ configure-stage4-libiberty:
  maybe-configure-stageprofile-libiberty:
  @if libiberty-bootstrap
  maybe-configure-stageprofile-libiberty: configure-stageprofile-libiberty
-configure-stageprofile-libiberty: 
+configure-stageprofile-libiberty:
         @[ `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; \
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty
+       test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS) \
         echo Configuring stage profile in $(HOST_SUBDIR)/libiberty ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \
         cd $(HOST_SUBDIR)/libiberty || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -17231,14 +17675,14 @@ configure-stageprofile-libiberty:
  maybe-configure-stagefeedback-libiberty:
  @if libiberty-bootstrap
  maybe-configure-stagefeedback-libiberty: configure-stagefeedback-libiberty
-configure-stagefeedback-libiberty: 
+configure-stagefeedback-libiberty:
         @[ `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; \
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty
+       test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS) \
         echo Configuring stage feedback in $(HOST_SUBDIR)/libiberty ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \
         cd $(HOST_SUBDIR)/libiberty || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -17465,7 +17909,7 @@ maybe-check-libiberty:
  maybe-check-libiberty: check-libiberty
  
  check-libiberty:
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -17480,7 +17924,7 @@ maybe-install-libiberty:
  maybe-install-libiberty: install-libiberty
  
  install-libiberty: installdirs
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -17744,8 +18188,8 @@ maintainer-clean-libiberty:
  maybe-configure-libtool:
  @if libtool
  maybe-configure-libtool: configure-libtool
-configure-libtool: 
-       @$(unstage)
+configure-libtool:
+       @: $(MAKE); $(unstage)
         @test ! -f $(HOST_SUBDIR)/libtool/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libtool ; \
         r=`${PWD_COMMAND}`; export r; \
@@ -17775,7 +18219,7 @@ maybe-all-libtool:
  TARGET-libtool=all
  maybe-all-libtool: all-libtool
  all-libtool: configure-libtool
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -17792,7 +18236,7 @@ maybe-check-libtool:
  maybe-check-libtool: check-libtool
  
  check-libtool:
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -17807,7 +18251,7 @@ maybe-install-libtool:
  maybe-install-libtool: install-libtool
  
  install-libtool: installdirs
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -17825,7 +18269,7 @@ maybe-info-libtool: info-libtool
  
  info-libtool: \
      configure-libtool 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./libtool/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -17851,7 +18295,7 @@ maybe-dvi-libtool: dvi-libtool
  
  dvi-libtool: \
      configure-libtool 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./libtool/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -17877,7 +18321,7 @@ maybe-html-libtool: html-libtool
  
  html-libtool: \
      configure-libtool 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./libtool/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -17903,7 +18347,7 @@ maybe-TAGS-libtool: TAGS-libtool
  
  TAGS-libtool: \
      configure-libtool 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./libtool/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -17930,7 +18374,7 @@ maybe-install-info-libtool: install-info-libtool
  install-info-libtool: \
      configure-libtool \
      info-libtool 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./libtool/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -17956,7 +18400,7 @@ maybe-installcheck-libtool: installcheck-libtool
  
  installcheck-libtool: \
      configure-libtool 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./libtool/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -17981,7 +18425,7 @@ maybe-mostlyclean-libtool:
  maybe-mostlyclean-libtool: mostlyclean-libtool
  
  mostlyclean-libtool: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./libtool/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -18006,7 +18450,7 @@ maybe-clean-libtool:
  maybe-clean-libtool: clean-libtool
  
  clean-libtool: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./libtool/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -18031,7 +18475,7 @@ maybe-distclean-libtool:
  maybe-distclean-libtool: distclean-libtool
  
  distclean-libtool: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./libtool/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -18056,7 +18500,7 @@ maybe-maintainer-clean-libtool:
  maybe-maintainer-clean-libtool: maintainer-clean-libtool
  
  maintainer-clean-libtool: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./libtool/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -18081,8 +18525,8 @@ maintainer-clean-libtool:
  maybe-configure-m4:
  @if m4
  maybe-configure-m4: configure-m4
-configure-m4: 
-       @$(unstage)
+configure-m4:
+       @: $(MAKE); $(unstage)
         @test ! -f $(HOST_SUBDIR)/m4/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/m4 ; \
         r=`${PWD_COMMAND}`; export r; \
@@ -18112,7 +18556,7 @@ maybe-all-m4:
  TARGET-m4=all
  maybe-all-m4: all-m4
  all-m4: configure-m4
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -18129,7 +18573,7 @@ maybe-check-m4:
  maybe-check-m4: check-m4
  
  check-m4:
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -18144,7 +18588,7 @@ maybe-install-m4:
  maybe-install-m4: install-m4
  
  install-m4: installdirs
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -18162,7 +18606,7 @@ maybe-info-m4: info-m4
  
  info-m4: \
      configure-m4 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./m4/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -18188,7 +18632,7 @@ maybe-dvi-m4: dvi-m4
  
  dvi-m4: \
      configure-m4 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./m4/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -18214,7 +18658,7 @@ maybe-html-m4: html-m4
  
  html-m4: \
      configure-m4 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./m4/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -18240,7 +18684,7 @@ maybe-TAGS-m4: TAGS-m4
  
  TAGS-m4: \
      configure-m4 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./m4/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -18267,7 +18711,7 @@ maybe-install-info-m4: install-info-m4
  install-info-m4: \
      configure-m4 \
      info-m4 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./m4/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -18293,7 +18737,7 @@ maybe-installcheck-m4: installcheck-m4
  
  installcheck-m4: \
      configure-m4 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./m4/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -18318,7 +18762,7 @@ maybe-mostlyclean-m4:
  maybe-mostlyclean-m4: mostlyclean-m4
  
  mostlyclean-m4: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./m4/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -18343,7 +18787,7 @@ maybe-clean-m4:
  maybe-clean-m4: clean-m4
  
  clean-m4: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./m4/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -18368,7 +18812,7 @@ maybe-distclean-m4:
  maybe-distclean-m4: distclean-m4
  
  distclean-m4: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./m4/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -18393,7 +18837,7 @@ maybe-maintainer-clean-m4:
  maybe-maintainer-clean-m4: maintainer-clean-m4
  
  maintainer-clean-m4: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./m4/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -18418,8 +18862,8 @@ maintainer-clean-m4:
  maybe-configure-make:
  @if make
  maybe-configure-make: configure-make
-configure-make: 
-       @$(unstage)
+configure-make:
+       @: $(MAKE); $(unstage)
         @test ! -f $(HOST_SUBDIR)/make/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/make ; \
         r=`${PWD_COMMAND}`; export r; \
@@ -18449,7 +18893,7 @@ maybe-all-make:
  TARGET-make=all
  maybe-all-make: all-make
  all-make: configure-make
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -18466,7 +18910,7 @@ maybe-check-make:
  maybe-check-make: check-make
  
  check-make:
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -18481,7 +18925,7 @@ maybe-install-make:
  maybe-install-make: install-make
  
  install-make: installdirs
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -18499,7 +18943,7 @@ maybe-info-make: info-make
  
  info-make: \
      configure-make 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./make/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -18525,7 +18969,7 @@ maybe-dvi-make: dvi-make
  
  dvi-make: \
      configure-make 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./make/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -18551,7 +18995,7 @@ maybe-html-make: html-make
  
  html-make: \
      configure-make 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./make/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -18577,7 +19021,7 @@ maybe-TAGS-make: TAGS-make
  
  TAGS-make: \
      configure-make 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./make/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -18604,7 +19048,7 @@ maybe-install-info-make: install-info-make
  install-info-make: \
      configure-make \
      info-make 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./make/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -18630,7 +19074,7 @@ maybe-installcheck-make: installcheck-make
  
  installcheck-make: \
      configure-make 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./make/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -18655,7 +19099,7 @@ maybe-mostlyclean-make:
  maybe-mostlyclean-make: mostlyclean-make
  
  mostlyclean-make: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./make/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -18680,7 +19124,7 @@ maybe-clean-make:
  maybe-clean-make: clean-make
  
  clean-make: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./make/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -18705,7 +19149,7 @@ maybe-distclean-make:
  maybe-distclean-make: distclean-make
  
  distclean-make: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./make/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -18730,7 +19174,7 @@ maybe-maintainer-clean-make:
  maybe-maintainer-clean-make: maintainer-clean-make
  
  maintainer-clean-make: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./make/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -18755,8 +19199,8 @@ maintainer-clean-make:
  maybe-configure-mmalloc:
  @if mmalloc
  maybe-configure-mmalloc: configure-mmalloc
-configure-mmalloc: 
-       @$(unstage)
+configure-mmalloc:
+       @: $(MAKE); $(unstage)
         @test ! -f $(HOST_SUBDIR)/mmalloc/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mmalloc ; \
         r=`${PWD_COMMAND}`; export r; \
@@ -18786,7 +19230,7 @@ maybe-all-mmalloc:
  TARGET-mmalloc=all
  maybe-all-mmalloc: all-mmalloc
  all-mmalloc: configure-mmalloc
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -18812,7 +19256,7 @@ maybe-install-mmalloc:
  maybe-install-mmalloc: install-mmalloc
  
  install-mmalloc: installdirs
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -18830,7 +19274,7 @@ maybe-info-mmalloc: info-mmalloc
  
  info-mmalloc: \
      configure-mmalloc 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./mmalloc/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -18856,7 +19300,7 @@ maybe-dvi-mmalloc: dvi-mmalloc
  
  dvi-mmalloc: \
      configure-mmalloc 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./mmalloc/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -18882,7 +19326,7 @@ maybe-html-mmalloc: html-mmalloc
  
  html-mmalloc: \
      configure-mmalloc 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./mmalloc/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -18908,7 +19352,7 @@ maybe-TAGS-mmalloc: TAGS-mmalloc
  
  TAGS-mmalloc: \
      configure-mmalloc 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./mmalloc/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -18935,7 +19379,7 @@ maybe-install-info-mmalloc: install-info-mmalloc
  install-info-mmalloc: \
      configure-mmalloc \
      info-mmalloc 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./mmalloc/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -18961,7 +19405,7 @@ maybe-installcheck-mmalloc: installcheck-mmalloc
  
  installcheck-mmalloc: \
      configure-mmalloc 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./mmalloc/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -18986,7 +19430,7 @@ maybe-mostlyclean-mmalloc:
  maybe-mostlyclean-mmalloc: mostlyclean-mmalloc
  
  mostlyclean-mmalloc: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./mmalloc/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -19011,7 +19455,7 @@ maybe-clean-mmalloc:
  maybe-clean-mmalloc: clean-mmalloc
  
  clean-mmalloc: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./mmalloc/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -19036,7 +19480,7 @@ maybe-distclean-mmalloc:
  maybe-distclean-mmalloc: distclean-mmalloc
  
  distclean-mmalloc: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./mmalloc/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -19061,7 +19505,7 @@ maybe-maintainer-clean-mmalloc:
  maybe-maintainer-clean-mmalloc: maintainer-clean-mmalloc
  
  maintainer-clean-mmalloc: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./mmalloc/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -19086,8 +19530,8 @@ maintainer-clean-mmalloc:
  maybe-configure-patch:
  @if patch
  maybe-configure-patch: configure-patch
-configure-patch: 
-       @$(unstage)
+configure-patch:
+       @: $(MAKE); $(unstage)
         @test ! -f $(HOST_SUBDIR)/patch/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/patch ; \
         r=`${PWD_COMMAND}`; export r; \
@@ -19117,7 +19561,7 @@ maybe-all-patch:
  TARGET-patch=all
  maybe-all-patch: all-patch
  all-patch: configure-patch
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -19134,7 +19578,7 @@ maybe-check-patch:
  maybe-check-patch: check-patch
  
  check-patch:
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -19149,7 +19593,7 @@ maybe-install-patch:
  maybe-install-patch: install-patch
  
  install-patch: installdirs
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -19167,7 +19611,7 @@ maybe-info-patch: info-patch
  
  info-patch: \
      configure-patch 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./patch/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -19193,7 +19637,7 @@ maybe-dvi-patch: dvi-patch
  
  dvi-patch: \
      configure-patch 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./patch/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -19219,7 +19663,7 @@ maybe-html-patch: html-patch
  
  html-patch: \
      configure-patch 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./patch/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -19245,7 +19689,7 @@ maybe-TAGS-patch: TAGS-patch
  
  TAGS-patch: \
      configure-patch 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./patch/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -19272,7 +19716,7 @@ maybe-install-info-patch: install-info-patch
  install-info-patch: \
      configure-patch \
      info-patch 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./patch/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -19298,7 +19742,7 @@ maybe-installcheck-patch: installcheck-patch
  
  installcheck-patch: \
      configure-patch 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./patch/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -19323,7 +19767,7 @@ maybe-mostlyclean-patch:
  maybe-mostlyclean-patch: mostlyclean-patch
  
  mostlyclean-patch: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./patch/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -19348,7 +19792,7 @@ maybe-clean-patch:
  maybe-clean-patch: clean-patch
  
  clean-patch: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./patch/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -19373,7 +19817,7 @@ maybe-distclean-patch:
  maybe-distclean-patch: distclean-patch
  
  distclean-patch: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./patch/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -19398,7 +19842,7 @@ maybe-maintainer-clean-patch:
  maybe-maintainer-clean-patch: maintainer-clean-patch
  
  maintainer-clean-patch: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./patch/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -19423,8 +19867,8 @@ maintainer-clean-patch:
  maybe-configure-perl:
  @if perl
  maybe-configure-perl: configure-perl
-configure-perl: 
-       @$(unstage)
+configure-perl:
+       @: $(MAKE); $(unstage)
         @test ! -f $(HOST_SUBDIR)/perl/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/perl ; \
         r=`${PWD_COMMAND}`; export r; \
@@ -19454,7 +19898,7 @@ maybe-all-perl:
  TARGET-perl=all
  maybe-all-perl: all-perl
  all-perl: configure-perl
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -19471,7 +19915,7 @@ maybe-check-perl:
  maybe-check-perl: check-perl
  
  check-perl:
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -19486,7 +19930,7 @@ maybe-install-perl:
  maybe-install-perl: install-perl
  
  install-perl: installdirs
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -19504,7 +19948,7 @@ maybe-info-perl: info-perl
  
  info-perl: \
      configure-perl 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./perl/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -19530,7 +19974,7 @@ maybe-dvi-perl: dvi-perl
  
  dvi-perl: \
      configure-perl 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./perl/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -19556,7 +20000,7 @@ maybe-html-perl: html-perl
  
  html-perl: \
      configure-perl 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./perl/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -19582,7 +20026,7 @@ maybe-TAGS-perl: TAGS-perl
  
  TAGS-perl: \
      configure-perl 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./perl/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -19609,7 +20053,7 @@ maybe-install-info-perl: install-info-perl
  install-info-perl: \
      configure-perl \
      info-perl 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./perl/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -19635,7 +20079,7 @@ maybe-installcheck-perl: installcheck-perl
  
  installcheck-perl: \
      configure-perl 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./perl/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -19660,7 +20104,7 @@ maybe-mostlyclean-perl:
  maybe-mostlyclean-perl: mostlyclean-perl
  
  mostlyclean-perl: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./perl/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -19685,7 +20129,7 @@ maybe-clean-perl:
  maybe-clean-perl: clean-perl
  
  clean-perl: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./perl/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -19710,7 +20154,7 @@ maybe-distclean-perl:
  maybe-distclean-perl: distclean-perl
  
  distclean-perl: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./perl/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -19735,7 +20179,7 @@ maybe-maintainer-clean-perl:
  maybe-maintainer-clean-perl: maintainer-clean-perl
  
  maintainer-clean-perl: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./perl/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -19760,8 +20204,8 @@ maintainer-clean-perl:
  maybe-configure-prms:
  @if prms
  maybe-configure-prms: configure-prms
-configure-prms: 
-       @$(unstage)
+configure-prms:
+       @: $(MAKE); $(unstage)
         @test ! -f $(HOST_SUBDIR)/prms/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/prms ; \
         r=`${PWD_COMMAND}`; export r; \
@@ -19791,7 +20235,7 @@ maybe-all-prms:
  TARGET-prms=all
  maybe-all-prms: all-prms
  all-prms: configure-prms
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -19808,7 +20252,7 @@ maybe-check-prms:
  maybe-check-prms: check-prms
  
  check-prms:
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -19823,7 +20267,7 @@ maybe-install-prms:
  maybe-install-prms: install-prms
  
  install-prms: installdirs
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -19841,7 +20285,7 @@ maybe-info-prms: info-prms
  
  info-prms: \
      configure-prms 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./prms/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -19867,7 +20311,7 @@ maybe-dvi-prms: dvi-prms
  
  dvi-prms: \
      configure-prms 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./prms/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -19893,7 +20337,7 @@ maybe-html-prms: html-prms
  
  html-prms: \
      configure-prms 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./prms/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -19919,7 +20363,7 @@ maybe-TAGS-prms: TAGS-prms
  
  TAGS-prms: \
      configure-prms 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./prms/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -19946,7 +20390,7 @@ maybe-install-info-prms: install-info-prms
  install-info-prms: \
      configure-prms \
      info-prms 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./prms/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -19972,7 +20416,7 @@ maybe-installcheck-prms: installcheck-prms
  
  installcheck-prms: \
      configure-prms 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./prms/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -19997,7 +20441,7 @@ maybe-mostlyclean-prms:
  maybe-mostlyclean-prms: mostlyclean-prms
  
  mostlyclean-prms: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./prms/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -20022,7 +20466,7 @@ maybe-clean-prms:
  maybe-clean-prms: clean-prms
  
  clean-prms: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./prms/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -20047,7 +20491,7 @@ maybe-distclean-prms:
  maybe-distclean-prms: distclean-prms
  
  distclean-prms: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./prms/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -20072,7 +20516,7 @@ maybe-maintainer-clean-prms:
  maybe-maintainer-clean-prms: maintainer-clean-prms
  
  maintainer-clean-prms: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./prms/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -20097,8 +20541,8 @@ maintainer-clean-prms:
  maybe-configure-rcs:
  @if rcs
  maybe-configure-rcs: configure-rcs
-configure-rcs: 
-       @$(unstage)
+configure-rcs:
+       @: $(MAKE); $(unstage)
         @test ! -f $(HOST_SUBDIR)/rcs/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/rcs ; \
         r=`${PWD_COMMAND}`; export r; \
@@ -20128,7 +20572,7 @@ maybe-all-rcs:
  TARGET-rcs=all
  maybe-all-rcs: all-rcs
  all-rcs: configure-rcs
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -20145,7 +20589,7 @@ maybe-check-rcs:
  maybe-check-rcs: check-rcs
  
  check-rcs:
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -20160,7 +20604,7 @@ maybe-install-rcs:
  maybe-install-rcs: install-rcs
  
  install-rcs: installdirs
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -20178,7 +20622,7 @@ maybe-info-rcs: info-rcs
  
  info-rcs: \
      configure-rcs 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./rcs/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -20204,7 +20648,7 @@ maybe-dvi-rcs: dvi-rcs
  
  dvi-rcs: \
      configure-rcs 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./rcs/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -20230,7 +20674,7 @@ maybe-html-rcs: html-rcs
  
  html-rcs: \
      configure-rcs 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./rcs/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -20256,7 +20700,7 @@ maybe-TAGS-rcs: TAGS-rcs
  
  TAGS-rcs: \
      configure-rcs 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./rcs/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -20283,7 +20727,7 @@ maybe-install-info-rcs: install-info-rcs
  install-info-rcs: \
      configure-rcs \
      info-rcs 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./rcs/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -20309,7 +20753,7 @@ maybe-installcheck-rcs: installcheck-rcs
  
  installcheck-rcs: \
      configure-rcs 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./rcs/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -20334,7 +20778,7 @@ maybe-mostlyclean-rcs:
  maybe-mostlyclean-rcs: mostlyclean-rcs
  
  mostlyclean-rcs: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./rcs/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -20359,7 +20803,7 @@ maybe-clean-rcs:
  maybe-clean-rcs: clean-rcs
  
  clean-rcs: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./rcs/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -20384,7 +20828,7 @@ maybe-distclean-rcs:
  maybe-distclean-rcs: distclean-rcs
  
  distclean-rcs: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./rcs/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -20409,7 +20853,7 @@ maybe-maintainer-clean-rcs:
  maybe-maintainer-clean-rcs: maintainer-clean-rcs
  
  maintainer-clean-rcs: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./rcs/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -20434,8 +20878,8 @@ maintainer-clean-rcs:
  maybe-configure-readline:
  @if readline
  maybe-configure-readline: configure-readline
-configure-readline: 
-       @$(unstage)
+configure-readline:
+       @: $(MAKE); $(unstage)
         @test ! -f $(HOST_SUBDIR)/readline/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/readline ; \
         r=`${PWD_COMMAND}`; export r; \
@@ -20465,7 +20909,7 @@ maybe-all-readline:
  TARGET-readline=all
  maybe-all-readline: all-readline
  all-readline: configure-readline
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -20482,7 +20926,7 @@ maybe-check-readline:
  maybe-check-readline: check-readline
  
  check-readline:
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -20497,7 +20941,7 @@ maybe-install-readline:
  maybe-install-readline: install-readline
  
  install-readline: installdirs
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -20515,7 +20959,7 @@ maybe-info-readline: info-readline
  
  info-readline: \
      configure-readline 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./readline/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -20541,7 +20985,7 @@ maybe-dvi-readline: dvi-readline
  
  dvi-readline: \
      configure-readline 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./readline/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -20567,7 +21011,7 @@ maybe-html-readline: html-readline
  
  html-readline: \
      configure-readline 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./readline/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -20593,7 +21037,7 @@ maybe-TAGS-readline: TAGS-readline
  
  TAGS-readline: \
      configure-readline 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./readline/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -20620,7 +21064,7 @@ maybe-install-info-readline: install-info-readline
  install-info-readline: \
      configure-readline \
      info-readline 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./readline/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -20646,7 +21090,7 @@ maybe-installcheck-readline: installcheck-readline
  
  installcheck-readline: \
      configure-readline 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./readline/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -20671,7 +21115,7 @@ maybe-mostlyclean-readline:
  maybe-mostlyclean-readline: mostlyclean-readline
  
  mostlyclean-readline: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./readline/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -20696,7 +21140,7 @@ maybe-clean-readline:
  maybe-clean-readline: clean-readline
  
  clean-readline: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./readline/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -20721,7 +21165,7 @@ maybe-distclean-readline:
  maybe-distclean-readline: distclean-readline
  
  distclean-readline: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./readline/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -20746,7 +21190,7 @@ maybe-maintainer-clean-readline:
  maybe-maintainer-clean-readline: maintainer-clean-readline
  
  maintainer-clean-readline: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./readline/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -20771,8 +21215,8 @@ maintainer-clean-readline:
  maybe-configure-release:
  @if release
  maybe-configure-release: configure-release
-configure-release: 
-       @$(unstage)
+configure-release:
+       @: $(MAKE); $(unstage)
         @test ! -f $(HOST_SUBDIR)/release/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/release ; \
         r=`${PWD_COMMAND}`; export r; \
@@ -20802,7 +21246,7 @@ maybe-all-release:
  TARGET-release=all
  maybe-all-release: all-release
  all-release: configure-release
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -20840,7 +21284,7 @@ maybe-info-release: info-release
  
  info-release: \
      configure-release 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./release/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -20866,7 +21310,7 @@ maybe-dvi-release: dvi-release
  
  dvi-release: \
      configure-release 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./release/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -20892,7 +21336,7 @@ maybe-html-release: html-release
  
  html-release: \
      configure-release 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./release/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -20918,7 +21362,7 @@ maybe-TAGS-release: TAGS-release
  
  TAGS-release: \
      configure-release 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./release/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -20945,7 +21389,7 @@ maybe-install-info-release: install-info-release
  install-info-release: \
      configure-release \
      info-release 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./release/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -20971,7 +21415,7 @@ maybe-installcheck-release: installcheck-release
  
  installcheck-release: \
      configure-release 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./release/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -20996,7 +21440,7 @@ maybe-mostlyclean-release:
  maybe-mostlyclean-release: mostlyclean-release
  
  mostlyclean-release: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./release/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -21021,7 +21465,7 @@ maybe-clean-release:
  maybe-clean-release: clean-release
  
  clean-release: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./release/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -21046,7 +21490,7 @@ maybe-distclean-release:
  maybe-distclean-release: distclean-release
  
  distclean-release: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./release/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -21071,7 +21515,7 @@ maybe-maintainer-clean-release:
  maybe-maintainer-clean-release: maintainer-clean-release
  
  maintainer-clean-release: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./release/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -21096,8 +21540,8 @@ maintainer-clean-release:
  maybe-configure-recode:
  @if recode
  maybe-configure-recode: configure-recode
-configure-recode: 
-       @$(unstage)
+configure-recode:
+       @: $(MAKE); $(unstage)
         @test ! -f $(HOST_SUBDIR)/recode/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/recode ; \
         r=`${PWD_COMMAND}`; export r; \
@@ -21127,7 +21571,7 @@ maybe-all-recode:
  TARGET-recode=all
  maybe-all-recode: all-recode
  all-recode: configure-recode
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -21144,7 +21588,7 @@ maybe-check-recode:
  maybe-check-recode: check-recode
  
  check-recode:
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -21159,7 +21603,7 @@ maybe-install-recode:
  maybe-install-recode: install-recode
  
  install-recode: installdirs
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -21177,7 +21621,7 @@ maybe-info-recode: info-recode
  
  info-recode: \
      configure-recode 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./recode/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -21203,7 +21647,7 @@ maybe-dvi-recode: dvi-recode
  
  dvi-recode: \
      configure-recode 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./recode/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -21229,7 +21673,7 @@ maybe-html-recode: html-recode
  
  html-recode: \
      configure-recode 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./recode/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -21255,7 +21699,7 @@ maybe-TAGS-recode: TAGS-recode
  
  TAGS-recode: \
      configure-recode 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./recode/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -21282,7 +21726,7 @@ maybe-install-info-recode: install-info-recode
  install-info-recode: \
      configure-recode \
      info-recode 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./recode/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -21308,7 +21752,7 @@ maybe-installcheck-recode: installcheck-recode
  
  installcheck-recode: \
      configure-recode 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./recode/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -21333,7 +21777,7 @@ maybe-mostlyclean-recode:
  maybe-mostlyclean-recode: mostlyclean-recode
  
  mostlyclean-recode: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./recode/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -21358,7 +21802,7 @@ maybe-clean-recode:
  maybe-clean-recode: clean-recode
  
  clean-recode: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./recode/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -21383,7 +21827,7 @@ maybe-distclean-recode:
  maybe-distclean-recode: distclean-recode
  
  distclean-recode: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./recode/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -21408,7 +21852,7 @@ maybe-maintainer-clean-recode:
  maybe-maintainer-clean-recode: maintainer-clean-recode
  
  maintainer-clean-recode: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./recode/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -21433,8 +21877,8 @@ maintainer-clean-recode:
  maybe-configure-sed:
  @if sed
  maybe-configure-sed: configure-sed
-configure-sed: 
-       @$(unstage)
+configure-sed:
+       @: $(MAKE); $(unstage)
         @test ! -f $(HOST_SUBDIR)/sed/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/sed ; \
         r=`${PWD_COMMAND}`; export r; \
@@ -21464,7 +21908,7 @@ maybe-all-sed:
  TARGET-sed=all
  maybe-all-sed: all-sed
  all-sed: configure-sed
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -21481,7 +21925,7 @@ maybe-check-sed:
  maybe-check-sed: check-sed
  
  check-sed:
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -21496,7 +21940,7 @@ maybe-install-sed:
  maybe-install-sed: install-sed
  
  install-sed: installdirs
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -21514,7 +21958,7 @@ maybe-info-sed: info-sed
  
  info-sed: \
      configure-sed 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./sed/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -21540,7 +21984,7 @@ maybe-dvi-sed: dvi-sed
  
  dvi-sed: \
      configure-sed 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./sed/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -21566,7 +22010,7 @@ maybe-html-sed: html-sed
  
  html-sed: \
      configure-sed 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./sed/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -21592,7 +22036,7 @@ maybe-TAGS-sed: TAGS-sed
  
  TAGS-sed: \
      configure-sed 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./sed/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -21619,7 +22063,7 @@ maybe-install-info-sed: install-info-sed
  install-info-sed: \
      configure-sed \
      info-sed 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./sed/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -21645,7 +22089,7 @@ maybe-installcheck-sed: installcheck-sed
  
  installcheck-sed: \
      configure-sed 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./sed/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -21670,7 +22114,7 @@ maybe-mostlyclean-sed:
  maybe-mostlyclean-sed: mostlyclean-sed
  
  mostlyclean-sed: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./sed/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -21695,7 +22139,7 @@ maybe-clean-sed:
  maybe-clean-sed: clean-sed
  
  clean-sed: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./sed/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -21720,7 +22164,7 @@ maybe-distclean-sed:
  maybe-distclean-sed: distclean-sed
  
  distclean-sed: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./sed/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -21745,7 +22189,7 @@ maybe-maintainer-clean-sed:
  maybe-maintainer-clean-sed: maintainer-clean-sed
  
  maintainer-clean-sed: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./sed/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -21770,8 +22214,8 @@ maintainer-clean-sed:
  maybe-configure-send-pr:
  @if send-pr
  maybe-configure-send-pr: configure-send-pr
-configure-send-pr: 
-       @$(unstage)
+configure-send-pr:
+       @: $(MAKE); $(unstage)
         @test ! -f $(HOST_SUBDIR)/send-pr/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/send-pr ; \
         r=`${PWD_COMMAND}`; export r; \
@@ -21801,7 +22245,7 @@ maybe-all-send-pr:
  TARGET-send-pr=all
  maybe-all-send-pr: all-send-pr
  all-send-pr: configure-send-pr
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -21818,7 +22262,7 @@ maybe-check-send-pr:
  maybe-check-send-pr: check-send-pr
  
  check-send-pr:
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -21833,7 +22277,7 @@ maybe-install-send-pr:
  maybe-install-send-pr: install-send-pr
  
  install-send-pr: installdirs
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -21851,7 +22295,7 @@ maybe-info-send-pr: info-send-pr
  
  info-send-pr: \
      configure-send-pr 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./send-pr/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -21877,7 +22321,7 @@ maybe-dvi-send-pr: dvi-send-pr
  
  dvi-send-pr: \
      configure-send-pr 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./send-pr/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -21903,7 +22347,7 @@ maybe-html-send-pr: html-send-pr
  
  html-send-pr: \
      configure-send-pr 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./send-pr/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -21929,7 +22373,7 @@ maybe-TAGS-send-pr: TAGS-send-pr
  
  TAGS-send-pr: \
      configure-send-pr 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./send-pr/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -21956,7 +22400,7 @@ maybe-install-info-send-pr: install-info-send-pr
  install-info-send-pr: \
      configure-send-pr \
      info-send-pr 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./send-pr/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -21982,7 +22426,7 @@ maybe-installcheck-send-pr: installcheck-send-pr
  
  installcheck-send-pr: \
      configure-send-pr 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./send-pr/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -22007,7 +22451,7 @@ maybe-mostlyclean-send-pr:
  maybe-mostlyclean-send-pr: mostlyclean-send-pr
  
  mostlyclean-send-pr: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./send-pr/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -22032,7 +22476,7 @@ maybe-clean-send-pr:
  maybe-clean-send-pr: clean-send-pr
  
  clean-send-pr: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./send-pr/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -22057,7 +22501,7 @@ maybe-distclean-send-pr:
  maybe-distclean-send-pr: distclean-send-pr
  
  distclean-send-pr: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./send-pr/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -22082,7 +22526,7 @@ maybe-maintainer-clean-send-pr:
  maybe-maintainer-clean-send-pr: maintainer-clean-send-pr
  
  maintainer-clean-send-pr: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./send-pr/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -22107,8 +22551,8 @@ maintainer-clean-send-pr:
  maybe-configure-shellutils:
  @if shellutils
  maybe-configure-shellutils: configure-shellutils
-configure-shellutils: 
-       @$(unstage)
+configure-shellutils:
+       @: $(MAKE); $(unstage)
         @test ! -f $(HOST_SUBDIR)/shellutils/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/shellutils ; \
         r=`${PWD_COMMAND}`; export r; \
@@ -22138,7 +22582,7 @@ maybe-all-shellutils:
  TARGET-shellutils=all
  maybe-all-shellutils: all-shellutils
  all-shellutils: configure-shellutils
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -22155,7 +22599,7 @@ maybe-check-shellutils:
  maybe-check-shellutils: check-shellutils
  
  check-shellutils:
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -22170,7 +22614,7 @@ maybe-install-shellutils:
  maybe-install-shellutils: install-shellutils
  
  install-shellutils: installdirs
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -22188,7 +22632,7 @@ maybe-info-shellutils: info-shellutils
  
  info-shellutils: \
      configure-shellutils 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./shellutils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -22214,7 +22658,7 @@ maybe-dvi-shellutils: dvi-shellutils
  
  dvi-shellutils: \
      configure-shellutils 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./shellutils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -22240,7 +22684,7 @@ maybe-html-shellutils: html-shellutils
  
  html-shellutils: \
      configure-shellutils 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./shellutils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -22266,7 +22710,7 @@ maybe-TAGS-shellutils: TAGS-shellutils
  
  TAGS-shellutils: \
      configure-shellutils 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./shellutils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -22293,7 +22737,7 @@ maybe-install-info-shellutils: install-info-shellutils
  install-info-shellutils: \
      configure-shellutils \
      info-shellutils 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./shellutils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -22319,7 +22763,7 @@ maybe-installcheck-shellutils: installcheck-shellutils
  
  installcheck-shellutils: \
      configure-shellutils 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./shellutils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -22344,7 +22788,7 @@ maybe-mostlyclean-shellutils:
  maybe-mostlyclean-shellutils: mostlyclean-shellutils
  
  mostlyclean-shellutils: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./shellutils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -22369,7 +22813,7 @@ maybe-clean-shellutils:
  maybe-clean-shellutils: clean-shellutils
  
  clean-shellutils: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./shellutils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -22394,7 +22838,7 @@ maybe-distclean-shellutils:
  maybe-distclean-shellutils: distclean-shellutils
  
  distclean-shellutils: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./shellutils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -22419,7 +22863,7 @@ maybe-maintainer-clean-shellutils:
  maybe-maintainer-clean-shellutils: maintainer-clean-shellutils
  
  maintainer-clean-shellutils: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./shellutils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -22444,8 +22888,8 @@ maintainer-clean-shellutils:
  maybe-configure-sid:
  @if sid
  maybe-configure-sid: configure-sid
-configure-sid: 
-       @$(unstage)
+configure-sid:
+       @: $(MAKE); $(unstage)
         @test ! -f $(HOST_SUBDIR)/sid/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/sid ; \
         r=`${PWD_COMMAND}`; export r; \
@@ -22475,7 +22919,7 @@ maybe-all-sid:
  TARGET-sid=all
  maybe-all-sid: all-sid
  all-sid: configure-sid
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -22492,7 +22936,7 @@ maybe-check-sid:
  maybe-check-sid: check-sid
  
  check-sid:
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -22507,7 +22951,7 @@ maybe-install-sid:
  maybe-install-sid: install-sid
  
  install-sid: installdirs
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -22525,7 +22969,7 @@ maybe-info-sid: info-sid
  
  info-sid: \
      configure-sid 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./sid/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -22551,7 +22995,7 @@ maybe-dvi-sid: dvi-sid
  
  dvi-sid: \
      configure-sid 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./sid/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -22577,7 +23021,7 @@ maybe-html-sid: html-sid
  
  html-sid: \
      configure-sid 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./sid/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -22603,7 +23047,7 @@ maybe-TAGS-sid: TAGS-sid
  
  TAGS-sid: \
      configure-sid 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./sid/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -22630,7 +23074,7 @@ maybe-install-info-sid: install-info-sid
  install-info-sid: \
      configure-sid \
      info-sid 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./sid/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -22656,7 +23100,7 @@ maybe-installcheck-sid: installcheck-sid
  
  installcheck-sid: \
      configure-sid 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./sid/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -22681,7 +23125,7 @@ maybe-mostlyclean-sid:
  maybe-mostlyclean-sid: mostlyclean-sid
  
  mostlyclean-sid: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./sid/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -22706,7 +23150,7 @@ maybe-clean-sid:
  maybe-clean-sid: clean-sid
  
  clean-sid: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./sid/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -22731,7 +23175,7 @@ maybe-distclean-sid:
  maybe-distclean-sid: distclean-sid
  
  distclean-sid: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./sid/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -22756,7 +23200,7 @@ maybe-maintainer-clean-sid:
  maybe-maintainer-clean-sid: maintainer-clean-sid
  
  maintainer-clean-sid: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./sid/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -22781,8 +23225,8 @@ maintainer-clean-sid:
  maybe-configure-sim:
  @if sim
  maybe-configure-sim: configure-sim
-configure-sim: 
-       @$(unstage)
+configure-sim:
+       @: $(MAKE); $(unstage)
         @test ! -f $(HOST_SUBDIR)/sim/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/sim ; \
         r=`${PWD_COMMAND}`; export r; \
@@ -22812,7 +23256,7 @@ maybe-all-sim:
  TARGET-sim=all
  maybe-all-sim: all-sim
  all-sim: configure-sim
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -22829,7 +23273,7 @@ maybe-check-sim:
  maybe-check-sim: check-sim
  
  check-sim:
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -22844,7 +23288,7 @@ maybe-install-sim:
  maybe-install-sim: install-sim
  
  install-sim: installdirs
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -22862,7 +23306,7 @@ maybe-info-sim: info-sim
  
  info-sim: \
      configure-sim 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./sim/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -22888,7 +23332,7 @@ maybe-dvi-sim: dvi-sim
  
  dvi-sim: \
      configure-sim 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./sim/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -22914,7 +23358,7 @@ maybe-html-sim: html-sim
  
  html-sim: \
      configure-sim 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./sim/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -22940,7 +23384,7 @@ maybe-TAGS-sim: TAGS-sim
  
  TAGS-sim: \
      configure-sim 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./sim/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -22967,7 +23411,7 @@ maybe-install-info-sim: install-info-sim
  install-info-sim: \
      configure-sim \
      info-sim 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./sim/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -22993,7 +23437,7 @@ maybe-installcheck-sim: installcheck-sim
  
  installcheck-sim: \
      configure-sim 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./sim/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -23018,7 +23462,7 @@ maybe-mostlyclean-sim:
  maybe-mostlyclean-sim: mostlyclean-sim
  
  mostlyclean-sim: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./sim/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -23043,7 +23487,7 @@ maybe-clean-sim:
  maybe-clean-sim: clean-sim
  
  clean-sim: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./sim/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -23068,7 +23512,7 @@ maybe-distclean-sim:
  maybe-distclean-sim: distclean-sim
  
  distclean-sim: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./sim/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -23093,7 +23537,7 @@ maybe-maintainer-clean-sim:
  maybe-maintainer-clean-sim: maintainer-clean-sim
  
  maintainer-clean-sim: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./sim/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -23118,8 +23562,8 @@ maintainer-clean-sim:
  maybe-configure-tar:
  @if tar
  maybe-configure-tar: configure-tar
-configure-tar: 
-       @$(unstage)
+configure-tar:
+       @: $(MAKE); $(unstage)
         @test ! -f $(HOST_SUBDIR)/tar/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/tar ; \
         r=`${PWD_COMMAND}`; export r; \
@@ -23149,7 +23593,7 @@ maybe-all-tar:
  TARGET-tar=all
  maybe-all-tar: all-tar
  all-tar: configure-tar
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -23166,7 +23610,7 @@ maybe-check-tar:
  maybe-check-tar: check-tar
  
  check-tar:
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -23181,7 +23625,7 @@ maybe-install-tar:
  maybe-install-tar: install-tar
  
  install-tar: installdirs
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -23199,7 +23643,7 @@ maybe-info-tar: info-tar
  
  info-tar: \
      configure-tar 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./tar/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -23225,7 +23669,7 @@ maybe-dvi-tar: dvi-tar
  
  dvi-tar: \
      configure-tar 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./tar/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -23251,7 +23695,7 @@ maybe-html-tar: html-tar
  
  html-tar: \
      configure-tar 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./tar/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -23277,7 +23721,7 @@ maybe-TAGS-tar: TAGS-tar
  
  TAGS-tar: \
      configure-tar 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./tar/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -23304,7 +23748,7 @@ maybe-install-info-tar: install-info-tar
  install-info-tar: \
      configure-tar \
      info-tar 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./tar/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -23330,7 +23774,7 @@ maybe-installcheck-tar: installcheck-tar
  
  installcheck-tar: \
      configure-tar 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./tar/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -23355,7 +23799,7 @@ maybe-mostlyclean-tar:
  maybe-mostlyclean-tar: mostlyclean-tar
  
  mostlyclean-tar: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./tar/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -23380,7 +23824,7 @@ maybe-clean-tar:
  maybe-clean-tar: clean-tar
  
  clean-tar: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./tar/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -23405,7 +23849,7 @@ maybe-distclean-tar:
  maybe-distclean-tar: distclean-tar
  
  distclean-tar: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./tar/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -23430,7 +23874,7 @@ maybe-maintainer-clean-tar:
  maybe-maintainer-clean-tar: maintainer-clean-tar
  
  maintainer-clean-tar: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./tar/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -23455,8 +23899,8 @@ maintainer-clean-tar:
  maybe-configure-texinfo:
  @if texinfo
  maybe-configure-texinfo: configure-texinfo
-configure-texinfo: 
-       @$(unstage)
+configure-texinfo:
+       @: $(MAKE); $(unstage)
         @test ! -f $(HOST_SUBDIR)/texinfo/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/texinfo ; \
         r=`${PWD_COMMAND}`; export r; \
@@ -23486,7 +23930,7 @@ maybe-all-texinfo:
  TARGET-texinfo=all
  maybe-all-texinfo: all-texinfo
  all-texinfo: configure-texinfo
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -23503,7 +23947,7 @@ maybe-check-texinfo:
  maybe-check-texinfo: check-texinfo
  
  check-texinfo:
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -23530,7 +23974,7 @@ maybe-info-texinfo: info-texinfo
  
  info-texinfo: \
      configure-texinfo 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./texinfo/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -23556,7 +24000,7 @@ maybe-dvi-texinfo: dvi-texinfo
  
  dvi-texinfo: \
      configure-texinfo 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./texinfo/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -23582,7 +24026,7 @@ maybe-html-texinfo: html-texinfo
  
  html-texinfo: \
      configure-texinfo 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./texinfo/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -23608,7 +24052,7 @@ maybe-TAGS-texinfo: TAGS-texinfo
  
  TAGS-texinfo: \
      configure-texinfo 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./texinfo/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -23635,7 +24079,7 @@ maybe-install-info-texinfo: install-info-texinfo
  install-info-texinfo: \
      configure-texinfo \
      info-texinfo 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./texinfo/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -23661,7 +24105,7 @@ maybe-installcheck-texinfo: installcheck-texinfo
  
  installcheck-texinfo: \
      configure-texinfo 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./texinfo/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -23686,7 +24130,7 @@ maybe-mostlyclean-texinfo:
  maybe-mostlyclean-texinfo: mostlyclean-texinfo
  
  mostlyclean-texinfo: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./texinfo/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -23711,7 +24155,7 @@ maybe-clean-texinfo:
  maybe-clean-texinfo: clean-texinfo
  
  clean-texinfo: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./texinfo/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -23736,7 +24180,7 @@ maybe-distclean-texinfo:
  maybe-distclean-texinfo: distclean-texinfo
  
  distclean-texinfo: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./texinfo/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -23761,7 +24205,7 @@ maybe-maintainer-clean-texinfo:
  maybe-maintainer-clean-texinfo: maintainer-clean-texinfo
  
  maintainer-clean-texinfo: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./texinfo/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -23786,8 +24230,8 @@ maintainer-clean-texinfo:
  maybe-configure-textutils:
  @if textutils
  maybe-configure-textutils: configure-textutils
-configure-textutils: 
-       @$(unstage)
+configure-textutils:
+       @: $(MAKE); $(unstage)
         @test ! -f $(HOST_SUBDIR)/textutils/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/textutils ; \
         r=`${PWD_COMMAND}`; export r; \
@@ -23817,7 +24261,7 @@ maybe-all-textutils:
  TARGET-textutils=all
  maybe-all-textutils: all-textutils
  all-textutils: configure-textutils
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -23834,7 +24278,7 @@ maybe-check-textutils:
  maybe-check-textutils: check-textutils
  
  check-textutils:
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -23849,7 +24293,7 @@ maybe-install-textutils:
  maybe-install-textutils: install-textutils
  
  install-textutils: installdirs
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -23867,7 +24311,7 @@ maybe-info-textutils: info-textutils
  
  info-textutils: \
      configure-textutils 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./textutils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -23893,7 +24337,7 @@ maybe-dvi-textutils: dvi-textutils
  
  dvi-textutils: \
      configure-textutils 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./textutils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -23919,7 +24363,7 @@ maybe-html-textutils: html-textutils
  
  html-textutils: \
      configure-textutils 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./textutils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -23945,7 +24389,7 @@ maybe-TAGS-textutils: TAGS-textutils
  
  TAGS-textutils: \
      configure-textutils 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./textutils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -23972,7 +24416,7 @@ maybe-install-info-textutils: install-info-textutils
  install-info-textutils: \
      configure-textutils \
      info-textutils 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./textutils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -23998,7 +24442,7 @@ maybe-installcheck-textutils: installcheck-textutils
  
  installcheck-textutils: \
      configure-textutils 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./textutils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -24023,7 +24467,7 @@ maybe-mostlyclean-textutils:
  maybe-mostlyclean-textutils: mostlyclean-textutils
  
  mostlyclean-textutils: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./textutils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -24048,7 +24492,7 @@ maybe-clean-textutils:
  maybe-clean-textutils: clean-textutils
  
  clean-textutils: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./textutils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -24073,7 +24517,7 @@ maybe-distclean-textutils:
  maybe-distclean-textutils: distclean-textutils
  
  distclean-textutils: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./textutils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -24098,7 +24542,7 @@ maybe-maintainer-clean-textutils:
  maybe-maintainer-clean-textutils: maintainer-clean-textutils
  
  maintainer-clean-textutils: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./textutils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -24123,8 +24567,8 @@ maintainer-clean-textutils:
  maybe-configure-time:
  @if time
  maybe-configure-time: configure-time
-configure-time: 
-       @$(unstage)
+configure-time:
+       @: $(MAKE); $(unstage)
         @test ! -f $(HOST_SUBDIR)/time/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/time ; \
         r=`${PWD_COMMAND}`; export r; \
@@ -24154,7 +24598,7 @@ maybe-all-time:
  TARGET-time=all
  maybe-all-time: all-time
  all-time: configure-time
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -24171,7 +24615,7 @@ maybe-check-time:
  maybe-check-time: check-time
  
  check-time:
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -24186,7 +24630,7 @@ maybe-install-time:
  maybe-install-time: install-time
  
  install-time: installdirs
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -24204,7 +24648,7 @@ maybe-info-time: info-time
  
  info-time: \
      configure-time 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./time/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -24230,7 +24674,7 @@ maybe-dvi-time: dvi-time
  
  dvi-time: \
      configure-time 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./time/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -24256,7 +24700,7 @@ maybe-html-time: html-time
  
  html-time: \
      configure-time 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./time/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -24282,7 +24726,7 @@ maybe-TAGS-time: TAGS-time
  
  TAGS-time: \
      configure-time 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./time/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -24309,7 +24753,7 @@ maybe-install-info-time: install-info-time
  install-info-time: \
      configure-time \
      info-time 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./time/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -24335,7 +24779,7 @@ maybe-installcheck-time: installcheck-time
  
  installcheck-time: \
      configure-time 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./time/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -24360,7 +24804,7 @@ maybe-mostlyclean-time:
  maybe-mostlyclean-time: mostlyclean-time
  
  mostlyclean-time: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./time/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -24385,7 +24829,7 @@ maybe-clean-time:
  maybe-clean-time: clean-time
  
  clean-time: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./time/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -24410,7 +24854,7 @@ maybe-distclean-time:
  maybe-distclean-time: distclean-time
  
  distclean-time: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./time/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -24435,7 +24879,7 @@ maybe-maintainer-clean-time:
  maybe-maintainer-clean-time: maintainer-clean-time
  
  maintainer-clean-time: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./time/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -24460,8 +24904,8 @@ maintainer-clean-time:
  maybe-configure-uudecode:
  @if uudecode
  maybe-configure-uudecode: configure-uudecode
-configure-uudecode: 
-       @$(unstage)
+configure-uudecode:
+       @: $(MAKE); $(unstage)
         @test ! -f $(HOST_SUBDIR)/uudecode/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/uudecode ; \
         r=`${PWD_COMMAND}`; export r; \
@@ -24491,7 +24935,7 @@ maybe-all-uudecode:
  TARGET-uudecode=all
  maybe-all-uudecode: all-uudecode
  all-uudecode: configure-uudecode
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -24508,7 +24952,7 @@ maybe-check-uudecode:
  maybe-check-uudecode: check-uudecode
  
  check-uudecode:
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -24523,7 +24967,7 @@ maybe-install-uudecode:
  maybe-install-uudecode: install-uudecode
  
  install-uudecode: installdirs
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -24541,7 +24985,7 @@ maybe-info-uudecode: info-uudecode
  
  info-uudecode: \
      configure-uudecode 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./uudecode/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -24567,7 +25011,7 @@ maybe-dvi-uudecode: dvi-uudecode
  
  dvi-uudecode: \
      configure-uudecode 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./uudecode/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -24593,7 +25037,7 @@ maybe-html-uudecode: html-uudecode
  
  html-uudecode: \
      configure-uudecode 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./uudecode/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -24619,7 +25063,7 @@ maybe-TAGS-uudecode: TAGS-uudecode
  
  TAGS-uudecode: \
      configure-uudecode 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./uudecode/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -24646,7 +25090,7 @@ maybe-install-info-uudecode: install-info-uudecode
  install-info-uudecode: \
      configure-uudecode \
      info-uudecode 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./uudecode/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -24672,7 +25116,7 @@ maybe-installcheck-uudecode: installcheck-uudecode
  
  installcheck-uudecode: \
      configure-uudecode 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./uudecode/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -24697,7 +25141,7 @@ maybe-mostlyclean-uudecode:
  maybe-mostlyclean-uudecode: mostlyclean-uudecode
  
  mostlyclean-uudecode: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./uudecode/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -24722,7 +25166,7 @@ maybe-clean-uudecode:
  maybe-clean-uudecode: clean-uudecode
  
  clean-uudecode: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./uudecode/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -24747,7 +25191,7 @@ maybe-distclean-uudecode:
  maybe-distclean-uudecode: distclean-uudecode
  
  distclean-uudecode: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./uudecode/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -24772,7 +25216,7 @@ maybe-maintainer-clean-uudecode:
  maybe-maintainer-clean-uudecode: maintainer-clean-uudecode
  
  maintainer-clean-uudecode: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./uudecode/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -24797,8 +25241,8 @@ maintainer-clean-uudecode:
  maybe-configure-wdiff:
  @if wdiff
  maybe-configure-wdiff: configure-wdiff
-configure-wdiff: 
-       @$(unstage)
+configure-wdiff:
+       @: $(MAKE); $(unstage)
         @test ! -f $(HOST_SUBDIR)/wdiff/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/wdiff ; \
         r=`${PWD_COMMAND}`; export r; \
@@ -24828,7 +25272,7 @@ maybe-all-wdiff:
  TARGET-wdiff=all
  maybe-all-wdiff: all-wdiff
  all-wdiff: configure-wdiff
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -24845,7 +25289,7 @@ maybe-check-wdiff:
  maybe-check-wdiff: check-wdiff
  
  check-wdiff:
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -24860,7 +25304,7 @@ maybe-install-wdiff:
  maybe-install-wdiff: install-wdiff
  
  install-wdiff: installdirs
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -24878,7 +25322,7 @@ maybe-info-wdiff: info-wdiff
  
  info-wdiff: \
      configure-wdiff 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./wdiff/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -24904,7 +25348,7 @@ maybe-dvi-wdiff: dvi-wdiff
  
  dvi-wdiff: \
      configure-wdiff 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./wdiff/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -24930,7 +25374,7 @@ maybe-html-wdiff: html-wdiff
  
  html-wdiff: \
      configure-wdiff 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./wdiff/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -24956,7 +25400,7 @@ maybe-TAGS-wdiff: TAGS-wdiff
  
  TAGS-wdiff: \
      configure-wdiff 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./wdiff/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -24983,7 +25427,7 @@ maybe-install-info-wdiff: install-info-wdiff
  install-info-wdiff: \
      configure-wdiff \
      info-wdiff 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./wdiff/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -25009,7 +25453,7 @@ maybe-installcheck-wdiff: installcheck-wdiff
  
  installcheck-wdiff: \
      configure-wdiff 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./wdiff/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -25034,7 +25478,7 @@ maybe-mostlyclean-wdiff:
  maybe-mostlyclean-wdiff: mostlyclean-wdiff
  
  mostlyclean-wdiff: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./wdiff/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -25059,7 +25503,7 @@ maybe-clean-wdiff:
  maybe-clean-wdiff: clean-wdiff
  
  clean-wdiff: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./wdiff/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -25084,7 +25528,7 @@ maybe-distclean-wdiff:
  maybe-distclean-wdiff: distclean-wdiff
  
  distclean-wdiff: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./wdiff/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -25109,7 +25553,7 @@ maybe-maintainer-clean-wdiff:
  maybe-maintainer-clean-wdiff: maintainer-clean-wdiff
  
  maintainer-clean-wdiff: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./wdiff/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -25134,8 +25578,8 @@ maintainer-clean-wdiff:
  maybe-configure-zip:
  @if zip
  maybe-configure-zip: configure-zip
-configure-zip: 
-       @$(unstage)
+configure-zip:
+       @: $(MAKE); $(unstage)
         @test ! -f $(HOST_SUBDIR)/zip/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zip ; \
         r=`${PWD_COMMAND}`; export r; \
@@ -25165,7 +25609,7 @@ maybe-all-zip:
  TARGET-zip=all
  maybe-all-zip: all-zip
  all-zip: configure-zip
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -25183,7 +25627,7 @@ maybe-check-zip: check-zip
  
  # This module is only tested in a native toolchain.
  check-zip:
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @if [ '$(host)' = '$(target)' ] ; then \
           r=`${PWD_COMMAND}`; export r; \
           s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -25200,7 +25644,7 @@ maybe-install-zip:
  maybe-install-zip: install-zip
  
  install-zip: installdirs
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -25218,7 +25662,7 @@ maybe-info-zip: info-zip
  
  info-zip: \
      configure-zip 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./zip/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -25244,7 +25688,7 @@ maybe-dvi-zip: dvi-zip
  
  dvi-zip: \
      configure-zip 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./zip/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -25270,7 +25714,7 @@ maybe-html-zip: html-zip
  
  html-zip: \
      configure-zip 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./zip/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -25296,7 +25740,7 @@ maybe-TAGS-zip: TAGS-zip
  
  TAGS-zip: \
      configure-zip 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./zip/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -25323,7 +25767,7 @@ maybe-install-info-zip: install-info-zip
  install-info-zip: \
      configure-zip \
      info-zip 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./zip/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -25349,7 +25793,7 @@ maybe-installcheck-zip: installcheck-zip
  
  installcheck-zip: \
      configure-zip 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./zip/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -25374,7 +25818,7 @@ maybe-mostlyclean-zip:
  maybe-mostlyclean-zip: mostlyclean-zip
  
  mostlyclean-zip: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./zip/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -25399,7 +25843,7 @@ maybe-clean-zip:
  maybe-clean-zip: clean-zip
  
  clean-zip: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./zip/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -25424,7 +25868,7 @@ maybe-distclean-zip:
  maybe-distclean-zip: distclean-zip
  
  distclean-zip: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./zip/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -25449,7 +25893,7 @@ maybe-maintainer-clean-zip:
  maybe-maintainer-clean-zip: maintainer-clean-zip
  
  maintainer-clean-zip: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./zip/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -25474,7 +25918,7 @@ maintainer-clean-zip:
  maybe-configure-zlib:
  @if zlib
  maybe-configure-zlib: configure-zlib
-configure-zlib: 
+configure-zlib:
         @test -f stage_last && exit 0; \
         test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \
@@ -25501,13 +25945,13 @@ configure-zlib:
  maybe-configure-stage1-zlib:
  @if zlib-bootstrap
  maybe-configure-stage1-zlib: configure-stage1-zlib
-configure-stage1-zlib: 
+configure-stage1-zlib:
         @[ `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; \
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib
+       test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \
         $(HOST_EXPORTS) \
         echo Configuring stage 1 in $(HOST_SUBDIR)/zlib ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \
         cd $(HOST_SUBDIR)/zlib || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -25525,14 +25969,14 @@ configure-stage1-zlib:
  maybe-configure-stage2-zlib:
  @if zlib-bootstrap
  maybe-configure-stage2-zlib: configure-stage2-zlib
-configure-stage2-zlib: 
+configure-stage2-zlib:
         @[ `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; \
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib
+       test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS) \
         echo Configuring stage 2 in $(HOST_SUBDIR)/zlib ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \
         cd $(HOST_SUBDIR)/zlib || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -25550,14 +25994,14 @@ configure-stage2-zlib:
  maybe-configure-stage3-zlib:
  @if zlib-bootstrap
  maybe-configure-stage3-zlib: configure-stage3-zlib
-configure-stage3-zlib: 
+configure-stage3-zlib:
         @[ `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; \
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib
+       test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS) \
         echo Configuring stage 3 in $(HOST_SUBDIR)/zlib ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \
         cd $(HOST_SUBDIR)/zlib || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -25575,14 +26019,14 @@ configure-stage3-zlib:
  maybe-configure-stage4-zlib:
  @if zlib-bootstrap
  maybe-configure-stage4-zlib: configure-stage4-zlib
-configure-stage4-zlib: 
+configure-stage4-zlib:
         @[ `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; \
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib
+       test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS) \
         echo Configuring stage 4 in $(HOST_SUBDIR)/zlib ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \
         cd $(HOST_SUBDIR)/zlib || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -25600,14 +26044,14 @@ configure-stage4-zlib:
  maybe-configure-stageprofile-zlib:
  @if zlib-bootstrap
  maybe-configure-stageprofile-zlib: configure-stageprofile-zlib
-configure-stageprofile-zlib: 
+configure-stageprofile-zlib:
         @[ `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; \
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib
+       test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS) \
         echo Configuring stage profile in $(HOST_SUBDIR)/zlib ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \
         cd $(HOST_SUBDIR)/zlib || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -25625,14 +26069,14 @@ configure-stageprofile-zlib:
  maybe-configure-stagefeedback-zlib:
  @if zlib-bootstrap
  maybe-configure-stagefeedback-zlib: configure-stagefeedback-zlib
-configure-stagefeedback-zlib: 
+configure-stagefeedback-zlib:
         @[ `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; \
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib
+       test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS) \
         echo Configuring stage feedback in $(HOST_SUBDIR)/zlib ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \
         cd $(HOST_SUBDIR)/zlib || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -26126,8 +26570,8 @@ maintainer-clean-zlib:
  maybe-configure-gdb:
  @if gdb
  maybe-configure-gdb: configure-gdb
-configure-gdb: 
-       @$(unstage)
+configure-gdb:
+       @: $(MAKE); $(unstage)
         @test ! -f $(HOST_SUBDIR)/gdb/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gdb ; \
         r=`${PWD_COMMAND}`; export r; \
@@ -26157,7 +26601,7 @@ maybe-all-gdb:
  TARGET-gdb=all
  maybe-all-gdb: all-gdb
  all-gdb: configure-gdb
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -26174,7 +26618,7 @@ maybe-check-gdb:
  maybe-check-gdb: check-gdb
  
  check-gdb:
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -26189,7 +26633,7 @@ maybe-install-gdb:
  maybe-install-gdb: install-gdb
  
  install-gdb: installdirs
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -26207,7 +26651,7 @@ maybe-info-gdb: info-gdb
  
  info-gdb: \
      configure-gdb 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./gdb/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -26233,7 +26677,7 @@ maybe-dvi-gdb: dvi-gdb
  
  dvi-gdb: \
      configure-gdb 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./gdb/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -26259,7 +26703,7 @@ maybe-html-gdb: html-gdb
  
  html-gdb: \
      configure-gdb 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./gdb/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -26285,7 +26729,7 @@ maybe-TAGS-gdb: TAGS-gdb
  
  TAGS-gdb: \
      configure-gdb 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./gdb/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -26312,7 +26756,7 @@ maybe-install-info-gdb: install-info-gdb
  install-info-gdb: \
      configure-gdb \
      info-gdb 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./gdb/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -26338,7 +26782,7 @@ maybe-installcheck-gdb: installcheck-gdb
  
  installcheck-gdb: \
      configure-gdb 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./gdb/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -26363,7 +26807,7 @@ maybe-mostlyclean-gdb:
  maybe-mostlyclean-gdb: mostlyclean-gdb
  
  mostlyclean-gdb: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./gdb/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -26388,7 +26832,7 @@ maybe-clean-gdb:
  maybe-clean-gdb: clean-gdb
  
  clean-gdb: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./gdb/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -26413,7 +26857,7 @@ maybe-distclean-gdb:
  maybe-distclean-gdb: distclean-gdb
  
  distclean-gdb: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./gdb/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -26438,7 +26882,7 @@ maybe-maintainer-clean-gdb:
  maybe-maintainer-clean-gdb: maintainer-clean-gdb
  
  maintainer-clean-gdb: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./gdb/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -26463,8 +26907,8 @@ maintainer-clean-gdb:
  maybe-configure-expect:
  @if expect
  maybe-configure-expect: configure-expect
-configure-expect: 
-       @$(unstage)
+configure-expect:
+       @: $(MAKE); $(unstage)
         @test ! -f $(HOST_SUBDIR)/expect/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/expect ; \
         r=`${PWD_COMMAND}`; export r; \
@@ -26494,7 +26938,7 @@ maybe-all-expect:
  TARGET-expect=all
  maybe-all-expect: all-expect
  all-expect: configure-expect
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -26511,7 +26955,7 @@ maybe-check-expect:
  maybe-check-expect: check-expect
  
  check-expect:
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -26526,7 +26970,7 @@ maybe-install-expect:
  maybe-install-expect: install-expect
  
  install-expect: installdirs
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -26544,7 +26988,7 @@ maybe-info-expect: info-expect
  
  info-expect: \
      configure-expect 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./expect/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -26570,7 +27014,7 @@ maybe-dvi-expect: dvi-expect
  
  dvi-expect: \
      configure-expect 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./expect/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -26596,7 +27040,7 @@ maybe-html-expect: html-expect
  
  html-expect: \
      configure-expect 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./expect/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -26622,7 +27066,7 @@ maybe-TAGS-expect: TAGS-expect
  
  TAGS-expect: \
      configure-expect 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./expect/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -26649,7 +27093,7 @@ maybe-install-info-expect: install-info-expect
  install-info-expect: \
      configure-expect \
      info-expect 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./expect/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -26675,7 +27119,7 @@ maybe-installcheck-expect: installcheck-expect
  
  installcheck-expect: \
      configure-expect 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./expect/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -26700,7 +27144,7 @@ maybe-mostlyclean-expect:
  maybe-mostlyclean-expect: mostlyclean-expect
  
  mostlyclean-expect: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./expect/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -26725,7 +27169,7 @@ maybe-clean-expect:
  maybe-clean-expect: clean-expect
  
  clean-expect: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./expect/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -26750,7 +27194,7 @@ maybe-distclean-expect:
  maybe-distclean-expect: distclean-expect
  
  distclean-expect: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./expect/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -26775,7 +27219,7 @@ maybe-maintainer-clean-expect:
  maybe-maintainer-clean-expect: maintainer-clean-expect
  
  maintainer-clean-expect: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./expect/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -26800,8 +27244,8 @@ maintainer-clean-expect:
  maybe-configure-guile:
  @if guile
  maybe-configure-guile: configure-guile
-configure-guile: 
-       @$(unstage)
+configure-guile:
+       @: $(MAKE); $(unstage)
         @test ! -f $(HOST_SUBDIR)/guile/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/guile ; \
         r=`${PWD_COMMAND}`; export r; \
@@ -26831,7 +27275,7 @@ maybe-all-guile:
  TARGET-guile=all
  maybe-all-guile: all-guile
  all-guile: configure-guile
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -26848,7 +27292,7 @@ maybe-check-guile:
  maybe-check-guile: check-guile
  
  check-guile:
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -26863,7 +27307,7 @@ maybe-install-guile:
  maybe-install-guile: install-guile
  
  install-guile: installdirs
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -26881,7 +27325,7 @@ maybe-info-guile: info-guile
  
  info-guile: \
      configure-guile 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./guile/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -26907,7 +27351,7 @@ maybe-dvi-guile: dvi-guile
  
  dvi-guile: \
      configure-guile 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./guile/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -26933,7 +27377,7 @@ maybe-html-guile: html-guile
  
  html-guile: \
      configure-guile 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./guile/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -26959,7 +27403,7 @@ maybe-TAGS-guile: TAGS-guile
  
  TAGS-guile: \
      configure-guile 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./guile/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -26986,7 +27430,7 @@ maybe-install-info-guile: install-info-guile
  install-info-guile: \
      configure-guile \
      info-guile 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./guile/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -27012,7 +27456,7 @@ maybe-installcheck-guile: installcheck-guile
  
  installcheck-guile: \
      configure-guile 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./guile/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -27037,7 +27481,7 @@ maybe-mostlyclean-guile:
  maybe-mostlyclean-guile: mostlyclean-guile
  
  mostlyclean-guile: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./guile/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -27062,7 +27506,7 @@ maybe-clean-guile:
  maybe-clean-guile: clean-guile
  
  clean-guile: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./guile/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -27087,7 +27531,7 @@ maybe-distclean-guile:
  maybe-distclean-guile: distclean-guile
  
  distclean-guile: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./guile/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -27112,7 +27556,7 @@ maybe-maintainer-clean-guile:
  maybe-maintainer-clean-guile: maintainer-clean-guile
  
  maintainer-clean-guile: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./guile/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -27137,8 +27581,8 @@ maintainer-clean-guile:
  maybe-configure-tk:
  @if tk
  maybe-configure-tk: configure-tk
-configure-tk: 
-       @$(unstage)
+configure-tk:
+       @: $(MAKE); $(unstage)
         @test ! -f $(HOST_SUBDIR)/tk/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/tk ; \
         r=`${PWD_COMMAND}`; export r; \
@@ -27168,7 +27612,7 @@ maybe-all-tk:
  TARGET-tk=all
  maybe-all-tk: all-tk
  all-tk: configure-tk
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -27185,7 +27629,7 @@ maybe-check-tk:
  maybe-check-tk: check-tk
  
  check-tk:
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -27200,7 +27644,7 @@ maybe-install-tk:
  maybe-install-tk: install-tk
  
  install-tk: installdirs
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -27218,7 +27662,7 @@ maybe-info-tk: info-tk
  
  info-tk: \
      configure-tk 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./tk/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -27244,7 +27688,7 @@ maybe-dvi-tk: dvi-tk
  
  dvi-tk: \
      configure-tk 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./tk/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -27270,7 +27714,7 @@ maybe-html-tk: html-tk
  
  html-tk: \
      configure-tk 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./tk/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -27296,7 +27740,7 @@ maybe-TAGS-tk: TAGS-tk
  
  TAGS-tk: \
      configure-tk 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./tk/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -27323,7 +27767,7 @@ maybe-install-info-tk: install-info-tk
  install-info-tk: \
      configure-tk \
      info-tk 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./tk/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -27349,7 +27793,7 @@ maybe-installcheck-tk: installcheck-tk
  
  installcheck-tk: \
      configure-tk 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./tk/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -27374,7 +27818,7 @@ maybe-mostlyclean-tk:
  maybe-mostlyclean-tk: mostlyclean-tk
  
  mostlyclean-tk: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./tk/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -27399,7 +27843,7 @@ maybe-clean-tk:
  maybe-clean-tk: clean-tk
  
  clean-tk: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./tk/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -27424,7 +27868,7 @@ maybe-distclean-tk:
  maybe-distclean-tk: distclean-tk
  
  distclean-tk: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./tk/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -27449,7 +27893,7 @@ maybe-maintainer-clean-tk:
  maybe-maintainer-clean-tk: maintainer-clean-tk
  
  maintainer-clean-tk: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./tk/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -27474,8 +27918,8 @@ maintainer-clean-tk:
  maybe-configure-libtermcap:
  @if libtermcap
  maybe-configure-libtermcap: configure-libtermcap
-configure-libtermcap: 
-       @$(unstage)
+configure-libtermcap:
+       @: $(MAKE); $(unstage)
         @test ! -f $(HOST_SUBDIR)/libtermcap/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libtermcap ; \
         r=`${PWD_COMMAND}`; export r; \
@@ -27505,7 +27949,7 @@ maybe-all-libtermcap:
  TARGET-libtermcap=all
  maybe-all-libtermcap: all-libtermcap
  all-libtermcap: configure-libtermcap
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -27531,7 +27975,7 @@ maybe-install-libtermcap:
  maybe-install-libtermcap: install-libtermcap
  
  install-libtermcap: installdirs
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -27549,7 +27993,7 @@ maybe-info-libtermcap: info-libtermcap
  
  info-libtermcap: \
      configure-libtermcap 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./libtermcap/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -27575,7 +28019,7 @@ maybe-dvi-libtermcap: dvi-libtermcap
  
  dvi-libtermcap: \
      configure-libtermcap 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./libtermcap/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -27601,7 +28045,7 @@ maybe-html-libtermcap: html-libtermcap
  
  html-libtermcap: \
      configure-libtermcap 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./libtermcap/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -27627,7 +28071,7 @@ maybe-TAGS-libtermcap: TAGS-libtermcap
  
  TAGS-libtermcap: \
      configure-libtermcap 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./libtermcap/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -27654,7 +28098,7 @@ maybe-install-info-libtermcap: install-info-libtermcap
  install-info-libtermcap: \
      configure-libtermcap \
      info-libtermcap 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./libtermcap/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -27680,7 +28124,7 @@ maybe-installcheck-libtermcap: installcheck-libtermcap
  
  installcheck-libtermcap: \
      configure-libtermcap 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./libtermcap/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -27745,8 +28189,8 @@ maintainer-clean-libtermcap:
  maybe-configure-utils:
  @if utils
  maybe-configure-utils: configure-utils
-configure-utils: 
-       @$(unstage)
+configure-utils:
+       @: $(MAKE); $(unstage)
         @test ! -f $(HOST_SUBDIR)/utils/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/utils ; \
         r=`${PWD_COMMAND}`; export r; \
@@ -27776,7 +28220,7 @@ maybe-all-utils:
  TARGET-utils=all
  maybe-all-utils: all-utils
  all-utils: configure-utils
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -27802,7 +28246,7 @@ maybe-install-utils:
  maybe-install-utils: install-utils
  
  install-utils: installdirs
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -27820,7 +28264,7 @@ maybe-info-utils: info-utils
  
  info-utils: \
      configure-utils 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./utils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -27846,7 +28290,7 @@ maybe-dvi-utils: dvi-utils
  
  dvi-utils: \
      configure-utils 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./utils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -27872,7 +28316,7 @@ maybe-html-utils: html-utils
  
  html-utils: \
      configure-utils 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./utils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -27898,7 +28342,7 @@ maybe-TAGS-utils: TAGS-utils
  
  TAGS-utils: \
      configure-utils 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./utils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -27925,7 +28369,7 @@ maybe-install-info-utils: install-info-utils
  install-info-utils: \
      configure-utils \
      info-utils 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./utils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -27951,7 +28395,7 @@ maybe-installcheck-utils: installcheck-utils
  
  installcheck-utils: \
      configure-utils 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./utils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -27976,7 +28420,7 @@ maybe-mostlyclean-utils:
  maybe-mostlyclean-utils: mostlyclean-utils
  
  mostlyclean-utils: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./utils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -28001,7 +28445,7 @@ maybe-clean-utils:
  maybe-clean-utils: clean-utils
  
  clean-utils: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./utils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -28026,7 +28470,7 @@ maybe-distclean-utils:
  maybe-distclean-utils: distclean-utils
  
  distclean-utils: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./utils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -28051,7 +28495,7 @@ maybe-maintainer-clean-utils:
  maybe-maintainer-clean-utils: maintainer-clean-utils
  
  maintainer-clean-utils: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./utils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -28076,8 +28520,8 @@ maintainer-clean-utils:
  maybe-configure-gnattools:
  @if gnattools
  maybe-configure-gnattools: configure-gnattools
-configure-gnattools: 
-       @$(unstage)
+configure-gnattools:
+       @: $(MAKE); $(unstage)
         @test ! -f $(HOST_SUBDIR)/gnattools/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gnattools ; \
         r=`${PWD_COMMAND}`; export r; \
@@ -28107,7 +28551,7 @@ maybe-all-gnattools:
  TARGET-gnattools=all
  maybe-all-gnattools: all-gnattools
  all-gnattools: configure-gnattools
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -28124,7 +28568,7 @@ maybe-check-gnattools:
  maybe-check-gnattools: check-gnattools
  
  check-gnattools:
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -28139,7 +28583,7 @@ maybe-install-gnattools:
  maybe-install-gnattools: install-gnattools
  
  install-gnattools: installdirs
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -28157,7 +28601,7 @@ maybe-info-gnattools: info-gnattools
  
  info-gnattools: \
      configure-gnattools 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./gnattools/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -28183,7 +28627,7 @@ maybe-dvi-gnattools: dvi-gnattools
  
  dvi-gnattools: \
      configure-gnattools 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./gnattools/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -28209,7 +28653,7 @@ maybe-html-gnattools: html-gnattools
  
  html-gnattools: \
      configure-gnattools 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./gnattools/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -28235,7 +28679,7 @@ maybe-TAGS-gnattools: TAGS-gnattools
  
  TAGS-gnattools: \
      configure-gnattools 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./gnattools/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -28262,7 +28706,7 @@ maybe-install-info-gnattools: install-info-gnattools
  install-info-gnattools: \
      configure-gnattools \
      info-gnattools 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./gnattools/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -28288,7 +28732,7 @@ maybe-installcheck-gnattools: installcheck-gnattools
  
  installcheck-gnattools: \
      configure-gnattools 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./gnattools/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -28313,7 +28757,7 @@ maybe-mostlyclean-gnattools:
  maybe-mostlyclean-gnattools: mostlyclean-gnattools
  
  mostlyclean-gnattools: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./gnattools/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -28338,7 +28782,7 @@ maybe-clean-gnattools:
  maybe-clean-gnattools: clean-gnattools
  
  clean-gnattools: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./gnattools/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -28363,7 +28807,7 @@ maybe-distclean-gnattools:
  maybe-distclean-gnattools: distclean-gnattools
  
  distclean-gnattools: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./gnattools/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -28388,7 +28832,7 @@ maybe-maintainer-clean-gnattools:
  maybe-maintainer-clean-gnattools: maintainer-clean-gnattools
  
  maintainer-clean-gnattools: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f ./gnattools/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -28414,22 +28858,29 @@ maintainer-clean-gnattools:
  # ---------------------------------------
  
  
-# There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
-@if target-libstdc++-v3
-$(TARGET_SUBDIR)/libstdc++-v3/multilib.out: multilib.out
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3 ; \
-       rm -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile || : ; \
-       cp multilib.out $(TARGET_SUBDIR)/libstdc++-v3/multilib.out
-@endif target-libstdc++-v3
-
  
  
  .PHONY: configure-target-libstdc++-v3 maybe-configure-target-libstdc++-v3
  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)
+configure-target-libstdc++-v3:
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       echo "Checking multilib configuration for libstdc++-v3..."; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3 ; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp 2> /dev/null ; \
+       if test -r $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \
+         if cmp -s $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \
+           rm -f $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp; \
+         else \
+           rm -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile; \
+           mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
+         fi; \
+       else \
+         mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
+       fi
         @test ! -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3 ; \
         r=`${PWD_COMMAND}`; export r; \
@@ -28460,7 +28911,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)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(RAW_CXX_TARGET_EXPORTS) \
@@ -28478,7 +28929,7 @@ maybe-check-target-libstdc++-v3:
  maybe-check-target-libstdc++-v3: check-target-libstdc++-v3
  
  check-target-libstdc++-v3:
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(RAW_CXX_TARGET_EXPORTS) \
@@ -28493,7 +28944,7 @@ maybe-install-target-libstdc++-v3:
  maybe-install-target-libstdc++-v3: install-target-libstdc++-v3
  
  install-target-libstdc++-v3: installdirs
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(RAW_CXX_TARGET_EXPORTS) \
@@ -28511,7 +28962,7 @@ maybe-info-target-libstdc++-v3: info-target-libstdc++-v3
  
  info-target-libstdc++-v3: \
      configure-target-libstdc++-v3 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -28537,7 +28988,7 @@ maybe-dvi-target-libstdc++-v3: dvi-target-libstdc++-v3
  
  dvi-target-libstdc++-v3: \
      configure-target-libstdc++-v3 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -28563,7 +29014,7 @@ maybe-html-target-libstdc++-v3: html-target-libstdc++-v3
  
  html-target-libstdc++-v3: \
      configure-target-libstdc++-v3 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -28589,7 +29040,7 @@ maybe-TAGS-target-libstdc++-v3: TAGS-target-libstdc++-v3
  
  TAGS-target-libstdc++-v3: \
      configure-target-libstdc++-v3 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -28616,7 +29067,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)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -28642,7 +29093,7 @@ maybe-installcheck-target-libstdc++-v3: installcheck-target-libstdc++-v3
  
  installcheck-target-libstdc++-v3: \
      configure-target-libstdc++-v3 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -28667,7 +29118,7 @@ maybe-mostlyclean-target-libstdc++-v3:
  maybe-mostlyclean-target-libstdc++-v3: mostlyclean-target-libstdc++-v3
  
  mostlyclean-target-libstdc++-v3: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -28692,7 +29143,7 @@ maybe-clean-target-libstdc++-v3:
  maybe-clean-target-libstdc++-v3: clean-target-libstdc++-v3
  
  clean-target-libstdc++-v3: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -28717,7 +29168,7 @@ maybe-distclean-target-libstdc++-v3:
  maybe-distclean-target-libstdc++-v3: distclean-target-libstdc++-v3
  
  distclean-target-libstdc++-v3: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -28742,7 +29193,7 @@ maybe-maintainer-clean-target-libstdc++-v3:
  maybe-maintainer-clean-target-libstdc++-v3: maintainer-clean-target-libstdc++-v3
  
  maintainer-clean-target-libstdc++-v3: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -28763,22 +29214,29 @@ maintainer-clean-target-libstdc++-v3:
  
  
  
-# There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
-@if target-libmudflap
-$(TARGET_SUBDIR)/libmudflap/multilib.out: multilib.out
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libmudflap ; \
-       rm -f $(TARGET_SUBDIR)/libmudflap/Makefile || : ; \
-       cp multilib.out $(TARGET_SUBDIR)/libmudflap/multilib.out
-@endif target-libmudflap
-
  
  
  .PHONY: configure-target-libmudflap maybe-configure-target-libmudflap
  maybe-configure-target-libmudflap:
  @if target-libmudflap
  maybe-configure-target-libmudflap: configure-target-libmudflap
-configure-target-libmudflap: $(TARGET_SUBDIR)/libmudflap/multilib.out
-       @$(unstage)
+configure-target-libmudflap:
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       echo "Checking multilib configuration for libmudflap..."; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libmudflap ; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libmudflap/multilib.tmp 2> /dev/null ; \
+       if test -r $(TARGET_SUBDIR)/libmudflap/multilib.out; then \
+         if cmp -s $(TARGET_SUBDIR)/libmudflap/multilib.tmp $(TARGET_SUBDIR)/libmudflap/multilib.out; then \
+           rm -f $(TARGET_SUBDIR)/libmudflap/multilib.tmp; \
+         else \
+           rm -f $(TARGET_SUBDIR)/libmudflap/Makefile; \
+           mv $(TARGET_SUBDIR)/libmudflap/multilib.tmp $(TARGET_SUBDIR)/libmudflap/multilib.out; \
+         fi; \
+       else \
+         mv $(TARGET_SUBDIR)/libmudflap/multilib.tmp $(TARGET_SUBDIR)/libmudflap/multilib.out; \
+       fi
         @test ! -f $(TARGET_SUBDIR)/libmudflap/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libmudflap ; \
         r=`${PWD_COMMAND}`; export r; \
@@ -28809,7 +29267,7 @@ maybe-all-target-libmudflap:
  TARGET-target-libmudflap=all
  maybe-all-target-libmudflap: all-target-libmudflap
  all-target-libmudflap: configure-target-libmudflap
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(NORMAL_TARGET_EXPORTS) \
@@ -28827,7 +29285,7 @@ maybe-check-target-libmudflap:
  maybe-check-target-libmudflap: check-target-libmudflap
  
  check-target-libmudflap:
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(NORMAL_TARGET_EXPORTS) \
@@ -28842,7 +29300,7 @@ maybe-install-target-libmudflap:
  maybe-install-target-libmudflap: install-target-libmudflap
  
  install-target-libmudflap: installdirs
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(NORMAL_TARGET_EXPORTS) \
@@ -28860,7 +29318,7 @@ maybe-info-target-libmudflap: info-target-libmudflap
  
  info-target-libmudflap: \
      configure-target-libmudflap 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -28886,7 +29344,7 @@ maybe-dvi-target-libmudflap: dvi-target-libmudflap
  
  dvi-target-libmudflap: \
      configure-target-libmudflap 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -28912,7 +29370,7 @@ maybe-html-target-libmudflap: html-target-libmudflap
  
  html-target-libmudflap: \
      configure-target-libmudflap 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -28938,7 +29396,7 @@ maybe-TAGS-target-libmudflap: TAGS-target-libmudflap
  
  TAGS-target-libmudflap: \
      configure-target-libmudflap 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -28965,7 +29423,7 @@ maybe-install-info-target-libmudflap: install-info-target-libmudflap
  install-info-target-libmudflap: \
      configure-target-libmudflap \
      info-target-libmudflap 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -28991,7 +29449,7 @@ maybe-installcheck-target-libmudflap: installcheck-target-libmudflap
  
  installcheck-target-libmudflap: \
      configure-target-libmudflap 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -29016,7 +29474,7 @@ maybe-mostlyclean-target-libmudflap:
  maybe-mostlyclean-target-libmudflap: mostlyclean-target-libmudflap
  
  mostlyclean-target-libmudflap: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -29041,7 +29499,7 @@ maybe-clean-target-libmudflap:
  maybe-clean-target-libmudflap: clean-target-libmudflap
  
  clean-target-libmudflap: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -29066,7 +29524,7 @@ maybe-distclean-target-libmudflap:
  maybe-distclean-target-libmudflap: distclean-target-libmudflap
  
  distclean-target-libmudflap: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -29091,7 +29549,7 @@ maybe-maintainer-clean-target-libmudflap:
  maybe-maintainer-clean-target-libmudflap: maintainer-clean-target-libmudflap
  
  maintainer-clean-target-libmudflap: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -29112,22 +29570,29 @@ maintainer-clean-target-libmudflap:
  
  
  
-# There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
-@if target-libssp
-$(TARGET_SUBDIR)/libssp/multilib.out: multilib.out
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libssp ; \
-       rm -f $(TARGET_SUBDIR)/libssp/Makefile || : ; \
-       cp multilib.out $(TARGET_SUBDIR)/libssp/multilib.out
-@endif target-libssp
-
  
  
  .PHONY: configure-target-libssp maybe-configure-target-libssp
  maybe-configure-target-libssp:
  @if target-libssp
  maybe-configure-target-libssp: configure-target-libssp
-configure-target-libssp: $(TARGET_SUBDIR)/libssp/multilib.out
-       @$(unstage)
+configure-target-libssp:
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       echo "Checking multilib configuration for libssp..."; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libssp ; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libssp/multilib.tmp 2> /dev/null ; \
+       if test -r $(TARGET_SUBDIR)/libssp/multilib.out; then \
+         if cmp -s $(TARGET_SUBDIR)/libssp/multilib.tmp $(TARGET_SUBDIR)/libssp/multilib.out; then \
+           rm -f $(TARGET_SUBDIR)/libssp/multilib.tmp; \
+         else \
+           rm -f $(TARGET_SUBDIR)/libssp/Makefile; \
+           mv $(TARGET_SUBDIR)/libssp/multilib.tmp $(TARGET_SUBDIR)/libssp/multilib.out; \
+         fi; \
+       else \
+         mv $(TARGET_SUBDIR)/libssp/multilib.tmp $(TARGET_SUBDIR)/libssp/multilib.out; \
+       fi
         @test ! -f $(TARGET_SUBDIR)/libssp/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libssp ; \
         r=`${PWD_COMMAND}`; export r; \
@@ -29158,7 +29623,7 @@ maybe-all-target-libssp:
  TARGET-target-libssp=all
  maybe-all-target-libssp: all-target-libssp
  all-target-libssp: configure-target-libssp
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(NORMAL_TARGET_EXPORTS) \
@@ -29176,7 +29641,7 @@ maybe-check-target-libssp:
  maybe-check-target-libssp: check-target-libssp
  
  check-target-libssp:
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(NORMAL_TARGET_EXPORTS) \
@@ -29191,7 +29656,7 @@ maybe-install-target-libssp:
  maybe-install-target-libssp: install-target-libssp
  
  install-target-libssp: installdirs
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(NORMAL_TARGET_EXPORTS) \
@@ -29209,7 +29674,7 @@ maybe-info-target-libssp: info-target-libssp
  
  info-target-libssp: \
      configure-target-libssp 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -29235,7 +29700,7 @@ maybe-dvi-target-libssp: dvi-target-libssp
  
  dvi-target-libssp: \
      configure-target-libssp 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -29261,7 +29726,7 @@ maybe-html-target-libssp: html-target-libssp
  
  html-target-libssp: \
      configure-target-libssp 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -29287,7 +29752,7 @@ maybe-TAGS-target-libssp: TAGS-target-libssp
  
  TAGS-target-libssp: \
      configure-target-libssp 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -29314,7 +29779,7 @@ maybe-install-info-target-libssp: install-info-target-libssp
  install-info-target-libssp: \
      configure-target-libssp \
      info-target-libssp 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -29340,7 +29805,7 @@ maybe-installcheck-target-libssp: installcheck-target-libssp
  
  installcheck-target-libssp: \
      configure-target-libssp 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -29365,7 +29830,7 @@ maybe-mostlyclean-target-libssp:
  maybe-mostlyclean-target-libssp: mostlyclean-target-libssp
  
  mostlyclean-target-libssp: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -29390,7 +29855,7 @@ maybe-clean-target-libssp:
  maybe-clean-target-libssp: clean-target-libssp
  
  clean-target-libssp: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -29415,7 +29880,7 @@ maybe-distclean-target-libssp:
  maybe-distclean-target-libssp: distclean-target-libssp
  
  distclean-target-libssp: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -29440,7 +29905,7 @@ maybe-maintainer-clean-target-libssp:
  maybe-maintainer-clean-target-libssp: maintainer-clean-target-libssp
  
  maintainer-clean-target-libssp: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -29461,22 +29926,29 @@ maintainer-clean-target-libssp:
  
  
  
-# There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
-@if target-newlib
-$(TARGET_SUBDIR)/newlib/multilib.out: multilib.out
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/newlib ; \
-       rm -f $(TARGET_SUBDIR)/newlib/Makefile || : ; \
-       cp multilib.out $(TARGET_SUBDIR)/newlib/multilib.out
-@endif target-newlib
-
  
  
  .PHONY: configure-target-newlib maybe-configure-target-newlib
  maybe-configure-target-newlib:
  @if target-newlib
  maybe-configure-target-newlib: configure-target-newlib
-configure-target-newlib: $(TARGET_SUBDIR)/newlib/multilib.out
-       @$(unstage)
+configure-target-newlib:
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       echo "Checking multilib configuration for newlib..."; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/newlib ; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/newlib/multilib.tmp 2> /dev/null ; \
+       if test -r $(TARGET_SUBDIR)/newlib/multilib.out; then \
+         if cmp -s $(TARGET_SUBDIR)/newlib/multilib.tmp $(TARGET_SUBDIR)/newlib/multilib.out; then \
+           rm -f $(TARGET_SUBDIR)/newlib/multilib.tmp; \
+         else \
+           rm -f $(TARGET_SUBDIR)/newlib/Makefile; \
+           mv $(TARGET_SUBDIR)/newlib/multilib.tmp $(TARGET_SUBDIR)/newlib/multilib.out; \
+         fi; \
+       else \
+         mv $(TARGET_SUBDIR)/newlib/multilib.tmp $(TARGET_SUBDIR)/newlib/multilib.out; \
+       fi
         @test ! -f $(TARGET_SUBDIR)/newlib/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/newlib ; \
         r=`${PWD_COMMAND}`; export r; \
@@ -29507,7 +29979,7 @@ maybe-all-target-newlib:
  TARGET-target-newlib=all
  maybe-all-target-newlib: all-target-newlib
  all-target-newlib: configure-target-newlib
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(NORMAL_TARGET_EXPORTS) \
@@ -29525,7 +29997,7 @@ maybe-check-target-newlib:
  maybe-check-target-newlib: check-target-newlib
  
  check-target-newlib:
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(NORMAL_TARGET_EXPORTS) \
@@ -29540,7 +30012,7 @@ maybe-install-target-newlib:
  maybe-install-target-newlib: install-target-newlib
  
  install-target-newlib: installdirs
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(NORMAL_TARGET_EXPORTS) \
@@ -29558,7 +30030,7 @@ maybe-info-target-newlib: info-target-newlib
  
  info-target-newlib: \
      configure-target-newlib 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -29584,7 +30056,7 @@ maybe-dvi-target-newlib: dvi-target-newlib
  
  dvi-target-newlib: \
      configure-target-newlib 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -29610,7 +30082,7 @@ maybe-html-target-newlib: html-target-newlib
  
  html-target-newlib: \
      configure-target-newlib 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -29636,7 +30108,7 @@ maybe-TAGS-target-newlib: TAGS-target-newlib
  
  TAGS-target-newlib: \
      configure-target-newlib 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -29663,7 +30135,7 @@ maybe-install-info-target-newlib: install-info-target-newlib
  install-info-target-newlib: \
      configure-target-newlib \
      info-target-newlib 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -29689,7 +30161,7 @@ maybe-installcheck-target-newlib: installcheck-target-newlib
  
  installcheck-target-newlib: \
      configure-target-newlib 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -29714,7 +30186,7 @@ maybe-mostlyclean-target-newlib:
  maybe-mostlyclean-target-newlib: mostlyclean-target-newlib
  
  mostlyclean-target-newlib: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -29739,7 +30211,7 @@ maybe-clean-target-newlib:
  maybe-clean-target-newlib: clean-target-newlib
  
  clean-target-newlib: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -29764,7 +30236,7 @@ maybe-distclean-target-newlib:
  maybe-distclean-target-newlib: distclean-target-newlib
  
  distclean-target-newlib: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -29789,7 +30261,7 @@ maybe-maintainer-clean-target-newlib:
  maybe-maintainer-clean-target-newlib: maintainer-clean-target-newlib
  
  maintainer-clean-target-newlib: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -29810,22 +30282,29 @@ maintainer-clean-target-newlib:
  
  
  
-# There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
-@if target-libgfortran
-$(TARGET_SUBDIR)/libgfortran/multilib.out: multilib.out
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgfortran ; \
-       rm -f $(TARGET_SUBDIR)/libgfortran/Makefile || : ; \
-       cp multilib.out $(TARGET_SUBDIR)/libgfortran/multilib.out
-@endif target-libgfortran
-
  
  
  .PHONY: configure-target-libgfortran maybe-configure-target-libgfortran
  maybe-configure-target-libgfortran:
  @if target-libgfortran
  maybe-configure-target-libgfortran: configure-target-libgfortran
-configure-target-libgfortran: $(TARGET_SUBDIR)/libgfortran/multilib.out
-       @$(unstage)
+configure-target-libgfortran:
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       echo "Checking multilib configuration for libgfortran..."; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgfortran ; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgfortran/multilib.tmp 2> /dev/null ; \
+       if test -r $(TARGET_SUBDIR)/libgfortran/multilib.out; then \
+         if cmp -s $(TARGET_SUBDIR)/libgfortran/multilib.tmp $(TARGET_SUBDIR)/libgfortran/multilib.out; then \
+           rm -f $(TARGET_SUBDIR)/libgfortran/multilib.tmp; \
+         else \
+           rm -f $(TARGET_SUBDIR)/libgfortran/Makefile; \
+           mv $(TARGET_SUBDIR)/libgfortran/multilib.tmp $(TARGET_SUBDIR)/libgfortran/multilib.out; \
+         fi; \
+       else \
+         mv $(TARGET_SUBDIR)/libgfortran/multilib.tmp $(TARGET_SUBDIR)/libgfortran/multilib.out; \
+       fi
         @test ! -f $(TARGET_SUBDIR)/libgfortran/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgfortran ; \
         r=`${PWD_COMMAND}`; export r; \
@@ -29856,7 +30335,7 @@ maybe-all-target-libgfortran:
  TARGET-target-libgfortran=all
  maybe-all-target-libgfortran: all-target-libgfortran
  all-target-libgfortran: configure-target-libgfortran
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(NORMAL_TARGET_EXPORTS) \
@@ -29874,7 +30353,7 @@ maybe-check-target-libgfortran:
  maybe-check-target-libgfortran: check-target-libgfortran
  
  check-target-libgfortran:
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(NORMAL_TARGET_EXPORTS) \
@@ -29889,7 +30368,7 @@ maybe-install-target-libgfortran:
  maybe-install-target-libgfortran: install-target-libgfortran
  
  install-target-libgfortran: installdirs
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(NORMAL_TARGET_EXPORTS) \
@@ -29907,7 +30386,7 @@ maybe-info-target-libgfortran: info-target-libgfortran
  
  info-target-libgfortran: \
      configure-target-libgfortran 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -29933,7 +30412,7 @@ maybe-dvi-target-libgfortran: dvi-target-libgfortran
  
  dvi-target-libgfortran: \
      configure-target-libgfortran 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -29959,7 +30438,7 @@ maybe-html-target-libgfortran: html-target-libgfortran
  
  html-target-libgfortran: \
      configure-target-libgfortran 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -29985,7 +30464,7 @@ maybe-TAGS-target-libgfortran: TAGS-target-libgfortran
  
  TAGS-target-libgfortran: \
      configure-target-libgfortran 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -30012,7 +30491,7 @@ maybe-install-info-target-libgfortran: install-info-target-libgfortran
  install-info-target-libgfortran: \
      configure-target-libgfortran \
      info-target-libgfortran 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -30038,7 +30517,7 @@ maybe-installcheck-target-libgfortran: installcheck-target-libgfortran
  
  installcheck-target-libgfortran: \
      configure-target-libgfortran 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -30063,7 +30542,7 @@ maybe-mostlyclean-target-libgfortran:
  maybe-mostlyclean-target-libgfortran: mostlyclean-target-libgfortran
  
  mostlyclean-target-libgfortran: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -30088,7 +30567,7 @@ maybe-clean-target-libgfortran:
  maybe-clean-target-libgfortran: clean-target-libgfortran
  
  clean-target-libgfortran: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -30113,7 +30592,7 @@ maybe-distclean-target-libgfortran:
  maybe-distclean-target-libgfortran: distclean-target-libgfortran
  
  distclean-target-libgfortran: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -30138,7 +30617,7 @@ maybe-maintainer-clean-target-libgfortran:
  maybe-maintainer-clean-target-libgfortran: maintainer-clean-target-libgfortran
  
  maintainer-clean-target-libgfortran: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -30159,22 +30638,29 @@ maintainer-clean-target-libgfortran:
  
  
  
-# There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
-@if target-libobjc
-$(TARGET_SUBDIR)/libobjc/multilib.out: multilib.out
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libobjc ; \
-       rm -f $(TARGET_SUBDIR)/libobjc/Makefile || : ; \
-       cp multilib.out $(TARGET_SUBDIR)/libobjc/multilib.out
-@endif target-libobjc
-
  
  
  .PHONY: configure-target-libobjc maybe-configure-target-libobjc
  maybe-configure-target-libobjc:
  @if target-libobjc
  maybe-configure-target-libobjc: configure-target-libobjc
-configure-target-libobjc: $(TARGET_SUBDIR)/libobjc/multilib.out
-       @$(unstage)
+configure-target-libobjc:
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       echo "Checking multilib configuration for libobjc..."; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libobjc ; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libobjc/multilib.tmp 2> /dev/null ; \
+       if test -r $(TARGET_SUBDIR)/libobjc/multilib.out; then \
+         if cmp -s $(TARGET_SUBDIR)/libobjc/multilib.tmp $(TARGET_SUBDIR)/libobjc/multilib.out; then \
+           rm -f $(TARGET_SUBDIR)/libobjc/multilib.tmp; \
+         else \
+           rm -f $(TARGET_SUBDIR)/libobjc/Makefile; \
+           mv $(TARGET_SUBDIR)/libobjc/multilib.tmp $(TARGET_SUBDIR)/libobjc/multilib.out; \
+         fi; \
+       else \
+         mv $(TARGET_SUBDIR)/libobjc/multilib.tmp $(TARGET_SUBDIR)/libobjc/multilib.out; \
+       fi
         @test ! -f $(TARGET_SUBDIR)/libobjc/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libobjc ; \
         r=`${PWD_COMMAND}`; export r; \
@@ -30205,7 +30691,7 @@ maybe-all-target-libobjc:
  TARGET-target-libobjc=all
  maybe-all-target-libobjc: all-target-libobjc
  all-target-libobjc: configure-target-libobjc
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(NORMAL_TARGET_EXPORTS) \
@@ -30223,7 +30709,7 @@ maybe-check-target-libobjc:
  maybe-check-target-libobjc: check-target-libobjc
  
  check-target-libobjc:
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(NORMAL_TARGET_EXPORTS) \
@@ -30238,7 +30724,7 @@ maybe-install-target-libobjc:
  maybe-install-target-libobjc: install-target-libobjc
  
  install-target-libobjc: installdirs
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(NORMAL_TARGET_EXPORTS) \
@@ -30256,7 +30742,7 @@ maybe-info-target-libobjc: info-target-libobjc
  
  info-target-libobjc: \
      configure-target-libobjc 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -30282,7 +30768,7 @@ maybe-dvi-target-libobjc: dvi-target-libobjc
  
  dvi-target-libobjc: \
      configure-target-libobjc 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -30308,7 +30794,7 @@ maybe-html-target-libobjc: html-target-libobjc
  
  html-target-libobjc: \
      configure-target-libobjc 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -30334,7 +30820,7 @@ maybe-TAGS-target-libobjc: TAGS-target-libobjc
  
  TAGS-target-libobjc: \
      configure-target-libobjc 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -30361,7 +30847,7 @@ maybe-install-info-target-libobjc: install-info-target-libobjc
  install-info-target-libobjc: \
      configure-target-libobjc \
      info-target-libobjc 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -30387,7 +30873,7 @@ maybe-installcheck-target-libobjc: installcheck-target-libobjc
  
  installcheck-target-libobjc: \
      configure-target-libobjc 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -30412,7 +30898,7 @@ maybe-mostlyclean-target-libobjc:
  maybe-mostlyclean-target-libobjc: mostlyclean-target-libobjc
  
  mostlyclean-target-libobjc: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -30437,7 +30923,7 @@ maybe-clean-target-libobjc:
  maybe-clean-target-libobjc: clean-target-libobjc
  
  clean-target-libobjc: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -30462,7 +30948,7 @@ maybe-distclean-target-libobjc:
  maybe-distclean-target-libobjc: distclean-target-libobjc
  
  distclean-target-libobjc: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -30487,7 +30973,7 @@ maybe-maintainer-clean-target-libobjc:
  maybe-maintainer-clean-target-libobjc: maintainer-clean-target-libobjc
  
  maintainer-clean-target-libobjc: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -30508,22 +30994,29 @@ maintainer-clean-target-libobjc:
  
  
  
-# There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
-@if target-libtermcap
-$(TARGET_SUBDIR)/libtermcap/multilib.out: multilib.out
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libtermcap ; \
-       rm -f $(TARGET_SUBDIR)/libtermcap/Makefile || : ; \
-       cp multilib.out $(TARGET_SUBDIR)/libtermcap/multilib.out
-@endif target-libtermcap
-
  
  
  .PHONY: configure-target-libtermcap maybe-configure-target-libtermcap
  maybe-configure-target-libtermcap:
  @if target-libtermcap
  maybe-configure-target-libtermcap: configure-target-libtermcap
-configure-target-libtermcap: $(TARGET_SUBDIR)/libtermcap/multilib.out
-       @$(unstage)
+configure-target-libtermcap:
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       echo "Checking multilib configuration for libtermcap..."; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libtermcap ; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libtermcap/multilib.tmp 2> /dev/null ; \
+       if test -r $(TARGET_SUBDIR)/libtermcap/multilib.out; then \
+         if cmp -s $(TARGET_SUBDIR)/libtermcap/multilib.tmp $(TARGET_SUBDIR)/libtermcap/multilib.out; then \
+           rm -f $(TARGET_SUBDIR)/libtermcap/multilib.tmp; \
+         else \
+           rm -f $(TARGET_SUBDIR)/libtermcap/Makefile; \
+           mv $(TARGET_SUBDIR)/libtermcap/multilib.tmp $(TARGET_SUBDIR)/libtermcap/multilib.out; \
+         fi; \
+       else \
+         mv $(TARGET_SUBDIR)/libtermcap/multilib.tmp $(TARGET_SUBDIR)/libtermcap/multilib.out; \
+       fi
         @test ! -f $(TARGET_SUBDIR)/libtermcap/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libtermcap ; \
         r=`${PWD_COMMAND}`; export r; \
@@ -30554,7 +31047,7 @@ maybe-all-target-libtermcap:
  TARGET-target-libtermcap=all
  maybe-all-target-libtermcap: all-target-libtermcap
  all-target-libtermcap: configure-target-libtermcap
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(NORMAL_TARGET_EXPORTS) \
@@ -30582,7 +31075,7 @@ maybe-install-target-libtermcap:
  maybe-install-target-libtermcap: install-target-libtermcap
  
  install-target-libtermcap: installdirs
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(NORMAL_TARGET_EXPORTS) \
@@ -30600,7 +31093,7 @@ maybe-info-target-libtermcap: info-target-libtermcap
  
  info-target-libtermcap: \
      configure-target-libtermcap 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/libtermcap/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -30626,7 +31119,7 @@ maybe-dvi-target-libtermcap: dvi-target-libtermcap
  
  dvi-target-libtermcap: \
      configure-target-libtermcap 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/libtermcap/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -30652,7 +31145,7 @@ maybe-html-target-libtermcap: html-target-libtermcap
  
  html-target-libtermcap: \
      configure-target-libtermcap 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/libtermcap/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -30678,7 +31171,7 @@ maybe-TAGS-target-libtermcap: TAGS-target-libtermcap
  
  TAGS-target-libtermcap: \
      configure-target-libtermcap 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/libtermcap/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -30705,7 +31198,7 @@ maybe-install-info-target-libtermcap: install-info-target-libtermcap
  install-info-target-libtermcap: \
      configure-target-libtermcap \
      info-target-libtermcap 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/libtermcap/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -30731,7 +31224,7 @@ maybe-installcheck-target-libtermcap: installcheck-target-libtermcap
  
  installcheck-target-libtermcap: \
      configure-target-libtermcap 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/libtermcap/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -30792,22 +31285,29 @@ maintainer-clean-target-libtermcap:
  
  
  
-# There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
-@if target-winsup
-$(TARGET_SUBDIR)/winsup/multilib.out: multilib.out
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/winsup ; \
-       rm -f $(TARGET_SUBDIR)/winsup/Makefile || : ; \
-       cp multilib.out $(TARGET_SUBDIR)/winsup/multilib.out
-@endif target-winsup
-
  
  
  .PHONY: configure-target-winsup maybe-configure-target-winsup
  maybe-configure-target-winsup:
  @if target-winsup
  maybe-configure-target-winsup: configure-target-winsup
-configure-target-winsup: $(TARGET_SUBDIR)/winsup/multilib.out
-       @$(unstage)
+configure-target-winsup:
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       echo "Checking multilib configuration for winsup..."; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/winsup ; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/winsup/multilib.tmp 2> /dev/null ; \
+       if test -r $(TARGET_SUBDIR)/winsup/multilib.out; then \
+         if cmp -s $(TARGET_SUBDIR)/winsup/multilib.tmp $(TARGET_SUBDIR)/winsup/multilib.out; then \
+           rm -f $(TARGET_SUBDIR)/winsup/multilib.tmp; \
+         else \
+           rm -f $(TARGET_SUBDIR)/winsup/Makefile; \
+           mv $(TARGET_SUBDIR)/winsup/multilib.tmp $(TARGET_SUBDIR)/winsup/multilib.out; \
+         fi; \
+       else \
+         mv $(TARGET_SUBDIR)/winsup/multilib.tmp $(TARGET_SUBDIR)/winsup/multilib.out; \
+       fi
         @test ! -f $(TARGET_SUBDIR)/winsup/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/winsup ; \
         r=`${PWD_COMMAND}`; export r; \
@@ -30838,7 +31338,7 @@ maybe-all-target-winsup:
  TARGET-target-winsup=all
  maybe-all-target-winsup: all-target-winsup
  all-target-winsup: configure-target-winsup
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(NORMAL_TARGET_EXPORTS) \
@@ -30856,7 +31356,7 @@ maybe-check-target-winsup:
  maybe-check-target-winsup: check-target-winsup
  
  check-target-winsup:
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(NORMAL_TARGET_EXPORTS) \
@@ -30871,7 +31371,7 @@ maybe-install-target-winsup:
  maybe-install-target-winsup: install-target-winsup
  
  install-target-winsup: installdirs
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(NORMAL_TARGET_EXPORTS) \
@@ -30889,7 +31389,7 @@ maybe-info-target-winsup: info-target-winsup
  
  info-target-winsup: \
      configure-target-winsup 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -30915,7 +31415,7 @@ maybe-dvi-target-winsup: dvi-target-winsup
  
  dvi-target-winsup: \
      configure-target-winsup 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -30941,7 +31441,7 @@ maybe-html-target-winsup: html-target-winsup
  
  html-target-winsup: \
      configure-target-winsup 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -30967,7 +31467,7 @@ maybe-TAGS-target-winsup: TAGS-target-winsup
  
  TAGS-target-winsup: \
      configure-target-winsup 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -30994,7 +31494,7 @@ maybe-install-info-target-winsup: install-info-target-winsup
  install-info-target-winsup: \
      configure-target-winsup \
      info-target-winsup 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -31020,7 +31520,7 @@ maybe-installcheck-target-winsup: installcheck-target-winsup
  
  installcheck-target-winsup: \
      configure-target-winsup 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -31045,7 +31545,7 @@ maybe-mostlyclean-target-winsup:
  maybe-mostlyclean-target-winsup: mostlyclean-target-winsup
  
  mostlyclean-target-winsup: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -31070,7 +31570,7 @@ maybe-clean-target-winsup:
  maybe-clean-target-winsup: clean-target-winsup
  
  clean-target-winsup: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -31095,7 +31595,7 @@ maybe-distclean-target-winsup:
  maybe-distclean-target-winsup: distclean-target-winsup
  
  distclean-target-winsup: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -31120,7 +31620,7 @@ maybe-maintainer-clean-target-winsup:
  maybe-maintainer-clean-target-winsup: maintainer-clean-target-winsup
  
  maintainer-clean-target-winsup: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -31141,22 +31641,29 @@ maintainer-clean-target-winsup:
  
  
  
-# There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
-@if target-libgloss
-$(TARGET_SUBDIR)/libgloss/multilib.out: multilib.out
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgloss ; \
-       rm -f $(TARGET_SUBDIR)/libgloss/Makefile || : ; \
-       cp multilib.out $(TARGET_SUBDIR)/libgloss/multilib.out
-@endif target-libgloss
-
  
  
  .PHONY: configure-target-libgloss maybe-configure-target-libgloss
  maybe-configure-target-libgloss:
  @if target-libgloss
  maybe-configure-target-libgloss: configure-target-libgloss
-configure-target-libgloss: $(TARGET_SUBDIR)/libgloss/multilib.out
-       @$(unstage)
+configure-target-libgloss:
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       echo "Checking multilib configuration for libgloss..."; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgloss ; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgloss/multilib.tmp 2> /dev/null ; \
+       if test -r $(TARGET_SUBDIR)/libgloss/multilib.out; then \
+         if cmp -s $(TARGET_SUBDIR)/libgloss/multilib.tmp $(TARGET_SUBDIR)/libgloss/multilib.out; then \
+           rm -f $(TARGET_SUBDIR)/libgloss/multilib.tmp; \
+         else \
+           rm -f $(TARGET_SUBDIR)/libgloss/Makefile; \
+           mv $(TARGET_SUBDIR)/libgloss/multilib.tmp $(TARGET_SUBDIR)/libgloss/multilib.out; \
+         fi; \
+       else \
+         mv $(TARGET_SUBDIR)/libgloss/multilib.tmp $(TARGET_SUBDIR)/libgloss/multilib.out; \
+       fi
         @test ! -f $(TARGET_SUBDIR)/libgloss/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgloss ; \
         r=`${PWD_COMMAND}`; export r; \
@@ -31187,7 +31694,7 @@ maybe-all-target-libgloss:
  TARGET-target-libgloss=all
  maybe-all-target-libgloss: all-target-libgloss
  all-target-libgloss: configure-target-libgloss
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(NORMAL_TARGET_EXPORTS) \
@@ -31215,7 +31722,7 @@ maybe-install-target-libgloss:
  maybe-install-target-libgloss: install-target-libgloss
  
  install-target-libgloss: installdirs
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(NORMAL_TARGET_EXPORTS) \
@@ -31233,7 +31740,7 @@ maybe-info-target-libgloss: info-target-libgloss
  
  info-target-libgloss: \
      configure-target-libgloss 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -31259,7 +31766,7 @@ maybe-dvi-target-libgloss: dvi-target-libgloss
  
  dvi-target-libgloss: \
      configure-target-libgloss 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -31285,7 +31792,7 @@ maybe-html-target-libgloss: html-target-libgloss
  
  html-target-libgloss: \
      configure-target-libgloss 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -31311,7 +31818,7 @@ maybe-TAGS-target-libgloss: TAGS-target-libgloss
  
  TAGS-target-libgloss: \
      configure-target-libgloss 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -31338,7 +31845,7 @@ maybe-install-info-target-libgloss: install-info-target-libgloss
  install-info-target-libgloss: \
      configure-target-libgloss \
      info-target-libgloss 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -31364,7 +31871,7 @@ maybe-installcheck-target-libgloss: installcheck-target-libgloss
  
  installcheck-target-libgloss: \
      configure-target-libgloss 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -31389,7 +31896,7 @@ maybe-mostlyclean-target-libgloss:
  maybe-mostlyclean-target-libgloss: mostlyclean-target-libgloss
  
  mostlyclean-target-libgloss: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -31414,7 +31921,7 @@ maybe-clean-target-libgloss:
  maybe-clean-target-libgloss: clean-target-libgloss
  
  clean-target-libgloss: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -31439,7 +31946,7 @@ maybe-distclean-target-libgloss:
  maybe-distclean-target-libgloss: distclean-target-libgloss
  
  distclean-target-libgloss: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -31464,7 +31971,7 @@ maybe-maintainer-clean-target-libgloss:
  maybe-maintainer-clean-target-libgloss: maintainer-clean-target-libgloss
  
  maintainer-clean-target-libgloss: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -31485,22 +31992,29 @@ maintainer-clean-target-libgloss:
  
  
  
-# There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
-@if target-libiberty
-$(TARGET_SUBDIR)/libiberty/multilib.out: multilib.out
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libiberty ; \
-       rm -f $(TARGET_SUBDIR)/libiberty/Makefile || : ; \
-       cp multilib.out $(TARGET_SUBDIR)/libiberty/multilib.out
-@endif target-libiberty
-
  
  
  .PHONY: configure-target-libiberty maybe-configure-target-libiberty
  maybe-configure-target-libiberty:
  @if target-libiberty
  maybe-configure-target-libiberty: configure-target-libiberty
-configure-target-libiberty: $(TARGET_SUBDIR)/libiberty/multilib.out
-       @$(unstage)
+configure-target-libiberty:
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       echo "Checking multilib configuration for libiberty..."; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libiberty ; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libiberty/multilib.tmp 2> /dev/null ; \
+       if test -r $(TARGET_SUBDIR)/libiberty/multilib.out; then \
+         if cmp -s $(TARGET_SUBDIR)/libiberty/multilib.tmp $(TARGET_SUBDIR)/libiberty/multilib.out; then \
+           rm -f $(TARGET_SUBDIR)/libiberty/multilib.tmp; \
+         else \
+           rm -f $(TARGET_SUBDIR)/libiberty/Makefile; \
+           mv $(TARGET_SUBDIR)/libiberty/multilib.tmp $(TARGET_SUBDIR)/libiberty/multilib.out; \
+         fi; \
+       else \
+         mv $(TARGET_SUBDIR)/libiberty/multilib.tmp $(TARGET_SUBDIR)/libiberty/multilib.out; \
+       fi
         @test ! -f $(TARGET_SUBDIR)/libiberty/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libiberty ; \
         r=`${PWD_COMMAND}`; export r; \
@@ -31531,7 +32045,7 @@ maybe-all-target-libiberty:
  TARGET-target-libiberty=all
  maybe-all-target-libiberty: all-target-libiberty
  all-target-libiberty: configure-target-libiberty
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(NORMAL_TARGET_EXPORTS) \
@@ -31549,7 +32063,7 @@ maybe-check-target-libiberty:
  maybe-check-target-libiberty: check-target-libiberty
  
  check-target-libiberty:
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(NORMAL_TARGET_EXPORTS) \
@@ -31564,7 +32078,7 @@ maybe-install-target-libiberty:
  maybe-install-target-libiberty: install-target-libiberty
  
  install-target-libiberty: installdirs
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(NORMAL_TARGET_EXPORTS) \
@@ -31582,7 +32096,7 @@ maybe-info-target-libiberty: info-target-libiberty
  
  info-target-libiberty: \
      configure-target-libiberty 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/libiberty/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -31608,7 +32122,7 @@ maybe-dvi-target-libiberty: dvi-target-libiberty
  
  dvi-target-libiberty: \
      configure-target-libiberty 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/libiberty/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -31634,7 +32148,7 @@ maybe-html-target-libiberty: html-target-libiberty
  
  html-target-libiberty: \
      configure-target-libiberty 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/libiberty/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -31660,7 +32174,7 @@ maybe-TAGS-target-libiberty: TAGS-target-libiberty
  
  TAGS-target-libiberty: \
      configure-target-libiberty 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/libiberty/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -31687,7 +32201,7 @@ maybe-install-info-target-libiberty: install-info-target-libiberty
  install-info-target-libiberty: \
      configure-target-libiberty \
      info-target-libiberty 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/libiberty/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -31713,7 +32227,7 @@ maybe-installcheck-target-libiberty: installcheck-target-libiberty
  
  installcheck-target-libiberty: \
      configure-target-libiberty 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/libiberty/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -31738,7 +32252,7 @@ maybe-mostlyclean-target-libiberty:
  maybe-mostlyclean-target-libiberty: mostlyclean-target-libiberty
  
  mostlyclean-target-libiberty: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/libiberty/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -31763,7 +32277,7 @@ maybe-clean-target-libiberty:
  maybe-clean-target-libiberty: clean-target-libiberty
  
  clean-target-libiberty: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/libiberty/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -31788,7 +32302,7 @@ maybe-distclean-target-libiberty:
  maybe-distclean-target-libiberty: distclean-target-libiberty
  
  distclean-target-libiberty: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/libiberty/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -31813,7 +32327,7 @@ maybe-maintainer-clean-target-libiberty:
  maybe-maintainer-clean-target-libiberty: maintainer-clean-target-libiberty
  
  maintainer-clean-target-libiberty: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/libiberty/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -31834,22 +32348,29 @@ maintainer-clean-target-libiberty:
  
  
  
-# There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
-@if target-gperf
-$(TARGET_SUBDIR)/gperf/multilib.out: multilib.out
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/gperf ; \
-       rm -f $(TARGET_SUBDIR)/gperf/Makefile || : ; \
-       cp multilib.out $(TARGET_SUBDIR)/gperf/multilib.out
-@endif target-gperf
-
  
  
  .PHONY: configure-target-gperf maybe-configure-target-gperf
  maybe-configure-target-gperf:
  @if target-gperf
  maybe-configure-target-gperf: configure-target-gperf
-configure-target-gperf: $(TARGET_SUBDIR)/gperf/multilib.out
-       @$(unstage)
+configure-target-gperf:
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       echo "Checking multilib configuration for gperf..."; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/gperf ; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/gperf/multilib.tmp 2> /dev/null ; \
+       if test -r $(TARGET_SUBDIR)/gperf/multilib.out; then \
+         if cmp -s $(TARGET_SUBDIR)/gperf/multilib.tmp $(TARGET_SUBDIR)/gperf/multilib.out; then \
+           rm -f $(TARGET_SUBDIR)/gperf/multilib.tmp; \
+         else \
+           rm -f $(TARGET_SUBDIR)/gperf/Makefile; \
+           mv $(TARGET_SUBDIR)/gperf/multilib.tmp $(TARGET_SUBDIR)/gperf/multilib.out; \
+         fi; \
+       else \
+         mv $(TARGET_SUBDIR)/gperf/multilib.tmp $(TARGET_SUBDIR)/gperf/multilib.out; \
+       fi
         @test ! -f $(TARGET_SUBDIR)/gperf/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/gperf ; \
         r=`${PWD_COMMAND}`; export r; \
@@ -31880,7 +32401,7 @@ maybe-all-target-gperf:
  TARGET-target-gperf=all
  maybe-all-target-gperf: all-target-gperf
  all-target-gperf: configure-target-gperf
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(NORMAL_TARGET_EXPORTS) \
@@ -31898,7 +32419,7 @@ maybe-check-target-gperf:
  maybe-check-target-gperf: check-target-gperf
  
  check-target-gperf:
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(NORMAL_TARGET_EXPORTS) \
@@ -31913,7 +32434,7 @@ maybe-install-target-gperf:
  maybe-install-target-gperf: install-target-gperf
  
  install-target-gperf: installdirs
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(NORMAL_TARGET_EXPORTS) \
@@ -31931,7 +32452,7 @@ maybe-info-target-gperf: info-target-gperf
  
  info-target-gperf: \
      configure-target-gperf 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/gperf/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -31957,7 +32478,7 @@ maybe-dvi-target-gperf: dvi-target-gperf
  
  dvi-target-gperf: \
      configure-target-gperf 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/gperf/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -31983,7 +32504,7 @@ maybe-html-target-gperf: html-target-gperf
  
  html-target-gperf: \
      configure-target-gperf 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/gperf/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -32009,7 +32530,7 @@ maybe-TAGS-target-gperf: TAGS-target-gperf
  
  TAGS-target-gperf: \
      configure-target-gperf 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/gperf/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -32036,7 +32557,7 @@ maybe-install-info-target-gperf: install-info-target-gperf
  install-info-target-gperf: \
      configure-target-gperf \
      info-target-gperf 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/gperf/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -32062,7 +32583,7 @@ maybe-installcheck-target-gperf: installcheck-target-gperf
  
  installcheck-target-gperf: \
      configure-target-gperf 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/gperf/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -32087,7 +32608,7 @@ maybe-mostlyclean-target-gperf:
  maybe-mostlyclean-target-gperf: mostlyclean-target-gperf
  
  mostlyclean-target-gperf: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/gperf/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -32112,7 +32633,7 @@ maybe-clean-target-gperf:
  maybe-clean-target-gperf: clean-target-gperf
  
  clean-target-gperf: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/gperf/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -32137,7 +32658,7 @@ maybe-distclean-target-gperf:
  maybe-distclean-target-gperf: distclean-target-gperf
  
  distclean-target-gperf: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/gperf/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -32162,7 +32683,7 @@ maybe-maintainer-clean-target-gperf:
  maybe-maintainer-clean-target-gperf: maintainer-clean-target-gperf
  
  maintainer-clean-target-gperf: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/gperf/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -32183,22 +32704,29 @@ maintainer-clean-target-gperf:
  
  
  
-# There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
-@if target-examples
-$(TARGET_SUBDIR)/examples/multilib.out: multilib.out
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/examples ; \
-       rm -f $(TARGET_SUBDIR)/examples/Makefile || : ; \
-       cp multilib.out $(TARGET_SUBDIR)/examples/multilib.out
-@endif target-examples
-
  
  
  .PHONY: configure-target-examples maybe-configure-target-examples
  maybe-configure-target-examples:
  @if target-examples
  maybe-configure-target-examples: configure-target-examples
-configure-target-examples: $(TARGET_SUBDIR)/examples/multilib.out
-       @$(unstage)
+configure-target-examples:
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       echo "Checking multilib configuration for examples..."; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/examples ; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/examples/multilib.tmp 2> /dev/null ; \
+       if test -r $(TARGET_SUBDIR)/examples/multilib.out; then \
+         if cmp -s $(TARGET_SUBDIR)/examples/multilib.tmp $(TARGET_SUBDIR)/examples/multilib.out; then \
+           rm -f $(TARGET_SUBDIR)/examples/multilib.tmp; \
+         else \
+           rm -f $(TARGET_SUBDIR)/examples/Makefile; \
+           mv $(TARGET_SUBDIR)/examples/multilib.tmp $(TARGET_SUBDIR)/examples/multilib.out; \
+         fi; \
+       else \
+         mv $(TARGET_SUBDIR)/examples/multilib.tmp $(TARGET_SUBDIR)/examples/multilib.out; \
+       fi
         @test ! -f $(TARGET_SUBDIR)/examples/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/examples ; \
         r=`${PWD_COMMAND}`; export r; \
@@ -32229,7 +32757,7 @@ maybe-all-target-examples:
  TARGET-target-examples=all
  maybe-all-target-examples: all-target-examples
  all-target-examples: configure-target-examples
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(NORMAL_TARGET_EXPORTS) \
@@ -32270,7 +32798,7 @@ maybe-info-target-examples: info-target-examples
  
  info-target-examples: \
      configure-target-examples 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/examples/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -32296,7 +32824,7 @@ maybe-dvi-target-examples: dvi-target-examples
  
  dvi-target-examples: \
      configure-target-examples 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/examples/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -32322,7 +32850,7 @@ maybe-html-target-examples: html-target-examples
  
  html-target-examples: \
      configure-target-examples 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/examples/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -32348,7 +32876,7 @@ maybe-TAGS-target-examples: TAGS-target-examples
  
  TAGS-target-examples: \
      configure-target-examples 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/examples/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -32375,7 +32903,7 @@ maybe-install-info-target-examples: install-info-target-examples
  install-info-target-examples: \
      configure-target-examples \
      info-target-examples 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/examples/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -32401,7 +32929,7 @@ maybe-installcheck-target-examples: installcheck-target-examples
  
  installcheck-target-examples: \
      configure-target-examples 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/examples/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -32426,7 +32954,7 @@ maybe-mostlyclean-target-examples:
  maybe-mostlyclean-target-examples: mostlyclean-target-examples
  
  mostlyclean-target-examples: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/examples/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -32451,7 +32979,7 @@ maybe-clean-target-examples:
  maybe-clean-target-examples: clean-target-examples
  
  clean-target-examples: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/examples/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -32476,7 +33004,7 @@ maybe-distclean-target-examples:
  maybe-distclean-target-examples: distclean-target-examples
  
  distclean-target-examples: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/examples/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -32501,7 +33029,7 @@ maybe-maintainer-clean-target-examples:
  maybe-maintainer-clean-target-examples: maintainer-clean-target-examples
  
  maintainer-clean-target-examples: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/examples/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -32522,22 +33050,29 @@ maintainer-clean-target-examples:
  
  
  
-# There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
-@if target-libffi
-$(TARGET_SUBDIR)/libffi/multilib.out: multilib.out
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libffi ; \
-       rm -f $(TARGET_SUBDIR)/libffi/Makefile || : ; \
-       cp multilib.out $(TARGET_SUBDIR)/libffi/multilib.out
-@endif target-libffi
-
  
  
  .PHONY: configure-target-libffi maybe-configure-target-libffi
  maybe-configure-target-libffi:
  @if target-libffi
  maybe-configure-target-libffi: configure-target-libffi
-configure-target-libffi: $(TARGET_SUBDIR)/libffi/multilib.out
-       @$(unstage)
+configure-target-libffi:
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       echo "Checking multilib configuration for libffi..."; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libffi ; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libffi/multilib.tmp 2> /dev/null ; \
+       if test -r $(TARGET_SUBDIR)/libffi/multilib.out; then \
+         if cmp -s $(TARGET_SUBDIR)/libffi/multilib.tmp $(TARGET_SUBDIR)/libffi/multilib.out; then \
+           rm -f $(TARGET_SUBDIR)/libffi/multilib.tmp; \
+         else \
+           rm -f $(TARGET_SUBDIR)/libffi/Makefile; \
+           mv $(TARGET_SUBDIR)/libffi/multilib.tmp $(TARGET_SUBDIR)/libffi/multilib.out; \
+         fi; \
+       else \
+         mv $(TARGET_SUBDIR)/libffi/multilib.tmp $(TARGET_SUBDIR)/libffi/multilib.out; \
+       fi
         @test ! -f $(TARGET_SUBDIR)/libffi/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libffi ; \
         r=`${PWD_COMMAND}`; export r; \
@@ -32568,7 +33103,7 @@ maybe-all-target-libffi:
  TARGET-target-libffi=all
  maybe-all-target-libffi: all-target-libffi
  all-target-libffi: configure-target-libffi
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(NORMAL_TARGET_EXPORTS) \
@@ -32586,7 +33121,7 @@ maybe-check-target-libffi:
  maybe-check-target-libffi: check-target-libffi
  
  check-target-libffi:
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(NORMAL_TARGET_EXPORTS) \
@@ -32601,7 +33136,7 @@ maybe-install-target-libffi:
  maybe-install-target-libffi: install-target-libffi
  
  install-target-libffi: installdirs
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(NORMAL_TARGET_EXPORTS) \
@@ -32619,7 +33154,7 @@ maybe-info-target-libffi: info-target-libffi
  
  info-target-libffi: \
      configure-target-libffi 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -32645,7 +33180,7 @@ maybe-dvi-target-libffi: dvi-target-libffi
  
  dvi-target-libffi: \
      configure-target-libffi 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -32671,7 +33206,7 @@ maybe-html-target-libffi: html-target-libffi
  
  html-target-libffi: \
      configure-target-libffi 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -32697,7 +33232,7 @@ maybe-TAGS-target-libffi: TAGS-target-libffi
  
  TAGS-target-libffi: \
      configure-target-libffi 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -32724,7 +33259,7 @@ maybe-install-info-target-libffi: install-info-target-libffi
  install-info-target-libffi: \
      configure-target-libffi \
      info-target-libffi 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -32750,7 +33285,7 @@ maybe-installcheck-target-libffi: installcheck-target-libffi
  
  installcheck-target-libffi: \
      configure-target-libffi 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -32775,7 +33310,7 @@ maybe-mostlyclean-target-libffi:
  maybe-mostlyclean-target-libffi: mostlyclean-target-libffi
  
  mostlyclean-target-libffi: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -32800,7 +33335,7 @@ maybe-clean-target-libffi:
  maybe-clean-target-libffi: clean-target-libffi
  
  clean-target-libffi: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -32825,7 +33360,7 @@ maybe-distclean-target-libffi:
  maybe-distclean-target-libffi: distclean-target-libffi
  
  distclean-target-libffi: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -32850,7 +33385,7 @@ maybe-maintainer-clean-target-libffi:
  maybe-maintainer-clean-target-libffi: maintainer-clean-target-libffi
  
  maintainer-clean-target-libffi: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -32871,22 +33406,29 @@ maintainer-clean-target-libffi:
  
  
  
-# There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
-@if target-libjava
-$(TARGET_SUBDIR)/libjava/multilib.out: multilib.out
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libjava ; \
-       rm -f $(TARGET_SUBDIR)/libjava/Makefile || : ; \
-       cp multilib.out $(TARGET_SUBDIR)/libjava/multilib.out
-@endif target-libjava
-
  
  
  .PHONY: configure-target-libjava maybe-configure-target-libjava
  maybe-configure-target-libjava:
  @if target-libjava
  maybe-configure-target-libjava: configure-target-libjava
-configure-target-libjava: $(TARGET_SUBDIR)/libjava/multilib.out
-       @$(unstage)
+configure-target-libjava:
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       echo "Checking multilib configuration for libjava..."; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libjava ; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libjava/multilib.tmp 2> /dev/null ; \
+       if test -r $(TARGET_SUBDIR)/libjava/multilib.out; then \
+         if cmp -s $(TARGET_SUBDIR)/libjava/multilib.tmp $(TARGET_SUBDIR)/libjava/multilib.out; then \
+           rm -f $(TARGET_SUBDIR)/libjava/multilib.tmp; \
+         else \
+           rm -f $(TARGET_SUBDIR)/libjava/Makefile; \
+           mv $(TARGET_SUBDIR)/libjava/multilib.tmp $(TARGET_SUBDIR)/libjava/multilib.out; \
+         fi; \
+       else \
+         mv $(TARGET_SUBDIR)/libjava/multilib.tmp $(TARGET_SUBDIR)/libjava/multilib.out; \
+       fi
         @test ! -f $(TARGET_SUBDIR)/libjava/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libjava ; \
         r=`${PWD_COMMAND}`; export r; \
@@ -32917,7 +33459,7 @@ maybe-all-target-libjava:
  TARGET-target-libjava=all
  maybe-all-target-libjava: all-target-libjava
  all-target-libjava: configure-target-libjava
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(RAW_CXX_TARGET_EXPORTS) \
@@ -32935,7 +33477,7 @@ maybe-check-target-libjava:
  maybe-check-target-libjava: check-target-libjava
  
  check-target-libjava:
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(RAW_CXX_TARGET_EXPORTS) \
@@ -32950,7 +33492,7 @@ maybe-install-target-libjava:
  maybe-install-target-libjava: install-target-libjava
  
  install-target-libjava: installdirs
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(RAW_CXX_TARGET_EXPORTS) \
@@ -32968,7 +33510,7 @@ maybe-info-target-libjava: info-target-libjava
  
  info-target-libjava: \
      configure-target-libjava 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -32994,7 +33536,7 @@ maybe-dvi-target-libjava: dvi-target-libjava
  
  dvi-target-libjava: \
      configure-target-libjava 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -33020,7 +33562,7 @@ maybe-html-target-libjava: html-target-libjava
  
  html-target-libjava: \
      configure-target-libjava 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -33046,7 +33588,7 @@ maybe-TAGS-target-libjava: TAGS-target-libjava
  
  TAGS-target-libjava: \
      configure-target-libjava 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -33073,7 +33615,7 @@ maybe-install-info-target-libjava: install-info-target-libjava
  install-info-target-libjava: \
      configure-target-libjava \
      info-target-libjava 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -33099,7 +33641,7 @@ maybe-installcheck-target-libjava: installcheck-target-libjava
  
  installcheck-target-libjava: \
      configure-target-libjava 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -33124,7 +33666,7 @@ maybe-mostlyclean-target-libjava:
  maybe-mostlyclean-target-libjava: mostlyclean-target-libjava
  
  mostlyclean-target-libjava: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -33149,7 +33691,7 @@ maybe-clean-target-libjava:
  maybe-clean-target-libjava: clean-target-libjava
  
  clean-target-libjava: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -33174,7 +33716,7 @@ maybe-distclean-target-libjava:
  maybe-distclean-target-libjava: distclean-target-libjava
  
  distclean-target-libjava: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -33199,7 +33741,7 @@ maybe-maintainer-clean-target-libjava:
  maybe-maintainer-clean-target-libjava: maintainer-clean-target-libjava
  
  maintainer-clean-target-libjava: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -33220,22 +33762,29 @@ maintainer-clean-target-libjava:
  
  
  
-# There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
-@if target-zlib
-$(TARGET_SUBDIR)/zlib/multilib.out: multilib.out
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/zlib ; \
-       rm -f $(TARGET_SUBDIR)/zlib/Makefile || : ; \
-       cp multilib.out $(TARGET_SUBDIR)/zlib/multilib.out
-@endif target-zlib
-
  
  
  .PHONY: configure-target-zlib maybe-configure-target-zlib
  maybe-configure-target-zlib:
  @if target-zlib
  maybe-configure-target-zlib: configure-target-zlib
-configure-target-zlib: $(TARGET_SUBDIR)/zlib/multilib.out
-       @$(unstage)
+configure-target-zlib:
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       echo "Checking multilib configuration for zlib..."; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/zlib ; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/zlib/multilib.tmp 2> /dev/null ; \
+       if test -r $(TARGET_SUBDIR)/zlib/multilib.out; then \
+         if cmp -s $(TARGET_SUBDIR)/zlib/multilib.tmp $(TARGET_SUBDIR)/zlib/multilib.out; then \
+           rm -f $(TARGET_SUBDIR)/zlib/multilib.tmp; \
+         else \
+           rm -f $(TARGET_SUBDIR)/zlib/Makefile; \
+           mv $(TARGET_SUBDIR)/zlib/multilib.tmp $(TARGET_SUBDIR)/zlib/multilib.out; \
+         fi; \
+       else \
+         mv $(TARGET_SUBDIR)/zlib/multilib.tmp $(TARGET_SUBDIR)/zlib/multilib.out; \
+       fi
         @test ! -f $(TARGET_SUBDIR)/zlib/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/zlib ; \
         r=`${PWD_COMMAND}`; export r; \
@@ -33266,7 +33815,7 @@ maybe-all-target-zlib:
  TARGET-target-zlib=all
  maybe-all-target-zlib: all-target-zlib
  all-target-zlib: configure-target-zlib
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(NORMAL_TARGET_EXPORTS) \
@@ -33284,7 +33833,7 @@ maybe-check-target-zlib:
  maybe-check-target-zlib: check-target-zlib
  
  check-target-zlib:
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(NORMAL_TARGET_EXPORTS) \
@@ -33299,7 +33848,7 @@ maybe-install-target-zlib:
  maybe-install-target-zlib: install-target-zlib
  
  install-target-zlib: installdirs
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(NORMAL_TARGET_EXPORTS) \
@@ -33317,7 +33866,7 @@ maybe-info-target-zlib: info-target-zlib
  
  info-target-zlib: \
      configure-target-zlib 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -33343,7 +33892,7 @@ maybe-dvi-target-zlib: dvi-target-zlib
  
  dvi-target-zlib: \
      configure-target-zlib 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -33369,7 +33918,7 @@ maybe-html-target-zlib: html-target-zlib
  
  html-target-zlib: \
      configure-target-zlib 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -33395,7 +33944,7 @@ maybe-TAGS-target-zlib: TAGS-target-zlib
  
  TAGS-target-zlib: \
      configure-target-zlib 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -33422,7 +33971,7 @@ maybe-install-info-target-zlib: install-info-target-zlib
  install-info-target-zlib: \
      configure-target-zlib \
      info-target-zlib 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -33448,7 +33997,7 @@ maybe-installcheck-target-zlib: installcheck-target-zlib
  
  installcheck-target-zlib: \
      configure-target-zlib 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -33473,7 +34022,7 @@ maybe-mostlyclean-target-zlib:
  maybe-mostlyclean-target-zlib: mostlyclean-target-zlib
  
  mostlyclean-target-zlib: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -33498,7 +34047,7 @@ maybe-clean-target-zlib:
  maybe-clean-target-zlib: clean-target-zlib
  
  clean-target-zlib: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -33523,7 +34072,7 @@ maybe-distclean-target-zlib:
  maybe-distclean-target-zlib: distclean-target-zlib
  
  distclean-target-zlib: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -33548,7 +34097,7 @@ maybe-maintainer-clean-target-zlib:
  maybe-maintainer-clean-target-zlib: maintainer-clean-target-zlib
  
  maintainer-clean-target-zlib: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -33569,22 +34118,29 @@ maintainer-clean-target-zlib:
  
  
  
-# There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
-@if target-boehm-gc
-$(TARGET_SUBDIR)/boehm-gc/multilib.out: multilib.out
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/boehm-gc ; \
-       rm -f $(TARGET_SUBDIR)/boehm-gc/Makefile || : ; \
-       cp multilib.out $(TARGET_SUBDIR)/boehm-gc/multilib.out
-@endif target-boehm-gc
-
  
  
  .PHONY: configure-target-boehm-gc maybe-configure-target-boehm-gc
  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)
+configure-target-boehm-gc:
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       echo "Checking multilib configuration for boehm-gc..."; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/boehm-gc ; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/boehm-gc/multilib.tmp 2> /dev/null ; \
+       if test -r $(TARGET_SUBDIR)/boehm-gc/multilib.out; then \
+         if cmp -s $(TARGET_SUBDIR)/boehm-gc/multilib.tmp $(TARGET_SUBDIR)/boehm-gc/multilib.out; then \
+           rm -f $(TARGET_SUBDIR)/boehm-gc/multilib.tmp; \
+         else \
+           rm -f $(TARGET_SUBDIR)/boehm-gc/Makefile; \
+           mv $(TARGET_SUBDIR)/boehm-gc/multilib.tmp $(TARGET_SUBDIR)/boehm-gc/multilib.out; \
+         fi; \
+       else \
+         mv $(TARGET_SUBDIR)/boehm-gc/multilib.tmp $(TARGET_SUBDIR)/boehm-gc/multilib.out; \
+       fi
         @test ! -f $(TARGET_SUBDIR)/boehm-gc/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/boehm-gc ; \
         r=`${PWD_COMMAND}`; export r; \
@@ -33615,7 +34171,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)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(NORMAL_TARGET_EXPORTS) \
@@ -33633,7 +34189,7 @@ maybe-check-target-boehm-gc:
  maybe-check-target-boehm-gc: check-target-boehm-gc
  
  check-target-boehm-gc:
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(NORMAL_TARGET_EXPORTS) \
@@ -33648,7 +34204,7 @@ maybe-install-target-boehm-gc:
  maybe-install-target-boehm-gc: install-target-boehm-gc
  
  install-target-boehm-gc: installdirs
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(NORMAL_TARGET_EXPORTS) \
@@ -33666,7 +34222,7 @@ maybe-info-target-boehm-gc: info-target-boehm-gc
  
  info-target-boehm-gc: \
      configure-target-boehm-gc 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -33692,7 +34248,7 @@ maybe-dvi-target-boehm-gc: dvi-target-boehm-gc
  
  dvi-target-boehm-gc: \
      configure-target-boehm-gc 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -33718,7 +34274,7 @@ maybe-html-target-boehm-gc: html-target-boehm-gc
  
  html-target-boehm-gc: \
      configure-target-boehm-gc 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -33744,7 +34300,7 @@ maybe-TAGS-target-boehm-gc: TAGS-target-boehm-gc
  
  TAGS-target-boehm-gc: \
      configure-target-boehm-gc 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -33771,7 +34327,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)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -33797,7 +34353,7 @@ maybe-installcheck-target-boehm-gc: installcheck-target-boehm-gc
  
  installcheck-target-boehm-gc: \
      configure-target-boehm-gc 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -33822,7 +34378,7 @@ maybe-mostlyclean-target-boehm-gc:
  maybe-mostlyclean-target-boehm-gc: mostlyclean-target-boehm-gc
  
  mostlyclean-target-boehm-gc: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -33847,7 +34403,7 @@ maybe-clean-target-boehm-gc:
  maybe-clean-target-boehm-gc: clean-target-boehm-gc
  
  clean-target-boehm-gc: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -33872,7 +34428,7 @@ maybe-distclean-target-boehm-gc:
  maybe-distclean-target-boehm-gc: distclean-target-boehm-gc
  
  distclean-target-boehm-gc: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -33897,7 +34453,7 @@ maybe-maintainer-clean-target-boehm-gc:
  maybe-maintainer-clean-target-boehm-gc: maintainer-clean-target-boehm-gc
  
  maintainer-clean-target-boehm-gc: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -33918,22 +34474,29 @@ maintainer-clean-target-boehm-gc:
  
  
  
-# There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
-@if target-qthreads
-$(TARGET_SUBDIR)/qthreads/multilib.out: multilib.out
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/qthreads ; \
-       rm -f $(TARGET_SUBDIR)/qthreads/Makefile || : ; \
-       cp multilib.out $(TARGET_SUBDIR)/qthreads/multilib.out
-@endif target-qthreads
-
  
  
  .PHONY: configure-target-qthreads maybe-configure-target-qthreads
  maybe-configure-target-qthreads:
  @if target-qthreads
  maybe-configure-target-qthreads: configure-target-qthreads
-configure-target-qthreads: $(TARGET_SUBDIR)/qthreads/multilib.out
-       @$(unstage)
+configure-target-qthreads:
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       echo "Checking multilib configuration for qthreads..."; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/qthreads ; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/qthreads/multilib.tmp 2> /dev/null ; \
+       if test -r $(TARGET_SUBDIR)/qthreads/multilib.out; then \
+         if cmp -s $(TARGET_SUBDIR)/qthreads/multilib.tmp $(TARGET_SUBDIR)/qthreads/multilib.out; then \
+           rm -f $(TARGET_SUBDIR)/qthreads/multilib.tmp; \
+         else \
+           rm -f $(TARGET_SUBDIR)/qthreads/Makefile; \
+           mv $(TARGET_SUBDIR)/qthreads/multilib.tmp $(TARGET_SUBDIR)/qthreads/multilib.out; \
+         fi; \
+       else \
+         mv $(TARGET_SUBDIR)/qthreads/multilib.tmp $(TARGET_SUBDIR)/qthreads/multilib.out; \
+       fi
         @test ! -f $(TARGET_SUBDIR)/qthreads/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/qthreads ; \
         r=`${PWD_COMMAND}`; export r; \
@@ -33964,7 +34527,7 @@ maybe-all-target-qthreads:
  TARGET-target-qthreads=all
  maybe-all-target-qthreads: all-target-qthreads
  all-target-qthreads: configure-target-qthreads
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(NORMAL_TARGET_EXPORTS) \
@@ -33982,7 +34545,7 @@ maybe-check-target-qthreads:
  maybe-check-target-qthreads: check-target-qthreads
  
  check-target-qthreads:
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(NORMAL_TARGET_EXPORTS) \
@@ -33997,7 +34560,7 @@ maybe-install-target-qthreads:
  maybe-install-target-qthreads: install-target-qthreads
  
  install-target-qthreads: installdirs
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(NORMAL_TARGET_EXPORTS) \
@@ -34015,7 +34578,7 @@ maybe-info-target-qthreads: info-target-qthreads
  
  info-target-qthreads: \
      configure-target-qthreads 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/qthreads/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -34041,7 +34604,7 @@ maybe-dvi-target-qthreads: dvi-target-qthreads
  
  dvi-target-qthreads: \
      configure-target-qthreads 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/qthreads/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -34067,7 +34630,7 @@ maybe-html-target-qthreads: html-target-qthreads
  
  html-target-qthreads: \
      configure-target-qthreads 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/qthreads/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -34093,7 +34656,7 @@ maybe-TAGS-target-qthreads: TAGS-target-qthreads
  
  TAGS-target-qthreads: \
      configure-target-qthreads 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/qthreads/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -34120,7 +34683,7 @@ maybe-install-info-target-qthreads: install-info-target-qthreads
  install-info-target-qthreads: \
      configure-target-qthreads \
      info-target-qthreads 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/qthreads/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -34146,7 +34709,7 @@ maybe-installcheck-target-qthreads: installcheck-target-qthreads
  
  installcheck-target-qthreads: \
      configure-target-qthreads 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/qthreads/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -34171,7 +34734,7 @@ maybe-mostlyclean-target-qthreads:
  maybe-mostlyclean-target-qthreads: mostlyclean-target-qthreads
  
  mostlyclean-target-qthreads: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/qthreads/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -34196,7 +34759,7 @@ maybe-clean-target-qthreads:
  maybe-clean-target-qthreads: clean-target-qthreads
  
  clean-target-qthreads: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/qthreads/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -34221,7 +34784,7 @@ maybe-distclean-target-qthreads:
  maybe-distclean-target-qthreads: distclean-target-qthreads
  
  distclean-target-qthreads: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/qthreads/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -34246,7 +34809,7 @@ maybe-maintainer-clean-target-qthreads:
  maybe-maintainer-clean-target-qthreads: maintainer-clean-target-qthreads
  
  maintainer-clean-target-qthreads: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/qthreads/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -34267,22 +34830,29 @@ maintainer-clean-target-qthreads:
  
  
  
-# There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
-@if target-rda
-$(TARGET_SUBDIR)/rda/multilib.out: multilib.out
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/rda ; \
-       rm -f $(TARGET_SUBDIR)/rda/Makefile || : ; \
-       cp multilib.out $(TARGET_SUBDIR)/rda/multilib.out
-@endif target-rda
-
  
  
  .PHONY: configure-target-rda maybe-configure-target-rda
  maybe-configure-target-rda:
  @if target-rda
  maybe-configure-target-rda: configure-target-rda
-configure-target-rda: $(TARGET_SUBDIR)/rda/multilib.out
-       @$(unstage)
+configure-target-rda:
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       echo "Checking multilib configuration for rda..."; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/rda ; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/rda/multilib.tmp 2> /dev/null ; \
+       if test -r $(TARGET_SUBDIR)/rda/multilib.out; then \
+         if cmp -s $(TARGET_SUBDIR)/rda/multilib.tmp $(TARGET_SUBDIR)/rda/multilib.out; then \
+           rm -f $(TARGET_SUBDIR)/rda/multilib.tmp; \
+         else \
+           rm -f $(TARGET_SUBDIR)/rda/Makefile; \
+           mv $(TARGET_SUBDIR)/rda/multilib.tmp $(TARGET_SUBDIR)/rda/multilib.out; \
+         fi; \
+       else \
+         mv $(TARGET_SUBDIR)/rda/multilib.tmp $(TARGET_SUBDIR)/rda/multilib.out; \
+       fi
         @test ! -f $(TARGET_SUBDIR)/rda/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/rda ; \
         r=`${PWD_COMMAND}`; export r; \
@@ -34313,7 +34883,7 @@ maybe-all-target-rda:
  TARGET-target-rda=all
  maybe-all-target-rda: all-target-rda
  all-target-rda: configure-target-rda
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(NORMAL_TARGET_EXPORTS) \
@@ -34331,7 +34901,7 @@ maybe-check-target-rda:
  maybe-check-target-rda: check-target-rda
  
  check-target-rda:
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(NORMAL_TARGET_EXPORTS) \
@@ -34346,7 +34916,7 @@ maybe-install-target-rda:
  maybe-install-target-rda: install-target-rda
  
  install-target-rda: installdirs
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(NORMAL_TARGET_EXPORTS) \
@@ -34364,7 +34934,7 @@ maybe-info-target-rda: info-target-rda
  
  info-target-rda: \
      configure-target-rda 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -34390,7 +34960,7 @@ maybe-dvi-target-rda: dvi-target-rda
  
  dvi-target-rda: \
      configure-target-rda 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -34416,7 +34986,7 @@ maybe-html-target-rda: html-target-rda
  
  html-target-rda: \
      configure-target-rda 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -34442,7 +35012,7 @@ maybe-TAGS-target-rda: TAGS-target-rda
  
  TAGS-target-rda: \
      configure-target-rda 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -34469,7 +35039,7 @@ maybe-install-info-target-rda: install-info-target-rda
  install-info-target-rda: \
      configure-target-rda \
      info-target-rda 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -34495,7 +35065,7 @@ maybe-installcheck-target-rda: installcheck-target-rda
  
  installcheck-target-rda: \
      configure-target-rda 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -34520,7 +35090,7 @@ maybe-mostlyclean-target-rda:
  maybe-mostlyclean-target-rda: mostlyclean-target-rda
  
  mostlyclean-target-rda: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -34545,7 +35115,7 @@ maybe-clean-target-rda:
  maybe-clean-target-rda: clean-target-rda
  
  clean-target-rda: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -34570,7 +35140,7 @@ maybe-distclean-target-rda:
  maybe-distclean-target-rda: distclean-target-rda
  
  distclean-target-rda: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -34595,7 +35165,7 @@ maybe-maintainer-clean-target-rda:
  maybe-maintainer-clean-target-rda: maintainer-clean-target-rda
  
  maintainer-clean-target-rda: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -34616,22 +35186,29 @@ maintainer-clean-target-rda:
  
  
  
-# There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
-@if target-libada
-$(TARGET_SUBDIR)/libada/multilib.out: multilib.out
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libada ; \
-       rm -f $(TARGET_SUBDIR)/libada/Makefile || : ; \
-       cp multilib.out $(TARGET_SUBDIR)/libada/multilib.out
-@endif target-libada
-
  
  
  .PHONY: configure-target-libada maybe-configure-target-libada
  maybe-configure-target-libada:
  @if target-libada
  maybe-configure-target-libada: configure-target-libada
-configure-target-libada: $(TARGET_SUBDIR)/libada/multilib.out
-       @$(unstage)
+configure-target-libada:
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       echo "Checking multilib configuration for libada..."; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libada ; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libada/multilib.tmp 2> /dev/null ; \
+       if test -r $(TARGET_SUBDIR)/libada/multilib.out; then \
+         if cmp -s $(TARGET_SUBDIR)/libada/multilib.tmp $(TARGET_SUBDIR)/libada/multilib.out; then \
+           rm -f $(TARGET_SUBDIR)/libada/multilib.tmp; \
+         else \
+           rm -f $(TARGET_SUBDIR)/libada/Makefile; \
+           mv $(TARGET_SUBDIR)/libada/multilib.tmp $(TARGET_SUBDIR)/libada/multilib.out; \
+         fi; \
+       else \
+         mv $(TARGET_SUBDIR)/libada/multilib.tmp $(TARGET_SUBDIR)/libada/multilib.out; \
+       fi
         @test ! -f $(TARGET_SUBDIR)/libada/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libada ; \
         r=`${PWD_COMMAND}`; export r; \
@@ -34662,7 +35239,7 @@ maybe-all-target-libada:
  TARGET-target-libada=all
  maybe-all-target-libada: all-target-libada
  all-target-libada: configure-target-libada
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(NORMAL_TARGET_EXPORTS) \
@@ -34680,7 +35257,7 @@ maybe-check-target-libada:
  maybe-check-target-libada: check-target-libada
  
  check-target-libada:
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(NORMAL_TARGET_EXPORTS) \
@@ -34695,7 +35272,7 @@ maybe-install-target-libada:
  maybe-install-target-libada: install-target-libada
  
  install-target-libada: installdirs
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(NORMAL_TARGET_EXPORTS) \
@@ -34713,7 +35290,7 @@ maybe-info-target-libada: info-target-libada
  
  info-target-libada: \
      configure-target-libada 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -34739,7 +35316,7 @@ maybe-dvi-target-libada: dvi-target-libada
  
  dvi-target-libada: \
      configure-target-libada 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -34765,7 +35342,7 @@ maybe-html-target-libada: html-target-libada
  
  html-target-libada: \
      configure-target-libada 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -34791,7 +35368,7 @@ maybe-TAGS-target-libada: TAGS-target-libada
  
  TAGS-target-libada: \
      configure-target-libada 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -34818,7 +35395,7 @@ maybe-install-info-target-libada: install-info-target-libada
  install-info-target-libada: \
      configure-target-libada \
      info-target-libada 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -34844,7 +35421,7 @@ maybe-installcheck-target-libada: installcheck-target-libada
  
  installcheck-target-libada: \
      configure-target-libada 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -34869,7 +35446,7 @@ maybe-mostlyclean-target-libada:
  maybe-mostlyclean-target-libada: mostlyclean-target-libada
  
  mostlyclean-target-libada: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -34894,7 +35471,7 @@ maybe-clean-target-libada:
  maybe-clean-target-libada: clean-target-libada
  
  clean-target-libada: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -34919,7 +35496,7 @@ maybe-distclean-target-libada:
  maybe-distclean-target-libada: distclean-target-libada
  
  distclean-target-libada: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -34944,7 +35521,7 @@ maybe-maintainer-clean-target-libada:
  maybe-maintainer-clean-target-libada: maintainer-clean-target-libada
  
  maintainer-clean-target-libada: 
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -35083,29 +35660,31 @@ gcc-no-fixedincludes:
  # are dummy when toplevel bootstrap is not active.
  
  # 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.
+# there, so $(unstage) should be run at various points.  To avoid excessive
+# recursive invocations of make, we "inline" them using a variable.  These
+# must be referenced as ": $(MAKE) ; $(unstage)" rather than "$(unstage)"
+# to avoid warnings from the GNU Make job server.
  
  unstage = :
  stage = :
  
  @if gcc-bootstrap
  unstage = [ -f stage_current ] || $(MAKE) `cat stage_last`-start
-stage = $(MAKE) `cat stage_current`-end
+stage = if [ -f stage_current ]; then $(MAKE) `cat stage_current`-end || exit 1; else :; fi
  @endif gcc-bootstrap
  
  .PHONY: unstage stage
  unstage:
-       @$(unstage)
+       @: $(MAKE); $(unstage)
  stage:
-       @$(stage)
+       @: $(MAKE); $(stage)
  
  # We name the build directories for the various stages "stage1-gcc",
  # "stage2-gcc","stage3-gcc", etc.
  
  # Since the 'compare' process will fail (on debugging information) if any
  # directory names are different, we need to link the gcc directory for
-# the previous stage to a constant name ('gcc-prev'), and to make the name of
+# the previous stage to a constant name ('prev-gcc'), and to make the name of
  # the build directories constant as well. For the latter, we use naked names
  # like 'gcc', because the scripts in that directory assume it.  We use
  # mv on platforms where symlinks to directories do not work or are not
@@ -35131,6 +35710,7 @@ POSTSTAGE1_FLAGS_TO_PASS = \
         CC="$${CC}" CC_FOR_BUILD="$${CC_FOR_BUILD}" \
         STAGE_PREFIX=$$r/prev-gcc/ \
         CFLAGS="$(BOOT_CFLAGS)" \
+       LDFLAGS="$(BOOT_LDFLAGS)" \
         ADAC="\$$(CC)"
  
  # For stage 1:
@@ -35146,10 +35726,10 @@ POSTSTAGE1_FLAGS_TO_PASS = \
  .PHONY: stage1-start stage1-end
  
  stage1-start::
-       @[ -f stage_current ] && $(MAKE) `cat stage_current`-end || : ; \
+       @: $(MAKE); $(stage); \
         echo stage1 > stage_current ; \
         echo stage1 > stage_last; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR) $(TARGET_SUBDIR)
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)
  @if bfd
         @cd $(HOST_SUBDIR); [ -d stage1-bfd ] || \
           mkdir stage1-bfd; \
@@ -35198,6 +35778,12 @@ stage1-start::
         set stage1-libcpp libcpp ; \
         @CREATE_LINK_TO_DIR@ 
  @endif libcpp
+@if libdecnumber
+       @cd $(HOST_SUBDIR); [ -d stage1-libdecnumber ] || \
+         mkdir stage1-libdecnumber; \
+       set stage1-libdecnumber libdecnumber ; \
+       @CREATE_LINK_TO_DIR@ 
+@endif libdecnumber
  @if libiberty
         @cd $(HOST_SUBDIR); [ -d stage1-libiberty ] || \
           mkdir stage1-libiberty; \
@@ -35210,56 +35796,92 @@ stage1-start::
         set stage1-zlib zlib ; \
         @CREATE_LINK_TO_DIR@ 
  @endif zlib
+       @[ -d stage1-$(TARGET_SUBDIR) ] || \
+         mkdir stage1-$(TARGET_SUBDIR); \
+       set stage1-$(TARGET_SUBDIR) $(TARGET_SUBDIR) ; \
+       @CREATE_LINK_TO_DIR@ 
  
  stage1-end::
         @rm -f stage_current
  @if bfd
-       @cd $(HOST_SUBDIR); set bfd stage1-bfd ; \
-       @UNDO_LINK_TO_DIR@ 
+       @if test -d $(HOST_SUBDIR) ; then \
+       cd $(HOST_SUBDIR); set bfd stage1-bfd ; \
+       @UNDO_LINK_TO_DIR@  ; \
+       fi
  @endif bfd
  @if opcodes
-       @cd $(HOST_SUBDIR); set opcodes stage1-opcodes ; \
-       @UNDO_LINK_TO_DIR@ 
+       @if test -d $(HOST_SUBDIR) ; then \
+       cd $(HOST_SUBDIR); set opcodes stage1-opcodes ; \
+       @UNDO_LINK_TO_DIR@  ; \
+       fi
  @endif opcodes
  @if binutils
-       @cd $(HOST_SUBDIR); set binutils stage1-binutils ; \
-       @UNDO_LINK_TO_DIR@ 
+       @if test -d $(HOST_SUBDIR) ; then \
+       cd $(HOST_SUBDIR); set binutils stage1-binutils ; \
+       @UNDO_LINK_TO_DIR@  ; \
+       fi
  @endif binutils
  @if gas
-       @cd $(HOST_SUBDIR); set gas stage1-gas ; \
-       @UNDO_LINK_TO_DIR@ 
+       @if test -d $(HOST_SUBDIR) ; then \
+       cd $(HOST_SUBDIR); set gas stage1-gas ; \
+       @UNDO_LINK_TO_DIR@  ; \
+       fi
  @endif gas
  @if gcc
-       @cd $(HOST_SUBDIR); set gcc stage1-gcc ; \
-       @UNDO_LINK_TO_DIR@ 
+       @if test -d $(HOST_SUBDIR) ; then \
+       cd $(HOST_SUBDIR); set gcc stage1-gcc ; \
+       @UNDO_LINK_TO_DIR@  ; \
+       fi
  @endif gcc
  @if intl
-       @cd $(HOST_SUBDIR); set intl stage1-intl ; \
-       @UNDO_LINK_TO_DIR@ 
+       @if test -d $(HOST_SUBDIR) ; then \
+       cd $(HOST_SUBDIR); set intl stage1-intl ; \
+       @UNDO_LINK_TO_DIR@  ; \
+       fi
  @endif intl
  @if ld
-       @cd $(HOST_SUBDIR); set ld stage1-ld ; \
-       @UNDO_LINK_TO_DIR@ 
+       @if test -d $(HOST_SUBDIR) ; then \
+       cd $(HOST_SUBDIR); set ld stage1-ld ; \
+       @UNDO_LINK_TO_DIR@  ; \
+       fi
  @endif ld
  @if libcpp
-       @cd $(HOST_SUBDIR); set libcpp stage1-libcpp ; \
-       @UNDO_LINK_TO_DIR@ 
+       @if test -d $(HOST_SUBDIR) ; then \
+       cd $(HOST_SUBDIR); set libcpp stage1-libcpp ; \
+       @UNDO_LINK_TO_DIR@  ; \
+       fi
  @endif libcpp
+@if libdecnumber
+       @if test -d $(HOST_SUBDIR) ; then \
+       cd $(HOST_SUBDIR); set libdecnumber stage1-libdecnumber ; \
+       @UNDO_LINK_TO_DIR@  ; \
+       fi
+@endif libdecnumber
  @if libiberty
-       @cd $(HOST_SUBDIR); set libiberty stage1-libiberty ; \
-       @UNDO_LINK_TO_DIR@ 
+       @if test -d $(HOST_SUBDIR) ; then \
+       cd $(HOST_SUBDIR); set libiberty stage1-libiberty ; \
+       @UNDO_LINK_TO_DIR@  ; \
+       fi
  @endif libiberty
  @if zlib
-       @cd $(HOST_SUBDIR); set zlib stage1-zlib ; \
-       @UNDO_LINK_TO_DIR@ 
+       @if test -d $(HOST_SUBDIR) ; then \
+       cd $(HOST_SUBDIR); set zlib stage1-zlib ; \
+       @UNDO_LINK_TO_DIR@  ; \
+       fi
  @endif zlib
+       @if test -d $(TARGET_SUBDIR) ; then \
+         set $(TARGET_SUBDIR) stage1-$(TARGET_SUBDIR) ; \
+         @UNDO_LINK_TO_DIR@  ; \
+       fi
  
-# Bubble a bugfix through all the stages up to stage 1.  They
-# are remade, but not reconfigured.  The next stage (if any) will not
-# be reconfigured as well.
+# Bubble a bugfix through all the stages up to stage 1.  They are
+# remade, but not reconfigured.  The next stage (if any) will not be
+# reconfigured as well.
  .PHONY: stage1-bubble
  stage1-bubble:: 
-       @if test -f stage1-lean  ; then \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       if test -f stage1-lean  ; then \
           echo Skipping rebuild of stage1 ; \
         else \
           $(MAKE) stage1-start; \
@@ -35280,7 +35902,7 @@ do-clean: clean-stage1
  
  .PHONY: distclean-stage1
  distclean-stage1::
-       [ -f stage_current ] && $(MAKE) `cat stage_current`-end || :
+       @: $(MAKE); $(stage)
         rm -rf stage1-* 
  
  
@@ -35290,10 +35912,10 @@ distclean-stage1::
  .PHONY: stage2-start stage2-end
  
  stage2-start::
-       @[ -f stage_current ] && $(MAKE) `cat stage_current`-end || : ; \
+       @: $(MAKE); $(stage); \
         echo stage2 > stage_current ; \
         echo stage2 > stage_last; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR) $(TARGET_SUBDIR)
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)
  @if bfd
         @cd $(HOST_SUBDIR); [ -d stage2-bfd ] || \
           mkdir stage2-bfd; \
@@ -35358,6 +35980,14 @@ stage2-start::
         set stage1-libcpp prev-libcpp ; \
         @CREATE_LINK_TO_DIR@ 
  @endif libcpp
+@if libdecnumber
+       @cd $(HOST_SUBDIR); [ -d stage2-libdecnumber ] || \
+         mkdir stage2-libdecnumber; \
+       set stage2-libdecnumber libdecnumber ; \
+       @CREATE_LINK_TO_DIR@  ; \
+       set stage1-libdecnumber prev-libdecnumber ; \
+       @CREATE_LINK_TO_DIR@ 
+@endif libdecnumber
  @if libiberty
         @cd $(HOST_SUBDIR); [ -d stage2-libiberty ] || \
           mkdir stage2-libiberty; \
@@ -35374,76 +36004,118 @@ stage2-start::
         set stage1-zlib prev-zlib ; \
         @CREATE_LINK_TO_DIR@ 
  @endif zlib
+       @[ -d stage2-$(TARGET_SUBDIR) ] || \
+         mkdir stage2-$(TARGET_SUBDIR); \
+       set stage2-$(TARGET_SUBDIR) $(TARGET_SUBDIR) ; \
+       @CREATE_LINK_TO_DIR@  ; \
+       set stage1-$(TARGET_SUBDIR) prev-$(TARGET_SUBDIR) ; \
+       @CREATE_LINK_TO_DIR@ 
  
  stage2-end::
         @rm -f stage_current
  @if bfd
-       @cd $(HOST_SUBDIR); set bfd stage2-bfd ; \
+       @if test -d $(HOST_SUBDIR) ; then \
+       cd $(HOST_SUBDIR); set bfd stage2-bfd ; \
         @UNDO_LINK_TO_DIR@  ; \
         set prev-bfd stage1-bfd ; \
-       @UNDO_LINK_TO_DIR@ 
+       @UNDO_LINK_TO_DIR@  ; \
+       fi
  @endif bfd
  @if opcodes
-       @cd $(HOST_SUBDIR); set opcodes stage2-opcodes ; \
+       @if test -d $(HOST_SUBDIR) ; then \
+       cd $(HOST_SUBDIR); set opcodes stage2-opcodes ; \
         @UNDO_LINK_TO_DIR@  ; \
         set prev-opcodes stage1-opcodes ; \
-       @UNDO_LINK_TO_DIR@ 
+       @UNDO_LINK_TO_DIR@  ; \
+       fi
  @endif opcodes
  @if binutils
-       @cd $(HOST_SUBDIR); set binutils stage2-binutils ; \
+       @if test -d $(HOST_SUBDIR) ; then \
+       cd $(HOST_SUBDIR); set binutils stage2-binutils ; \
         @UNDO_LINK_TO_DIR@  ; \
         set prev-binutils stage1-binutils ; \
-       @UNDO_LINK_TO_DIR@ 
+       @UNDO_LINK_TO_DIR@  ; \
+       fi
  @endif binutils
  @if gas
-       @cd $(HOST_SUBDIR); set gas stage2-gas ; \
+       @if test -d $(HOST_SUBDIR) ; then \
+       cd $(HOST_SUBDIR); set gas stage2-gas ; \
         @UNDO_LINK_TO_DIR@  ; \
         set prev-gas stage1-gas ; \
-       @UNDO_LINK_TO_DIR@ 
+       @UNDO_LINK_TO_DIR@  ; \
+       fi
  @endif gas
  @if gcc
-       @cd $(HOST_SUBDIR); set gcc stage2-gcc ; \
+       @if test -d $(HOST_SUBDIR) ; then \
+       cd $(HOST_SUBDIR); set gcc stage2-gcc ; \
         @UNDO_LINK_TO_DIR@  ; \
         set prev-gcc stage1-gcc ; \
-       @UNDO_LINK_TO_DIR@ 
+       @UNDO_LINK_TO_DIR@  ; \
+       fi
  @endif gcc
  @if intl
-       @cd $(HOST_SUBDIR); set intl stage2-intl ; \
+       @if test -d $(HOST_SUBDIR) ; then \
+       cd $(HOST_SUBDIR); set intl stage2-intl ; \
         @UNDO_LINK_TO_DIR@  ; \
         set prev-intl stage1-intl ; \
-       @UNDO_LINK_TO_DIR@ 
+       @UNDO_LINK_TO_DIR@  ; \
+       fi
  @endif intl
  @if ld
-       @cd $(HOST_SUBDIR); set ld stage2-ld ; \
+       @if test -d $(HOST_SUBDIR) ; then \
+       cd $(HOST_SUBDIR); set ld stage2-ld ; \
         @UNDO_LINK_TO_DIR@  ; \
         set prev-ld stage1-ld ; \
-       @UNDO_LINK_TO_DIR@ 
+       @UNDO_LINK_TO_DIR@  ; \
+       fi
  @endif ld
  @if libcpp
-       @cd $(HOST_SUBDIR); set libcpp stage2-libcpp ; \
+       @if test -d $(HOST_SUBDIR) ; then \
+       cd $(HOST_SUBDIR); set libcpp stage2-libcpp ; \
         @UNDO_LINK_TO_DIR@  ; \
         set prev-libcpp stage1-libcpp ; \
-       @UNDO_LINK_TO_DIR@ 
+       @UNDO_LINK_TO_DIR@  ; \
+       fi
  @endif libcpp
+@if libdecnumber
+       @if test -d $(HOST_SUBDIR) ; then \
+       cd $(HOST_SUBDIR); set libdecnumber stage2-libdecnumber ; \
+       @UNDO_LINK_TO_DIR@  ; \
+       set prev-libdecnumber stage1-libdecnumber ; \
+       @UNDO_LINK_TO_DIR@  ; \
+       fi
+@endif libdecnumber
  @if libiberty
-       @cd $(HOST_SUBDIR); set libiberty stage2-libiberty ; \
+       @if test -d $(HOST_SUBDIR) ; then \
+       cd $(HOST_SUBDIR); set libiberty stage2-libiberty ; \
         @UNDO_LINK_TO_DIR@  ; \
         set prev-libiberty stage1-libiberty ; \
-       @UNDO_LINK_TO_DIR@ 
+       @UNDO_LINK_TO_DIR@  ; \
+       fi
  @endif libiberty
  @if zlib
-       @cd $(HOST_SUBDIR); set zlib stage2-zlib ; \
+       @if test -d $(HOST_SUBDIR) ; then \
+       cd $(HOST_SUBDIR); set zlib stage2-zlib ; \
         @UNDO_LINK_TO_DIR@  ; \
         set prev-zlib stage1-zlib ; \
-       @UNDO_LINK_TO_DIR@ 
+       @UNDO_LINK_TO_DIR@  ; \
+       fi
  @endif zlib
+       @if test -d $(TARGET_SUBDIR) ; then \
+         set $(TARGET_SUBDIR) stage2-$(TARGET_SUBDIR) ; \
+         @UNDO_LINK_TO_DIR@  ; \
+         set prev-$(TARGET_SUBDIR) stage1-$(TARGET_SUBDIR) ; \
+         @UNDO_LINK_TO_DIR@  ; \
+       fi
  
-# Bubble a bugfix through all the stages up to stage 2.  They
-# are remade, but not reconfigured.  The next stage (if any) will not
-# be reconfigured as well.
+# Bubble a bugfix through all the stages up to stage 2.  They are
+# remade, but not reconfigured.  The next stage (if any) will not be
+# reconfigured as well.
  .PHONY: stage2-bubble
  stage2-bubble:: stage1-bubble
-       @if test -f stage2-lean || test -f stage1-lean  ; then \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       if test -f stage2-lean || test -f stage1-lean  ; then \
           echo Skipping rebuild of stage2 ; \
         else \
           $(MAKE) stage2-start; \
@@ -35460,15 +36132,22 @@ do-clean: clean-stage2
  
  
  .PHONY: bootstrap2
-bootstrap2: stage2-bubble
-       $(MAKE) $(RECURSE_FLAGS_TO_PASS) all
+bootstrap2:
+       echo stage2 > stage_final
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(MAKE) $(RECURSE_FLAGS_TO_PASS) stage2-bubble
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target
  
  
  # Rules to wipe a stage and all the following ones, also used for cleanstrap
  distclean-stage1:: distclean-stage2 
  .PHONY: distclean-stage2
  distclean-stage2::
-       [ -f stage_current ] && $(MAKE) `cat stage_current`-end || :
+       @: $(MAKE); $(stage)
         rm -rf stage2-* 
  
  
@@ -35478,10 +36157,10 @@ distclean-stage2::
  .PHONY: stage3-start stage3-end
  
  stage3-start::
-       @[ -f stage_current ] && $(MAKE) `cat stage_current`-end || : ; \
+       @: $(MAKE); $(stage); \
         echo stage3 > stage_current ; \
         echo stage3 > stage_last; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR) $(TARGET_SUBDIR)
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)
  @if bfd
         @cd $(HOST_SUBDIR); [ -d stage3-bfd ] || \
           mkdir stage3-bfd; \
@@ -35546,6 +36225,14 @@ stage3-start::
         set stage2-libcpp prev-libcpp ; \
         @CREATE_LINK_TO_DIR@ 
  @endif libcpp
+@if libdecnumber
+       @cd $(HOST_SUBDIR); [ -d stage3-libdecnumber ] || \
+         mkdir stage3-libdecnumber; \
+       set stage3-libdecnumber libdecnumber ; \
+       @CREATE_LINK_TO_DIR@  ; \
+       set stage2-libdecnumber prev-libdecnumber ; \
+       @CREATE_LINK_TO_DIR@ 
+@endif libdecnumber
  @if libiberty
         @cd $(HOST_SUBDIR); [ -d stage3-libiberty ] || \
           mkdir stage3-libiberty; \
@@ -35562,82 +36249,125 @@ stage3-start::
         set stage2-zlib prev-zlib ; \
         @CREATE_LINK_TO_DIR@ 
  @endif zlib
+       @[ -d stage3-$(TARGET_SUBDIR) ] || \
+         mkdir stage3-$(TARGET_SUBDIR); \
+       set stage3-$(TARGET_SUBDIR) $(TARGET_SUBDIR) ; \
+       @CREATE_LINK_TO_DIR@  ; \
+       set stage2-$(TARGET_SUBDIR) prev-$(TARGET_SUBDIR) ; \
+       @CREATE_LINK_TO_DIR@ 
  
  stage3-end::
         @rm -f stage_current
  @if bfd
-       @cd $(HOST_SUBDIR); set bfd stage3-bfd ; \
+       @if test -d $(HOST_SUBDIR) ; then \
+       cd $(HOST_SUBDIR); set bfd stage3-bfd ; \
         @UNDO_LINK_TO_DIR@  ; \
         set prev-bfd stage2-bfd ; \
-       @UNDO_LINK_TO_DIR@ 
+       @UNDO_LINK_TO_DIR@  ; \
+       fi
  @endif bfd
  @if opcodes
-       @cd $(HOST_SUBDIR); set opcodes stage3-opcodes ; \
+       @if test -d $(HOST_SUBDIR) ; then \
+       cd $(HOST_SUBDIR); set opcodes stage3-opcodes ; \
         @UNDO_LINK_TO_DIR@  ; \
         set prev-opcodes stage2-opcodes ; \
-       @UNDO_LINK_TO_DIR@ 
+       @UNDO_LINK_TO_DIR@  ; \
+       fi
  @endif opcodes
  @if binutils
-       @cd $(HOST_SUBDIR); set binutils stage3-binutils ; \
+       @if test -d $(HOST_SUBDIR) ; then \
+       cd $(HOST_SUBDIR); set binutils stage3-binutils ; \
         @UNDO_LINK_TO_DIR@  ; \
         set prev-binutils stage2-binutils ; \
-       @UNDO_LINK_TO_DIR@ 
+       @UNDO_LINK_TO_DIR@  ; \
+       fi
  @endif binutils
  @if gas
-       @cd $(HOST_SUBDIR); set gas stage3-gas ; \
+       @if test -d $(HOST_SUBDIR) ; then \
+       cd $(HOST_SUBDIR); set gas stage3-gas ; \
         @UNDO_LINK_TO_DIR@  ; \
         set prev-gas stage2-gas ; \
-       @UNDO_LINK_TO_DIR@ 
+       @UNDO_LINK_TO_DIR@  ; \
+       fi
  @endif gas
  @if gcc
-       @cd $(HOST_SUBDIR); set gcc stage3-gcc ; \
+       @if test -d $(HOST_SUBDIR) ; then \
+       cd $(HOST_SUBDIR); set gcc stage3-gcc ; \
         @UNDO_LINK_TO_DIR@  ; \
         set prev-gcc stage2-gcc ; \
-       @UNDO_LINK_TO_DIR@ 
+       @UNDO_LINK_TO_DIR@  ; \
+       fi
  @endif gcc
  @if intl
-       @cd $(HOST_SUBDIR); set intl stage3-intl ; \
+       @if test -d $(HOST_SUBDIR) ; then \
+       cd $(HOST_SUBDIR); set intl stage3-intl ; \
         @UNDO_LINK_TO_DIR@  ; \
         set prev-intl stage2-intl ; \
-       @UNDO_LINK_TO_DIR@ 
+       @UNDO_LINK_TO_DIR@  ; \
+       fi
  @endif intl
  @if ld
-       @cd $(HOST_SUBDIR); set ld stage3-ld ; \
+       @if test -d $(HOST_SUBDIR) ; then \
+       cd $(HOST_SUBDIR); set ld stage3-ld ; \
         @UNDO_LINK_TO_DIR@  ; \
         set prev-ld stage2-ld ; \
-       @UNDO_LINK_TO_DIR@ 
+       @UNDO_LINK_TO_DIR@  ; \
+       fi
  @endif ld
  @if libcpp
-       @cd $(HOST_SUBDIR); set libcpp stage3-libcpp ; \
+       @if test -d $(HOST_SUBDIR) ; then \
+       cd $(HOST_SUBDIR); set libcpp stage3-libcpp ; \
         @UNDO_LINK_TO_DIR@  ; \
         set prev-libcpp stage2-libcpp ; \
-       @UNDO_LINK_TO_DIR@ 
+       @UNDO_LINK_TO_DIR@  ; \
+       fi
  @endif libcpp
+@if libdecnumber
+       @if test -d $(HOST_SUBDIR) ; then \
+       cd $(HOST_SUBDIR); set libdecnumber stage3-libdecnumber ; \
+       @UNDO_LINK_TO_DIR@  ; \
+       set prev-libdecnumber stage2-libdecnumber ; \
+       @UNDO_LINK_TO_DIR@  ; \
+       fi
+@endif libdecnumber
  @if libiberty
-       @cd $(HOST_SUBDIR); set libiberty stage3-libiberty ; \
+       @if test -d $(HOST_SUBDIR) ; then \
+       cd $(HOST_SUBDIR); set libiberty stage3-libiberty ; \
         @UNDO_LINK_TO_DIR@  ; \
         set prev-libiberty stage2-libiberty ; \
-       @UNDO_LINK_TO_DIR@ 
+       @UNDO_LINK_TO_DIR@  ; \
+       fi
  @endif libiberty
  @if zlib
-       @cd $(HOST_SUBDIR); set zlib stage3-zlib ; \
+       @if test -d $(HOST_SUBDIR) ; then \
+       cd $(HOST_SUBDIR); set zlib stage3-zlib ; \
         @UNDO_LINK_TO_DIR@  ; \
         set prev-zlib stage2-zlib ; \
-       @UNDO_LINK_TO_DIR@ 
+       @UNDO_LINK_TO_DIR@  ; \
+       fi
  @endif zlib
+       @if test -d $(TARGET_SUBDIR) ; then \
+         set $(TARGET_SUBDIR) stage3-$(TARGET_SUBDIR) ; \
+         @UNDO_LINK_TO_DIR@  ; \
+         set prev-$(TARGET_SUBDIR) stage2-$(TARGET_SUBDIR) ; \
+         @UNDO_LINK_TO_DIR@  ; \
+       fi
  
-# Bubble a bugfix through all the stages up to stage 3.  They
-# are remade, but not reconfigured.  The next stage (if any) will not
-# be reconfigured as well.
+# Bubble a bugfix through all the stages up to stage 3.  They are
+# remade, but not reconfigured.  The next stage (if any) will not be
+# reconfigured as well.
  .PHONY: stage3-bubble
  stage3-bubble:: stage2-bubble
         @bootstrap_lean@-rm -rf stage1-* ; $(STAMP) stage1-lean
-       @if test -f stage3-lean || test -f stage2-lean  ; then \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       if test -f stage3-lean || test -f stage2-lean  ; then \
           echo Skipping rebuild of stage3 ; \
         else \
           $(MAKE) stage3-start; \
           $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stage3; \
         fi
+       $(MAKE) $(RECURSE_FLAGS_TO_PASS) compare
  
  .PHONY: all-stage3 clean-stage3
  do-clean: clean-stage3
@@ -35647,13 +36377,13 @@ do-clean: clean-stage3
  @if gcc-bootstrap
  
  compare:
-       @if test -f stage2-lean; then \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       if test -f stage2-lean; then \
           echo Cannot compare object files as stage 2 was deleted. ; \
           exit 0 ; \
         fi; \
-       [ -f stage_current ] && $(MAKE) `cat stage_current`-end || : ; \
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       : $(MAKE); $(stage); \
         rm -f .bad_compare ; \
         cd stage3-gcc; \
         files=`find . -name "*$(objext)" -print` ; \
@@ -35683,16 +36413,22 @@ compare:
  
  
  .PHONY: bootstrap
-bootstrap: stage3-bubble
-       $(MAKE) compare
-       $(MAKE) $(RECURSE_FLAGS_TO_PASS) all
+bootstrap:
+       echo stage3 > stage_final
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(MAKE) $(RECURSE_FLAGS_TO_PASS) stage3-bubble
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target
  
  
  # Rules to wipe a stage and all the following ones, also used for cleanstrap
  distclean-stage2:: distclean-stage3 
  .PHONY: distclean-stage3
  distclean-stage3::
-       [ -f stage_current ] && $(MAKE) `cat stage_current`-end || :
+       @: $(MAKE); $(stage)
         rm -rf stage3-* compare 
  
  
@@ -35705,10 +36441,10 @@ cleanstrap: distclean bootstrap
  .PHONY: stage4-start stage4-end
  
  stage4-start::
-       @[ -f stage_current ] && $(MAKE) `cat stage_current`-end || : ; \
+       @: $(MAKE); $(stage); \
         echo stage4 > stage_current ; \
         echo stage4 > stage_last; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR) $(TARGET_SUBDIR)
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)
  @if bfd
         @cd $(HOST_SUBDIR); [ -d stage4-bfd ] || \
           mkdir stage4-bfd; \
@@ -35773,6 +36509,14 @@ stage4-start::
         set stage3-libcpp prev-libcpp ; \
         @CREATE_LINK_TO_DIR@ 
  @endif libcpp
+@if libdecnumber
+       @cd $(HOST_SUBDIR); [ -d stage4-libdecnumber ] || \
+         mkdir stage4-libdecnumber; \
+       set stage4-libdecnumber libdecnumber ; \
+       @CREATE_LINK_TO_DIR@  ; \
+       set stage3-libdecnumber prev-libdecnumber ; \
+       @CREATE_LINK_TO_DIR@ 
+@endif libdecnumber
  @if libiberty
         @cd $(HOST_SUBDIR); [ -d stage4-libiberty ] || \
           mkdir stage4-libiberty; \
@@ -35789,82 +36533,125 @@ stage4-start::
         set stage3-zlib prev-zlib ; \
         @CREATE_LINK_TO_DIR@ 
  @endif zlib
+       @[ -d stage4-$(TARGET_SUBDIR) ] || \
+         mkdir stage4-$(TARGET_SUBDIR); \
+       set stage4-$(TARGET_SUBDIR) $(TARGET_SUBDIR) ; \
+       @CREATE_LINK_TO_DIR@  ; \
+       set stage3-$(TARGET_SUBDIR) prev-$(TARGET_SUBDIR) ; \
+       @CREATE_LINK_TO_DIR@ 
  
  stage4-end::
         @rm -f stage_current
  @if bfd
-       @cd $(HOST_SUBDIR); set bfd stage4-bfd ; \
+       @if test -d $(HOST_SUBDIR) ; then \
+       cd $(HOST_SUBDIR); set bfd stage4-bfd ; \
         @UNDO_LINK_TO_DIR@  ; \
         set prev-bfd stage3-bfd ; \
-       @UNDO_LINK_TO_DIR@ 
+       @UNDO_LINK_TO_DIR@  ; \
+       fi
  @endif bfd
  @if opcodes
-       @cd $(HOST_SUBDIR); set opcodes stage4-opcodes ; \
+       @if test -d $(HOST_SUBDIR) ; then \
+       cd $(HOST_SUBDIR); set opcodes stage4-opcodes ; \
         @UNDO_LINK_TO_DIR@  ; \
         set prev-opcodes stage3-opcodes ; \
-       @UNDO_LINK_TO_DIR@ 
+       @UNDO_LINK_TO_DIR@  ; \
+       fi
  @endif opcodes
  @if binutils
-       @cd $(HOST_SUBDIR); set binutils stage4-binutils ; \
+       @if test -d $(HOST_SUBDIR) ; then \
+       cd $(HOST_SUBDIR); set binutils stage4-binutils ; \
         @UNDO_LINK_TO_DIR@  ; \
         set prev-binutils stage3-binutils ; \
-       @UNDO_LINK_TO_DIR@ 
+       @UNDO_LINK_TO_DIR@  ; \
+       fi
  @endif binutils
  @if gas
-       @cd $(HOST_SUBDIR); set gas stage4-gas ; \
+       @if test -d $(HOST_SUBDIR) ; then \
+       cd $(HOST_SUBDIR); set gas stage4-gas ; \
         @UNDO_LINK_TO_DIR@  ; \
         set prev-gas stage3-gas ; \
-       @UNDO_LINK_TO_DIR@ 
+       @UNDO_LINK_TO_DIR@  ; \
+       fi
  @endif gas
  @if gcc
-       @cd $(HOST_SUBDIR); set gcc stage4-gcc ; \
+       @if test -d $(HOST_SUBDIR) ; then \
+       cd $(HOST_SUBDIR); set gcc stage4-gcc ; \
         @UNDO_LINK_TO_DIR@  ; \
         set prev-gcc stage3-gcc ; \
-       @UNDO_LINK_TO_DIR@ 
+       @UNDO_LINK_TO_DIR@  ; \
+       fi
  @endif gcc
  @if intl
-       @cd $(HOST_SUBDIR); set intl stage4-intl ; \
+       @if test -d $(HOST_SUBDIR) ; then \
+       cd $(HOST_SUBDIR); set intl stage4-intl ; \
         @UNDO_LINK_TO_DIR@  ; \
         set prev-intl stage3-intl ; \
-       @UNDO_LINK_TO_DIR@ 
+       @UNDO_LINK_TO_DIR@  ; \
+       fi
  @endif intl
  @if ld
-       @cd $(HOST_SUBDIR); set ld stage4-ld ; \
+       @if test -d $(HOST_SUBDIR) ; then \
+       cd $(HOST_SUBDIR); set ld stage4-ld ; \
         @UNDO_LINK_TO_DIR@  ; \
         set prev-ld stage3-ld ; \
-       @UNDO_LINK_TO_DIR@ 
+       @UNDO_LINK_TO_DIR@  ; \
+       fi
  @endif ld
  @if libcpp
-       @cd $(HOST_SUBDIR); set libcpp stage4-libcpp ; \
+       @if test -d $(HOST_SUBDIR) ; then \
+       cd $(HOST_SUBDIR); set libcpp stage4-libcpp ; \
         @UNDO_LINK_TO_DIR@  ; \
         set prev-libcpp stage3-libcpp ; \
-       @UNDO_LINK_TO_DIR@ 
+       @UNDO_LINK_TO_DIR@  ; \
+       fi
  @endif libcpp
+@if libdecnumber
+       @if test -d $(HOST_SUBDIR) ; then \
+       cd $(HOST_SUBDIR); set libdecnumber stage4-libdecnumber ; \
+       @UNDO_LINK_TO_DIR@  ; \
+       set prev-libdecnumber stage3-libdecnumber ; \
+       @UNDO_LINK_TO_DIR@  ; \
+       fi
+@endif libdecnumber
  @if libiberty
-       @cd $(HOST_SUBDIR); set libiberty stage4-libiberty ; \
+       @if test -d $(HOST_SUBDIR) ; then \
+       cd $(HOST_SUBDIR); set libiberty stage4-libiberty ; \
         @UNDO_LINK_TO_DIR@  ; \
         set prev-libiberty stage3-libiberty ; \
-       @UNDO_LINK_TO_DIR@ 
+       @UNDO_LINK_TO_DIR@  ; \
+       fi
  @endif libiberty
  @if zlib
-       @cd $(HOST_SUBDIR); set zlib stage4-zlib ; \
+       @if test -d $(HOST_SUBDIR) ; then \
+       cd $(HOST_SUBDIR); set zlib stage4-zlib ; \
         @UNDO_LINK_TO_DIR@  ; \
         set prev-zlib stage3-zlib ; \
-       @UNDO_LINK_TO_DIR@ 
+       @UNDO_LINK_TO_DIR@  ; \
+       fi
  @endif zlib
+       @if test -d $(TARGET_SUBDIR) ; then \
+         set $(TARGET_SUBDIR) stage4-$(TARGET_SUBDIR) ; \
+         @UNDO_LINK_TO_DIR@  ; \
+         set prev-$(TARGET_SUBDIR) stage3-$(TARGET_SUBDIR) ; \
+         @UNDO_LINK_TO_DIR@  ; \
+       fi
  
-# Bubble a bugfix through all the stages up to stage 4.  They
-# are remade, but not reconfigured.  The next stage (if any) will not
-# be reconfigured as well.
+# Bubble a bugfix through all the stages up to stage 4.  They are
+# remade, but not reconfigured.  The next stage (if any) will not be
+# reconfigured as well.
  .PHONY: stage4-bubble
  stage4-bubble:: stage3-bubble
         @bootstrap_lean@-rm -rf stage2-* ; $(STAMP) stage2-lean
-       @if test -f stage4-lean || test -f stage3-lean  ; then \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       if test -f stage4-lean || test -f stage3-lean  ; then \
           echo Skipping rebuild of stage4 ; \
         else \
           $(MAKE) stage4-start; \
           $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stage4; \
         fi
+       $(MAKE) $(RECURSE_FLAGS_TO_PASS) compare3
  
  .PHONY: all-stage4 clean-stage4
  do-clean: clean-stage4
@@ -35874,13 +36661,13 @@ do-clean: clean-stage4
  @if gcc-bootstrap
  
  compare3:
-       @if test -f stage3-lean; then \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       if test -f stage3-lean; then \
           echo Cannot compare object files as stage 3 was deleted. ; \
           exit 0 ; \
         fi; \
-       [ -f stage_current ] && $(MAKE) `cat stage_current`-end || : ; \
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       : $(MAKE); $(stage); \
         rm -f .bad_compare ; \
         cd stage4-gcc; \
         files=`find . -name "*$(objext)" -print` ; \
@@ -35910,16 +36697,22 @@ compare3:
  
  
  .PHONY: bootstrap4
-bootstrap4: stage4-bubble
-       $(MAKE) compare3
-       $(MAKE) $(RECURSE_FLAGS_TO_PASS) all
+bootstrap4:
+       echo stage4 > stage_final
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(MAKE) $(RECURSE_FLAGS_TO_PASS) stage4-bubble
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target
  
  
  # Rules to wipe a stage and all the following ones, also used for cleanstrap
  distclean-stage3:: distclean-stage4 
  .PHONY: distclean-stage4
  distclean-stage4::
-       [ -f stage_current ] && $(MAKE) `cat stage_current`-end || :
+       @: $(MAKE); $(stage)
         rm -rf stage4-* compare3 
  
  
@@ -35929,10 +36722,10 @@ distclean-stage4::
  .PHONY: stageprofile-start stageprofile-end
  
  stageprofile-start::
-       @[ -f stage_current ] && $(MAKE) `cat stage_current`-end || : ; \
+       @: $(MAKE); $(stage); \
         echo stageprofile > stage_current ; \
         echo stageprofile > stage_last; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR) $(TARGET_SUBDIR)
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)
  @if bfd
         @cd $(HOST_SUBDIR); [ -d stageprofile-bfd ] || \
           mkdir stageprofile-bfd; \
@@ -35997,6 +36790,14 @@ stageprofile-start::
         set stage1-libcpp prev-libcpp ; \
         @CREATE_LINK_TO_DIR@ 
  @endif libcpp
+@if libdecnumber
+       @cd $(HOST_SUBDIR); [ -d stageprofile-libdecnumber ] || \
+         mkdir stageprofile-libdecnumber; \
+       set stageprofile-libdecnumber libdecnumber ; \
+       @CREATE_LINK_TO_DIR@  ; \
+       set stage1-libdecnumber prev-libdecnumber ; \
+       @CREATE_LINK_TO_DIR@ 
+@endif libdecnumber
  @if libiberty
         @cd $(HOST_SUBDIR); [ -d stageprofile-libiberty ] || \
           mkdir stageprofile-libiberty; \
@@ -36013,76 +36814,118 @@ stageprofile-start::
         set stage1-zlib prev-zlib ; \
         @CREATE_LINK_TO_DIR@ 
  @endif zlib
+       @[ -d stageprofile-$(TARGET_SUBDIR) ] || \
+         mkdir stageprofile-$(TARGET_SUBDIR); \
+       set stageprofile-$(TARGET_SUBDIR) $(TARGET_SUBDIR) ; \
+       @CREATE_LINK_TO_DIR@  ; \
+       set stage1-$(TARGET_SUBDIR) prev-$(TARGET_SUBDIR) ; \
+       @CREATE_LINK_TO_DIR@ 
  
  stageprofile-end::
         @rm -f stage_current
  @if bfd
-       @cd $(HOST_SUBDIR); set bfd stageprofile-bfd ; \
+       @if test -d $(HOST_SUBDIR) ; then \
+       cd $(HOST_SUBDIR); set bfd stageprofile-bfd ; \
         @UNDO_LINK_TO_DIR@  ; \
         set prev-bfd stage1-bfd ; \
-       @UNDO_LINK_TO_DIR@ 
+       @UNDO_LINK_TO_DIR@  ; \
+       fi
  @endif bfd
  @if opcodes
-       @cd $(HOST_SUBDIR); set opcodes stageprofile-opcodes ; \
+       @if test -d $(HOST_SUBDIR) ; then \
+       cd $(HOST_SUBDIR); set opcodes stageprofile-opcodes ; \
         @UNDO_LINK_TO_DIR@  ; \
         set prev-opcodes stage1-opcodes ; \
-       @UNDO_LINK_TO_DIR@ 
+       @UNDO_LINK_TO_DIR@  ; \
+       fi
  @endif opcodes
  @if binutils
-       @cd $(HOST_SUBDIR); set binutils stageprofile-binutils ; \
+       @if test -d $(HOST_SUBDIR) ; then \
+       cd $(HOST_SUBDIR); set binutils stageprofile-binutils ; \
         @UNDO_LINK_TO_DIR@  ; \
         set prev-binutils stage1-binutils ; \
-       @UNDO_LINK_TO_DIR@ 
+       @UNDO_LINK_TO_DIR@  ; \
+       fi
  @endif binutils
  @if gas
-       @cd $(HOST_SUBDIR); set gas stageprofile-gas ; \
+       @if test -d $(HOST_SUBDIR) ; then \
+       cd $(HOST_SUBDIR); set gas stageprofile-gas ; \
         @UNDO_LINK_TO_DIR@  ; \
         set prev-gas stage1-gas ; \
-       @UNDO_LINK_TO_DIR@ 
+       @UNDO_LINK_TO_DIR@  ; \
+       fi
  @endif gas
  @if gcc
-       @cd $(HOST_SUBDIR); set gcc stageprofile-gcc ; \
+       @if test -d $(HOST_SUBDIR) ; then \
+       cd $(HOST_SUBDIR); set gcc stageprofile-gcc ; \
         @UNDO_LINK_TO_DIR@  ; \
         set prev-gcc stage1-gcc ; \
-       @UNDO_LINK_TO_DIR@ 
+       @UNDO_LINK_TO_DIR@  ; \
+       fi
  @endif gcc
  @if intl
-       @cd $(HOST_SUBDIR); set intl stageprofile-intl ; \
+       @if test -d $(HOST_SUBDIR) ; then \
+       cd $(HOST_SUBDIR); set intl stageprofile-intl ; \
         @UNDO_LINK_TO_DIR@  ; \
         set prev-intl stage1-intl ; \
-       @UNDO_LINK_TO_DIR@ 
+       @UNDO_LINK_TO_DIR@  ; \
+       fi
  @endif intl
  @if ld
-       @cd $(HOST_SUBDIR); set ld stageprofile-ld ; \
+       @if test -d $(HOST_SUBDIR) ; then \
+       cd $(HOST_SUBDIR); set ld stageprofile-ld ; \
         @UNDO_LINK_TO_DIR@  ; \
         set prev-ld stage1-ld ; \
-       @UNDO_LINK_TO_DIR@ 
+       @UNDO_LINK_TO_DIR@  ; \
+       fi
  @endif ld
  @if libcpp
-       @cd $(HOST_SUBDIR); set libcpp stageprofile-libcpp ; \
+       @if test -d $(HOST_SUBDIR) ; then \
+       cd $(HOST_SUBDIR); set libcpp stageprofile-libcpp ; \
         @UNDO_LINK_TO_DIR@  ; \
         set prev-libcpp stage1-libcpp ; \
-       @UNDO_LINK_TO_DIR@ 
+       @UNDO_LINK_TO_DIR@  ; \
+       fi
  @endif libcpp
+@if libdecnumber
+       @if test -d $(HOST_SUBDIR) ; then \
+       cd $(HOST_SUBDIR); set libdecnumber stageprofile-libdecnumber ; \
+       @UNDO_LINK_TO_DIR@  ; \
+       set prev-libdecnumber stage1-libdecnumber ; \
+       @UNDO_LINK_TO_DIR@  ; \
+       fi
+@endif libdecnumber
  @if libiberty
-       @cd $(HOST_SUBDIR); set libiberty stageprofile-libiberty ; \
+       @if test -d $(HOST_SUBDIR) ; then \
+       cd $(HOST_SUBDIR); set libiberty stageprofile-libiberty ; \
         @UNDO_LINK_TO_DIR@  ; \
         set prev-libiberty stage1-libiberty ; \
-       @UNDO_LINK_TO_DIR@ 
+       @UNDO_LINK_TO_DIR@  ; \
+       fi
  @endif libiberty
  @if zlib
-       @cd $(HOST_SUBDIR); set zlib stageprofile-zlib ; \
+       @if test -d $(HOST_SUBDIR) ; then \
+       cd $(HOST_SUBDIR); set zlib stageprofile-zlib ; \
         @UNDO_LINK_TO_DIR@  ; \
         set prev-zlib stage1-zlib ; \
-       @UNDO_LINK_TO_DIR@ 
+       @UNDO_LINK_TO_DIR@  ; \
+       fi
  @endif zlib
+       @if test -d $(TARGET_SUBDIR) ; then \
+         set $(TARGET_SUBDIR) stageprofile-$(TARGET_SUBDIR) ; \
+         @UNDO_LINK_TO_DIR@  ; \
+         set prev-$(TARGET_SUBDIR) stage1-$(TARGET_SUBDIR) ; \
+         @UNDO_LINK_TO_DIR@  ; \
+       fi
  
-# Bubble a bugfix through all the stages up to stage profile.  They
-# are remade, but not reconfigured.  The next stage (if any) will not
-# be reconfigured as well.
+# Bubble a bugfix through all the stages up to stage profile.  They are
+# remade, but not reconfigured.  The next stage (if any) will not be
+# reconfigured as well.
  .PHONY: stageprofile-bubble
  stageprofile-bubble:: stage1-bubble
-       @if test -f stageprofile-lean || test -f stage1-lean  ; then \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       if test -f stageprofile-lean || test -f stage1-lean  ; then \
           echo Skipping rebuild of stageprofile ; \
         else \
           $(MAKE) stageprofile-start; \
@@ -36103,7 +36946,7 @@ do-clean: clean-stageprofile
  distclean-stage1:: distclean-stageprofile 
  .PHONY: distclean-stageprofile
  distclean-stageprofile::
-       [ -f stage_current ] && $(MAKE) `cat stage_current`-end || :
+       @: $(MAKE); $(stage)
         rm -rf stageprofile-* 
  
  
@@ -36113,10 +36956,10 @@ distclean-stageprofile::
  .PHONY: stagefeedback-start stagefeedback-end
  
  stagefeedback-start::
-       @[ -f stage_current ] && $(MAKE) `cat stage_current`-end || : ; \
+       @: $(MAKE); $(stage); \
         echo stagefeedback > stage_current ; \
         echo stagefeedback > stage_last; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR) $(TARGET_SUBDIR)
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)
  @if bfd
         @cd $(HOST_SUBDIR); [ -d stagefeedback-bfd ] || \
           mkdir stagefeedback-bfd; \
@@ -36181,6 +37024,14 @@ stagefeedback-start::
         set stageprofile-libcpp prev-libcpp ; \
         @CREATE_LINK_TO_DIR@ 
  @endif libcpp
+@if libdecnumber
+       @cd $(HOST_SUBDIR); [ -d stagefeedback-libdecnumber ] || \
+         mkdir stagefeedback-libdecnumber; \
+       set stagefeedback-libdecnumber libdecnumber ; \
+       @CREATE_LINK_TO_DIR@  ; \
+       set stageprofile-libdecnumber prev-libdecnumber ; \
+       @CREATE_LINK_TO_DIR@ 
+@endif libdecnumber
  @if libiberty
         @cd $(HOST_SUBDIR); [ -d stagefeedback-libiberty ] || \
           mkdir stagefeedback-libiberty; \
@@ -36197,76 +37048,118 @@ stagefeedback-start::
         set stageprofile-zlib prev-zlib ; \
         @CREATE_LINK_TO_DIR@ 
  @endif zlib
+       @[ -d stagefeedback-$(TARGET_SUBDIR) ] || \
+         mkdir stagefeedback-$(TARGET_SUBDIR); \
+       set stagefeedback-$(TARGET_SUBDIR) $(TARGET_SUBDIR) ; \
+       @CREATE_LINK_TO_DIR@  ; \
+       set stageprofile-$(TARGET_SUBDIR) prev-$(TARGET_SUBDIR) ; \
+       @CREATE_LINK_TO_DIR@ 
  
  stagefeedback-end::
         @rm -f stage_current
  @if bfd
-       @cd $(HOST_SUBDIR); set bfd stagefeedback-bfd ; \
+       @if test -d $(HOST_SUBDIR) ; then \
+       cd $(HOST_SUBDIR); set bfd stagefeedback-bfd ; \
         @UNDO_LINK_TO_DIR@  ; \
         set prev-bfd stageprofile-bfd ; \
-       @UNDO_LINK_TO_DIR@ 
+       @UNDO_LINK_TO_DIR@  ; \
+       fi
  @endif bfd
  @if opcodes
-       @cd $(HOST_SUBDIR); set opcodes stagefeedback-opcodes ; \
+       @if test -d $(HOST_SUBDIR) ; then \
+       cd $(HOST_SUBDIR); set opcodes stagefeedback-opcodes ; \
         @UNDO_LINK_TO_DIR@  ; \
         set prev-opcodes stageprofile-opcodes ; \
-       @UNDO_LINK_TO_DIR@ 
+       @UNDO_LINK_TO_DIR@  ; \
+       fi
  @endif opcodes
  @if binutils
-       @cd $(HOST_SUBDIR); set binutils stagefeedback-binutils ; \
+       @if test -d $(HOST_SUBDIR) ; then \
+       cd $(HOST_SUBDIR); set binutils stagefeedback-binutils ; \
         @UNDO_LINK_TO_DIR@  ; \
         set prev-binutils stageprofile-binutils ; \
-       @UNDO_LINK_TO_DIR@ 
+       @UNDO_LINK_TO_DIR@  ; \
+       fi
  @endif binutils
  @if gas
-       @cd $(HOST_SUBDIR); set gas stagefeedback-gas ; \
+       @if test -d $(HOST_SUBDIR) ; then \
+       cd $(HOST_SUBDIR); set gas stagefeedback-gas ; \
         @UNDO_LINK_TO_DIR@  ; \
         set prev-gas stageprofile-gas ; \
-       @UNDO_LINK_TO_DIR@ 
+       @UNDO_LINK_TO_DIR@  ; \
+       fi
  @endif gas
  @if gcc
-       @cd $(HOST_SUBDIR); set gcc stagefeedback-gcc ; \
+       @if test -d $(HOST_SUBDIR) ; then \
+       cd $(HOST_SUBDIR); set gcc stagefeedback-gcc ; \
         @UNDO_LINK_TO_DIR@  ; \
         set prev-gcc stageprofile-gcc ; \
-       @UNDO_LINK_TO_DIR@ 
+       @UNDO_LINK_TO_DIR@  ; \
+       fi
  @endif gcc
  @if intl
-       @cd $(HOST_SUBDIR); set intl stagefeedback-intl ; \
+       @if test -d $(HOST_SUBDIR) ; then \
+       cd $(HOST_SUBDIR); set intl stagefeedback-intl ; \
         @UNDO_LINK_TO_DIR@  ; \
         set prev-intl stageprofile-intl ; \
-       @UNDO_LINK_TO_DIR@ 
+       @UNDO_LINK_TO_DIR@  ; \
+       fi
  @endif intl
  @if ld
-       @cd $(HOST_SUBDIR); set ld stagefeedback-ld ; \
+       @if test -d $(HOST_SUBDIR) ; then \
+       cd $(HOST_SUBDIR); set ld stagefeedback-ld ; \
         @UNDO_LINK_TO_DIR@  ; \
         set prev-ld stageprofile-ld ; \
-       @UNDO_LINK_TO_DIR@ 
+       @UNDO_LINK_TO_DIR@  ; \
+       fi
  @endif ld
  @if libcpp
-       @cd $(HOST_SUBDIR); set libcpp stagefeedback-libcpp ; \
+       @if test -d $(HOST_SUBDIR) ; then \
+       cd $(HOST_SUBDIR); set libcpp stagefeedback-libcpp ; \
         @UNDO_LINK_TO_DIR@  ; \
         set prev-libcpp stageprofile-libcpp ; \
-       @UNDO_LINK_TO_DIR@ 
+       @UNDO_LINK_TO_DIR@  ; \
+       fi
  @endif libcpp
+@if libdecnumber
+       @if test -d $(HOST_SUBDIR) ; then \
+       cd $(HOST_SUBDIR); set libdecnumber stagefeedback-libdecnumber ; \
+       @UNDO_LINK_TO_DIR@  ; \
+       set prev-libdecnumber stageprofile-libdecnumber ; \
+       @UNDO_LINK_TO_DIR@  ; \
+       fi
+@endif libdecnumber
  @if libiberty
-       @cd $(HOST_SUBDIR); set libiberty stagefeedback-libiberty ; \
+       @if test -d $(HOST_SUBDIR) ; then \
+       cd $(HOST_SUBDIR); set libiberty stagefeedback-libiberty ; \
         @UNDO_LINK_TO_DIR@  ; \
         set prev-libiberty stageprofile-libiberty ; \
-       @UNDO_LINK_TO_DIR@ 
+       @UNDO_LINK_TO_DIR@  ; \
+       fi
  @endif libiberty
  @if zlib
-       @cd $(HOST_SUBDIR); set zlib stagefeedback-zlib ; \
+       @if test -d $(HOST_SUBDIR) ; then \
+       cd $(HOST_SUBDIR); set zlib stagefeedback-zlib ; \
         @UNDO_LINK_TO_DIR@  ; \
         set prev-zlib stageprofile-zlib ; \
-       @UNDO_LINK_TO_DIR@ 
+       @UNDO_LINK_TO_DIR@  ; \
+       fi
  @endif zlib
+       @if test -d $(TARGET_SUBDIR) ; then \
+         set $(TARGET_SUBDIR) stagefeedback-$(TARGET_SUBDIR) ; \
+         @UNDO_LINK_TO_DIR@  ; \
+         set prev-$(TARGET_SUBDIR) stageprofile-$(TARGET_SUBDIR) ; \
+         @UNDO_LINK_TO_DIR@  ; \
+       fi
  
-# Bubble a bugfix through all the stages up to stage feedback.  They
-# are remade, but not reconfigured.  The next stage (if any) will not
-# be reconfigured as well.
+# Bubble a bugfix through all the stages up to stage feedback.  They are
+# remade, but not reconfigured.  The next stage (if any) will not be
+# reconfigured as well.
  .PHONY: stagefeedback-bubble
  stagefeedback-bubble:: stageprofile-bubble
-       @if test -f stagefeedback-lean || test -f stageprofile-lean  ; then \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       if test -f stagefeedback-lean || test -f stageprofile-lean  ; then \
           echo Skipping rebuild of stagefeedback ; \
         else \
           $(MAKE) stagefeedback-start; \
@@ -36283,15 +37176,22 @@ do-clean: clean-stagefeedback
  
  
  .PHONY: profiledbootstrap
-profiledbootstrap: stagefeedback-bubble
-       $(MAKE) $(RECURSE_FLAGS_TO_PASS) all
+profiledbootstrap:
+       echo stagefeedback > stage_final
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(MAKE) $(RECURSE_FLAGS_TO_PASS) stagefeedback-bubble
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target
  
  
  # Rules to wipe a stage and all the following ones, also used for cleanstrap
  distclean-stageprofile:: distclean-stagefeedback 
  .PHONY: distclean-stagefeedback
  distclean-stagefeedback::
-       [ -f stage_current ] && $(MAKE) `cat stage_current`-end || :
+       @: $(MAKE); $(stage)
         rm -rf stagefeedback-* 
  
  
@@ -36541,6 +37441,14 @@ all-stage3-gcc: all-stage3-libcpp
  all-stage4-gcc: all-stage4-libcpp
  all-stageprofile-gcc: all-stageprofile-libcpp
  all-stagefeedback-gcc: all-stagefeedback-libcpp
+all-gcc: all-libdecnumber
+
+all-stage1-gcc: all-stage1-libdecnumber
+all-stage2-gcc: all-stage2-libdecnumber
+all-stage3-gcc: all-stage3-libdecnumber
+all-stage4-gcc: all-stage4-libdecnumber
+all-stageprofile-gcc: all-stageprofile-libdecnumber
+all-stagefeedback-gcc: all-stagefeedback-libdecnumber
  all-gcc: maybe-all-libiberty
  
  all-stage1-gcc: maybe-all-stage1-libiberty
@@ -36585,9 +37493,6 @@ all-stageprofile-libcpp: maybe-all-stageprofile-intl
  all-stagefeedback-libcpp: maybe-all-stagefeedback-intl
  all-fixincludes: maybe-all-libiberty
  all-gnattools: maybe-all-target-libada
-configure-gdb: maybe-configure-itcl
-configure-gdb: maybe-configure-tcl
-configure-gdb: maybe-configure-tk
  configure-gdb: maybe-configure-sim
  all-gdb: maybe-all-libiberty
  all-gdb: maybe-all-opcodes
@@ -36596,10 +37501,6 @@ all-gdb: maybe-all-readline
  all-gdb: maybe-all-build-bison
  all-gdb: maybe-all-build-byacc
  all-gdb: maybe-all-sim
-install-gdb: maybe-install-tcl
-install-gdb: maybe-install-tk
-install-gdb: maybe-install-itcl
-install-gdb: maybe-install-libgui
  configure-libgui: maybe-configure-tcl
  configure-libgui: maybe-configure-tk
  all-libgui: maybe-all-tcl
@@ -36894,12 +37795,17 @@ all-prebootstrap: maybe-all-gas
  all-prebootstrap: maybe-all-intl
  all-prebootstrap: maybe-all-ld
  all-prebootstrap: maybe-all-libcpp
+all-prebootstrap: maybe-all-libdecnumber
  all-prebootstrap: maybe-all-libiberty
  all-prebootstrap: maybe-all-zlib
  @endif gcc-no-bootstrap
  
+CONFIGURE_GDB_TK = @CONFIGURE_GDB_TK@
  GDB_TK = @GDB_TK@
+INSTALL_GDB_TK = @INSTALL_GDB_TK@
+configure-gdb: $(CONFIGURE_GDB_TK)
  all-gdb: $(gdbnlmrequirements) $(GDB_TK)
+install-gdb: $(INSTALL_GDB_TK)
  
  # Serialization dependencies.  Host configures don't work well in parallel to
  # each other, due to contention over config.cache.  Target configures and 
@@ -36910,17 +37816,6 @@ all-gdb: $(gdbnlmrequirements) $(GDB_TK)
  # Regenerating top level configury
  # --------------------------------
  
-# Multilib.out tells target dirs what multilibs they should build.
-# There is really only one copy.  We use the 'timestamp' method to
-# work around various timestamp bugs on some systems.
-# We use move-if-change so that it's only considered updated when it
-# actually changes, because it has to depend on a phony target.
-multilib.out: maybe-all-gcc
-       @r=`${PWD_COMMAND}`; export r; \
-       echo "Checking multilib configuration..."; \
-       $(CC_FOR_TARGET) --print-multi-lib > multilib.tmp 2> /dev/null ; \
-       $(SHELL) $(srcdir)/move-if-change multilib.tmp multilib.out ; \
-
  # Rebuilding Makefile.in, using autogen.
  AUTOGEN = autogen
  $(srcdir)/Makefile.in: @MAINT@ $(srcdir)/Makefile.tpl $(srcdir)/Makefile.def