* g++.dg/rtti/repo1.C: Call cleanup-repo-files.

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

index fe0db6c..9739732 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; \
@@ -245,47 +253,14 @@ BUILD_PREFIX_1 = @BUILD_PREFIX_1@
  # here so that they can be overridden by Makefile fragments.
  BOOT_CFLAGS= -g -O2
  
-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 +268,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 +299,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 = 
  
  # ------------------------------------
@@ -712,8 +472,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 +493,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 +573,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 +633,20 @@ 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)
+       @: $(MAKE); $(stage)
  
  .PHONY: all-build
  all-build:  \
@@ -938,6 +693,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,12 +756,12 @@ all-target:  \
  
  .PHONY: do-info
  do-info:
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(MAKE) $(RECURSE_FLAGS_TO_PASS) info-host \
           info-target
-       @$(stage)
+       @: $(MAKE); $(stage)
  
  
  .PHONY: info-host
@@ -1044,6 +800,7 @@ info-host:  \
      maybe-info-itcl \
      maybe-info-ld \
      maybe-info-libcpp \
+    maybe-info-libdecnumber \
      maybe-info-libgui \
      maybe-info-libiberty \
      maybe-info-libtool \
@@ -1102,12 +859,12 @@ info-target:  \
  
  .PHONY: do-dvi
  do-dvi:
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(MAKE) $(RECURSE_FLAGS_TO_PASS) dvi-host \
           dvi-target
-       @$(stage)
+       @: $(MAKE); $(stage)
  
  
  .PHONY: dvi-host
@@ -1146,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 \
@@ -1204,12 +962,12 @@ dvi-target:  \
  
  .PHONY: do-html
  do-html:
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(MAKE) $(RECURSE_FLAGS_TO_PASS) html-host \
           html-target
-       @$(stage)
+       @: $(MAKE); $(stage)
  
  
  .PHONY: html-host
@@ -1248,6 +1006,7 @@ html-host:  \
      maybe-html-itcl \
      maybe-html-ld \
      maybe-html-libcpp \
+    maybe-html-libdecnumber \
      maybe-html-libgui \
      maybe-html-libiberty \
      maybe-html-libtool \
@@ -1306,12 +1065,12 @@ html-target:  \
  
  .PHONY: do-TAGS
  do-TAGS:
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(MAKE) $(RECURSE_FLAGS_TO_PASS) TAGS-host \
           TAGS-target
-       @$(stage)
+       @: $(MAKE); $(stage)
  
  
  .PHONY: TAGS-host
@@ -1350,6 +1109,7 @@ TAGS-host:  \
      maybe-TAGS-itcl \
      maybe-TAGS-ld \
      maybe-TAGS-libcpp \
+    maybe-TAGS-libdecnumber \
      maybe-TAGS-libgui \
      maybe-TAGS-libiberty \
      maybe-TAGS-libtool \
@@ -1408,12 +1168,12 @@ TAGS-target:  \
  
  .PHONY: do-install-info
  do-install-info:
-       @$(unstage)
+       @: $(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)
+       @: $(MAKE); $(stage)
  
  
  .PHONY: install-info-host
@@ -1452,6 +1212,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 \
@@ -1510,12 +1271,12 @@ install-info-target:  \
  
  .PHONY: do-installcheck
  do-installcheck:
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(MAKE) $(RECURSE_FLAGS_TO_PASS) installcheck-host \
           installcheck-target
-       @$(stage)
+       @: $(MAKE); $(stage)
  
  
  .PHONY: installcheck-host
@@ -1554,6 +1315,7 @@ installcheck-host:  \
      maybe-installcheck-itcl \
      maybe-installcheck-ld \
      maybe-installcheck-libcpp \
+    maybe-installcheck-libdecnumber \
      maybe-installcheck-libgui \
      maybe-installcheck-libiberty \
      maybe-installcheck-libtool \
@@ -1612,12 +1374,12 @@ installcheck-target:  \
  
  .PHONY: do-mostlyclean
  do-mostlyclean:
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(MAKE) $(RECURSE_FLAGS_TO_PASS) mostlyclean-host \
           mostlyclean-target
-       @$(stage)
+       @: $(MAKE); $(stage)
  
  
  .PHONY: mostlyclean-host
@@ -1656,6 +1418,7 @@ mostlyclean-host:  \
      maybe-mostlyclean-itcl \
      maybe-mostlyclean-ld \
      maybe-mostlyclean-libcpp \
+    maybe-mostlyclean-libdecnumber \
      maybe-mostlyclean-libgui \
      maybe-mostlyclean-libiberty \
      maybe-mostlyclean-libtool \
@@ -1714,12 +1477,12 @@ mostlyclean-target:  \
  
  .PHONY: do-clean
  do-clean:
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(MAKE) $(RECURSE_FLAGS_TO_PASS) clean-host \
           clean-target
-       @$(stage)
+       @: $(MAKE); $(stage)
  
  
  .PHONY: clean-host
@@ -1758,6 +1521,7 @@ clean-host:  \
      maybe-clean-itcl \
      maybe-clean-ld \
      maybe-clean-libcpp \
+    maybe-clean-libdecnumber \
      maybe-clean-libgui \
      maybe-clean-libiberty \
      maybe-clean-libtool \
@@ -1816,12 +1580,12 @@ clean-target:  \
  
  .PHONY: do-distclean
  do-distclean:
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(MAKE) $(RECURSE_FLAGS_TO_PASS) distclean-host \
           distclean-target
-       @$(stage)
+       @: $(MAKE); $(stage)
  
  
  .PHONY: distclean-host
@@ -1860,6 +1624,7 @@ distclean-host:  \
      maybe-distclean-itcl \
      maybe-distclean-ld \
      maybe-distclean-libcpp \
+    maybe-distclean-libdecnumber \
      maybe-distclean-libgui \
      maybe-distclean-libiberty \
      maybe-distclean-libtool \
@@ -1918,12 +1683,12 @@ distclean-target:  \
  
  .PHONY: do-maintainer-clean
  do-maintainer-clean:
-       @$(unstage)
+       @: $(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)
+       @: $(MAKE); $(stage)
  
  
  .PHONY: maintainer-clean-host
@@ -1962,6 +1727,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 \
@@ -2044,7 +1810,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
@@ -2069,14 +1835,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.
  
@@ -2120,6 +1882,7 @@ check-host:  \
      maybe-check-itcl \
      maybe-check-ld \
      maybe-check-libcpp \
+    maybe-check-libdecnumber \
      maybe-check-libgui \
      maybe-check-libiberty \
      maybe-check-libtool \
@@ -2177,11 +1940,11 @@ check-target:  \
      maybe-check-target-libada
  
  do-check:
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(MAKE) $(RECURSE_FLAGS_TO_PASS) check-host check-target
-       @$(stage)
+       @: $(MAKE); $(stage)
  
  # Automated reporting of test results.
  
@@ -2208,11 +1971,11 @@ mail-report-with-warnings.log: warning.log
  
  .PHONY: install uninstall
  install:
-       @$(unstage)
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(MAKE) $(RECURSE_FLAGS_TO_PASS) installdirs install-host install-target
-       @$(stage)
+       @: $(MAKE); $(stage)
  
  .PHONY: install-host-nogcc
  install-host-nogcc:  \
@@ -2249,6 +2012,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 \
@@ -2319,6 +2083,7 @@ install-host:  \
      maybe-install-itcl \
      maybe-install-ld \
      maybe-install-libcpp \
+    maybe-install-libdecnumber \
      maybe-install-libgui \
      maybe-install-libiberty \
      maybe-install-libtool \
@@ -2382,6 +2147,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) ; \
@@ -2442,8 +2208,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; \
@@ -2474,7 +2240,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) \
@@ -2490,8 +2256,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; \
@@ -2522,7 +2288,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) \
@@ -2538,8 +2304,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; \
@@ -2570,7 +2336,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) \
@@ -2586,8 +2352,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; \
@@ -2618,7 +2384,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) \
@@ -2634,8 +2400,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; \
@@ -2666,7 +2432,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) \
@@ -2682,8 +2448,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; \
@@ -2714,7 +2480,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) \
@@ -2730,8 +2496,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; \
@@ -2762,7 +2528,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) \
@@ -2783,8 +2549,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; \
@@ -2814,7 +2580,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) \
@@ -2831,7 +2597,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) \
@@ -2846,7 +2612,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) \
@@ -2864,7 +2630,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; \
@@ -2890,7 +2656,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; \
@@ -2916,7 +2682,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; \
@@ -2942,7 +2708,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; \
@@ -2969,7 +2735,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; \
@@ -2995,7 +2761,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; \
@@ -3020,7 +2786,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; \
@@ -3045,7 +2811,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; \
@@ -3070,7 +2836,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; \
@@ -3095,7 +2861,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; \
@@ -3120,8 +2886,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; \
@@ -3151,7 +2917,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) \
@@ -3168,7 +2934,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) \
@@ -3183,7 +2949,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) \
@@ -3201,7 +2967,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; \
@@ -3227,7 +2993,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; \
@@ -3253,7 +3019,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; \
@@ -3279,7 +3045,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; \
@@ -3306,7 +3072,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; \
@@ -3332,7 +3098,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; \
@@ -3357,7 +3123,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; \
@@ -3382,7 +3148,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; \
@@ -3407,7 +3173,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; \
@@ -3432,7 +3198,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; \
@@ -3457,8 +3223,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; \
@@ -3488,7 +3254,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) \
@@ -3505,7 +3271,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) \
@@ -3520,7 +3286,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) \
@@ -3538,7 +3304,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; \
@@ -3564,7 +3330,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; \
@@ -3590,7 +3356,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; \
@@ -3616,7 +3382,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; \
@@ -3643,7 +3409,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; \
@@ -3669,7 +3435,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; \
@@ -3694,7 +3460,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; \
@@ -3719,7 +3485,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; \
@@ -3744,7 +3510,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; \
@@ -3769,7 +3535,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; \
@@ -3794,8 +3560,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; \
@@ -3825,7 +3591,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) \
@@ -3842,7 +3608,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) \
@@ -3857,7 +3623,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) \
@@ -3875,7 +3641,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; \
@@ -3901,7 +3667,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; \
@@ -3927,7 +3693,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; \
@@ -3953,7 +3719,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; \
@@ -3980,7 +3746,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; \
@@ -4006,7 +3772,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; \
@@ -4031,7 +3797,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; \
@@ -4056,7 +3822,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; \
@@ -4081,7 +3847,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; \
@@ -4106,7 +3872,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; \
@@ -4131,7 +3897,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 ; \
@@ -4158,13 +3924,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) ;; \
@@ -4182,14 +3948,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) ;; \
@@ -4207,14 +3973,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) ;; \
@@ -4232,14 +3998,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) ;; \
@@ -4257,14 +4023,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) ;; \
@@ -4282,14 +4048,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) ;; \
@@ -4516,7 +4282,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) \
@@ -4531,7 +4297,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) \
@@ -4795,7 +4561,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 ; \
@@ -4822,13 +4588,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) ;; \
@@ -4846,14 +4612,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) ;; \
@@ -4871,14 +4637,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) ;; \
@@ -4896,14 +4662,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) ;; \
@@ -4921,14 +4687,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) ;; \
@@ -4946,14 +4712,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) ;; \
@@ -5180,7 +4946,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) \
@@ -5195,7 +4961,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) \
@@ -5459,7 +5225,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 ; \
@@ -5486,13 +5252,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) ;; \
@@ -5510,14 +5276,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) ;; \
@@ -5535,14 +5301,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) ;; \
@@ -5560,14 +5326,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) ;; \
@@ -5585,14 +5351,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) ;; \
@@ -5610,14 +5376,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) ;; \
@@ -5844,7 +5610,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) \
@@ -5859,7 +5625,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) \
@@ -6123,8 +5889,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; \
@@ -6154,7 +5920,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) \
@@ -6172,7 +5938,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; \
@@ -6189,7 +5955,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) \
@@ -6207,7 +5973,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; \
@@ -6233,7 +5999,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; \
@@ -6259,7 +6025,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; \
@@ -6285,7 +6051,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; \
@@ -6312,7 +6078,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; \
@@ -6338,7 +6104,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; \
@@ -6363,7 +6129,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; \
@@ -6388,7 +6154,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; \
@@ -6413,7 +6179,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; \
@@ -6438,7 +6204,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; \
@@ -6463,8 +6229,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; \
@@ -6494,7 +6260,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) \
@@ -6512,7 +6278,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; \
@@ -6529,7 +6295,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) \
@@ -6547,7 +6313,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; \
@@ -6573,7 +6339,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; \
@@ -6599,7 +6365,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; \
@@ -6625,7 +6391,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; \
@@ -6652,7 +6418,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; \
@@ -6678,7 +6444,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; \
@@ -6703,7 +6469,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; \
@@ -6728,7 +6494,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; \
@@ -6753,7 +6519,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; \
@@ -6778,7 +6544,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; \
@@ -6803,8 +6569,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; \
@@ -6834,7 +6600,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) \
@@ -6851,7 +6617,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) \
@@ -6866,7 +6632,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) \
@@ -6884,7 +6650,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; \
@@ -6910,7 +6676,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; \
@@ -6936,7 +6702,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; \
@@ -6962,7 +6728,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; \
@@ -6989,7 +6755,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; \
@@ -7015,7 +6781,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; \
@@ -7040,7 +6806,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; \
@@ -7065,7 +6831,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; \
@@ -7090,7 +6856,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; \
@@ -7115,7 +6881,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; \
@@ -7140,8 +6906,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; \
@@ -7171,7 +6937,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) \
@@ -7188,7 +6954,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) \
@@ -7203,7 +6969,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) \
@@ -7221,7 +6987,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; \
@@ -7247,7 +7013,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; \
@@ -7273,7 +7039,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; \
@@ -7299,7 +7065,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; \
@@ -7326,7 +7092,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; \
@@ -7352,7 +7118,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; \
@@ -7377,7 +7143,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; \
@@ -7402,7 +7168,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; \
@@ -7427,7 +7193,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; \
@@ -7452,7 +7218,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; \
@@ -7477,8 +7243,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; \
@@ -7508,7 +7274,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) \
@@ -7525,7 +7291,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) \
@@ -7540,7 +7306,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) \
@@ -7558,7 +7324,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; \
@@ -7584,7 +7350,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; \
@@ -7610,7 +7376,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; \
@@ -7636,7 +7402,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; \
@@ -7663,7 +7429,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; \
@@ -7689,7 +7455,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; \
@@ -7714,7 +7480,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; \
@@ -7739,7 +7505,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; \
@@ -7764,7 +7530,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; \
@@ -7789,7 +7555,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; \
@@ -7814,8 +7580,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; \
@@ -7845,7 +7611,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) \
@@ -7871,7 +7637,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) \
@@ -7889,7 +7655,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; \
@@ -7915,7 +7681,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; \
@@ -7941,7 +7707,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; \
@@ -7967,7 +7733,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; \
@@ -7994,7 +7760,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; \
@@ -8020,7 +7786,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; \
@@ -8045,7 +7811,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; \
@@ -8070,7 +7836,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; \
@@ -8095,7 +7861,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; \
@@ -8120,7 +7886,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; \
@@ -8145,8 +7911,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; \
@@ -8176,7 +7942,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) \
@@ -8193,7 +7959,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) \
@@ -8208,7 +7974,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) \
@@ -8226,7 +7992,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; \
@@ -8252,7 +8018,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; \
@@ -8278,7 +8044,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; \
@@ -8304,7 +8070,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; \
@@ -8331,7 +8097,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; \
@@ -8357,7 +8123,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; \
@@ -8382,7 +8148,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; \
@@ -8407,7 +8173,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; \
@@ -8432,7 +8198,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; \
@@ -8457,7 +8223,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; \
@@ -8482,8 +8248,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; \
@@ -8513,7 +8279,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) \
@@ -8531,7 +8297,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; \
@@ -8548,7 +8314,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) \
@@ -8566,7 +8332,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; \
@@ -8592,7 +8358,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; \
@@ -8618,7 +8384,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; \
@@ -8644,7 +8410,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; \
@@ -8671,7 +8437,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; \
@@ -8697,7 +8463,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; \
@@ -8722,7 +8488,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; \
@@ -8747,7 +8513,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; \
@@ -8772,7 +8538,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; \
@@ -8797,7 +8563,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; \
@@ -8822,8 +8588,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; \
@@ -8853,7 +8619,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) \
@@ -8870,7 +8636,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) \
@@ -8885,7 +8651,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) \
@@ -8903,7 +8669,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; \
@@ -8929,7 +8695,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; \
@@ -8955,7 +8721,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; \
@@ -8981,7 +8747,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; \
@@ -9008,7 +8774,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; \
@@ -9034,7 +8800,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; \
@@ -9059,7 +8825,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; \
@@ -9084,7 +8850,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; \
@@ -9109,7 +8875,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; \
@@ -9134,7 +8900,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; \
@@ -9159,8 +8925,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; \
@@ -9190,7 +8956,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) \
@@ -9207,7 +8973,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) \
@@ -9222,7 +8988,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) \
@@ -9240,7 +9006,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; \
@@ -9266,7 +9032,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; \
@@ -9292,7 +9058,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; \
@@ -9318,7 +9084,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; \
@@ -9345,7 +9111,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; \
@@ -9371,7 +9137,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; \
@@ -9396,7 +9162,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; \
@@ -9421,7 +9187,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; \
@@ -9446,7 +9212,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; \
@@ -9471,7 +9237,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; \
@@ -9496,8 +9262,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; \
@@ -9527,7 +9293,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) \
@@ -9544,7 +9310,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) \
@@ -9559,7 +9325,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) \
@@ -9577,7 +9343,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; \
@@ -9603,7 +9369,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; \
@@ -9629,7 +9395,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; \
@@ -9655,7 +9421,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; \
@@ -9682,7 +9448,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; \
@@ -9708,7 +9474,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; \
@@ -9733,7 +9499,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; \
@@ -9758,7 +9524,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; \
@@ -9783,7 +9549,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; \
@@ -9808,7 +9574,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; \
@@ -9833,8 +9599,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; \
@@ -9864,7 +9630,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) \
@@ -9881,7 +9647,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) \
@@ -9896,7 +9662,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) \
@@ -9934,7 +9700,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; \
@@ -9989,7 +9755,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; \
@@ -10014,7 +9780,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; \
@@ -10039,7 +9805,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; \
@@ -10064,7 +9830,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; \
@@ -10089,8 +9855,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; \
@@ -10120,7 +9886,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) \
@@ -10138,7 +9904,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; \
@@ -10155,7 +9921,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) \
@@ -10173,7 +9939,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; \
@@ -10199,7 +9965,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; \
@@ -10225,7 +9991,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; \
@@ -10251,7 +10017,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; \
@@ -10278,7 +10044,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; \
@@ -10304,7 +10070,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; \
@@ -10329,7 +10095,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; \
@@ -10354,7 +10120,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; \
@@ -10379,7 +10145,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; \
@@ -10404,7 +10170,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; \
@@ -10429,7 +10195,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 ; \
@@ -10456,13 +10222,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) ;; \
@@ -10480,14 +10246,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) ;; \
@@ -10505,14 +10271,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) ;; \
@@ -10530,14 +10296,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) ;; \
@@ -10555,14 +10321,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) ;; \
@@ -10580,14 +10346,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) ;; \
@@ -10814,7 +10580,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) \
@@ -10829,7 +10595,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) \
@@ -11093,7 +10859,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 ; \
@@ -11120,13 +10886,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) ;; \
@@ -11144,14 +10910,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) ;; \
@@ -11169,14 +10935,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) ;; \
@@ -11194,14 +10960,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) ;; \
@@ -11219,14 +10985,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) ;; \
@@ -11244,14 +11010,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) ;; \
@@ -11478,7 +11244,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) \
@@ -11493,7 +11259,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) \
@@ -11757,8 +11523,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; \
@@ -11788,7 +11554,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) \
@@ -11805,7 +11571,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) \
@@ -11820,7 +11586,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) \
@@ -11838,7 +11604,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; \
@@ -11864,7 +11630,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; \
@@ -11890,7 +11656,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; \
@@ -11916,7 +11682,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; \
@@ -11943,7 +11709,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; \
@@ -11969,7 +11735,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; \
@@ -11994,7 +11760,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; \
@@ -12019,7 +11785,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; \
@@ -12044,7 +11810,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; \
@@ -12069,7 +11835,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; \
@@ -12094,8 +11860,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; \
@@ -12125,7 +11891,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) \
@@ -12142,7 +11908,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) \
@@ -12157,7 +11923,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) \
@@ -12175,7 +11941,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; \
@@ -12201,7 +11967,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; \
@@ -12227,7 +11993,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; \
@@ -12253,7 +12019,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; \
@@ -12280,7 +12046,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; \
@@ -12306,7 +12072,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; \
@@ -12331,7 +12097,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; \
@@ -12356,7 +12122,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; \
@@ -12381,7 +12147,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; \
@@ -12406,7 +12172,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; \
@@ -12431,8 +12197,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; \
@@ -12462,7 +12228,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) \
@@ -12479,7 +12245,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) \
@@ -12494,7 +12260,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) \
@@ -12512,7 +12278,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; \
@@ -12538,7 +12304,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; \
@@ -12564,7 +12330,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; \
@@ -12590,7 +12356,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; \
@@ -12617,7 +12383,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; \
@@ -12643,7 +12409,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; \
@@ -12668,7 +12434,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; \
@@ -12693,7 +12459,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; \
@@ -12718,7 +12484,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; \
@@ -12743,7 +12509,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; \
@@ -12768,8 +12534,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; \
@@ -12799,7 +12565,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) \
@@ -12816,7 +12582,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) \
@@ -12831,7 +12597,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) \
@@ -12849,7 +12615,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; \
@@ -12875,7 +12641,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; \
@@ -12901,7 +12667,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; \
@@ -12927,7 +12693,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; \
@@ -12954,7 +12720,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; \
@@ -12980,7 +12746,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; \
@@ -13005,7 +12771,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; \
@@ -13030,7 +12796,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; \
@@ -13055,7 +12821,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; \
@@ -13080,7 +12846,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; \
@@ -13105,8 +12871,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; \
@@ -13136,7 +12902,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) \
@@ -13153,7 +12919,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) \
@@ -13168,7 +12934,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) \
@@ -13186,7 +12952,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; \
@@ -13212,7 +12978,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; \
@@ -13238,7 +13004,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; \
@@ -13264,7 +13030,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; \
@@ -13291,7 +13057,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; \
@@ -13317,7 +13083,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; \
@@ -13342,7 +13108,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; \
@@ -13367,7 +13133,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; \
@@ -13392,7 +13158,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; \
@@ -13417,7 +13183,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; \
@@ -13442,8 +13208,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; \
@@ -13473,7 +13239,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) \
@@ -13490,7 +13256,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) \
@@ -13505,7 +13271,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) \
@@ -13523,7 +13289,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; \
@@ -13549,7 +13315,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; \
@@ -13575,7 +13341,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; \
@@ -13601,7 +13367,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; \
@@ -13628,7 +13394,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; \
@@ -13654,7 +13420,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; \
@@ -13679,7 +13445,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; \
@@ -13704,7 +13470,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; \
@@ -13729,7 +13495,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; \
@@ -13754,7 +13520,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; \
@@ -13779,8 +13545,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; \
@@ -13810,7 +13576,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) \
@@ -13827,7 +13593,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) \
@@ -13842,7 +13608,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) \
@@ -13860,7 +13626,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; \
@@ -13886,7 +13652,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; \
@@ -13912,7 +13678,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; \
@@ -13938,7 +13704,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; \
@@ -13965,7 +13731,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; \
@@ -13991,7 +13757,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; \
@@ -14016,7 +13782,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; \
@@ -14041,7 +13807,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; \
@@ -14066,7 +13832,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; \
@@ -14091,7 +13857,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; \
@@ -14116,7 +13882,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 ; \
@@ -14143,13 +13909,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) ;; \
@@ -14167,14 +13933,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) ;; \
@@ -14192,14 +13958,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) ;; \
@@ -14217,14 +13983,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) ;; \
@@ -14242,14 +14008,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) ;; \
@@ -14267,14 +14033,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) ;; \
@@ -14501,7 +14267,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) \
@@ -14516,7 +14282,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) \
@@ -14780,8 +14546,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; \
@@ -14811,7 +14577,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) \
@@ -14828,7 +14594,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) \
@@ -14843,7 +14609,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) \
@@ -14861,7 +14627,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; \
@@ -14887,7 +14653,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; \
@@ -14913,7 +14679,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; \
@@ -14939,7 +14705,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; \
@@ -14966,7 +14732,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; \
@@ -14992,7 +14758,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; \
@@ -15027,7 +14793,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; \
@@ -15052,7 +14818,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; \
@@ -15077,7 +14843,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; \
@@ -15102,8 +14868,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; \
@@ -15133,7 +14899,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) \
@@ -15150,7 +14916,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) \
@@ -15165,7 +14931,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) \
@@ -15183,7 +14949,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; \
@@ -15209,7 +14975,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; \
@@ -15235,7 +15001,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; \
@@ -15261,7 +15027,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; \
@@ -15288,7 +15054,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; \
@@ -15314,7 +15080,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; \
@@ -15339,7 +15105,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; \
@@ -15364,7 +15130,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; \
@@ -15389,7 +15155,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; \
@@ -15414,7 +15180,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; \
@@ -15439,7 +15205,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 ; \
@@ -15466,13 +15232,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) ;; \
@@ -15490,14 +15256,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) ;; \
@@ -15515,14 +15281,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) ;; \
@@ -15540,14 +15306,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) ;; \
@@ -15565,14 +15331,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) ;; \
@@ -15590,14 +15356,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) ;; \
@@ -15824,7 +15590,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) \
@@ -15839,7 +15605,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) \
@@ -16103,7 +15869,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 ; \
@@ -16130,13 +15896,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) ;; \
@@ -16154,14 +15920,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) ;; \
@@ -16179,14 +15945,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) ;; \
@@ -16204,14 +15970,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) ;; \
@@ -16229,14 +15995,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) ;; \
@@ -16254,14 +16020,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) ;; \
@@ -16488,7 +16254,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) \
@@ -16503,7 +16269,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) \
@@ -16763,12 +16529,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; \
@@ -16798,7 +17228,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) \
@@ -16815,7 +17245,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) \
@@ -16830,7 +17260,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) \
@@ -16848,7 +17278,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; \
@@ -16874,7 +17304,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; \
@@ -16900,7 +17330,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; \
@@ -16926,7 +17356,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; \
@@ -16953,7 +17383,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; \
@@ -16979,7 +17409,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; \
@@ -17004,7 +17434,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; \
@@ -17029,7 +17459,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; \
@@ -17054,7 +17484,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; \
@@ -17079,7 +17509,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; \
@@ -17104,7 +17534,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 ; \
@@ -17131,13 +17561,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) ;; \
@@ -17155,14 +17585,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) ;; \
@@ -17180,14 +17610,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) ;; \
@@ -17205,14 +17635,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) ;; \
@@ -17230,14 +17660,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) ;; \
@@ -17255,14 +17685,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) ;; \
@@ -17489,7 +17919,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) \
@@ -17504,7 +17934,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) \
@@ -17768,8 +18198,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; \
@@ -17799,7 +18229,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) \
@@ -17816,7 +18246,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) \
@@ -17831,7 +18261,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) \
@@ -17849,7 +18279,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; \
@@ -17875,7 +18305,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; \
@@ -17901,7 +18331,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; \
@@ -17927,7 +18357,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; \
@@ -17954,7 +18384,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; \
@@ -17980,7 +18410,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; \
@@ -18005,7 +18435,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; \
@@ -18030,7 +18460,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; \
@@ -18055,7 +18485,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; \
@@ -18080,7 +18510,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; \
@@ -18105,8 +18535,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; \
@@ -18136,7 +18566,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) \
@@ -18153,7 +18583,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) \
@@ -18168,7 +18598,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) \
@@ -18186,7 +18616,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; \
@@ -18212,7 +18642,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; \
@@ -18238,7 +18668,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; \
@@ -18264,7 +18694,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; \
@@ -18291,7 +18721,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; \
@@ -18317,7 +18747,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; \
@@ -18342,7 +18772,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; \
@@ -18367,7 +18797,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; \
@@ -18392,7 +18822,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; \
@@ -18417,7 +18847,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; \
@@ -18442,8 +18872,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; \
@@ -18473,7 +18903,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) \
@@ -18490,7 +18920,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) \
@@ -18505,7 +18935,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) \
@@ -18523,7 +18953,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; \
@@ -18549,7 +18979,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; \
@@ -18575,7 +19005,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; \
@@ -18601,7 +19031,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; \
@@ -18628,7 +19058,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; \
@@ -18654,7 +19084,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; \
@@ -18679,7 +19109,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; \
@@ -18704,7 +19134,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; \
@@ -18729,7 +19159,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; \
@@ -18754,7 +19184,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; \
@@ -18779,8 +19209,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; \
@@ -18810,7 +19240,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) \
@@ -18836,7 +19266,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) \
@@ -18854,7 +19284,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; \
@@ -18880,7 +19310,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; \
@@ -18906,7 +19336,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; \
@@ -18932,7 +19362,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; \
@@ -18959,7 +19389,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; \
@@ -18985,7 +19415,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; \
@@ -19010,7 +19440,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; \
@@ -19035,7 +19465,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; \
@@ -19060,7 +19490,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; \
@@ -19085,7 +19515,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; \
@@ -19110,8 +19540,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; \
@@ -19141,7 +19571,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) \
@@ -19158,7 +19588,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) \
@@ -19173,7 +19603,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) \
@@ -19191,7 +19621,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; \
@@ -19217,7 +19647,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; \
@@ -19243,7 +19673,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; \
@@ -19269,7 +19699,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; \
@@ -19296,7 +19726,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; \
@@ -19322,7 +19752,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; \
@@ -19347,7 +19777,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; \
@@ -19372,7 +19802,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; \
@@ -19397,7 +19827,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; \
@@ -19422,7 +19852,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; \
@@ -19447,8 +19877,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; \
@@ -19478,7 +19908,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) \
@@ -19495,7 +19925,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) \
@@ -19510,7 +19940,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) \
@@ -19528,7 +19958,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; \
@@ -19554,7 +19984,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; \
@@ -19580,7 +20010,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; \
@@ -19606,7 +20036,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; \
@@ -19633,7 +20063,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; \
@@ -19659,7 +20089,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; \
@@ -19684,7 +20114,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; \
@@ -19709,7 +20139,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; \
@@ -19734,7 +20164,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; \
@@ -19759,7 +20189,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; \
@@ -19784,8 +20214,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; \
@@ -19815,7 +20245,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) \
@@ -19832,7 +20262,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) \
@@ -19847,7 +20277,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) \
@@ -19865,7 +20295,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; \
@@ -19891,7 +20321,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; \
@@ -19917,7 +20347,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; \
@@ -19943,7 +20373,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; \
@@ -19970,7 +20400,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; \
@@ -19996,7 +20426,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; \
@@ -20021,7 +20451,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; \
@@ -20046,7 +20476,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; \
@@ -20071,7 +20501,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; \
@@ -20096,7 +20526,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; \
@@ -20121,8 +20551,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; \
@@ -20152,7 +20582,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) \
@@ -20169,7 +20599,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) \
@@ -20184,7 +20614,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) \
@@ -20202,7 +20632,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; \
@@ -20228,7 +20658,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; \
@@ -20254,7 +20684,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; \
@@ -20280,7 +20710,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; \
@@ -20307,7 +20737,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; \
@@ -20333,7 +20763,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; \
@@ -20358,7 +20788,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; \
@@ -20383,7 +20813,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; \
@@ -20408,7 +20838,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; \
@@ -20433,7 +20863,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; \
@@ -20458,8 +20888,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; \
@@ -20489,7 +20919,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) \
@@ -20506,7 +20936,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) \
@@ -20521,7 +20951,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) \
@@ -20539,7 +20969,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; \
@@ -20565,7 +20995,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; \
@@ -20591,7 +21021,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; \
@@ -20617,7 +21047,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; \
@@ -20644,7 +21074,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; \
@@ -20670,7 +21100,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; \
@@ -20695,7 +21125,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; \
@@ -20720,7 +21150,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; \
@@ -20745,7 +21175,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; \
@@ -20770,7 +21200,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; \
@@ -20795,8 +21225,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; \
@@ -20826,7 +21256,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) \
@@ -20864,7 +21294,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; \
@@ -20890,7 +21320,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; \
@@ -20916,7 +21346,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; \
@@ -20942,7 +21372,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; \
@@ -20969,7 +21399,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; \
@@ -20995,7 +21425,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; \
@@ -21020,7 +21450,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; \
@@ -21045,7 +21475,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; \
@@ -21070,7 +21500,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; \
@@ -21095,7 +21525,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; \
@@ -21120,8 +21550,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; \
@@ -21151,7 +21581,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) \
@@ -21168,7 +21598,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) \
@@ -21183,7 +21613,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) \
@@ -21201,7 +21631,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; \
@@ -21227,7 +21657,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; \
@@ -21253,7 +21683,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; \
@@ -21279,7 +21709,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; \
@@ -21306,7 +21736,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; \
@@ -21332,7 +21762,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; \
@@ -21357,7 +21787,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; \
@@ -21382,7 +21812,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; \
@@ -21407,7 +21837,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; \
@@ -21432,7 +21862,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; \
@@ -21457,8 +21887,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; \
@@ -21488,7 +21918,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) \
@@ -21505,7 +21935,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) \
@@ -21520,7 +21950,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) \
@@ -21538,7 +21968,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; \
@@ -21564,7 +21994,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; \
@@ -21590,7 +22020,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; \
@@ -21616,7 +22046,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; \
@@ -21643,7 +22073,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; \
@@ -21669,7 +22099,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; \
@@ -21694,7 +22124,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; \
@@ -21719,7 +22149,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; \
@@ -21744,7 +22174,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; \
@@ -21769,7 +22199,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; \
@@ -21794,8 +22224,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; \
@@ -21825,7 +22255,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) \
@@ -21842,7 +22272,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) \
@@ -21857,7 +22287,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) \
@@ -21875,7 +22305,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; \
@@ -21901,7 +22331,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; \
@@ -21927,7 +22357,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; \
@@ -21953,7 +22383,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; \
@@ -21980,7 +22410,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; \
@@ -22006,7 +22436,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; \
@@ -22031,7 +22461,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; \
@@ -22056,7 +22486,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; \
@@ -22081,7 +22511,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; \
@@ -22106,7 +22536,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; \
@@ -22131,8 +22561,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; \
@@ -22162,7 +22592,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) \
@@ -22179,7 +22609,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) \
@@ -22194,7 +22624,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) \
@@ -22212,7 +22642,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; \
@@ -22238,7 +22668,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; \
@@ -22264,7 +22694,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; \
@@ -22290,7 +22720,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; \
@@ -22317,7 +22747,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; \
@@ -22343,7 +22773,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; \
@@ -22368,7 +22798,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; \
@@ -22393,7 +22823,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; \
@@ -22418,7 +22848,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; \
@@ -22443,7 +22873,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; \
@@ -22468,8 +22898,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; \
@@ -22499,7 +22929,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) \
@@ -22516,7 +22946,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) \
@@ -22531,7 +22961,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) \
@@ -22549,7 +22979,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; \
@@ -22575,7 +23005,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; \
@@ -22601,7 +23031,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; \
@@ -22627,7 +23057,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; \
@@ -22654,7 +23084,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; \
@@ -22680,7 +23110,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; \
@@ -22705,7 +23135,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; \
@@ -22730,7 +23160,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; \
@@ -22755,7 +23185,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; \
@@ -22780,7 +23210,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; \
@@ -22805,8 +23235,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; \
@@ -22836,7 +23266,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) \
@@ -22853,7 +23283,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) \
@@ -22868,7 +23298,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) \
@@ -22886,7 +23316,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; \
@@ -22912,7 +23342,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; \
@@ -22938,7 +23368,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; \
@@ -22964,7 +23394,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; \
@@ -22991,7 +23421,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; \
@@ -23017,7 +23447,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; \
@@ -23042,7 +23472,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; \
@@ -23067,7 +23497,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; \
@@ -23092,7 +23522,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; \
@@ -23117,7 +23547,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; \
@@ -23142,8 +23572,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; \
@@ -23173,7 +23603,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) \
@@ -23190,7 +23620,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) \
@@ -23205,7 +23635,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) \
@@ -23223,7 +23653,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; \
@@ -23249,7 +23679,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; \
@@ -23275,7 +23705,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; \
@@ -23301,7 +23731,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; \
@@ -23328,7 +23758,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; \
@@ -23354,7 +23784,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; \
@@ -23379,7 +23809,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; \
@@ -23404,7 +23834,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; \
@@ -23429,7 +23859,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; \
@@ -23454,7 +23884,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; \
@@ -23479,8 +23909,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; \
@@ -23510,7 +23940,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) \
@@ -23527,7 +23957,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) \
@@ -23554,7 +23984,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; \
@@ -23580,7 +24010,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; \
@@ -23606,7 +24036,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; \
@@ -23632,7 +24062,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; \
@@ -23659,7 +24089,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; \
@@ -23685,7 +24115,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; \
@@ -23710,7 +24140,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; \
@@ -23735,7 +24165,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; \
@@ -23760,7 +24190,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; \
@@ -23785,7 +24215,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; \
@@ -23810,8 +24240,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; \
@@ -23841,7 +24271,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) \
@@ -23858,7 +24288,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) \
@@ -23873,7 +24303,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) \
@@ -23891,7 +24321,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; \
@@ -23917,7 +24347,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; \
@@ -23943,7 +24373,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; \
@@ -23969,7 +24399,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; \
@@ -23996,7 +24426,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; \
@@ -24022,7 +24452,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; \
@@ -24047,7 +24477,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; \
@@ -24072,7 +24502,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; \
@@ -24097,7 +24527,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; \
@@ -24122,7 +24552,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; \
@@ -24147,8 +24577,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; \
@@ -24178,7 +24608,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) \
@@ -24195,7 +24625,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) \
@@ -24210,7 +24640,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) \
@@ -24228,7 +24658,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; \
@@ -24254,7 +24684,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; \
@@ -24280,7 +24710,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; \
@@ -24306,7 +24736,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; \
@@ -24333,7 +24763,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; \
@@ -24359,7 +24789,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; \
@@ -24384,7 +24814,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; \
@@ -24409,7 +24839,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; \
@@ -24434,7 +24864,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; \
@@ -24459,7 +24889,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; \
@@ -24484,8 +24914,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; \
@@ -24515,7 +24945,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) \
@@ -24532,7 +24962,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) \
@@ -24547,7 +24977,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) \
@@ -24565,7 +24995,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; \
@@ -24591,7 +25021,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; \
@@ -24617,7 +25047,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; \
@@ -24643,7 +25073,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; \
@@ -24670,7 +25100,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; \
@@ -24696,7 +25126,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; \
@@ -24721,7 +25151,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; \
@@ -24746,7 +25176,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; \
@@ -24771,7 +25201,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; \
@@ -24796,7 +25226,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; \
@@ -24821,8 +25251,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; \
@@ -24852,7 +25282,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) \
@@ -24869,7 +25299,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) \
@@ -24884,7 +25314,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) \
@@ -24902,7 +25332,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; \
@@ -24928,7 +25358,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; \
@@ -24954,7 +25384,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; \
@@ -24980,7 +25410,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; \
@@ -25007,7 +25437,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; \
@@ -25033,7 +25463,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; \
@@ -25058,7 +25488,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; \
@@ -25083,7 +25513,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; \
@@ -25108,7 +25538,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; \
@@ -25133,7 +25563,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; \
@@ -25158,8 +25588,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; \
@@ -25189,7 +25619,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) \
@@ -25207,7 +25637,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; \
@@ -25224,7 +25654,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) \
@@ -25242,7 +25672,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; \
@@ -25268,7 +25698,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; \
@@ -25294,7 +25724,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; \
@@ -25320,7 +25750,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; \
@@ -25347,7 +25777,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; \
@@ -25373,7 +25803,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; \
@@ -25398,7 +25828,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; \
@@ -25423,7 +25853,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; \
@@ -25448,7 +25878,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; \
@@ -25473,7 +25903,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; \
@@ -25498,7 +25928,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 ; \
@@ -25525,13 +25955,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) ;; \
@@ -25549,14 +25979,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) ;; \
@@ -25574,14 +26004,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) ;; \
@@ -25599,14 +26029,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) ;; \
@@ -25624,14 +26054,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) ;; \
@@ -25649,14 +26079,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) ;; \
@@ -26150,8 +26580,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; \
@@ -26181,7 +26611,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) \
@@ -26198,7 +26628,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) \
@@ -26213,7 +26643,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) \
@@ -26231,7 +26661,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; \
@@ -26257,7 +26687,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; \
@@ -26283,7 +26713,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; \
@@ -26309,7 +26739,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; \
@@ -26336,7 +26766,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; \
@@ -26362,7 +26792,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; \
@@ -26387,7 +26817,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; \
@@ -26412,7 +26842,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; \
@@ -26437,7 +26867,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; \
@@ -26462,7 +26892,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; \
@@ -26487,8 +26917,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; \
@@ -26518,7 +26948,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) \
@@ -26535,7 +26965,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) \
@@ -26550,7 +26980,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) \
@@ -26568,7 +26998,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; \
@@ -26594,7 +27024,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; \
@@ -26620,7 +27050,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; \
@@ -26646,7 +27076,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; \
@@ -26673,7 +27103,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; \
@@ -26699,7 +27129,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; \
@@ -26724,7 +27154,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; \
@@ -26749,7 +27179,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; \
@@ -26774,7 +27204,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; \
@@ -26799,7 +27229,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; \
@@ -26824,8 +27254,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; \
@@ -26855,7 +27285,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) \
@@ -26872,7 +27302,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) \
@@ -26887,7 +27317,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) \
@@ -26905,7 +27335,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; \
@@ -26931,7 +27361,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; \
@@ -26957,7 +27387,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; \
@@ -26983,7 +27413,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; \
@@ -27010,7 +27440,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; \
@@ -27036,7 +27466,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; \
@@ -27061,7 +27491,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; \
@@ -27086,7 +27516,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; \
@@ -27111,7 +27541,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; \
@@ -27136,7 +27566,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; \
@@ -27161,8 +27591,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; \
@@ -27192,7 +27622,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) \
@@ -27209,7 +27639,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) \
@@ -27224,7 +27654,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) \
@@ -27242,7 +27672,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; \
@@ -27268,7 +27698,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; \
@@ -27294,7 +27724,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; \
@@ -27320,7 +27750,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; \
@@ -27347,7 +27777,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; \
@@ -27373,7 +27803,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; \
@@ -27398,7 +27828,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; \
@@ -27423,7 +27853,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; \
@@ -27448,7 +27878,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; \
@@ -27473,7 +27903,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; \
@@ -27498,8 +27928,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; \
@@ -27529,7 +27959,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) \
@@ -27555,7 +27985,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) \
@@ -27573,7 +28003,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; \
@@ -27599,7 +28029,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; \
@@ -27625,7 +28055,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; \
@@ -27651,7 +28081,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; \
@@ -27678,7 +28108,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; \
@@ -27704,7 +28134,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; \
@@ -27769,8 +28199,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; \
@@ -27800,7 +28230,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) \
@@ -27826,7 +28256,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) \
@@ -27844,7 +28274,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; \
@@ -27870,7 +28300,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; \
@@ -27896,7 +28326,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; \
@@ -27922,7 +28352,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; \
@@ -27949,7 +28379,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; \
@@ -27975,7 +28405,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; \
@@ -28000,7 +28430,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; \
@@ -28025,7 +28455,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; \
@@ -28050,7 +28480,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; \
@@ -28075,7 +28505,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; \
@@ -28100,8 +28530,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; \
@@ -28131,7 +28561,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) \
@@ -28148,7 +28578,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) \
@@ -28163,7 +28593,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) \
@@ -28181,7 +28611,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; \
@@ -28207,7 +28637,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; \
@@ -28233,7 +28663,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; \
@@ -28259,7 +28689,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; \
@@ -28286,7 +28716,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; \
@@ -28312,7 +28742,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; \
@@ -28337,7 +28767,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; \
@@ -28362,7 +28792,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; \
@@ -28387,7 +28817,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; \
@@ -28412,7 +28842,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; \
@@ -28438,22 +28868,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; \
@@ -28484,7 +28921,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) \
@@ -28502,7 +28939,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) \
@@ -28517,7 +28954,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) \
@@ -28535,7 +28972,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; \
@@ -28561,7 +28998,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; \
@@ -28587,7 +29024,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; \
@@ -28613,7 +29050,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; \
@@ -28640,7 +29077,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; \
@@ -28666,7 +29103,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; \
@@ -28691,7 +29128,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; \
@@ -28716,7 +29153,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; \
@@ -28741,7 +29178,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; \
@@ -28766,7 +29203,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; \
@@ -28787,22 +29224,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; \
@@ -28833,7 +29277,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) \
@@ -28851,7 +29295,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) \
@@ -28866,7 +29310,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) \
@@ -28884,7 +29328,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; \
@@ -28910,7 +29354,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; \
@@ -28936,7 +29380,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; \
@@ -28962,7 +29406,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; \
@@ -28989,7 +29433,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; \
@@ -29015,7 +29459,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; \
@@ -29040,7 +29484,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; \
@@ -29065,7 +29509,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; \
@@ -29090,7 +29534,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; \
@@ -29115,7 +29559,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; \
@@ -29136,22 +29580,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; \
@@ -29182,7 +29633,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) \
@@ -29200,7 +29651,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) \
@@ -29215,7 +29666,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) \
@@ -29233,7 +29684,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; \
@@ -29259,7 +29710,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; \
@@ -29285,7 +29736,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; \
@@ -29311,7 +29762,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; \
@@ -29338,7 +29789,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; \
@@ -29364,7 +29815,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; \
@@ -29389,7 +29840,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; \
@@ -29414,7 +29865,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; \
@@ -29439,7 +29890,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; \
@@ -29464,7 +29915,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; \
@@ -29485,22 +29936,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; \
@@ -29531,7 +29989,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) \
@@ -29549,7 +30007,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) \
@@ -29564,7 +30022,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) \
@@ -29582,7 +30040,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; \
@@ -29608,7 +30066,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; \
@@ -29634,7 +30092,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; \
@@ -29660,7 +30118,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; \
@@ -29687,7 +30145,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; \
@@ -29713,7 +30171,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; \
@@ -29738,7 +30196,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; \
@@ -29763,7 +30221,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; \
@@ -29788,7 +30246,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; \
@@ -29813,7 +30271,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; \
@@ -29834,22 +30292,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; \
@@ -29880,7 +30345,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) \
@@ -29898,7 +30363,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) \
@@ -29913,7 +30378,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) \
@@ -29931,7 +30396,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; \
@@ -29957,7 +30422,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; \
@@ -29983,7 +30448,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; \
@@ -30009,7 +30474,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; \
@@ -30036,7 +30501,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; \
@@ -30062,7 +30527,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; \
@@ -30087,7 +30552,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; \
@@ -30112,7 +30577,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; \
@@ -30137,7 +30602,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; \
@@ -30162,7 +30627,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; \
@@ -30183,22 +30648,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; \
@@ -30229,7 +30701,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) \
@@ -30247,7 +30719,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) \
@@ -30262,7 +30734,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) \
@@ -30280,7 +30752,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; \
@@ -30306,7 +30778,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; \
@@ -30332,7 +30804,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; \
@@ -30358,7 +30830,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; \
@@ -30385,7 +30857,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; \
@@ -30411,7 +30883,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; \
@@ -30436,7 +30908,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; \
@@ -30461,7 +30933,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; \
@@ -30486,7 +30958,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; \
@@ -30511,7 +30983,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; \
@@ -30532,22 +31004,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; \
@@ -30578,7 +31057,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) \
@@ -30606,7 +31085,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) \
@@ -30624,7 +31103,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; \
@@ -30650,7 +31129,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; \
@@ -30676,7 +31155,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; \
@@ -30702,7 +31181,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; \
@@ -30729,7 +31208,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; \
@@ -30755,7 +31234,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; \
@@ -30816,22 +31295,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; \
@@ -30862,7 +31348,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) \
@@ -30880,7 +31366,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) \
@@ -30895,7 +31381,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) \
@@ -30913,7 +31399,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; \
@@ -30939,7 +31425,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; \
@@ -30965,7 +31451,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; \
@@ -30991,7 +31477,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; \
@@ -31018,7 +31504,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; \
@@ -31044,7 +31530,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; \
@@ -31069,7 +31555,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; \
@@ -31094,7 +31580,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; \
@@ -31119,7 +31605,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; \
@@ -31144,7 +31630,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; \
@@ -31165,22 +31651,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; \
@@ -31211,7 +31704,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) \
@@ -31239,7 +31732,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) \
@@ -31257,7 +31750,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; \
@@ -31283,7 +31776,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; \
@@ -31309,7 +31802,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; \
@@ -31335,7 +31828,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; \
@@ -31362,7 +31855,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; \
@@ -31388,7 +31881,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; \
@@ -31413,7 +31906,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; \
@@ -31438,7 +31931,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; \
@@ -31463,7 +31956,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; \
@@ -31488,7 +31981,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; \
@@ -31509,22 +32002,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; \
@@ -31555,7 +32055,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) \
@@ -31573,7 +32073,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) \
@@ -31588,7 +32088,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) \
@@ -31606,7 +32106,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; \
@@ -31632,7 +32132,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; \
@@ -31658,7 +32158,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; \
@@ -31684,7 +32184,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; \
@@ -31711,7 +32211,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; \
@@ -31737,7 +32237,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; \
@@ -31762,7 +32262,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; \
@@ -31787,7 +32287,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; \
@@ -31812,7 +32312,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; \
@@ -31837,7 +32337,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; \
@@ -31858,22 +32358,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; \
@@ -31904,7 +32411,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) \
@@ -31922,7 +32429,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) \
@@ -31937,7 +32444,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) \
@@ -31955,7 +32462,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; \
@@ -31981,7 +32488,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; \
@@ -32007,7 +32514,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; \
@@ -32033,7 +32540,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; \
@@ -32060,7 +32567,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; \
@@ -32086,7 +32593,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; \
@@ -32111,7 +32618,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; \
@@ -32136,7 +32643,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; \
@@ -32161,7 +32668,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; \
@@ -32186,7 +32693,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; \
@@ -32207,22 +32714,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; \
@@ -32253,7 +32767,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) \
@@ -32294,7 +32808,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; \
@@ -32320,7 +32834,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; \
@@ -32346,7 +32860,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; \
@@ -32372,7 +32886,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; \
@@ -32399,7 +32913,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; \
@@ -32425,7 +32939,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; \
@@ -32450,7 +32964,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; \
@@ -32475,7 +32989,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; \
@@ -32500,7 +33014,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; \
@@ -32525,7 +33039,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; \
@@ -32546,22 +33060,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; \
@@ -32592,7 +33113,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) \
@@ -32610,7 +33131,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) \
@@ -32625,7 +33146,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) \
@@ -32643,7 +33164,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; \
@@ -32669,7 +33190,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; \
@@ -32695,7 +33216,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; \
@@ -32721,7 +33242,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; \
@@ -32748,7 +33269,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; \
@@ -32774,7 +33295,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; \
@@ -32799,7 +33320,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; \
@@ -32824,7 +33345,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; \
@@ -32849,7 +33370,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; \
@@ -32874,7 +33395,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; \
@@ -32895,22 +33416,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; \
@@ -32941,7 +33469,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) \
@@ -32959,7 +33487,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) \
@@ -32974,7 +33502,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) \
@@ -32992,7 +33520,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; \
@@ -33018,7 +33546,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; \
@@ -33044,7 +33572,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; \
@@ -33070,7 +33598,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; \
@@ -33097,7 +33625,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; \
@@ -33123,7 +33651,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; \
@@ -33148,7 +33676,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; \
@@ -33173,7 +33701,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; \
@@ -33198,7 +33726,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; \
@@ -33223,7 +33751,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; \
@@ -33244,22 +33772,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; \
@@ -33290,7 +33825,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) \
@@ -33308,7 +33843,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) \
@@ -33323,7 +33858,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) \
@@ -33341,7 +33876,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; \
@@ -33367,7 +33902,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; \
@@ -33393,7 +33928,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; \
@@ -33419,7 +33954,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; \
@@ -33446,7 +33981,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; \
@@ -33472,7 +34007,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; \
@@ -33497,7 +34032,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; \
@@ -33522,7 +34057,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; \
@@ -33547,7 +34082,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; \
@@ -33572,7 +34107,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; \
@@ -33593,22 +34128,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; \
@@ -33639,7 +34181,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) \
@@ -33657,7 +34199,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) \
@@ -33672,7 +34214,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) \
@@ -33690,7 +34232,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; \
@@ -33716,7 +34258,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; \
@@ -33742,7 +34284,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; \
@@ -33768,7 +34310,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; \
@@ -33795,7 +34337,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; \
@@ -33821,7 +34363,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; \
@@ -33846,7 +34388,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; \
@@ -33871,7 +34413,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; \
@@ -33896,7 +34438,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; \
@@ -33921,7 +34463,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; \
@@ -33942,22 +34484,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; \
@@ -33988,7 +34537,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) \
@@ -34006,7 +34555,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) \
@@ -34021,7 +34570,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) \
@@ -34039,7 +34588,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; \
@@ -34065,7 +34614,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; \
@@ -34091,7 +34640,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; \
@@ -34117,7 +34666,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; \
@@ -34144,7 +34693,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; \
@@ -34170,7 +34719,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; \
@@ -34195,7 +34744,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; \
@@ -34220,7 +34769,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; \
@@ -34245,7 +34794,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; \
@@ -34270,7 +34819,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; \
@@ -34291,22 +34840,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; \
@@ -34337,7 +34893,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) \
@@ -34355,7 +34911,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) \
@@ -34370,7 +34926,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) \
@@ -34388,7 +34944,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; \
@@ -34414,7 +34970,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; \
@@ -34440,7 +34996,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; \
@@ -34466,7 +35022,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; \
@@ -34493,7 +35049,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; \
@@ -34519,7 +35075,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; \
@@ -34544,7 +35100,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; \
@@ -34569,7 +35125,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; \
@@ -34594,7 +35150,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; \
@@ -34619,7 +35175,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; \
@@ -34640,22 +35196,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; \
@@ -34686,7 +35249,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) \
@@ -34704,7 +35267,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) \
@@ -34719,7 +35282,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) \
@@ -34737,7 +35300,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; \
@@ -34763,7 +35326,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; \
@@ -34789,7 +35352,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; \
@@ -34815,7 +35378,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; \
@@ -34842,7 +35405,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; \
@@ -34868,7 +35431,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; \
@@ -34893,7 +35456,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; \
@@ -34918,7 +35481,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; \
@@ -34943,7 +35506,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; \
@@ -34968,7 +35531,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; \
@@ -35107,29 +35670,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 = [ -f stage_current ] && $(MAKE) `cat stage_current`-end || :
  @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
@@ -35170,10 +35735,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; \
@@ -35222,6 +35787,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; \
@@ -35234,53 +35805,87 @@ 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:: 
         @r=`${PWD_COMMAND}`; export r; \
@@ -35306,7 +35911,7 @@ do-clean: clean-stage1
  
  .PHONY: distclean-stage1
  distclean-stage1::
-       [ -f stage_current ] && $(MAKE) `cat stage_current`-end || :
+       @: $(MAKE); $(stage)
         rm -rf stage1-* 
  
  
@@ -35316,10 +35921,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; \
@@ -35384,6 +35989,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; \
@@ -35400,73 +36013,113 @@ 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
         @r=`${PWD_COMMAND}`; export r; \
@@ -35488,15 +36141,23 @@ 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
+       @: $(MAKE); $(stage)
  
  
  # 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-* 
  
  
@@ -35506,10 +36167,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; \
@@ -35574,6 +36235,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; \
@@ -35590,73 +36259,113 @@ 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
@@ -35668,6 +36377,7 @@ stage3-bubble:: stage2-bubble
           $(MAKE) stage3-start; \
           $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stage3; \
         fi
+       $(MAKE) compare
  
  .PHONY: all-stage3 clean-stage3
  do-clean: clean-stage3
@@ -35683,7 +36393,7 @@ compare:
           echo Cannot compare object files as stage 2 was deleted. ; \
           exit 0 ; \
         fi; \
-       [ -f stage_current ] && $(MAKE) `cat stage_current`-end || : ; \
+       : $(MAKE); $(stage); \
         rm -f .bad_compare ; \
         cd stage3-gcc; \
         files=`find . -name "*$(objext)" -print` ; \
@@ -35713,16 +36423,23 @@ 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
+       @: $(MAKE); $(stage)
  
  
  # 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 
  
  
@@ -35735,10 +36452,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; \
@@ -35803,6 +36520,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; \
@@ -35819,73 +36544,113 @@ 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
@@ -35897,6 +36662,7 @@ stage4-bubble:: stage3-bubble
           $(MAKE) stage4-start; \
           $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stage4; \
         fi
+       $(MAKE) compare3
  
  .PHONY: all-stage4 clean-stage4
  do-clean: clean-stage4
@@ -35912,7 +36678,7 @@ compare3:
           echo Cannot compare object files as stage 3 was deleted. ; \
           exit 0 ; \
         fi; \
-       [ -f stage_current ] && $(MAKE) `cat stage_current`-end || : ; \
+       : $(MAKE); $(stage); \
         rm -f .bad_compare ; \
         cd stage4-gcc; \
         files=`find . -name "*$(objext)" -print` ; \
@@ -35942,16 +36708,23 @@ 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
+       @: $(MAKE); $(stage)
  
  
  # 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 
  
  
@@ -35961,10 +36734,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; \
@@ -36029,6 +36802,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; \
@@ -36045,73 +36826,113 @@ 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
         @r=`${PWD_COMMAND}`; export r; \
@@ -36137,7 +36958,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-* 
  
  
@@ -36147,10 +36968,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; \
@@ -36215,6 +37036,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; \
@@ -36231,73 +37060,113 @@ 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
         @r=`${PWD_COMMAND}`; export r; \
@@ -36319,15 +37188,23 @@ 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
+       @: $(MAKE); $(stage)
  
  
  # 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-* 
  
  
@@ -36577,6 +37454,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
@@ -36923,6 +37808,7 @@ 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
@@ -36943,17 +37829,6 @@ install-gdb: $(INSTALL_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