* gcc.dg/altivec-vec-merge.c: Make test usable on GNU/Linux targets

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

index 06652d4..719b091 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -72,45 +72,25 @@ LN_S = @LN_S@
  # Miscellaneous non-standard autoconf-set variables
  # -------------------------------------------------
  
-# The file containing GCC's version number.
-gcc_version_trigger = @gcc_version_trigger@
-gcc_version = @gcc_version@
-
  # The gcc driver likes to know the arguments it was configured with.
  TOPLEVEL_CONFIGURE_ARGUMENTS=@TOPLEVEL_CONFIGURE_ARGUMENTS@
  
-gxx_include_dir = @gxx_include_dir@
-libstdcxx_incdir = @libstdcxx_incdir@
-
  tooldir = @tooldir@
  build_tooldir = @build_tooldir@
  
-# Directory in which the compiler finds executables, libraries, etc.
-libsubdir = $(libdir)/gcc/$(target_alias)/$(gcc_version)
  GDB_NLM_DEPS = 
  
  # This is the name of the environment variable used for the path to
  # the libraries.
  RPATH_ENVVAR = @RPATH_ENVVAR@
  
-# This is set by configure to REALLY_SET_LIB_PATH if --enable-shared
-# was used.
-SET_LIB_PATH = @SET_LIB_PATH@
-
-# configure.in sets SET_LIB_PATH to this if --enable-shared was used.
-# Some platforms don't like blank entries, so we remove duplicate,
-# leading and trailing colons.
-REALLY_SET_LIB_PATH = \
-  @SET_GCC_LIB_PATH@ \
-  $(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH):$(TARGET_LIB_PATH):$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR);
-
  # This is the list of directories to be built for the build system.
  BUILD_CONFIGDIRS = libiberty
  # Build programs are put under this directory.
  BUILD_SUBDIR = @build_subdir@
  # This is set by the configure script to the arguments to use when configuring
  # directories built for the build system.
-BUILD_CONFIGARGS = @build_configargs@
+BUILD_CONFIGARGS = @build_configargs@ --with-build-subdir="$(BUILD_SUBDIR)"
  
  # This is the list of variables to export in the environment when
  # configuring any subdirectory.  It must also be exported whenever
@@ -175,11 +155,11 @@ HOST_EXPORTS = \
         TOPLEVEL_CONFIGURE_ARGUMENTS="$(TOPLEVEL_CONFIGURE_ARGUMENTS)"; export TOPLEVEL_CONFIGURE_ARGUMENTS; \
         GMPLIBS="$(HOST_GMPLIBS)"; export GMPLIBS; \
         GMPINC="$(HOST_GMPINC)"; export GMPINC; \
-       SET_GCC_LIB_PATH_CMD="@SET_GCC_LIB_PATH@"; export SET_GCC_LIB_PATH_CMD; \
-       @SET_GCC_LIB_PATH@
+       $(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR);
  
  # Similar, for later GCC stages.
-STAGE_HOST_EXPORTS = \
+POSTSTAGE1_HOST_EXPORTS = \
+       $(RPATH_ENVVAR)=`echo "$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); \
         $(HOST_EXPORTS) \
         CC="$(STAGE_CC_WRAPPER) $$r/$(HOST_SUBDIR)/prev-gcc/xgcc$(exeext) \
           -B$$r/$(HOST_SUBDIR)/prev-gcc/ -B$(build_tooldir)/bin/"; export CC; \
@@ -195,7 +175,7 @@ TARGET_CONFIGDIRS = @target_configdirs@
  TARGET_SUBDIR = @target_subdir@
  # This is set by the configure script to the arguments to use when configuring
  # directories built for the target.
-TARGET_CONFIGARGS = @target_configargs@
+TARGET_CONFIGARGS = @target_configargs@ --with-target-subdir="$(TARGET_SUBDIR)"
  # This is the list of variables to export in the environment when
  # configuring subdirectories for the host system.
  BASE_TARGET_EXPORTS = \
@@ -215,8 +195,7 @@ BASE_TARGET_EXPORTS = \
         NM="$(NM_FOR_TARGET)"; export NM; \
         RANLIB="$(RANLIB_FOR_TARGET)"; export RANLIB; \
         WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES; \
-       SET_GCC_LIB_PATH_CMD="@SET_GCC_LIB_PATH@"; export SET_GCC_LIB_PATH_CMD; \
-       @SET_GCC_LIB_PATH@
+       $(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR);
  
  RAW_CXX_TARGET_EXPORTS = \
         $(BASE_TARGET_EXPORTS) \
@@ -322,10 +301,6 @@ RUNTEST = `if [ -f $$s/dejagnu/runtest ] ; \
  # Programs producing files for the HOST machine
  # ---------------------------------------------
  
-# This is the list of directories that may be needed in RPATH_ENVVAR
-# so that programs built for the host machine work.
-HOST_LIB_PATH = $$r/$(HOST_SUBDIR)/bfd:$$r/$(HOST_SUBDIR)/opcodes
-
  AS = @AS@
  
  AR = @AR@
@@ -356,10 +331,6 @@ PICFLAG =
  # Programs producing files for the TARGET machine
  # -----------------------------------------------
  
-# This is the list of directories that may be needed in RPATH_ENVVAR
-# so that prorgams built for the target machine work.
-TARGET_LIB_PATH = $$r/$(TARGET_SUBDIR)/libstdc++-v3/src/.libs:$$r/$(TARGET_SUBDIR)/libmudflap/.libs
-
  FLAGS_FOR_TARGET = @FLAGS_FOR_TARGET@
  
  AR_FOR_TARGET=@AR_FOR_TARGET@
@@ -507,6 +478,41 @@ PICFLAG_FOR_TARGET =
  @host_makefile_frag@
  ###
  
+# This is the list of directories that may be needed in RPATH_ENVVAR
+# so that prorgams built for the target machine work.
+TARGET_LIB_PATH = $(TARGET_LIB_PATH_libstdc++-v3)$(TARGET_LIB_PATH_libmudflap)$(HOST_LIB_PATH_gcc)
+
+@if target-libstdc++-v3
+TARGET_LIB_PATH_libstdc++-v3 = $$r/$(TARGET_SUBDIR)/libstdc++-v3/.libs:
+@endif target-libstdc++-v3
+
+@if target-libmudflap
+TARGET_LIB_PATH_libmudflap = $$r/$(TARGET_SUBDIR)/libmudflap/.libs:
+@endif target-libmudflap
+
+
+
+# This is the list of directories that may be needed in RPATH_ENVVAR
+# so that programs built for the host machine work.
+HOST_LIB_PATH = $(HOST_LIB_PATH_bfd)$(HOST_LIB_PATH_opcodes)
+
+# Define HOST_LIB_PATH_gcc here, for the sake of TARGET_LIB_PATH, ouch
+@if gcc
+HOST_LIB_PATH_gcc = $$r/$(HOST_SUBDIR)/gcc:$$r/$(HOST_SUBDIR)/prev-gcc:
+@endif gcc
+
+
+@if bfd
+HOST_LIB_PATH_bfd = \
+  $$r/$(HOST_SUBDIR)/bfd/.:$$r/$(HOST_SUBDIR)/prev-bfd/.:
+@endif bfd
+
+@if opcodes
+HOST_LIB_PATH_opcodes = \
+  $$r/$(HOST_SUBDIR)/opcodes/.:$$r/$(HOST_SUBDIR)/prev-opcodes/.:
+@endif opcodes
+
+
  # Flags to pass down to all sub-makes.
  BASE_FLAGS_TO_PASS = \
         "DESTDIR=$(DESTDIR)" \
@@ -520,8 +526,6 @@ BASE_FLAGS_TO_PASS = \
         "libdir=$(libdir)" \
         "libexecdir=$(libexecdir)" \
         "lispdir=$(lispdir)" \
-       "libstdcxx_incdir=$(libstdcxx_incdir)" \
-       "libsubdir=$(libsubdir)" \
         "localstatedir=$(localstatedir)" \
         "mandir=$(mandir)" \
         "oldincludedir=$(oldincludedir)" \
@@ -531,9 +535,6 @@ BASE_FLAGS_TO_PASS = \
         "sysconfdir=$(sysconfdir)" \
         "tooldir=$(tooldir)" \
         "build_tooldir=$(build_tooldir)" \
-       "gxx_include_dir=$(gxx_include_dir)" \
-       "gcc_version=$(gcc_version)" \
-       "gcc_version_trigger=$(gcc_version_trigger)" \
         "target_alias=$(target_alias)" \
         "BISON=$(BISON)" \
         "CC_FOR_BUILD=$(CC_FOR_BUILD)" \
@@ -2141,7 +2142,6 @@ uninstall:
  install.all: install-no-fixedincludes
         @if [ -f ./gcc/Makefile ] ; then \
                 r=`${PWD_COMMAND}` ; export r ; \
-               $(SET_LIB_PATH) \
                 $(HOST_EXPORTS) \
                 (cd ./gcc && \
                 $(MAKE) $(FLAGS_TO_PASS) install-headers) ; \
@@ -2185,15 +2185,24 @@ etags tags: TAGS
  # built are.
  TAGS: do-TAGS
  
+# ------------------------------------
+# Macros for configure and all targets
+# ------------------------------------
+
+
+
+
+
  # --------------------------------------
  # Modules which run on the build machine
  # --------------------------------------
  
+
  .PHONY: configure-build-libiberty maybe-configure-build-libiberty
  maybe-configure-build-libiberty:
  @if build-libiberty
  maybe-configure-build-libiberty: configure-build-libiberty
-configure-build-libiberty:
+configure-build-libiberty: 
         @test ! -f $(BUILD_SUBDIR)/libiberty/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/libiberty ; \
         r=`${PWD_COMMAND}`; export r; \
@@ -2210,11 +2219,14 @@ configure-build-libiberty:
         libsrcdir="$$s/libiberty"; \
         rm -f no-such-file || : ; \
         CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
-         $(BUILD_CONFIGARGS) $${srcdiroption} \
-         --with-build-subdir="$(BUILD_SUBDIR)"  \
+         $(BUILD_CONFIGARGS) $${srcdiroption}  \
           || exit 1
  @endif build-libiberty
  
+
+
+
+
  .PHONY: all-build-libiberty maybe-all-build-libiberty
  maybe-all-build-libiberty:
  @if build-libiberty
@@ -2225,14 +2237,18 @@ all-build-libiberty: configure-build-libiberty
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(BUILD_EXPORTS) \
         (cd $(BUILD_SUBDIR)/libiberty && \
-         $(MAKE)  $(TARGET-build-libiberty))
+         $(MAKE)   $(TARGET-build-libiberty))
  @endif build-libiberty
  
+
+
+
+
  .PHONY: configure-build-bison maybe-configure-build-bison
  maybe-configure-build-bison:
  @if build-bison
  maybe-configure-build-bison: configure-build-bison
-configure-build-bison:
+configure-build-bison: 
         @test ! -f $(BUILD_SUBDIR)/bison/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/bison ; \
         r=`${PWD_COMMAND}`; export r; \
@@ -2249,11 +2265,14 @@ configure-build-bison:
         libsrcdir="$$s/bison"; \
         rm -f no-such-file || : ; \
         CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
-         $(BUILD_CONFIGARGS) $${srcdiroption} \
-         --with-build-subdir="$(BUILD_SUBDIR)"  \
+         $(BUILD_CONFIGARGS) $${srcdiroption}  \
           || exit 1
  @endif build-bison
  
+
+
+
+
  .PHONY: all-build-bison maybe-all-build-bison
  maybe-all-build-bison:
  @if build-bison
@@ -2264,14 +2283,18 @@ all-build-bison: configure-build-bison
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(BUILD_EXPORTS) \
         (cd $(BUILD_SUBDIR)/bison && \
-         $(MAKE)  $(TARGET-build-bison))
+         $(MAKE)   $(TARGET-build-bison))
  @endif build-bison
  
+
+
+
+
  .PHONY: configure-build-byacc maybe-configure-build-byacc
  maybe-configure-build-byacc:
  @if build-byacc
  maybe-configure-build-byacc: configure-build-byacc
-configure-build-byacc:
+configure-build-byacc: 
         @test ! -f $(BUILD_SUBDIR)/byacc/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/byacc ; \
         r=`${PWD_COMMAND}`; export r; \
@@ -2288,11 +2311,14 @@ configure-build-byacc:
         libsrcdir="$$s/byacc"; \
         rm -f no-such-file || : ; \
         CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
-         $(BUILD_CONFIGARGS) $${srcdiroption} \
-         --with-build-subdir="$(BUILD_SUBDIR)"  \
+         $(BUILD_CONFIGARGS) $${srcdiroption}  \
           || exit 1
  @endif build-byacc
  
+
+
+
+
  .PHONY: all-build-byacc maybe-all-build-byacc
  maybe-all-build-byacc:
  @if build-byacc
@@ -2303,14 +2329,18 @@ all-build-byacc: configure-build-byacc
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(BUILD_EXPORTS) \
         (cd $(BUILD_SUBDIR)/byacc && \
-         $(MAKE)  $(TARGET-build-byacc))
+         $(MAKE)   $(TARGET-build-byacc))
  @endif build-byacc
  
+
+
+
+
  .PHONY: configure-build-flex maybe-configure-build-flex
  maybe-configure-build-flex:
  @if build-flex
  maybe-configure-build-flex: configure-build-flex
-configure-build-flex:
+configure-build-flex: 
         @test ! -f $(BUILD_SUBDIR)/flex/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/flex ; \
         r=`${PWD_COMMAND}`; export r; \
@@ -2327,11 +2357,14 @@ configure-build-flex:
         libsrcdir="$$s/flex"; \
         rm -f no-such-file || : ; \
         CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
-         $(BUILD_CONFIGARGS) $${srcdiroption} \
-         --with-build-subdir="$(BUILD_SUBDIR)"  \
+         $(BUILD_CONFIGARGS) $${srcdiroption}  \
           || exit 1
  @endif build-flex
  
+
+
+
+
  .PHONY: all-build-flex maybe-all-build-flex
  maybe-all-build-flex:
  @if build-flex
@@ -2342,14 +2375,18 @@ all-build-flex: configure-build-flex
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(BUILD_EXPORTS) \
         (cd $(BUILD_SUBDIR)/flex && \
-         $(MAKE)  $(TARGET-build-flex))
+         $(MAKE)   $(TARGET-build-flex))
  @endif build-flex
  
+
+
+
+
  .PHONY: configure-build-m4 maybe-configure-build-m4
  maybe-configure-build-m4:
  @if build-m4
  maybe-configure-build-m4: configure-build-m4
-configure-build-m4:
+configure-build-m4: 
         @test ! -f $(BUILD_SUBDIR)/m4/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/m4 ; \
         r=`${PWD_COMMAND}`; export r; \
@@ -2366,11 +2403,14 @@ configure-build-m4:
         libsrcdir="$$s/m4"; \
         rm -f no-such-file || : ; \
         CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
-         $(BUILD_CONFIGARGS) $${srcdiroption} \
-         --with-build-subdir="$(BUILD_SUBDIR)"  \
+         $(BUILD_CONFIGARGS) $${srcdiroption}  \
           || exit 1
  @endif build-m4
  
+
+
+
+
  .PHONY: all-build-m4 maybe-all-build-m4
  maybe-all-build-m4:
  @if build-m4
@@ -2381,14 +2421,18 @@ all-build-m4: configure-build-m4
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(BUILD_EXPORTS) \
         (cd $(BUILD_SUBDIR)/m4 && \
-         $(MAKE)  $(TARGET-build-m4))
+         $(MAKE)   $(TARGET-build-m4))
  @endif build-m4
  
+
+
+
+
  .PHONY: configure-build-texinfo maybe-configure-build-texinfo
  maybe-configure-build-texinfo:
  @if build-texinfo
  maybe-configure-build-texinfo: configure-build-texinfo
-configure-build-texinfo:
+configure-build-texinfo: 
         @test ! -f $(BUILD_SUBDIR)/texinfo/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/texinfo ; \
         r=`${PWD_COMMAND}`; export r; \
@@ -2405,11 +2449,14 @@ configure-build-texinfo:
         libsrcdir="$$s/texinfo"; \
         rm -f no-such-file || : ; \
         CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
-         $(BUILD_CONFIGARGS) $${srcdiroption} \
-         --with-build-subdir="$(BUILD_SUBDIR)"  \
+         $(BUILD_CONFIGARGS) $${srcdiroption}  \
           || exit 1
  @endif build-texinfo
  
+
+
+
+
  .PHONY: all-build-texinfo maybe-all-build-texinfo
  maybe-all-build-texinfo:
  @if build-texinfo
@@ -2420,14 +2467,18 @@ all-build-texinfo: configure-build-texinfo
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(BUILD_EXPORTS) \
         (cd $(BUILD_SUBDIR)/texinfo && \
-         $(MAKE)  $(TARGET-build-texinfo))
+         $(MAKE)   $(TARGET-build-texinfo))
  @endif build-texinfo
  
+
+
+
+
  .PHONY: configure-build-fixincludes maybe-configure-build-fixincludes
  maybe-configure-build-fixincludes:
  @if build-fixincludes
  maybe-configure-build-fixincludes: configure-build-fixincludes
-configure-build-fixincludes:
+configure-build-fixincludes: 
         @test ! -f $(BUILD_SUBDIR)/fixincludes/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/fixincludes ; \
         r=`${PWD_COMMAND}`; export r; \
@@ -2444,11 +2495,14 @@ configure-build-fixincludes:
         libsrcdir="$$s/fixincludes"; \
         rm -f no-such-file || : ; \
         CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
-         $(BUILD_CONFIGARGS) $${srcdiroption} \
-         --with-build-subdir="$(BUILD_SUBDIR)"  \
+         $(BUILD_CONFIGARGS) $${srcdiroption}  \
           || exit 1
  @endif build-fixincludes
  
+
+
+
+
  .PHONY: all-build-fixincludes maybe-all-build-fixincludes
  maybe-all-build-fixincludes:
  @if build-fixincludes
@@ -2459,26 +2513,30 @@ all-build-fixincludes: configure-build-fixincludes
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(BUILD_EXPORTS) \
         (cd $(BUILD_SUBDIR)/fixincludes && \
-         $(MAKE)  $(TARGET-build-fixincludes))
+         $(MAKE)   $(TARGET-build-fixincludes))
  @endif build-fixincludes
  
  
+
+
+
  # --------------------------------------
  # Modules which run on the host machine
  # --------------------------------------
  
+
  .PHONY: configure-ash maybe-configure-ash
  maybe-configure-ash:
  @if ash
  maybe-configure-ash: configure-ash
-configure-ash:
+configure-ash: 
         @test ! -f $(HOST_SUBDIR)/ash/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ash ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       echo Configuring in ash; \
-       cd $(HOST_SUBDIR)/ash || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/ash; \
+       cd "$(HOST_SUBDIR)/ash" || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/ash/ | \
@@ -2491,6 +2549,10 @@ configure-ash:
           || exit 1
  @endif ash
  
+
+
+
+
  .PHONY: all-ash maybe-all-ash
  maybe-all-ash:
  @if ash
@@ -2499,12 +2561,14 @@ maybe-all-ash: all-ash
  all-ash: configure-ash
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/ash && \
           $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-ash))
  @endif ash
  
+
+
+
  .PHONY: check-ash maybe-check-ash
  maybe-check-ash:
  @if ash
@@ -2513,7 +2577,6 @@ maybe-check-ash: check-ash
  check-ash:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/ash && \
           $(MAKE) $(FLAGS_TO_PASS)  check)
@@ -2528,10 +2591,9 @@ maybe-install-ash: install-ash
  install-ash: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/ash && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS)  install)
  
  @endif ash
  
@@ -2547,7 +2609,6 @@ info-ash: \
         @[ -f ./ash/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -2573,7 +2634,6 @@ dvi-ash: \
         @[ -f ./ash/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -2599,7 +2659,6 @@ html-ash: \
         @[ -f ./ash/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -2625,7 +2684,6 @@ TAGS-ash: \
         @[ -f ./ash/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -2652,7 +2710,6 @@ install-info-ash: \
         @[ -f ./ash/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -2678,7 +2735,6 @@ installcheck-ash: \
         @[ -f ./ash/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -2703,7 +2759,6 @@ mostlyclean-ash:
         @[ -f ./ash/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -2728,7 +2783,6 @@ clean-ash:
         @[ -f ./ash/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -2753,7 +2807,6 @@ distclean-ash:
         @[ -f ./ash/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -2778,7 +2831,6 @@ maintainer-clean-ash:
         @[ -f ./ash/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -2795,18 +2847,19 @@ maintainer-clean-ash:
  @endif ash
  
  
+
  .PHONY: configure-autoconf maybe-configure-autoconf
  maybe-configure-autoconf:
  @if autoconf
  maybe-configure-autoconf: configure-autoconf
-configure-autoconf:
+configure-autoconf: 
         @test ! -f $(HOST_SUBDIR)/autoconf/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/autoconf ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       echo Configuring in autoconf; \
-       cd $(HOST_SUBDIR)/autoconf || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/autoconf; \
+       cd "$(HOST_SUBDIR)/autoconf" || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/autoconf/ | \
@@ -2819,6 +2872,10 @@ configure-autoconf:
           || exit 1
  @endif autoconf
  
+
+
+
+
  .PHONY: all-autoconf maybe-all-autoconf
  maybe-all-autoconf:
  @if autoconf
@@ -2827,12 +2884,14 @@ maybe-all-autoconf: all-autoconf
  all-autoconf: configure-autoconf
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/autoconf && \
           $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-autoconf))
  @endif autoconf
  
+
+
+
  .PHONY: check-autoconf maybe-check-autoconf
  maybe-check-autoconf:
  @if autoconf
@@ -2841,7 +2900,6 @@ maybe-check-autoconf: check-autoconf
  check-autoconf:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/autoconf && \
           $(MAKE) $(FLAGS_TO_PASS)  check)
@@ -2856,10 +2914,9 @@ maybe-install-autoconf: install-autoconf
  install-autoconf: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/autoconf && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS)  install)
  
  @endif autoconf
  
@@ -2875,7 +2932,6 @@ info-autoconf: \
         @[ -f ./autoconf/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -2901,7 +2957,6 @@ dvi-autoconf: \
         @[ -f ./autoconf/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -2927,7 +2982,6 @@ html-autoconf: \
         @[ -f ./autoconf/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -2953,7 +3007,6 @@ TAGS-autoconf: \
         @[ -f ./autoconf/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -2980,7 +3033,6 @@ install-info-autoconf: \
         @[ -f ./autoconf/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -3006,7 +3058,6 @@ installcheck-autoconf: \
         @[ -f ./autoconf/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -3031,7 +3082,6 @@ mostlyclean-autoconf:
         @[ -f ./autoconf/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -3056,7 +3106,6 @@ clean-autoconf:
         @[ -f ./autoconf/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -3081,7 +3130,6 @@ distclean-autoconf:
         @[ -f ./autoconf/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -3106,7 +3154,6 @@ maintainer-clean-autoconf:
         @[ -f ./autoconf/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -3123,18 +3170,19 @@ maintainer-clean-autoconf:
  @endif autoconf
  
  
+
  .PHONY: configure-automake maybe-configure-automake
  maybe-configure-automake:
  @if automake
  maybe-configure-automake: configure-automake
-configure-automake:
+configure-automake: 
         @test ! -f $(HOST_SUBDIR)/automake/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/automake ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       echo Configuring in automake; \
-       cd $(HOST_SUBDIR)/automake || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/automake; \
+       cd "$(HOST_SUBDIR)/automake" || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/automake/ | \
@@ -3147,6 +3195,10 @@ configure-automake:
           || exit 1
  @endif automake
  
+
+
+
+
  .PHONY: all-automake maybe-all-automake
  maybe-all-automake:
  @if automake
@@ -3155,12 +3207,14 @@ maybe-all-automake: all-automake
  all-automake: configure-automake
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/automake && \
           $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-automake))
  @endif automake
  
+
+
+
  .PHONY: check-automake maybe-check-automake
  maybe-check-automake:
  @if automake
@@ -3169,7 +3223,6 @@ maybe-check-automake: check-automake
  check-automake:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/automake && \
           $(MAKE) $(FLAGS_TO_PASS)  check)
@@ -3184,10 +3237,9 @@ maybe-install-automake: install-automake
  install-automake: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/automake && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS)  install)
  
  @endif automake
  
@@ -3203,7 +3255,6 @@ info-automake: \
         @[ -f ./automake/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -3229,7 +3280,6 @@ dvi-automake: \
         @[ -f ./automake/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -3255,7 +3305,6 @@ html-automake: \
         @[ -f ./automake/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -3281,7 +3330,6 @@ TAGS-automake: \
         @[ -f ./automake/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -3308,7 +3356,6 @@ install-info-automake: \
         @[ -f ./automake/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -3334,7 +3381,6 @@ installcheck-automake: \
         @[ -f ./automake/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -3359,7 +3405,6 @@ mostlyclean-automake:
         @[ -f ./automake/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -3384,7 +3429,6 @@ clean-automake:
         @[ -f ./automake/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -3409,7 +3453,6 @@ distclean-automake:
         @[ -f ./automake/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -3434,7 +3477,6 @@ maintainer-clean-automake:
         @[ -f ./automake/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -3451,18 +3493,19 @@ maintainer-clean-automake:
  @endif automake
  
  
+
  .PHONY: configure-bash maybe-configure-bash
  maybe-configure-bash:
  @if bash
  maybe-configure-bash: configure-bash
-configure-bash:
+configure-bash: 
         @test ! -f $(HOST_SUBDIR)/bash/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bash ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       echo Configuring in bash; \
-       cd $(HOST_SUBDIR)/bash || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/bash; \
+       cd "$(HOST_SUBDIR)/bash" || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/bash/ | \
@@ -3475,6 +3518,10 @@ configure-bash:
           || exit 1
  @endif bash
  
+
+
+
+
  .PHONY: all-bash maybe-all-bash
  maybe-all-bash:
  @if bash
@@ -3483,12 +3530,14 @@ maybe-all-bash: all-bash
  all-bash: configure-bash
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/bash && \
           $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-bash))
  @endif bash
  
+
+
+
  .PHONY: check-bash maybe-check-bash
  maybe-check-bash:
  @if bash
@@ -3497,7 +3546,6 @@ maybe-check-bash: check-bash
  check-bash:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/bash && \
           $(MAKE) $(FLAGS_TO_PASS)  check)
@@ -3512,10 +3560,9 @@ maybe-install-bash: install-bash
  install-bash: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/bash && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS)  install)
  
  @endif bash
  
@@ -3531,7 +3578,6 @@ info-bash: \
         @[ -f ./bash/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -3557,7 +3603,6 @@ dvi-bash: \
         @[ -f ./bash/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -3583,7 +3628,6 @@ html-bash: \
         @[ -f ./bash/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -3609,7 +3653,6 @@ TAGS-bash: \
         @[ -f ./bash/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -3636,7 +3679,6 @@ install-info-bash: \
         @[ -f ./bash/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -3662,7 +3704,6 @@ installcheck-bash: \
         @[ -f ./bash/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -3687,7 +3728,6 @@ mostlyclean-bash:
         @[ -f ./bash/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -3712,7 +3752,6 @@ clean-bash:
         @[ -f ./bash/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -3737,7 +3776,6 @@ distclean-bash:
         @[ -f ./bash/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -3762,7 +3800,6 @@ maintainer-clean-bash:
         @[ -f ./bash/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -3779,19 +3816,20 @@ maintainer-clean-bash:
  @endif bash
  
  
+
  .PHONY: configure-bfd maybe-configure-bfd
  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 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       echo Configuring in bfd; \
-       cd $(HOST_SUBDIR)/bfd || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/bfd; \
+       cd "$(HOST_SUBDIR)/bfd" || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/bfd/ | \
@@ -3804,6 +3842,161 @@ configure-bfd:
           || exit 1
  @endif bfd
  
+
+
+.PHONY: configure-stage1-bfd maybe-configure-stage1-bfd
+maybe-configure-stage1-bfd:
+@if bfd-bootstrap
+maybe-configure-stage1-bfd: configure-stage1-bfd
+configure-stage1-bfd: 
+       @$(MAKE) stage1-start
+       @[ -f $(HOST_SUBDIR)/bfd/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       echo Configuring stage 1 in $(HOST_SUBDIR)/bfd ; \
+       cd $(HOST_SUBDIR)/bfd || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/bfd/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/bfd"; \
+       libsrcdir="$$s/bfd"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         --disable-intermodule           --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" 
+@endif bfd-bootstrap
+
+.PHONY: configure-stage2-bfd maybe-configure-stage2-bfd
+maybe-configure-stage2-bfd:
+@if bfd-bootstrap
+maybe-configure-stage2-bfd: configure-stage2-bfd
+configure-stage2-bfd: 
+       @$(MAKE) stage2-start
+       @[ -f $(HOST_SUBDIR)/bfd/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       echo Configuring stage 2 in $(HOST_SUBDIR)/bfd ; \
+       cd $(HOST_SUBDIR)/bfd || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/bfd/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/bfd"; \
+       libsrcdir="$$s/bfd"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+@endif bfd-bootstrap
+
+.PHONY: configure-stage3-bfd maybe-configure-stage3-bfd
+maybe-configure-stage3-bfd:
+@if bfd-bootstrap
+maybe-configure-stage3-bfd: configure-stage3-bfd
+configure-stage3-bfd: 
+       @$(MAKE) stage3-start
+       @[ -f $(HOST_SUBDIR)/bfd/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       echo Configuring stage 3 in $(HOST_SUBDIR)/bfd ; \
+       cd $(HOST_SUBDIR)/bfd || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/bfd/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/bfd"; \
+       libsrcdir="$$s/bfd"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+@endif bfd-bootstrap
+
+.PHONY: configure-stage4-bfd maybe-configure-stage4-bfd
+maybe-configure-stage4-bfd:
+@if bfd-bootstrap
+maybe-configure-stage4-bfd: configure-stage4-bfd
+configure-stage4-bfd: 
+       @$(MAKE) stage4-start
+       @[ -f $(HOST_SUBDIR)/bfd/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       echo Configuring stage 4 in $(HOST_SUBDIR)/bfd ; \
+       cd $(HOST_SUBDIR)/bfd || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/bfd/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/bfd"; \
+       libsrcdir="$$s/bfd"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+@endif bfd-bootstrap
+
+.PHONY: configure-stageprofile-bfd maybe-configure-stageprofile-bfd
+maybe-configure-stageprofile-bfd:
+@if bfd-bootstrap
+maybe-configure-stageprofile-bfd: configure-stageprofile-bfd
+configure-stageprofile-bfd: 
+       @$(MAKE) stageprofile-start
+       @[ -f $(HOST_SUBDIR)/bfd/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       echo Configuring stage profile in $(HOST_SUBDIR)/bfd ; \
+       cd $(HOST_SUBDIR)/bfd || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/bfd/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/bfd"; \
+       libsrcdir="$$s/bfd"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+@endif bfd-bootstrap
+
+.PHONY: configure-stagefeedback-bfd maybe-configure-stagefeedback-bfd
+maybe-configure-stagefeedback-bfd:
+@if bfd-bootstrap
+maybe-configure-stagefeedback-bfd: configure-stagefeedback-bfd
+configure-stagefeedback-bfd: 
+       @$(MAKE) stagefeedback-start
+       @[ -f $(HOST_SUBDIR)/bfd/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       echo Configuring stage feedback in $(HOST_SUBDIR)/bfd ; \
+       cd $(HOST_SUBDIR)/bfd || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/bfd/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/bfd"; \
+       libsrcdir="$$s/bfd"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+@endif bfd-bootstrap
+
+
+
+
+
  .PHONY: all-bfd maybe-all-bfd
  maybe-all-bfd:
  @if bfd
@@ -3813,12 +4006,188 @@ all-bfd: configure-bfd
         @test -f stage_last && exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/bfd && \
           $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-bfd))
  @endif bfd
  
+
+
+.PHONY: all-stage1-bfd maybe-all-stage1-bfd
+.PHONY: clean-stage1-bfd maybe-clean-stage1-bfd
+maybe-all-stage1-bfd:
+maybe-clean-stage1-bfd:
+@if bfd-bootstrap
+maybe-all-stage1-bfd: all-stage1-bfd
+all-stage1: all-stage1-bfd
+all-stage1-bfd: configure-stage1-bfd
+       @$(MAKE) stage1-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       cd $(HOST_SUBDIR)/bfd && \
+       $(MAKE) $(FLAGS_TO_PASS)  CFLAGS="$(STAGE1_CFLAGS)" 
+
+maybe-clean-stage1-bfd: clean-stage1-bfd
+clean-stage1: clean-stage1-bfd
+clean-stage1-bfd:
+       @[ -f $(HOST_SUBDIR)/bfd/Makefile ] || [ -f $(HOST_SUBDIR)/stage1-bfd/Makefile ] \
+         || exit 0 ; \
+       [ -f $(HOST_SUBDIR)/bfd/Makefile ] || $(MAKE) stage1-start ; \
+       cd $(HOST_SUBDIR)/bfd && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               CFLAGS="$(STAGE1_CFLAGS)"  clean
+@endif bfd-bootstrap
+
+
+.PHONY: all-stage2-bfd maybe-all-stage2-bfd
+.PHONY: clean-stage2-bfd maybe-clean-stage2-bfd
+maybe-all-stage2-bfd:
+maybe-clean-stage2-bfd:
+@if bfd-bootstrap
+maybe-all-stage2-bfd: all-stage2-bfd
+all-stage2: all-stage2-bfd
+all-stage2-bfd: configure-stage2-bfd
+       @$(MAKE) stage2-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       cd $(HOST_SUBDIR)/bfd && \
+       $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)  
+
+maybe-clean-stage2-bfd: clean-stage2-bfd
+clean-stage2: clean-stage2-bfd
+clean-stage2-bfd:
+       @[ -f $(HOST_SUBDIR)/bfd/Makefile ] || [ -f $(HOST_SUBDIR)/stage2-bfd/Makefile ] \
+         || exit 0 ; \
+       [ -f $(HOST_SUBDIR)/bfd/Makefile ] || $(MAKE) stage2-start ; \
+       cd $(HOST_SUBDIR)/bfd && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                 clean
+@endif bfd-bootstrap
+
+
+.PHONY: all-stage3-bfd maybe-all-stage3-bfd
+.PHONY: clean-stage3-bfd maybe-clean-stage3-bfd
+maybe-all-stage3-bfd:
+maybe-clean-stage3-bfd:
+@if bfd-bootstrap
+maybe-all-stage3-bfd: all-stage3-bfd
+all-stage3: all-stage3-bfd
+all-stage3-bfd: configure-stage3-bfd
+       @$(MAKE) stage3-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       cd $(HOST_SUBDIR)/bfd && \
+       $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)  
+
+maybe-clean-stage3-bfd: clean-stage3-bfd
+clean-stage3: clean-stage3-bfd
+clean-stage3-bfd:
+       @[ -f $(HOST_SUBDIR)/bfd/Makefile ] || [ -f $(HOST_SUBDIR)/stage3-bfd/Makefile ] \
+         || exit 0 ; \
+       [ -f $(HOST_SUBDIR)/bfd/Makefile ] || $(MAKE) stage3-start ; \
+       cd $(HOST_SUBDIR)/bfd && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                 clean
+@endif bfd-bootstrap
+
+
+.PHONY: all-stage4-bfd maybe-all-stage4-bfd
+.PHONY: clean-stage4-bfd maybe-clean-stage4-bfd
+maybe-all-stage4-bfd:
+maybe-clean-stage4-bfd:
+@if bfd-bootstrap
+maybe-all-stage4-bfd: all-stage4-bfd
+all-stage4: all-stage4-bfd
+all-stage4-bfd: configure-stage4-bfd
+       @$(MAKE) stage4-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       cd $(HOST_SUBDIR)/bfd && \
+       $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)  
+
+maybe-clean-stage4-bfd: clean-stage4-bfd
+clean-stage4: clean-stage4-bfd
+clean-stage4-bfd:
+       @[ -f $(HOST_SUBDIR)/bfd/Makefile ] || [ -f $(HOST_SUBDIR)/stage4-bfd/Makefile ] \
+         || exit 0 ; \
+       [ -f $(HOST_SUBDIR)/bfd/Makefile ] || $(MAKE) stage4-start ; \
+       cd $(HOST_SUBDIR)/bfd && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                 clean
+@endif bfd-bootstrap
+
+
+.PHONY: all-stageprofile-bfd maybe-all-stageprofile-bfd
+.PHONY: clean-stageprofile-bfd maybe-clean-stageprofile-bfd
+maybe-all-stageprofile-bfd:
+maybe-clean-stageprofile-bfd:
+@if bfd-bootstrap
+maybe-all-stageprofile-bfd: all-stageprofile-bfd
+all-stageprofile: all-stageprofile-bfd
+all-stageprofile-bfd: configure-stageprofile-bfd
+       @$(MAKE) stageprofile-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       cd $(HOST_SUBDIR)/bfd && \
+       $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" 
+
+maybe-clean-stageprofile-bfd: clean-stageprofile-bfd
+clean-stageprofile: clean-stageprofile-bfd
+clean-stageprofile-bfd:
+       @[ -f $(HOST_SUBDIR)/bfd/Makefile ] || [ -f $(HOST_SUBDIR)/stageprofile-bfd/Makefile ] \
+         || exit 0 ; \
+       [ -f $(HOST_SUBDIR)/bfd/Makefile ] || $(MAKE) stageprofile-start ; \
+       cd $(HOST_SUBDIR)/bfd && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-generate"  clean
+@endif bfd-bootstrap
+
+
+.PHONY: all-stagefeedback-bfd maybe-all-stagefeedback-bfd
+.PHONY: clean-stagefeedback-bfd maybe-clean-stagefeedback-bfd
+maybe-all-stagefeedback-bfd:
+maybe-clean-stagefeedback-bfd:
+@if bfd-bootstrap
+maybe-all-stagefeedback-bfd: all-stagefeedback-bfd
+all-stagefeedback: all-stagefeedback-bfd
+all-stagefeedback-bfd: configure-stagefeedback-bfd
+       @$(MAKE) stagefeedback-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       cd $(HOST_SUBDIR)/bfd && \
+       $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-use" 
+
+maybe-clean-stagefeedback-bfd: clean-stagefeedback-bfd
+clean-stagefeedback: clean-stagefeedback-bfd
+clean-stagefeedback-bfd:
+       @[ -f $(HOST_SUBDIR)/bfd/Makefile ] || [ -f $(HOST_SUBDIR)/stagefeedback-bfd/Makefile ] \
+         || exit 0 ; \
+       [ -f $(HOST_SUBDIR)/bfd/Makefile ] || $(MAKE) stagefeedback-start ; \
+       cd $(HOST_SUBDIR)/bfd && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-use"  clean
+@endif bfd-bootstrap
+
+
+
+
+
  .PHONY: check-bfd maybe-check-bfd
  maybe-check-bfd:
  @if bfd
@@ -3827,7 +4196,6 @@ maybe-check-bfd: check-bfd
  check-bfd:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/bfd && \
           $(MAKE) $(FLAGS_TO_PASS)  check)
@@ -3842,10 +4210,9 @@ maybe-install-bfd: install-bfd
  install-bfd: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/bfd && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS)  install)
  
  @endif bfd
  
@@ -3861,7 +4228,6 @@ info-bfd: \
         @[ -f ./bfd/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -3887,7 +4253,6 @@ dvi-bfd: \
         @[ -f ./bfd/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -3913,7 +4278,6 @@ html-bfd: \
         @[ -f ./bfd/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -3939,7 +4303,6 @@ TAGS-bfd: \
         @[ -f ./bfd/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -3966,7 +4329,6 @@ install-info-bfd: \
         @[ -f ./bfd/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -3992,7 +4354,6 @@ installcheck-bfd: \
         @[ -f ./bfd/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -4017,7 +4378,6 @@ mostlyclean-bfd:
         @[ -f ./bfd/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -4042,7 +4402,6 @@ clean-bfd:
         @[ -f ./bfd/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -4067,7 +4426,6 @@ distclean-bfd:
         @[ -f ./bfd/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -4092,7 +4450,6 @@ maintainer-clean-bfd:
         @[ -f ./bfd/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -4109,19 +4466,20 @@ maintainer-clean-bfd:
  @endif bfd
  
  
+
  .PHONY: configure-opcodes maybe-configure-opcodes
  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 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       echo Configuring in opcodes; \
-       cd $(HOST_SUBDIR)/opcodes || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/opcodes; \
+       cd "$(HOST_SUBDIR)/opcodes" || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/opcodes/ | \
@@ -4134,6 +4492,161 @@ configure-opcodes:
           || exit 1
  @endif opcodes
  
+
+
+.PHONY: configure-stage1-opcodes maybe-configure-stage1-opcodes
+maybe-configure-stage1-opcodes:
+@if opcodes-bootstrap
+maybe-configure-stage1-opcodes: configure-stage1-opcodes
+configure-stage1-opcodes: 
+       @$(MAKE) stage1-start
+       @[ -f $(HOST_SUBDIR)/opcodes/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       echo Configuring stage 1 in $(HOST_SUBDIR)/opcodes ; \
+       cd $(HOST_SUBDIR)/opcodes || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/opcodes/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/opcodes"; \
+       libsrcdir="$$s/opcodes"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         --disable-intermodule           --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" 
+@endif opcodes-bootstrap
+
+.PHONY: configure-stage2-opcodes maybe-configure-stage2-opcodes
+maybe-configure-stage2-opcodes:
+@if opcodes-bootstrap
+maybe-configure-stage2-opcodes: configure-stage2-opcodes
+configure-stage2-opcodes: 
+       @$(MAKE) stage2-start
+       @[ -f $(HOST_SUBDIR)/opcodes/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       echo Configuring stage 2 in $(HOST_SUBDIR)/opcodes ; \
+       cd $(HOST_SUBDIR)/opcodes || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/opcodes/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/opcodes"; \
+       libsrcdir="$$s/opcodes"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+@endif opcodes-bootstrap
+
+.PHONY: configure-stage3-opcodes maybe-configure-stage3-opcodes
+maybe-configure-stage3-opcodes:
+@if opcodes-bootstrap
+maybe-configure-stage3-opcodes: configure-stage3-opcodes
+configure-stage3-opcodes: 
+       @$(MAKE) stage3-start
+       @[ -f $(HOST_SUBDIR)/opcodes/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       echo Configuring stage 3 in $(HOST_SUBDIR)/opcodes ; \
+       cd $(HOST_SUBDIR)/opcodes || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/opcodes/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/opcodes"; \
+       libsrcdir="$$s/opcodes"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+@endif opcodes-bootstrap
+
+.PHONY: configure-stage4-opcodes maybe-configure-stage4-opcodes
+maybe-configure-stage4-opcodes:
+@if opcodes-bootstrap
+maybe-configure-stage4-opcodes: configure-stage4-opcodes
+configure-stage4-opcodes: 
+       @$(MAKE) stage4-start
+       @[ -f $(HOST_SUBDIR)/opcodes/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       echo Configuring stage 4 in $(HOST_SUBDIR)/opcodes ; \
+       cd $(HOST_SUBDIR)/opcodes || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/opcodes/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/opcodes"; \
+       libsrcdir="$$s/opcodes"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+@endif opcodes-bootstrap
+
+.PHONY: configure-stageprofile-opcodes maybe-configure-stageprofile-opcodes
+maybe-configure-stageprofile-opcodes:
+@if opcodes-bootstrap
+maybe-configure-stageprofile-opcodes: configure-stageprofile-opcodes
+configure-stageprofile-opcodes: 
+       @$(MAKE) stageprofile-start
+       @[ -f $(HOST_SUBDIR)/opcodes/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       echo Configuring stage profile in $(HOST_SUBDIR)/opcodes ; \
+       cd $(HOST_SUBDIR)/opcodes || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/opcodes/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/opcodes"; \
+       libsrcdir="$$s/opcodes"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+@endif opcodes-bootstrap
+
+.PHONY: configure-stagefeedback-opcodes maybe-configure-stagefeedback-opcodes
+maybe-configure-stagefeedback-opcodes:
+@if opcodes-bootstrap
+maybe-configure-stagefeedback-opcodes: configure-stagefeedback-opcodes
+configure-stagefeedback-opcodes: 
+       @$(MAKE) stagefeedback-start
+       @[ -f $(HOST_SUBDIR)/opcodes/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       echo Configuring stage feedback in $(HOST_SUBDIR)/opcodes ; \
+       cd $(HOST_SUBDIR)/opcodes || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/opcodes/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/opcodes"; \
+       libsrcdir="$$s/opcodes"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+@endif opcodes-bootstrap
+
+
+
+
+
  .PHONY: all-opcodes maybe-all-opcodes
  maybe-all-opcodes:
  @if opcodes
@@ -4143,12 +4656,188 @@ all-opcodes: configure-opcodes
         @test -f stage_last && exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/opcodes && \
           $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-opcodes))
  @endif opcodes
  
+
+
+.PHONY: all-stage1-opcodes maybe-all-stage1-opcodes
+.PHONY: clean-stage1-opcodes maybe-clean-stage1-opcodes
+maybe-all-stage1-opcodes:
+maybe-clean-stage1-opcodes:
+@if opcodes-bootstrap
+maybe-all-stage1-opcodes: all-stage1-opcodes
+all-stage1: all-stage1-opcodes
+all-stage1-opcodes: configure-stage1-opcodes
+       @$(MAKE) stage1-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       cd $(HOST_SUBDIR)/opcodes && \
+       $(MAKE) $(FLAGS_TO_PASS)  CFLAGS="$(STAGE1_CFLAGS)" 
+
+maybe-clean-stage1-opcodes: clean-stage1-opcodes
+clean-stage1: clean-stage1-opcodes
+clean-stage1-opcodes:
+       @[ -f $(HOST_SUBDIR)/opcodes/Makefile ] || [ -f $(HOST_SUBDIR)/stage1-opcodes/Makefile ] \
+         || exit 0 ; \
+       [ -f $(HOST_SUBDIR)/opcodes/Makefile ] || $(MAKE) stage1-start ; \
+       cd $(HOST_SUBDIR)/opcodes && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               CFLAGS="$(STAGE1_CFLAGS)"  clean
+@endif opcodes-bootstrap
+
+
+.PHONY: all-stage2-opcodes maybe-all-stage2-opcodes
+.PHONY: clean-stage2-opcodes maybe-clean-stage2-opcodes
+maybe-all-stage2-opcodes:
+maybe-clean-stage2-opcodes:
+@if opcodes-bootstrap
+maybe-all-stage2-opcodes: all-stage2-opcodes
+all-stage2: all-stage2-opcodes
+all-stage2-opcodes: configure-stage2-opcodes
+       @$(MAKE) stage2-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       cd $(HOST_SUBDIR)/opcodes && \
+       $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)  
+
+maybe-clean-stage2-opcodes: clean-stage2-opcodes
+clean-stage2: clean-stage2-opcodes
+clean-stage2-opcodes:
+       @[ -f $(HOST_SUBDIR)/opcodes/Makefile ] || [ -f $(HOST_SUBDIR)/stage2-opcodes/Makefile ] \
+         || exit 0 ; \
+       [ -f $(HOST_SUBDIR)/opcodes/Makefile ] || $(MAKE) stage2-start ; \
+       cd $(HOST_SUBDIR)/opcodes && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                 clean
+@endif opcodes-bootstrap
+
+
+.PHONY: all-stage3-opcodes maybe-all-stage3-opcodes
+.PHONY: clean-stage3-opcodes maybe-clean-stage3-opcodes
+maybe-all-stage3-opcodes:
+maybe-clean-stage3-opcodes:
+@if opcodes-bootstrap
+maybe-all-stage3-opcodes: all-stage3-opcodes
+all-stage3: all-stage3-opcodes
+all-stage3-opcodes: configure-stage3-opcodes
+       @$(MAKE) stage3-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       cd $(HOST_SUBDIR)/opcodes && \
+       $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)  
+
+maybe-clean-stage3-opcodes: clean-stage3-opcodes
+clean-stage3: clean-stage3-opcodes
+clean-stage3-opcodes:
+       @[ -f $(HOST_SUBDIR)/opcodes/Makefile ] || [ -f $(HOST_SUBDIR)/stage3-opcodes/Makefile ] \
+         || exit 0 ; \
+       [ -f $(HOST_SUBDIR)/opcodes/Makefile ] || $(MAKE) stage3-start ; \
+       cd $(HOST_SUBDIR)/opcodes && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                 clean
+@endif opcodes-bootstrap
+
+
+.PHONY: all-stage4-opcodes maybe-all-stage4-opcodes
+.PHONY: clean-stage4-opcodes maybe-clean-stage4-opcodes
+maybe-all-stage4-opcodes:
+maybe-clean-stage4-opcodes:
+@if opcodes-bootstrap
+maybe-all-stage4-opcodes: all-stage4-opcodes
+all-stage4: all-stage4-opcodes
+all-stage4-opcodes: configure-stage4-opcodes
+       @$(MAKE) stage4-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       cd $(HOST_SUBDIR)/opcodes && \
+       $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)  
+
+maybe-clean-stage4-opcodes: clean-stage4-opcodes
+clean-stage4: clean-stage4-opcodes
+clean-stage4-opcodes:
+       @[ -f $(HOST_SUBDIR)/opcodes/Makefile ] || [ -f $(HOST_SUBDIR)/stage4-opcodes/Makefile ] \
+         || exit 0 ; \
+       [ -f $(HOST_SUBDIR)/opcodes/Makefile ] || $(MAKE) stage4-start ; \
+       cd $(HOST_SUBDIR)/opcodes && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                 clean
+@endif opcodes-bootstrap
+
+
+.PHONY: all-stageprofile-opcodes maybe-all-stageprofile-opcodes
+.PHONY: clean-stageprofile-opcodes maybe-clean-stageprofile-opcodes
+maybe-all-stageprofile-opcodes:
+maybe-clean-stageprofile-opcodes:
+@if opcodes-bootstrap
+maybe-all-stageprofile-opcodes: all-stageprofile-opcodes
+all-stageprofile: all-stageprofile-opcodes
+all-stageprofile-opcodes: configure-stageprofile-opcodes
+       @$(MAKE) stageprofile-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       cd $(HOST_SUBDIR)/opcodes && \
+       $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" 
+
+maybe-clean-stageprofile-opcodes: clean-stageprofile-opcodes
+clean-stageprofile: clean-stageprofile-opcodes
+clean-stageprofile-opcodes:
+       @[ -f $(HOST_SUBDIR)/opcodes/Makefile ] || [ -f $(HOST_SUBDIR)/stageprofile-opcodes/Makefile ] \
+         || exit 0 ; \
+       [ -f $(HOST_SUBDIR)/opcodes/Makefile ] || $(MAKE) stageprofile-start ; \
+       cd $(HOST_SUBDIR)/opcodes && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-generate"  clean
+@endif opcodes-bootstrap
+
+
+.PHONY: all-stagefeedback-opcodes maybe-all-stagefeedback-opcodes
+.PHONY: clean-stagefeedback-opcodes maybe-clean-stagefeedback-opcodes
+maybe-all-stagefeedback-opcodes:
+maybe-clean-stagefeedback-opcodes:
+@if opcodes-bootstrap
+maybe-all-stagefeedback-opcodes: all-stagefeedback-opcodes
+all-stagefeedback: all-stagefeedback-opcodes
+all-stagefeedback-opcodes: configure-stagefeedback-opcodes
+       @$(MAKE) stagefeedback-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       cd $(HOST_SUBDIR)/opcodes && \
+       $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-use" 
+
+maybe-clean-stagefeedback-opcodes: clean-stagefeedback-opcodes
+clean-stagefeedback: clean-stagefeedback-opcodes
+clean-stagefeedback-opcodes:
+       @[ -f $(HOST_SUBDIR)/opcodes/Makefile ] || [ -f $(HOST_SUBDIR)/stagefeedback-opcodes/Makefile ] \
+         || exit 0 ; \
+       [ -f $(HOST_SUBDIR)/opcodes/Makefile ] || $(MAKE) stagefeedback-start ; \
+       cd $(HOST_SUBDIR)/opcodes && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-use"  clean
+@endif opcodes-bootstrap
+
+
+
+
+
  .PHONY: check-opcodes maybe-check-opcodes
  maybe-check-opcodes:
  @if opcodes
@@ -4157,7 +4846,6 @@ maybe-check-opcodes: check-opcodes
  check-opcodes:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/opcodes && \
           $(MAKE) $(FLAGS_TO_PASS)  check)
@@ -4172,10 +4860,9 @@ maybe-install-opcodes: install-opcodes
  install-opcodes: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/opcodes && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS)  install)
  
  @endif opcodes
  
@@ -4191,7 +4878,6 @@ info-opcodes: \
         @[ -f ./opcodes/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -4217,7 +4903,6 @@ dvi-opcodes: \
         @[ -f ./opcodes/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -4243,7 +4928,6 @@ html-opcodes: \
         @[ -f ./opcodes/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -4269,7 +4953,6 @@ TAGS-opcodes: \
         @[ -f ./opcodes/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -4296,7 +4979,6 @@ install-info-opcodes: \
         @[ -f ./opcodes/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -4322,7 +5004,6 @@ installcheck-opcodes: \
         @[ -f ./opcodes/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -4347,7 +5028,6 @@ mostlyclean-opcodes:
         @[ -f ./opcodes/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -4372,7 +5052,6 @@ clean-opcodes:
         @[ -f ./opcodes/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -4397,7 +5076,6 @@ distclean-opcodes:
         @[ -f ./opcodes/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -4422,7 +5100,6 @@ maintainer-clean-opcodes:
         @[ -f ./opcodes/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -4439,19 +5116,20 @@ maintainer-clean-opcodes:
  @endif opcodes
  
  
+
  .PHONY: configure-binutils maybe-configure-binutils
  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 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       echo Configuring in binutils; \
-       cd $(HOST_SUBDIR)/binutils || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/binutils; \
+       cd "$(HOST_SUBDIR)/binutils" || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/binutils/ | \
@@ -4464,6 +5142,161 @@ configure-binutils:
           || exit 1
  @endif binutils
  
+
+
+.PHONY: configure-stage1-binutils maybe-configure-stage1-binutils
+maybe-configure-stage1-binutils:
+@if binutils-bootstrap
+maybe-configure-stage1-binutils: configure-stage1-binutils
+configure-stage1-binutils: 
+       @$(MAKE) stage1-start
+       @[ -f $(HOST_SUBDIR)/binutils/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       echo Configuring stage 1 in $(HOST_SUBDIR)/binutils ; \
+       cd $(HOST_SUBDIR)/binutils || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/binutils/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/binutils"; \
+       libsrcdir="$$s/binutils"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         --disable-intermodule           --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" 
+@endif binutils-bootstrap
+
+.PHONY: configure-stage2-binutils maybe-configure-stage2-binutils
+maybe-configure-stage2-binutils:
+@if binutils-bootstrap
+maybe-configure-stage2-binutils: configure-stage2-binutils
+configure-stage2-binutils: 
+       @$(MAKE) stage2-start
+       @[ -f $(HOST_SUBDIR)/binutils/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       echo Configuring stage 2 in $(HOST_SUBDIR)/binutils ; \
+       cd $(HOST_SUBDIR)/binutils || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/binutils/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/binutils"; \
+       libsrcdir="$$s/binutils"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+@endif binutils-bootstrap
+
+.PHONY: configure-stage3-binutils maybe-configure-stage3-binutils
+maybe-configure-stage3-binutils:
+@if binutils-bootstrap
+maybe-configure-stage3-binutils: configure-stage3-binutils
+configure-stage3-binutils: 
+       @$(MAKE) stage3-start
+       @[ -f $(HOST_SUBDIR)/binutils/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       echo Configuring stage 3 in $(HOST_SUBDIR)/binutils ; \
+       cd $(HOST_SUBDIR)/binutils || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/binutils/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/binutils"; \
+       libsrcdir="$$s/binutils"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+@endif binutils-bootstrap
+
+.PHONY: configure-stage4-binutils maybe-configure-stage4-binutils
+maybe-configure-stage4-binutils:
+@if binutils-bootstrap
+maybe-configure-stage4-binutils: configure-stage4-binutils
+configure-stage4-binutils: 
+       @$(MAKE) stage4-start
+       @[ -f $(HOST_SUBDIR)/binutils/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       echo Configuring stage 4 in $(HOST_SUBDIR)/binutils ; \
+       cd $(HOST_SUBDIR)/binutils || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/binutils/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/binutils"; \
+       libsrcdir="$$s/binutils"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+@endif binutils-bootstrap
+
+.PHONY: configure-stageprofile-binutils maybe-configure-stageprofile-binutils
+maybe-configure-stageprofile-binutils:
+@if binutils-bootstrap
+maybe-configure-stageprofile-binutils: configure-stageprofile-binutils
+configure-stageprofile-binutils: 
+       @$(MAKE) stageprofile-start
+       @[ -f $(HOST_SUBDIR)/binutils/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       echo Configuring stage profile in $(HOST_SUBDIR)/binutils ; \
+       cd $(HOST_SUBDIR)/binutils || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/binutils/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/binutils"; \
+       libsrcdir="$$s/binutils"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+@endif binutils-bootstrap
+
+.PHONY: configure-stagefeedback-binutils maybe-configure-stagefeedback-binutils
+maybe-configure-stagefeedback-binutils:
+@if binutils-bootstrap
+maybe-configure-stagefeedback-binutils: configure-stagefeedback-binutils
+configure-stagefeedback-binutils: 
+       @$(MAKE) stagefeedback-start
+       @[ -f $(HOST_SUBDIR)/binutils/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       echo Configuring stage feedback in $(HOST_SUBDIR)/binutils ; \
+       cd $(HOST_SUBDIR)/binutils || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/binutils/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/binutils"; \
+       libsrcdir="$$s/binutils"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+@endif binutils-bootstrap
+
+
+
+
+
  .PHONY: all-binutils maybe-all-binutils
  maybe-all-binutils:
  @if binutils
@@ -4473,12 +5306,188 @@ all-binutils: configure-binutils
         @test -f stage_last && exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/binutils && \
           $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-binutils))
  @endif binutils
  
+
+
+.PHONY: all-stage1-binutils maybe-all-stage1-binutils
+.PHONY: clean-stage1-binutils maybe-clean-stage1-binutils
+maybe-all-stage1-binutils:
+maybe-clean-stage1-binutils:
+@if binutils-bootstrap
+maybe-all-stage1-binutils: all-stage1-binutils
+all-stage1: all-stage1-binutils
+all-stage1-binutils: configure-stage1-binutils
+       @$(MAKE) stage1-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       cd $(HOST_SUBDIR)/binutils && \
+       $(MAKE) $(FLAGS_TO_PASS)  CFLAGS="$(STAGE1_CFLAGS)" 
+
+maybe-clean-stage1-binutils: clean-stage1-binutils
+clean-stage1: clean-stage1-binutils
+clean-stage1-binutils:
+       @[ -f $(HOST_SUBDIR)/binutils/Makefile ] || [ -f $(HOST_SUBDIR)/stage1-binutils/Makefile ] \
+         || exit 0 ; \
+       [ -f $(HOST_SUBDIR)/binutils/Makefile ] || $(MAKE) stage1-start ; \
+       cd $(HOST_SUBDIR)/binutils && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               CFLAGS="$(STAGE1_CFLAGS)"  clean
+@endif binutils-bootstrap
+
+
+.PHONY: all-stage2-binutils maybe-all-stage2-binutils
+.PHONY: clean-stage2-binutils maybe-clean-stage2-binutils
+maybe-all-stage2-binutils:
+maybe-clean-stage2-binutils:
+@if binutils-bootstrap
+maybe-all-stage2-binutils: all-stage2-binutils
+all-stage2: all-stage2-binutils
+all-stage2-binutils: configure-stage2-binutils
+       @$(MAKE) stage2-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       cd $(HOST_SUBDIR)/binutils && \
+       $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)  
+
+maybe-clean-stage2-binutils: clean-stage2-binutils
+clean-stage2: clean-stage2-binutils
+clean-stage2-binutils:
+       @[ -f $(HOST_SUBDIR)/binutils/Makefile ] || [ -f $(HOST_SUBDIR)/stage2-binutils/Makefile ] \
+         || exit 0 ; \
+       [ -f $(HOST_SUBDIR)/binutils/Makefile ] || $(MAKE) stage2-start ; \
+       cd $(HOST_SUBDIR)/binutils && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                 clean
+@endif binutils-bootstrap
+
+
+.PHONY: all-stage3-binutils maybe-all-stage3-binutils
+.PHONY: clean-stage3-binutils maybe-clean-stage3-binutils
+maybe-all-stage3-binutils:
+maybe-clean-stage3-binutils:
+@if binutils-bootstrap
+maybe-all-stage3-binutils: all-stage3-binutils
+all-stage3: all-stage3-binutils
+all-stage3-binutils: configure-stage3-binutils
+       @$(MAKE) stage3-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       cd $(HOST_SUBDIR)/binutils && \
+       $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)  
+
+maybe-clean-stage3-binutils: clean-stage3-binutils
+clean-stage3: clean-stage3-binutils
+clean-stage3-binutils:
+       @[ -f $(HOST_SUBDIR)/binutils/Makefile ] || [ -f $(HOST_SUBDIR)/stage3-binutils/Makefile ] \
+         || exit 0 ; \
+       [ -f $(HOST_SUBDIR)/binutils/Makefile ] || $(MAKE) stage3-start ; \
+       cd $(HOST_SUBDIR)/binutils && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                 clean
+@endif binutils-bootstrap
+
+
+.PHONY: all-stage4-binutils maybe-all-stage4-binutils
+.PHONY: clean-stage4-binutils maybe-clean-stage4-binutils
+maybe-all-stage4-binutils:
+maybe-clean-stage4-binutils:
+@if binutils-bootstrap
+maybe-all-stage4-binutils: all-stage4-binutils
+all-stage4: all-stage4-binutils
+all-stage4-binutils: configure-stage4-binutils
+       @$(MAKE) stage4-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       cd $(HOST_SUBDIR)/binutils && \
+       $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)  
+
+maybe-clean-stage4-binutils: clean-stage4-binutils
+clean-stage4: clean-stage4-binutils
+clean-stage4-binutils:
+       @[ -f $(HOST_SUBDIR)/binutils/Makefile ] || [ -f $(HOST_SUBDIR)/stage4-binutils/Makefile ] \
+         || exit 0 ; \
+       [ -f $(HOST_SUBDIR)/binutils/Makefile ] || $(MAKE) stage4-start ; \
+       cd $(HOST_SUBDIR)/binutils && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                 clean
+@endif binutils-bootstrap
+
+
+.PHONY: all-stageprofile-binutils maybe-all-stageprofile-binutils
+.PHONY: clean-stageprofile-binutils maybe-clean-stageprofile-binutils
+maybe-all-stageprofile-binutils:
+maybe-clean-stageprofile-binutils:
+@if binutils-bootstrap
+maybe-all-stageprofile-binutils: all-stageprofile-binutils
+all-stageprofile: all-stageprofile-binutils
+all-stageprofile-binutils: configure-stageprofile-binutils
+       @$(MAKE) stageprofile-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       cd $(HOST_SUBDIR)/binutils && \
+       $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" 
+
+maybe-clean-stageprofile-binutils: clean-stageprofile-binutils
+clean-stageprofile: clean-stageprofile-binutils
+clean-stageprofile-binutils:
+       @[ -f $(HOST_SUBDIR)/binutils/Makefile ] || [ -f $(HOST_SUBDIR)/stageprofile-binutils/Makefile ] \
+         || exit 0 ; \
+       [ -f $(HOST_SUBDIR)/binutils/Makefile ] || $(MAKE) stageprofile-start ; \
+       cd $(HOST_SUBDIR)/binutils && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-generate"  clean
+@endif binutils-bootstrap
+
+
+.PHONY: all-stagefeedback-binutils maybe-all-stagefeedback-binutils
+.PHONY: clean-stagefeedback-binutils maybe-clean-stagefeedback-binutils
+maybe-all-stagefeedback-binutils:
+maybe-clean-stagefeedback-binutils:
+@if binutils-bootstrap
+maybe-all-stagefeedback-binutils: all-stagefeedback-binutils
+all-stagefeedback: all-stagefeedback-binutils
+all-stagefeedback-binutils: configure-stagefeedback-binutils
+       @$(MAKE) stagefeedback-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       cd $(HOST_SUBDIR)/binutils && \
+       $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-use" 
+
+maybe-clean-stagefeedback-binutils: clean-stagefeedback-binutils
+clean-stagefeedback: clean-stagefeedback-binutils
+clean-stagefeedback-binutils:
+       @[ -f $(HOST_SUBDIR)/binutils/Makefile ] || [ -f $(HOST_SUBDIR)/stagefeedback-binutils/Makefile ] \
+         || exit 0 ; \
+       [ -f $(HOST_SUBDIR)/binutils/Makefile ] || $(MAKE) stagefeedback-start ; \
+       cd $(HOST_SUBDIR)/binutils && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-use"  clean
+@endif binutils-bootstrap
+
+
+
+
+
  .PHONY: check-binutils maybe-check-binutils
  maybe-check-binutils:
  @if binutils
@@ -4487,7 +5496,6 @@ maybe-check-binutils: check-binutils
  check-binutils:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/binutils && \
           $(MAKE) $(FLAGS_TO_PASS)  check)
@@ -4502,10 +5510,9 @@ maybe-install-binutils: install-binutils
  install-binutils: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/binutils && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS)  install)
  
  @endif binutils
  
@@ -4521,7 +5528,6 @@ info-binutils: \
         @[ -f ./binutils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -4547,7 +5553,6 @@ dvi-binutils: \
         @[ -f ./binutils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -4573,7 +5578,6 @@ html-binutils: \
         @[ -f ./binutils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -4599,7 +5603,6 @@ TAGS-binutils: \
         @[ -f ./binutils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -4626,7 +5629,6 @@ install-info-binutils: \
         @[ -f ./binutils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -4652,7 +5654,6 @@ installcheck-binutils: \
         @[ -f ./binutils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -4677,7 +5678,6 @@ mostlyclean-binutils:
         @[ -f ./binutils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -4702,7 +5702,6 @@ clean-binutils:
         @[ -f ./binutils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -4727,7 +5726,6 @@ distclean-binutils:
         @[ -f ./binutils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -4752,7 +5750,6 @@ maintainer-clean-binutils:
         @[ -f ./binutils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -4769,18 +5766,19 @@ maintainer-clean-binutils:
  @endif binutils
  
  
+
  .PHONY: configure-bison maybe-configure-bison
  maybe-configure-bison:
  @if bison
  maybe-configure-bison: configure-bison
-configure-bison:
+configure-bison: 
         @test ! -f $(HOST_SUBDIR)/bison/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bison ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       echo Configuring in bison; \
-       cd $(HOST_SUBDIR)/bison || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/bison; \
+       cd "$(HOST_SUBDIR)/bison" || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/bison/ | \
@@ -4793,6 +5791,10 @@ configure-bison:
           || exit 1
  @endif bison
  
+
+
+
+
  .PHONY: all-bison maybe-all-bison
  maybe-all-bison:
  @if bison
@@ -4801,12 +5803,14 @@ maybe-all-bison: all-bison
  all-bison: configure-bison
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/bison && \
           $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-bison))
  @endif bison
  
+
+
+
  .PHONY: check-bison maybe-check-bison
  maybe-check-bison:
  @if bison
@@ -4817,10 +5821,9 @@ check-bison:
         @if [ '$(host)' = '$(target)' ] ; then \
           r=`${PWD_COMMAND}`; export r; \
           s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-         $(SET_LIB_PATH) \
           $(HOST_EXPORTS) \
           (cd $(HOST_SUBDIR)/bison && \
-           $(MAKE) $(FLAGS_TO_PASS)  check)
+           $(MAKE) $(FLAGS_TO_PASS)  check); \
         fi
  
  @endif bison
@@ -4833,10 +5836,9 @@ maybe-install-bison: install-bison
  install-bison: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/bison && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS)  install)
  
  @endif bison
  
@@ -4852,7 +5854,6 @@ info-bison: \
         @[ -f ./bison/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -4878,7 +5879,6 @@ dvi-bison: \
         @[ -f ./bison/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -4904,7 +5904,6 @@ html-bison: \
         @[ -f ./bison/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -4930,7 +5929,6 @@ TAGS-bison: \
         @[ -f ./bison/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -4957,7 +5955,6 @@ install-info-bison: \
         @[ -f ./bison/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -4983,7 +5980,6 @@ installcheck-bison: \
         @[ -f ./bison/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -5008,7 +6004,6 @@ mostlyclean-bison:
         @[ -f ./bison/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -5033,7 +6028,6 @@ clean-bison:
         @[ -f ./bison/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -5058,7 +6052,6 @@ distclean-bison:
         @[ -f ./bison/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -5083,7 +6076,6 @@ maintainer-clean-bison:
         @[ -f ./bison/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -5100,18 +6092,19 @@ maintainer-clean-bison:
  @endif bison
  
  
+
  .PHONY: configure-byacc maybe-configure-byacc
  maybe-configure-byacc:
  @if byacc
  maybe-configure-byacc: configure-byacc
-configure-byacc:
+configure-byacc: 
         @test ! -f $(HOST_SUBDIR)/byacc/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/byacc ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       echo Configuring in byacc; \
-       cd $(HOST_SUBDIR)/byacc || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/byacc; \
+       cd "$(HOST_SUBDIR)/byacc" || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/byacc/ | \
@@ -5124,6 +6117,10 @@ configure-byacc:
           || exit 1
  @endif byacc
  
+
+
+
+
  .PHONY: all-byacc maybe-all-byacc
  maybe-all-byacc:
  @if byacc
@@ -5132,12 +6129,14 @@ maybe-all-byacc: all-byacc
  all-byacc: configure-byacc
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/byacc && \
           $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-byacc))
  @endif byacc
  
+
+
+
  .PHONY: check-byacc maybe-check-byacc
  maybe-check-byacc:
  @if byacc
@@ -5148,10 +6147,9 @@ check-byacc:
         @if [ '$(host)' = '$(target)' ] ; then \
           r=`${PWD_COMMAND}`; export r; \
           s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-         $(SET_LIB_PATH) \
           $(HOST_EXPORTS) \
           (cd $(HOST_SUBDIR)/byacc && \
-           $(MAKE) $(FLAGS_TO_PASS)  check)
+           $(MAKE) $(FLAGS_TO_PASS)  check); \
         fi
  
  @endif byacc
@@ -5164,10 +6162,9 @@ maybe-install-byacc: install-byacc
  install-byacc: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/byacc && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS)  install)
  
  @endif byacc
  
@@ -5183,7 +6180,6 @@ info-byacc: \
         @[ -f ./byacc/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -5209,7 +6205,6 @@ dvi-byacc: \
         @[ -f ./byacc/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -5235,7 +6230,6 @@ html-byacc: \
         @[ -f ./byacc/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -5261,7 +6255,6 @@ TAGS-byacc: \
         @[ -f ./byacc/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -5288,7 +6281,6 @@ install-info-byacc: \
         @[ -f ./byacc/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -5314,7 +6306,6 @@ installcheck-byacc: \
         @[ -f ./byacc/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -5339,7 +6330,6 @@ mostlyclean-byacc:
         @[ -f ./byacc/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -5364,7 +6354,6 @@ clean-byacc:
         @[ -f ./byacc/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -5389,7 +6378,6 @@ distclean-byacc:
         @[ -f ./byacc/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -5414,7 +6402,6 @@ maintainer-clean-byacc:
         @[ -f ./byacc/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -5431,18 +6418,19 @@ maintainer-clean-byacc:
  @endif byacc
  
  
+
  .PHONY: configure-bzip2 maybe-configure-bzip2
  maybe-configure-bzip2:
  @if bzip2
  maybe-configure-bzip2: configure-bzip2
-configure-bzip2:
+configure-bzip2: 
         @test ! -f $(HOST_SUBDIR)/bzip2/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bzip2 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       echo Configuring in bzip2; \
-       cd $(HOST_SUBDIR)/bzip2 || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/bzip2; \
+       cd "$(HOST_SUBDIR)/bzip2" || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/bzip2/ | \
@@ -5455,6 +6443,10 @@ configure-bzip2:
           || exit 1
  @endif bzip2
  
+
+
+
+
  .PHONY: all-bzip2 maybe-all-bzip2
  maybe-all-bzip2:
  @if bzip2
@@ -5463,12 +6455,14 @@ maybe-all-bzip2: all-bzip2
  all-bzip2: configure-bzip2
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/bzip2 && \
           $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-bzip2))
  @endif bzip2
  
+
+
+
  .PHONY: check-bzip2 maybe-check-bzip2
  maybe-check-bzip2:
  @if bzip2
@@ -5477,7 +6471,6 @@ maybe-check-bzip2: check-bzip2
  check-bzip2:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/bzip2 && \
           $(MAKE) $(FLAGS_TO_PASS)  check)
@@ -5492,10 +6485,9 @@ maybe-install-bzip2: install-bzip2
  install-bzip2: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/bzip2 && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS)  install)
  
  @endif bzip2
  
@@ -5511,7 +6503,6 @@ info-bzip2: \
         @[ -f ./bzip2/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -5537,7 +6528,6 @@ dvi-bzip2: \
         @[ -f ./bzip2/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -5563,7 +6553,6 @@ html-bzip2: \
         @[ -f ./bzip2/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -5589,7 +6578,6 @@ TAGS-bzip2: \
         @[ -f ./bzip2/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -5616,7 +6604,6 @@ install-info-bzip2: \
         @[ -f ./bzip2/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -5642,7 +6629,6 @@ installcheck-bzip2: \
         @[ -f ./bzip2/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -5667,7 +6653,6 @@ mostlyclean-bzip2:
         @[ -f ./bzip2/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -5692,7 +6677,6 @@ clean-bzip2:
         @[ -f ./bzip2/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -5717,7 +6701,6 @@ distclean-bzip2:
         @[ -f ./bzip2/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -5742,7 +6725,6 @@ maintainer-clean-bzip2:
         @[ -f ./bzip2/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -5759,18 +6741,19 @@ maintainer-clean-bzip2:
  @endif bzip2
  
  
+
  .PHONY: configure-dejagnu maybe-configure-dejagnu
  maybe-configure-dejagnu:
  @if dejagnu
  maybe-configure-dejagnu: configure-dejagnu
-configure-dejagnu:
+configure-dejagnu: 
         @test ! -f $(HOST_SUBDIR)/dejagnu/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/dejagnu ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       echo Configuring in dejagnu; \
-       cd $(HOST_SUBDIR)/dejagnu || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/dejagnu; \
+       cd "$(HOST_SUBDIR)/dejagnu" || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/dejagnu/ | \
@@ -5783,6 +6766,10 @@ configure-dejagnu:
           || exit 1
  @endif dejagnu
  
+
+
+
+
  .PHONY: all-dejagnu maybe-all-dejagnu
  maybe-all-dejagnu:
  @if dejagnu
@@ -5791,12 +6778,14 @@ maybe-all-dejagnu: all-dejagnu
  all-dejagnu: configure-dejagnu
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/dejagnu && \
           $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-dejagnu))
  @endif dejagnu
  
+
+
+
  .PHONY: check-dejagnu maybe-check-dejagnu
  maybe-check-dejagnu:
  @if dejagnu
@@ -5805,7 +6794,6 @@ maybe-check-dejagnu: check-dejagnu
  check-dejagnu:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/dejagnu && \
           $(MAKE) $(FLAGS_TO_PASS)  check)
@@ -5820,10 +6808,9 @@ maybe-install-dejagnu: install-dejagnu
  install-dejagnu: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/dejagnu && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS)  install)
  
  @endif dejagnu
  
@@ -5839,7 +6826,6 @@ info-dejagnu: \
         @[ -f ./dejagnu/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -5865,7 +6851,6 @@ dvi-dejagnu: \
         @[ -f ./dejagnu/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -5891,7 +6876,6 @@ html-dejagnu: \
         @[ -f ./dejagnu/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -5917,7 +6901,6 @@ TAGS-dejagnu: \
         @[ -f ./dejagnu/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -5944,7 +6927,6 @@ install-info-dejagnu: \
         @[ -f ./dejagnu/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -5970,7 +6952,6 @@ installcheck-dejagnu: \
         @[ -f ./dejagnu/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -5995,7 +6976,6 @@ mostlyclean-dejagnu:
         @[ -f ./dejagnu/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -6020,7 +7000,6 @@ clean-dejagnu:
         @[ -f ./dejagnu/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -6045,7 +7024,6 @@ distclean-dejagnu:
         @[ -f ./dejagnu/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -6070,7 +7048,6 @@ maintainer-clean-dejagnu:
         @[ -f ./dejagnu/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -6087,18 +7064,19 @@ maintainer-clean-dejagnu:
  @endif dejagnu
  
  
+
  .PHONY: configure-diff maybe-configure-diff
  maybe-configure-diff:
  @if diff
  maybe-configure-diff: configure-diff
-configure-diff:
+configure-diff: 
         @test ! -f $(HOST_SUBDIR)/diff/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/diff ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       echo Configuring in diff; \
-       cd $(HOST_SUBDIR)/diff || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/diff; \
+       cd "$(HOST_SUBDIR)/diff" || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/diff/ | \
@@ -6111,6 +7089,10 @@ configure-diff:
           || exit 1
  @endif diff
  
+
+
+
+
  .PHONY: all-diff maybe-all-diff
  maybe-all-diff:
  @if diff
@@ -6119,12 +7101,14 @@ maybe-all-diff: all-diff
  all-diff: configure-diff
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/diff && \
           $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-diff))
  @endif diff
  
+
+
+
  .PHONY: check-diff maybe-check-diff
  maybe-check-diff:
  @if diff
@@ -6133,7 +7117,6 @@ maybe-check-diff: check-diff
  check-diff:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/diff && \
           $(MAKE) $(FLAGS_TO_PASS)  check)
@@ -6148,10 +7131,9 @@ maybe-install-diff: install-diff
  install-diff: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/diff && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS)  install)
  
  @endif diff
  
@@ -6167,7 +7149,6 @@ info-diff: \
         @[ -f ./diff/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -6193,7 +7174,6 @@ dvi-diff: \
         @[ -f ./diff/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -6219,7 +7199,6 @@ html-diff: \
         @[ -f ./diff/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -6245,7 +7224,6 @@ TAGS-diff: \
         @[ -f ./diff/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -6272,7 +7250,6 @@ install-info-diff: \
         @[ -f ./diff/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -6298,7 +7275,6 @@ installcheck-diff: \
         @[ -f ./diff/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -6323,7 +7299,6 @@ mostlyclean-diff:
         @[ -f ./diff/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -6348,7 +7323,6 @@ clean-diff:
         @[ -f ./diff/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -6373,7 +7347,6 @@ distclean-diff:
         @[ -f ./diff/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -6398,7 +7371,6 @@ maintainer-clean-diff:
         @[ -f ./diff/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -6415,18 +7387,19 @@ maintainer-clean-diff:
  @endif diff
  
  
+
  .PHONY: configure-dosutils maybe-configure-dosutils
  maybe-configure-dosutils:
  @if dosutils
  maybe-configure-dosutils: configure-dosutils
-configure-dosutils:
+configure-dosutils: 
         @test ! -f $(HOST_SUBDIR)/dosutils/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/dosutils ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       echo Configuring in dosutils; \
-       cd $(HOST_SUBDIR)/dosutils || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/dosutils; \
+       cd "$(HOST_SUBDIR)/dosutils" || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/dosutils/ | \
@@ -6439,6 +7412,10 @@ configure-dosutils:
           || exit 1
  @endif dosutils
  
+
+
+
+
  .PHONY: all-dosutils maybe-all-dosutils
  maybe-all-dosutils:
  @if dosutils
@@ -6447,12 +7424,14 @@ maybe-all-dosutils: all-dosutils
  all-dosutils: configure-dosutils
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/dosutils && \
           $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-dosutils))
  @endif dosutils
  
+
+
+
  .PHONY: check-dosutils maybe-check-dosutils
  maybe-check-dosutils:
  @if dosutils
@@ -6470,10 +7449,9 @@ maybe-install-dosutils: install-dosutils
  install-dosutils: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/dosutils && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS)  install)
  
  @endif dosutils
  
@@ -6489,7 +7467,6 @@ info-dosutils: \
         @[ -f ./dosutils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -6515,7 +7492,6 @@ dvi-dosutils: \
         @[ -f ./dosutils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -6541,7 +7517,6 @@ html-dosutils: \
         @[ -f ./dosutils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -6567,7 +7542,6 @@ TAGS-dosutils: \
         @[ -f ./dosutils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -6594,7 +7568,6 @@ install-info-dosutils: \
         @[ -f ./dosutils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -6620,7 +7593,6 @@ installcheck-dosutils: \
         @[ -f ./dosutils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -6645,7 +7617,6 @@ mostlyclean-dosutils:
         @[ -f ./dosutils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -6670,7 +7641,6 @@ clean-dosutils:
         @[ -f ./dosutils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -6695,7 +7665,6 @@ distclean-dosutils:
         @[ -f ./dosutils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -6720,7 +7689,6 @@ maintainer-clean-dosutils:
         @[ -f ./dosutils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -6737,18 +7705,19 @@ maintainer-clean-dosutils:
  @endif dosutils
  
  
+
  .PHONY: configure-etc maybe-configure-etc
  maybe-configure-etc:
  @if etc
  maybe-configure-etc: configure-etc
-configure-etc:
+configure-etc: 
         @test ! -f $(HOST_SUBDIR)/etc/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/etc ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       echo Configuring in etc; \
-       cd $(HOST_SUBDIR)/etc || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/etc; \
+       cd "$(HOST_SUBDIR)/etc" || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/etc/ | \
@@ -6761,6 +7730,10 @@ configure-etc:
           || exit 1
  @endif etc
  
+
+
+
+
  .PHONY: all-etc maybe-all-etc
  maybe-all-etc:
  @if etc
@@ -6769,12 +7742,14 @@ maybe-all-etc: all-etc
  all-etc: configure-etc
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/etc && \
           $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-etc))
  @endif etc
  
+
+
+
  .PHONY: check-etc maybe-check-etc
  maybe-check-etc:
  @if etc
@@ -6783,7 +7758,6 @@ maybe-check-etc: check-etc
  check-etc:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/etc && \
           $(MAKE) $(FLAGS_TO_PASS)  check)
@@ -6798,10 +7772,9 @@ maybe-install-etc: install-etc
  install-etc: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/etc && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS)  install)
  
  @endif etc
  
@@ -6817,7 +7790,6 @@ info-etc: \
         @[ -f ./etc/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -6843,7 +7815,6 @@ dvi-etc: \
         @[ -f ./etc/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -6869,7 +7840,6 @@ html-etc: \
         @[ -f ./etc/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -6895,7 +7865,6 @@ TAGS-etc: \
         @[ -f ./etc/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -6922,7 +7891,6 @@ install-info-etc: \
         @[ -f ./etc/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -6948,7 +7916,6 @@ installcheck-etc: \
         @[ -f ./etc/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -6973,7 +7940,6 @@ mostlyclean-etc:
         @[ -f ./etc/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -6998,7 +7964,6 @@ clean-etc:
         @[ -f ./etc/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -7023,7 +7988,6 @@ distclean-etc:
         @[ -f ./etc/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -7048,7 +8012,6 @@ maintainer-clean-etc:
         @[ -f ./etc/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -7065,18 +8028,19 @@ maintainer-clean-etc:
  @endif etc
  
  
+
  .PHONY: configure-fastjar maybe-configure-fastjar
  maybe-configure-fastjar:
  @if fastjar
  maybe-configure-fastjar: configure-fastjar
-configure-fastjar:
+configure-fastjar: 
         @test ! -f $(HOST_SUBDIR)/fastjar/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/fastjar ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       echo Configuring in fastjar; \
-       cd $(HOST_SUBDIR)/fastjar || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/fastjar; \
+       cd "$(HOST_SUBDIR)/fastjar" || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/fastjar/ | \
@@ -7089,6 +8053,10 @@ configure-fastjar:
           || exit 1
  @endif fastjar
  
+
+
+
+
  .PHONY: all-fastjar maybe-all-fastjar
  maybe-all-fastjar:
  @if fastjar
@@ -7097,12 +8065,14 @@ maybe-all-fastjar: all-fastjar
  all-fastjar: configure-fastjar
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/fastjar && \
           $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-fastjar))
  @endif fastjar
  
+
+
+
  .PHONY: check-fastjar maybe-check-fastjar
  maybe-check-fastjar:
  @if fastjar
@@ -7113,10 +8083,9 @@ check-fastjar:
         @if [ '$(host)' = '$(target)' ] ; then \
           r=`${PWD_COMMAND}`; export r; \
           s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-         $(SET_LIB_PATH) \
           $(HOST_EXPORTS) \
           (cd $(HOST_SUBDIR)/fastjar && \
-           $(MAKE) $(FLAGS_TO_PASS)  check)
+           $(MAKE) $(FLAGS_TO_PASS)  check); \
         fi
  
  @endif fastjar
@@ -7129,10 +8098,9 @@ maybe-install-fastjar: install-fastjar
  install-fastjar: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/fastjar && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS)  install)
  
  @endif fastjar
  
@@ -7148,7 +8116,6 @@ info-fastjar: \
         @[ -f ./fastjar/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -7174,7 +8141,6 @@ dvi-fastjar: \
         @[ -f ./fastjar/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -7200,7 +8166,6 @@ html-fastjar: \
         @[ -f ./fastjar/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -7226,7 +8191,6 @@ TAGS-fastjar: \
         @[ -f ./fastjar/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -7253,7 +8217,6 @@ install-info-fastjar: \
         @[ -f ./fastjar/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -7279,7 +8242,6 @@ installcheck-fastjar: \
         @[ -f ./fastjar/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -7304,7 +8266,6 @@ mostlyclean-fastjar:
         @[ -f ./fastjar/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -7329,7 +8290,6 @@ clean-fastjar:
         @[ -f ./fastjar/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -7354,7 +8314,6 @@ distclean-fastjar:
         @[ -f ./fastjar/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -7379,7 +8338,6 @@ maintainer-clean-fastjar:
         @[ -f ./fastjar/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -7396,18 +8354,19 @@ maintainer-clean-fastjar:
  @endif fastjar
  
  
+
  .PHONY: configure-fileutils maybe-configure-fileutils
  maybe-configure-fileutils:
  @if fileutils
  maybe-configure-fileutils: configure-fileutils
-configure-fileutils:
+configure-fileutils: 
         @test ! -f $(HOST_SUBDIR)/fileutils/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/fileutils ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       echo Configuring in fileutils; \
-       cd $(HOST_SUBDIR)/fileutils || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/fileutils; \
+       cd "$(HOST_SUBDIR)/fileutils" || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/fileutils/ | \
@@ -7420,6 +8379,10 @@ configure-fileutils:
           || exit 1
  @endif fileutils
  
+
+
+
+
  .PHONY: all-fileutils maybe-all-fileutils
  maybe-all-fileutils:
  @if fileutils
@@ -7428,12 +8391,14 @@ maybe-all-fileutils: all-fileutils
  all-fileutils: configure-fileutils
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/fileutils && \
           $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-fileutils))
  @endif fileutils
  
+
+
+
  .PHONY: check-fileutils maybe-check-fileutils
  maybe-check-fileutils:
  @if fileutils
@@ -7442,7 +8407,6 @@ maybe-check-fileutils: check-fileutils
  check-fileutils:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/fileutils && \
           $(MAKE) $(FLAGS_TO_PASS)  check)
@@ -7457,10 +8421,9 @@ maybe-install-fileutils: install-fileutils
  install-fileutils: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/fileutils && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS)  install)
  
  @endif fileutils
  
@@ -7476,7 +8439,6 @@ info-fileutils: \
         @[ -f ./fileutils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -7502,7 +8464,6 @@ dvi-fileutils: \
         @[ -f ./fileutils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -7528,7 +8489,6 @@ html-fileutils: \
         @[ -f ./fileutils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -7554,7 +8514,6 @@ TAGS-fileutils: \
         @[ -f ./fileutils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -7581,7 +8540,6 @@ install-info-fileutils: \
         @[ -f ./fileutils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -7607,7 +8565,6 @@ installcheck-fileutils: \
         @[ -f ./fileutils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -7632,7 +8589,6 @@ mostlyclean-fileutils:
         @[ -f ./fileutils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -7657,7 +8613,6 @@ clean-fileutils:
         @[ -f ./fileutils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -7682,7 +8637,6 @@ distclean-fileutils:
         @[ -f ./fileutils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -7707,7 +8661,6 @@ maintainer-clean-fileutils:
         @[ -f ./fileutils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -7724,18 +8677,19 @@ maintainer-clean-fileutils:
  @endif fileutils
  
  
+
  .PHONY: configure-findutils maybe-configure-findutils
  maybe-configure-findutils:
  @if findutils
  maybe-configure-findutils: configure-findutils
-configure-findutils:
+configure-findutils: 
         @test ! -f $(HOST_SUBDIR)/findutils/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/findutils ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       echo Configuring in findutils; \
-       cd $(HOST_SUBDIR)/findutils || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/findutils; \
+       cd "$(HOST_SUBDIR)/findutils" || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/findutils/ | \
@@ -7748,6 +8702,10 @@ configure-findutils:
           || exit 1
  @endif findutils
  
+
+
+
+
  .PHONY: all-findutils maybe-all-findutils
  maybe-all-findutils:
  @if findutils
@@ -7756,12 +8714,14 @@ maybe-all-findutils: all-findutils
  all-findutils: configure-findutils
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/findutils && \
           $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-findutils))
  @endif findutils
  
+
+
+
  .PHONY: check-findutils maybe-check-findutils
  maybe-check-findutils:
  @if findutils
@@ -7770,7 +8730,6 @@ maybe-check-findutils: check-findutils
  check-findutils:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/findutils && \
           $(MAKE) $(FLAGS_TO_PASS)  check)
@@ -7785,10 +8744,9 @@ maybe-install-findutils: install-findutils
  install-findutils: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/findutils && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS)  install)
  
  @endif findutils
  
@@ -7804,7 +8762,6 @@ info-findutils: \
         @[ -f ./findutils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -7830,7 +8787,6 @@ dvi-findutils: \
         @[ -f ./findutils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -7856,7 +8812,6 @@ html-findutils: \
         @[ -f ./findutils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -7882,7 +8837,6 @@ TAGS-findutils: \
         @[ -f ./findutils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -7909,7 +8863,6 @@ install-info-findutils: \
         @[ -f ./findutils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -7935,7 +8888,6 @@ installcheck-findutils: \
         @[ -f ./findutils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -7960,7 +8912,6 @@ mostlyclean-findutils:
         @[ -f ./findutils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -7985,7 +8936,6 @@ clean-findutils:
         @[ -f ./findutils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -8010,7 +8960,6 @@ distclean-findutils:
         @[ -f ./findutils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -8035,7 +8984,6 @@ maintainer-clean-findutils:
         @[ -f ./findutils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -8052,18 +9000,19 @@ maintainer-clean-findutils:
  @endif findutils
  
  
+
  .PHONY: configure-find maybe-configure-find
  maybe-configure-find:
  @if find
  maybe-configure-find: configure-find
-configure-find:
+configure-find: 
         @test ! -f $(HOST_SUBDIR)/find/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/find ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       echo Configuring in find; \
-       cd $(HOST_SUBDIR)/find || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/find; \
+       cd "$(HOST_SUBDIR)/find" || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/find/ | \
@@ -8076,6 +9025,10 @@ configure-find:
           || exit 1
  @endif find
  
+
+
+
+
  .PHONY: all-find maybe-all-find
  maybe-all-find:
  @if find
@@ -8084,12 +9037,14 @@ maybe-all-find: all-find
  all-find: configure-find
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/find && \
           $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-find))
  @endif find
  
+
+
+
  .PHONY: check-find maybe-check-find
  maybe-check-find:
  @if find
@@ -8098,7 +9053,6 @@ maybe-check-find: check-find
  check-find:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/find && \
           $(MAKE) $(FLAGS_TO_PASS)  check)
@@ -8113,10 +9067,9 @@ maybe-install-find: install-find
  install-find: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/find && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS)  install)
  
  @endif find
  
@@ -8132,7 +9085,6 @@ info-find: \
         @[ -f ./find/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -8158,7 +9110,6 @@ dvi-find: \
         @[ -f ./find/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -8184,7 +9135,6 @@ html-find: \
         @[ -f ./find/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -8210,7 +9160,6 @@ TAGS-find: \
         @[ -f ./find/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -8237,7 +9186,6 @@ install-info-find: \
         @[ -f ./find/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -8263,7 +9211,6 @@ installcheck-find: \
         @[ -f ./find/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -8288,7 +9235,6 @@ mostlyclean-find:
         @[ -f ./find/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -8313,7 +9259,6 @@ clean-find:
         @[ -f ./find/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -8338,7 +9283,6 @@ distclean-find:
         @[ -f ./find/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -8363,7 +9307,6 @@ maintainer-clean-find:
         @[ -f ./find/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -8380,18 +9323,19 @@ maintainer-clean-find:
  @endif find
  
  
+
  .PHONY: configure-fixincludes maybe-configure-fixincludes
  maybe-configure-fixincludes:
  @if fixincludes
  maybe-configure-fixincludes: configure-fixincludes
-configure-fixincludes:
+configure-fixincludes: 
         @test ! -f $(HOST_SUBDIR)/fixincludes/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/fixincludes ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       echo Configuring in fixincludes; \
-       cd $(HOST_SUBDIR)/fixincludes || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/fixincludes; \
+       cd "$(HOST_SUBDIR)/fixincludes" || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/fixincludes/ | \
@@ -8404,6 +9348,10 @@ configure-fixincludes:
           || exit 1
  @endif fixincludes
  
+
+
+
+
  .PHONY: all-fixincludes maybe-all-fixincludes
  maybe-all-fixincludes:
  @if fixincludes
@@ -8412,12 +9360,14 @@ maybe-all-fixincludes: all-fixincludes
  all-fixincludes: configure-fixincludes
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/fixincludes && \
           $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-fixincludes))
  @endif fixincludes
  
+
+
+
  .PHONY: check-fixincludes maybe-check-fixincludes
  maybe-check-fixincludes:
  @if fixincludes
@@ -8426,7 +9376,6 @@ maybe-check-fixincludes: check-fixincludes
  check-fixincludes:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/fixincludes && \
           $(MAKE) $(FLAGS_TO_PASS)  check)
@@ -8441,10 +9390,9 @@ maybe-install-fixincludes: install-fixincludes
  install-fixincludes: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/fixincludes && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS)  install)
  
  @endif fixincludes
  
@@ -8480,7 +9428,6 @@ html-fixincludes: \
         @[ -f ./fixincludes/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -8535,7 +9482,6 @@ mostlyclean-fixincludes:
         @[ -f ./fixincludes/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -8560,7 +9506,6 @@ clean-fixincludes:
         @[ -f ./fixincludes/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -8585,7 +9530,6 @@ distclean-fixincludes:
         @[ -f ./fixincludes/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -8610,7 +9554,6 @@ maintainer-clean-fixincludes:
         @[ -f ./fixincludes/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -8627,18 +9570,19 @@ maintainer-clean-fixincludes:
  @endif fixincludes
  
  
+
  .PHONY: configure-flex maybe-configure-flex
  maybe-configure-flex:
  @if flex
  maybe-configure-flex: configure-flex
-configure-flex:
+configure-flex: 
         @test ! -f $(HOST_SUBDIR)/flex/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/flex ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       echo Configuring in flex; \
-       cd $(HOST_SUBDIR)/flex || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/flex; \
+       cd "$(HOST_SUBDIR)/flex" || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/flex/ | \
@@ -8651,6 +9595,10 @@ configure-flex:
           || exit 1
  @endif flex
  
+
+
+
+
  .PHONY: all-flex maybe-all-flex
  maybe-all-flex:
  @if flex
@@ -8659,12 +9607,14 @@ maybe-all-flex: all-flex
  all-flex: configure-flex
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/flex && \
           $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-flex))
  @endif flex
  
+
+
+
  .PHONY: check-flex maybe-check-flex
  maybe-check-flex:
  @if flex
@@ -8675,10 +9625,9 @@ check-flex:
         @if [ '$(host)' = '$(target)' ] ; then \
           r=`${PWD_COMMAND}`; export r; \
           s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-         $(SET_LIB_PATH) \
           $(HOST_EXPORTS) \
           (cd $(HOST_SUBDIR)/flex && \
-           $(MAKE) $(FLAGS_TO_PASS)  check)
+           $(MAKE) $(FLAGS_TO_PASS)  check); \
         fi
  
  @endif flex
@@ -8691,10 +9640,9 @@ maybe-install-flex: install-flex
  install-flex: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/flex && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS)  install)
  
  @endif flex
  
@@ -8710,7 +9658,6 @@ info-flex: \
         @[ -f ./flex/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -8736,7 +9683,6 @@ dvi-flex: \
         @[ -f ./flex/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -8762,7 +9708,6 @@ html-flex: \
         @[ -f ./flex/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -8788,7 +9733,6 @@ TAGS-flex: \
         @[ -f ./flex/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -8815,7 +9759,6 @@ install-info-flex: \
         @[ -f ./flex/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -8841,7 +9784,6 @@ installcheck-flex: \
         @[ -f ./flex/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -8866,7 +9808,6 @@ mostlyclean-flex:
         @[ -f ./flex/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -8891,7 +9832,6 @@ clean-flex:
         @[ -f ./flex/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -8916,7 +9856,6 @@ distclean-flex:
         @[ -f ./flex/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -8941,7 +9880,6 @@ maintainer-clean-flex:
         @[ -f ./flex/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -8958,19 +9896,20 @@ maintainer-clean-flex:
  @endif flex
  
  
+
  .PHONY: configure-gas maybe-configure-gas
  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 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       echo Configuring in gas; \
-       cd $(HOST_SUBDIR)/gas || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/gas; \
+       cd "$(HOST_SUBDIR)/gas" || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/gas/ | \
@@ -8983,6 +9922,161 @@ configure-gas:
           || exit 1
  @endif gas
  
+
+
+.PHONY: configure-stage1-gas maybe-configure-stage1-gas
+maybe-configure-stage1-gas:
+@if gas-bootstrap
+maybe-configure-stage1-gas: configure-stage1-gas
+configure-stage1-gas: 
+       @$(MAKE) stage1-start
+       @[ -f $(HOST_SUBDIR)/gas/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       echo Configuring stage 1 in $(HOST_SUBDIR)/gas ; \
+       cd $(HOST_SUBDIR)/gas || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/gas/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/gas"; \
+       libsrcdir="$$s/gas"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         --disable-intermodule           --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" 
+@endif gas-bootstrap
+
+.PHONY: configure-stage2-gas maybe-configure-stage2-gas
+maybe-configure-stage2-gas:
+@if gas-bootstrap
+maybe-configure-stage2-gas: configure-stage2-gas
+configure-stage2-gas: 
+       @$(MAKE) stage2-start
+       @[ -f $(HOST_SUBDIR)/gas/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       echo Configuring stage 2 in $(HOST_SUBDIR)/gas ; \
+       cd $(HOST_SUBDIR)/gas || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/gas/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/gas"; \
+       libsrcdir="$$s/gas"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+@endif gas-bootstrap
+
+.PHONY: configure-stage3-gas maybe-configure-stage3-gas
+maybe-configure-stage3-gas:
+@if gas-bootstrap
+maybe-configure-stage3-gas: configure-stage3-gas
+configure-stage3-gas: 
+       @$(MAKE) stage3-start
+       @[ -f $(HOST_SUBDIR)/gas/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       echo Configuring stage 3 in $(HOST_SUBDIR)/gas ; \
+       cd $(HOST_SUBDIR)/gas || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/gas/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/gas"; \
+       libsrcdir="$$s/gas"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+@endif gas-bootstrap
+
+.PHONY: configure-stage4-gas maybe-configure-stage4-gas
+maybe-configure-stage4-gas:
+@if gas-bootstrap
+maybe-configure-stage4-gas: configure-stage4-gas
+configure-stage4-gas: 
+       @$(MAKE) stage4-start
+       @[ -f $(HOST_SUBDIR)/gas/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       echo Configuring stage 4 in $(HOST_SUBDIR)/gas ; \
+       cd $(HOST_SUBDIR)/gas || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/gas/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/gas"; \
+       libsrcdir="$$s/gas"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+@endif gas-bootstrap
+
+.PHONY: configure-stageprofile-gas maybe-configure-stageprofile-gas
+maybe-configure-stageprofile-gas:
+@if gas-bootstrap
+maybe-configure-stageprofile-gas: configure-stageprofile-gas
+configure-stageprofile-gas: 
+       @$(MAKE) stageprofile-start
+       @[ -f $(HOST_SUBDIR)/gas/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       echo Configuring stage profile in $(HOST_SUBDIR)/gas ; \
+       cd $(HOST_SUBDIR)/gas || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/gas/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/gas"; \
+       libsrcdir="$$s/gas"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+@endif gas-bootstrap
+
+.PHONY: configure-stagefeedback-gas maybe-configure-stagefeedback-gas
+maybe-configure-stagefeedback-gas:
+@if gas-bootstrap
+maybe-configure-stagefeedback-gas: configure-stagefeedback-gas
+configure-stagefeedback-gas: 
+       @$(MAKE) stagefeedback-start
+       @[ -f $(HOST_SUBDIR)/gas/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       echo Configuring stage feedback in $(HOST_SUBDIR)/gas ; \
+       cd $(HOST_SUBDIR)/gas || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/gas/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/gas"; \
+       libsrcdir="$$s/gas"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+@endif gas-bootstrap
+
+
+
+
+
  .PHONY: all-gas maybe-all-gas
  maybe-all-gas:
  @if gas
@@ -8992,12 +10086,188 @@ all-gas: configure-gas
         @test -f stage_last && exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/gas && \
           $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-gas))
  @endif gas
  
+
+
+.PHONY: all-stage1-gas maybe-all-stage1-gas
+.PHONY: clean-stage1-gas maybe-clean-stage1-gas
+maybe-all-stage1-gas:
+maybe-clean-stage1-gas:
+@if gas-bootstrap
+maybe-all-stage1-gas: all-stage1-gas
+all-stage1: all-stage1-gas
+all-stage1-gas: configure-stage1-gas
+       @$(MAKE) stage1-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       cd $(HOST_SUBDIR)/gas && \
+       $(MAKE) $(FLAGS_TO_PASS)  CFLAGS="$(STAGE1_CFLAGS)" 
+
+maybe-clean-stage1-gas: clean-stage1-gas
+clean-stage1: clean-stage1-gas
+clean-stage1-gas:
+       @[ -f $(HOST_SUBDIR)/gas/Makefile ] || [ -f $(HOST_SUBDIR)/stage1-gas/Makefile ] \
+         || exit 0 ; \
+       [ -f $(HOST_SUBDIR)/gas/Makefile ] || $(MAKE) stage1-start ; \
+       cd $(HOST_SUBDIR)/gas && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               CFLAGS="$(STAGE1_CFLAGS)"  clean
+@endif gas-bootstrap
+
+
+.PHONY: all-stage2-gas maybe-all-stage2-gas
+.PHONY: clean-stage2-gas maybe-clean-stage2-gas
+maybe-all-stage2-gas:
+maybe-clean-stage2-gas:
+@if gas-bootstrap
+maybe-all-stage2-gas: all-stage2-gas
+all-stage2: all-stage2-gas
+all-stage2-gas: configure-stage2-gas
+       @$(MAKE) stage2-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       cd $(HOST_SUBDIR)/gas && \
+       $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)  
+
+maybe-clean-stage2-gas: clean-stage2-gas
+clean-stage2: clean-stage2-gas
+clean-stage2-gas:
+       @[ -f $(HOST_SUBDIR)/gas/Makefile ] || [ -f $(HOST_SUBDIR)/stage2-gas/Makefile ] \
+         || exit 0 ; \
+       [ -f $(HOST_SUBDIR)/gas/Makefile ] || $(MAKE) stage2-start ; \
+       cd $(HOST_SUBDIR)/gas && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                 clean
+@endif gas-bootstrap
+
+
+.PHONY: all-stage3-gas maybe-all-stage3-gas
+.PHONY: clean-stage3-gas maybe-clean-stage3-gas
+maybe-all-stage3-gas:
+maybe-clean-stage3-gas:
+@if gas-bootstrap
+maybe-all-stage3-gas: all-stage3-gas
+all-stage3: all-stage3-gas
+all-stage3-gas: configure-stage3-gas
+       @$(MAKE) stage3-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       cd $(HOST_SUBDIR)/gas && \
+       $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)  
+
+maybe-clean-stage3-gas: clean-stage3-gas
+clean-stage3: clean-stage3-gas
+clean-stage3-gas:
+       @[ -f $(HOST_SUBDIR)/gas/Makefile ] || [ -f $(HOST_SUBDIR)/stage3-gas/Makefile ] \
+         || exit 0 ; \
+       [ -f $(HOST_SUBDIR)/gas/Makefile ] || $(MAKE) stage3-start ; \
+       cd $(HOST_SUBDIR)/gas && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                 clean
+@endif gas-bootstrap
+
+
+.PHONY: all-stage4-gas maybe-all-stage4-gas
+.PHONY: clean-stage4-gas maybe-clean-stage4-gas
+maybe-all-stage4-gas:
+maybe-clean-stage4-gas:
+@if gas-bootstrap
+maybe-all-stage4-gas: all-stage4-gas
+all-stage4: all-stage4-gas
+all-stage4-gas: configure-stage4-gas
+       @$(MAKE) stage4-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       cd $(HOST_SUBDIR)/gas && \
+       $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)  
+
+maybe-clean-stage4-gas: clean-stage4-gas
+clean-stage4: clean-stage4-gas
+clean-stage4-gas:
+       @[ -f $(HOST_SUBDIR)/gas/Makefile ] || [ -f $(HOST_SUBDIR)/stage4-gas/Makefile ] \
+         || exit 0 ; \
+       [ -f $(HOST_SUBDIR)/gas/Makefile ] || $(MAKE) stage4-start ; \
+       cd $(HOST_SUBDIR)/gas && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                 clean
+@endif gas-bootstrap
+
+
+.PHONY: all-stageprofile-gas maybe-all-stageprofile-gas
+.PHONY: clean-stageprofile-gas maybe-clean-stageprofile-gas
+maybe-all-stageprofile-gas:
+maybe-clean-stageprofile-gas:
+@if gas-bootstrap
+maybe-all-stageprofile-gas: all-stageprofile-gas
+all-stageprofile: all-stageprofile-gas
+all-stageprofile-gas: configure-stageprofile-gas
+       @$(MAKE) stageprofile-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       cd $(HOST_SUBDIR)/gas && \
+       $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" 
+
+maybe-clean-stageprofile-gas: clean-stageprofile-gas
+clean-stageprofile: clean-stageprofile-gas
+clean-stageprofile-gas:
+       @[ -f $(HOST_SUBDIR)/gas/Makefile ] || [ -f $(HOST_SUBDIR)/stageprofile-gas/Makefile ] \
+         || exit 0 ; \
+       [ -f $(HOST_SUBDIR)/gas/Makefile ] || $(MAKE) stageprofile-start ; \
+       cd $(HOST_SUBDIR)/gas && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-generate"  clean
+@endif gas-bootstrap
+
+
+.PHONY: all-stagefeedback-gas maybe-all-stagefeedback-gas
+.PHONY: clean-stagefeedback-gas maybe-clean-stagefeedback-gas
+maybe-all-stagefeedback-gas:
+maybe-clean-stagefeedback-gas:
+@if gas-bootstrap
+maybe-all-stagefeedback-gas: all-stagefeedback-gas
+all-stagefeedback: all-stagefeedback-gas
+all-stagefeedback-gas: configure-stagefeedback-gas
+       @$(MAKE) stagefeedback-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       cd $(HOST_SUBDIR)/gas && \
+       $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-use" 
+
+maybe-clean-stagefeedback-gas: clean-stagefeedback-gas
+clean-stagefeedback: clean-stagefeedback-gas
+clean-stagefeedback-gas:
+       @[ -f $(HOST_SUBDIR)/gas/Makefile ] || [ -f $(HOST_SUBDIR)/stagefeedback-gas/Makefile ] \
+         || exit 0 ; \
+       [ -f $(HOST_SUBDIR)/gas/Makefile ] || $(MAKE) stagefeedback-start ; \
+       cd $(HOST_SUBDIR)/gas && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-use"  clean
+@endif gas-bootstrap
+
+
+
+
+
  .PHONY: check-gas maybe-check-gas
  maybe-check-gas:
  @if gas
@@ -9006,7 +10276,6 @@ maybe-check-gas: check-gas
  check-gas:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/gas && \
           $(MAKE) $(FLAGS_TO_PASS)  check)
@@ -9021,10 +10290,9 @@ maybe-install-gas: install-gas
  install-gas: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/gas && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS)  install)
  
  @endif gas
  
@@ -9040,7 +10308,6 @@ info-gas: \
         @[ -f ./gas/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -9066,7 +10333,6 @@ dvi-gas: \
         @[ -f ./gas/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -9092,7 +10358,6 @@ html-gas: \
         @[ -f ./gas/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -9118,7 +10383,6 @@ TAGS-gas: \
         @[ -f ./gas/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -9145,7 +10409,6 @@ install-info-gas: \
         @[ -f ./gas/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -9171,7 +10434,6 @@ installcheck-gas: \
         @[ -f ./gas/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -9196,7 +10458,6 @@ mostlyclean-gas:
         @[ -f ./gas/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -9221,7 +10482,6 @@ clean-gas:
         @[ -f ./gas/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -9246,7 +10506,6 @@ distclean-gas:
         @[ -f ./gas/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -9271,7 +10530,6 @@ maintainer-clean-gas:
         @[ -f ./gas/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -9288,19 +10546,20 @@ maintainer-clean-gas:
  @endif gas
  
  
+
  .PHONY: configure-gcc maybe-configure-gcc
  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 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       echo Configuring in gcc; \
-       cd $(HOST_SUBDIR)/gcc || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/gcc; \
+       cd "$(HOST_SUBDIR)/gcc" || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/gcc/ | \
@@ -9313,6 +10572,161 @@ configure-gcc:
           || exit 1
  @endif gcc
  
+
+
+.PHONY: configure-stage1-gcc maybe-configure-stage1-gcc
+maybe-configure-stage1-gcc:
+@if gcc-bootstrap
+maybe-configure-stage1-gcc: configure-stage1-gcc
+configure-stage1-gcc: 
+       @$(MAKE) stage1-start
+       @[ -f $(HOST_SUBDIR)/gcc/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       echo Configuring stage 1 in $(HOST_SUBDIR)/gcc ; \
+       cd $(HOST_SUBDIR)/gcc || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/gcc/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/gcc"; \
+       libsrcdir="$$s/gcc"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         --disable-intermodule           --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" 
+@endif gcc-bootstrap
+
+.PHONY: configure-stage2-gcc maybe-configure-stage2-gcc
+maybe-configure-stage2-gcc:
+@if gcc-bootstrap
+maybe-configure-stage2-gcc: configure-stage2-gcc
+configure-stage2-gcc: 
+       @$(MAKE) stage2-start
+       @[ -f $(HOST_SUBDIR)/gcc/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       echo Configuring stage 2 in $(HOST_SUBDIR)/gcc ; \
+       cd $(HOST_SUBDIR)/gcc || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/gcc/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/gcc"; \
+       libsrcdir="$$s/gcc"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+@endif gcc-bootstrap
+
+.PHONY: configure-stage3-gcc maybe-configure-stage3-gcc
+maybe-configure-stage3-gcc:
+@if gcc-bootstrap
+maybe-configure-stage3-gcc: configure-stage3-gcc
+configure-stage3-gcc: 
+       @$(MAKE) stage3-start
+       @[ -f $(HOST_SUBDIR)/gcc/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       echo Configuring stage 3 in $(HOST_SUBDIR)/gcc ; \
+       cd $(HOST_SUBDIR)/gcc || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/gcc/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/gcc"; \
+       libsrcdir="$$s/gcc"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+@endif gcc-bootstrap
+
+.PHONY: configure-stage4-gcc maybe-configure-stage4-gcc
+maybe-configure-stage4-gcc:
+@if gcc-bootstrap
+maybe-configure-stage4-gcc: configure-stage4-gcc
+configure-stage4-gcc: 
+       @$(MAKE) stage4-start
+       @[ -f $(HOST_SUBDIR)/gcc/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       echo Configuring stage 4 in $(HOST_SUBDIR)/gcc ; \
+       cd $(HOST_SUBDIR)/gcc || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/gcc/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/gcc"; \
+       libsrcdir="$$s/gcc"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+@endif gcc-bootstrap
+
+.PHONY: configure-stageprofile-gcc maybe-configure-stageprofile-gcc
+maybe-configure-stageprofile-gcc:
+@if gcc-bootstrap
+maybe-configure-stageprofile-gcc: configure-stageprofile-gcc
+configure-stageprofile-gcc: 
+       @$(MAKE) stageprofile-start
+       @[ -f $(HOST_SUBDIR)/gcc/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       echo Configuring stage profile in $(HOST_SUBDIR)/gcc ; \
+       cd $(HOST_SUBDIR)/gcc || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/gcc/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/gcc"; \
+       libsrcdir="$$s/gcc"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+@endif gcc-bootstrap
+
+.PHONY: configure-stagefeedback-gcc maybe-configure-stagefeedback-gcc
+maybe-configure-stagefeedback-gcc:
+@if gcc-bootstrap
+maybe-configure-stagefeedback-gcc: configure-stagefeedback-gcc
+configure-stagefeedback-gcc: 
+       @$(MAKE) stagefeedback-start
+       @[ -f $(HOST_SUBDIR)/gcc/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       echo Configuring stage feedback in $(HOST_SUBDIR)/gcc ; \
+       cd $(HOST_SUBDIR)/gcc || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/gcc/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/gcc"; \
+       libsrcdir="$$s/gcc"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+@endif gcc-bootstrap
+
+
+
+
+
  .PHONY: all-gcc maybe-all-gcc
  maybe-all-gcc:
  @if gcc
@@ -9322,12 +10736,188 @@ all-gcc: configure-gcc
         @test -f stage_last && exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/gcc && \
           $(MAKE) $(FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) $(TARGET-gcc))
  @endif gcc
  
+
+
+.PHONY: all-stage1-gcc maybe-all-stage1-gcc
+.PHONY: clean-stage1-gcc maybe-clean-stage1-gcc
+maybe-all-stage1-gcc:
+maybe-clean-stage1-gcc:
+@if gcc-bootstrap
+maybe-all-stage1-gcc: all-stage1-gcc
+all-stage1: all-stage1-gcc
+all-stage1-gcc: configure-stage1-gcc
+       @$(MAKE) stage1-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       cd $(HOST_SUBDIR)/gcc && \
+       $(MAKE) $(FLAGS_TO_PASS)  CFLAGS="$(STAGE1_CFLAGS)" $(EXTRA_GCC_FLAGS)
+
+maybe-clean-stage1-gcc: clean-stage1-gcc
+clean-stage1: clean-stage1-gcc
+clean-stage1-gcc:
+       @[ -f $(HOST_SUBDIR)/gcc/Makefile ] || [ -f $(HOST_SUBDIR)/stage1-gcc/Makefile ] \
+         || exit 0 ; \
+       [ -f $(HOST_SUBDIR)/gcc/Makefile ] || $(MAKE) stage1-start ; \
+       cd $(HOST_SUBDIR)/gcc && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               CFLAGS="$(STAGE1_CFLAGS)" $(EXTRA_GCC_FLAGS) clean
+@endif gcc-bootstrap
+
+
+.PHONY: all-stage2-gcc maybe-all-stage2-gcc
+.PHONY: clean-stage2-gcc maybe-clean-stage2-gcc
+maybe-all-stage2-gcc:
+maybe-clean-stage2-gcc:
+@if gcc-bootstrap
+maybe-all-stage2-gcc: all-stage2-gcc
+all-stage2: all-stage2-gcc
+all-stage2-gcc: configure-stage2-gcc
+       @$(MAKE) stage2-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       cd $(HOST_SUBDIR)/gcc && \
+       $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)  $(EXTRA_GCC_FLAGS)
+
+maybe-clean-stage2-gcc: clean-stage2-gcc
+clean-stage2: clean-stage2-gcc
+clean-stage2-gcc:
+       @[ -f $(HOST_SUBDIR)/gcc/Makefile ] || [ -f $(HOST_SUBDIR)/stage2-gcc/Makefile ] \
+         || exit 0 ; \
+       [ -f $(HOST_SUBDIR)/gcc/Makefile ] || $(MAKE) stage2-start ; \
+       cd $(HOST_SUBDIR)/gcc && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                $(EXTRA_GCC_FLAGS) clean
+@endif gcc-bootstrap
+
+
+.PHONY: all-stage3-gcc maybe-all-stage3-gcc
+.PHONY: clean-stage3-gcc maybe-clean-stage3-gcc
+maybe-all-stage3-gcc:
+maybe-clean-stage3-gcc:
+@if gcc-bootstrap
+maybe-all-stage3-gcc: all-stage3-gcc
+all-stage3: all-stage3-gcc
+all-stage3-gcc: configure-stage3-gcc
+       @$(MAKE) stage3-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       cd $(HOST_SUBDIR)/gcc && \
+       $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)  $(EXTRA_GCC_FLAGS)
+
+maybe-clean-stage3-gcc: clean-stage3-gcc
+clean-stage3: clean-stage3-gcc
+clean-stage3-gcc:
+       @[ -f $(HOST_SUBDIR)/gcc/Makefile ] || [ -f $(HOST_SUBDIR)/stage3-gcc/Makefile ] \
+         || exit 0 ; \
+       [ -f $(HOST_SUBDIR)/gcc/Makefile ] || $(MAKE) stage3-start ; \
+       cd $(HOST_SUBDIR)/gcc && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                $(EXTRA_GCC_FLAGS) clean
+@endif gcc-bootstrap
+
+
+.PHONY: all-stage4-gcc maybe-all-stage4-gcc
+.PHONY: clean-stage4-gcc maybe-clean-stage4-gcc
+maybe-all-stage4-gcc:
+maybe-clean-stage4-gcc:
+@if gcc-bootstrap
+maybe-all-stage4-gcc: all-stage4-gcc
+all-stage4: all-stage4-gcc
+all-stage4-gcc: configure-stage4-gcc
+       @$(MAKE) stage4-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       cd $(HOST_SUBDIR)/gcc && \
+       $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)  $(EXTRA_GCC_FLAGS)
+
+maybe-clean-stage4-gcc: clean-stage4-gcc
+clean-stage4: clean-stage4-gcc
+clean-stage4-gcc:
+       @[ -f $(HOST_SUBDIR)/gcc/Makefile ] || [ -f $(HOST_SUBDIR)/stage4-gcc/Makefile ] \
+         || exit 0 ; \
+       [ -f $(HOST_SUBDIR)/gcc/Makefile ] || $(MAKE) stage4-start ; \
+       cd $(HOST_SUBDIR)/gcc && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                $(EXTRA_GCC_FLAGS) clean
+@endif gcc-bootstrap
+
+
+.PHONY: all-stageprofile-gcc maybe-all-stageprofile-gcc
+.PHONY: clean-stageprofile-gcc maybe-clean-stageprofile-gcc
+maybe-all-stageprofile-gcc:
+maybe-clean-stageprofile-gcc:
+@if gcc-bootstrap
+maybe-all-stageprofile-gcc: all-stageprofile-gcc
+all-stageprofile: all-stageprofile-gcc
+all-stageprofile-gcc: configure-stageprofile-gcc
+       @$(MAKE) stageprofile-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       cd $(HOST_SUBDIR)/gcc && \
+       $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" $(EXTRA_GCC_FLAGS)
+
+maybe-clean-stageprofile-gcc: clean-stageprofile-gcc
+clean-stageprofile: clean-stageprofile-gcc
+clean-stageprofile-gcc:
+       @[ -f $(HOST_SUBDIR)/gcc/Makefile ] || [ -f $(HOST_SUBDIR)/stageprofile-gcc/Makefile ] \
+         || exit 0 ; \
+       [ -f $(HOST_SUBDIR)/gcc/Makefile ] || $(MAKE) stageprofile-start ; \
+       cd $(HOST_SUBDIR)/gcc && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" $(EXTRA_GCC_FLAGS) clean
+@endif gcc-bootstrap
+
+
+.PHONY: all-stagefeedback-gcc maybe-all-stagefeedback-gcc
+.PHONY: clean-stagefeedback-gcc maybe-clean-stagefeedback-gcc
+maybe-all-stagefeedback-gcc:
+maybe-clean-stagefeedback-gcc:
+@if gcc-bootstrap
+maybe-all-stagefeedback-gcc: all-stagefeedback-gcc
+all-stagefeedback: all-stagefeedback-gcc
+all-stagefeedback-gcc: configure-stagefeedback-gcc
+       @$(MAKE) stagefeedback-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       cd $(HOST_SUBDIR)/gcc && \
+       $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-use" $(EXTRA_GCC_FLAGS)
+
+maybe-clean-stagefeedback-gcc: clean-stagefeedback-gcc
+clean-stagefeedback: clean-stagefeedback-gcc
+clean-stagefeedback-gcc:
+       @[ -f $(HOST_SUBDIR)/gcc/Makefile ] || [ -f $(HOST_SUBDIR)/stagefeedback-gcc/Makefile ] \
+         || exit 0 ; \
+       [ -f $(HOST_SUBDIR)/gcc/Makefile ] || $(MAKE) stagefeedback-start ; \
+       cd $(HOST_SUBDIR)/gcc && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-use" $(EXTRA_GCC_FLAGS) clean
+@endif gcc-bootstrap
+
+
+
+
+
  .PHONY: check-gcc maybe-check-gcc
  maybe-check-gcc:
  @if gcc
@@ -9336,7 +10926,6 @@ maybe-check-gcc: check-gcc
  check-gcc:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/gcc && \
           $(MAKE) $(FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) check)
@@ -9351,10 +10940,9 @@ maybe-install-gcc: install-gcc
  install-gcc: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/gcc && \
-         $(MAKE) $(FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) check)
+         $(MAKE) $(FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) install)
  
  @endif gcc
  
@@ -9370,7 +10958,6 @@ info-gcc: \
         @[ -f ./gcc/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -9396,7 +10983,6 @@ dvi-gcc: \
         @[ -f ./gcc/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -9422,7 +11008,6 @@ html-gcc: \
         @[ -f ./gcc/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -9448,7 +11033,6 @@ TAGS-gcc: \
         @[ -f ./gcc/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -9475,7 +11059,6 @@ install-info-gcc: \
         @[ -f ./gcc/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -9501,7 +11084,6 @@ installcheck-gcc: \
         @[ -f ./gcc/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -9526,7 +11108,6 @@ mostlyclean-gcc:
         @[ -f ./gcc/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -9551,7 +11132,6 @@ clean-gcc:
         @[ -f ./gcc/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -9576,7 +11156,6 @@ distclean-gcc:
         @[ -f ./gcc/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -9601,7 +11180,6 @@ maintainer-clean-gcc:
         @[ -f ./gcc/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -9618,18 +11196,19 @@ maintainer-clean-gcc:
  @endif gcc
  
  
+
  .PHONY: configure-gawk maybe-configure-gawk
  maybe-configure-gawk:
  @if gawk
  maybe-configure-gawk: configure-gawk
-configure-gawk:
+configure-gawk: 
         @test ! -f $(HOST_SUBDIR)/gawk/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gawk ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       echo Configuring in gawk; \
-       cd $(HOST_SUBDIR)/gawk || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/gawk; \
+       cd "$(HOST_SUBDIR)/gawk" || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/gawk/ | \
@@ -9642,6 +11221,10 @@ configure-gawk:
           || exit 1
  @endif gawk
  
+
+
+
+
  .PHONY: all-gawk maybe-all-gawk
  maybe-all-gawk:
  @if gawk
@@ -9650,12 +11233,14 @@ maybe-all-gawk: all-gawk
  all-gawk: configure-gawk
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/gawk && \
           $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-gawk))
  @endif gawk
  
+
+
+
  .PHONY: check-gawk maybe-check-gawk
  maybe-check-gawk:
  @if gawk
@@ -9664,7 +11249,6 @@ maybe-check-gawk: check-gawk
  check-gawk:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/gawk && \
           $(MAKE) $(FLAGS_TO_PASS)  check)
@@ -9679,10 +11263,9 @@ maybe-install-gawk: install-gawk
  install-gawk: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/gawk && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS)  install)
  
  @endif gawk
  
@@ -9698,7 +11281,6 @@ info-gawk: \
         @[ -f ./gawk/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -9724,7 +11306,6 @@ dvi-gawk: \
         @[ -f ./gawk/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -9750,7 +11331,6 @@ html-gawk: \
         @[ -f ./gawk/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -9776,7 +11356,6 @@ TAGS-gawk: \
         @[ -f ./gawk/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -9803,7 +11382,6 @@ install-info-gawk: \
         @[ -f ./gawk/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -9829,7 +11407,6 @@ installcheck-gawk: \
         @[ -f ./gawk/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -9854,7 +11431,6 @@ mostlyclean-gawk:
         @[ -f ./gawk/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -9879,7 +11455,6 @@ clean-gawk:
         @[ -f ./gawk/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -9904,7 +11479,6 @@ distclean-gawk:
         @[ -f ./gawk/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -9929,7 +11503,6 @@ maintainer-clean-gawk:
         @[ -f ./gawk/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -9946,18 +11519,19 @@ maintainer-clean-gawk:
  @endif gawk
  
  
+
  .PHONY: configure-gettext maybe-configure-gettext
  maybe-configure-gettext:
  @if gettext
  maybe-configure-gettext: configure-gettext
-configure-gettext:
+configure-gettext: 
         @test ! -f $(HOST_SUBDIR)/gettext/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gettext ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       echo Configuring in gettext; \
-       cd $(HOST_SUBDIR)/gettext || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/gettext; \
+       cd "$(HOST_SUBDIR)/gettext" || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/gettext/ | \
@@ -9970,6 +11544,10 @@ configure-gettext:
           || exit 1
  @endif gettext
  
+
+
+
+
  .PHONY: all-gettext maybe-all-gettext
  maybe-all-gettext:
  @if gettext
@@ -9978,12 +11556,14 @@ maybe-all-gettext: all-gettext
  all-gettext: configure-gettext
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/gettext && \
           $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-gettext))
  @endif gettext
  
+
+
+
  .PHONY: check-gettext maybe-check-gettext
  maybe-check-gettext:
  @if gettext
@@ -9992,7 +11572,6 @@ maybe-check-gettext: check-gettext
  check-gettext:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/gettext && \
           $(MAKE) $(FLAGS_TO_PASS)  check)
@@ -10007,10 +11586,9 @@ maybe-install-gettext: install-gettext
  install-gettext: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/gettext && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS)  install)
  
  @endif gettext
  
@@ -10026,7 +11604,6 @@ info-gettext: \
         @[ -f ./gettext/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -10052,7 +11629,6 @@ dvi-gettext: \
         @[ -f ./gettext/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -10078,7 +11654,6 @@ html-gettext: \
         @[ -f ./gettext/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -10104,7 +11679,6 @@ TAGS-gettext: \
         @[ -f ./gettext/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -10131,7 +11705,6 @@ install-info-gettext: \
         @[ -f ./gettext/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -10157,7 +11730,6 @@ installcheck-gettext: \
         @[ -f ./gettext/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -10182,7 +11754,6 @@ mostlyclean-gettext:
         @[ -f ./gettext/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -10207,7 +11778,6 @@ clean-gettext:
         @[ -f ./gettext/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -10232,7 +11802,6 @@ distclean-gettext:
         @[ -f ./gettext/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -10257,7 +11826,6 @@ maintainer-clean-gettext:
         @[ -f ./gettext/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -10274,18 +11842,19 @@ maintainer-clean-gettext:
  @endif gettext
  
  
+
  .PHONY: configure-gnuserv maybe-configure-gnuserv
  maybe-configure-gnuserv:
  @if gnuserv
  maybe-configure-gnuserv: configure-gnuserv
-configure-gnuserv:
+configure-gnuserv: 
         @test ! -f $(HOST_SUBDIR)/gnuserv/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gnuserv ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       echo Configuring in gnuserv; \
-       cd $(HOST_SUBDIR)/gnuserv || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/gnuserv; \
+       cd "$(HOST_SUBDIR)/gnuserv" || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/gnuserv/ | \
@@ -10298,6 +11867,10 @@ configure-gnuserv:
           || exit 1
  @endif gnuserv
  
+
+
+
+
  .PHONY: all-gnuserv maybe-all-gnuserv
  maybe-all-gnuserv:
  @if gnuserv
@@ -10306,12 +11879,14 @@ maybe-all-gnuserv: all-gnuserv
  all-gnuserv: configure-gnuserv
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/gnuserv && \
           $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-gnuserv))
  @endif gnuserv
  
+
+
+
  .PHONY: check-gnuserv maybe-check-gnuserv
  maybe-check-gnuserv:
  @if gnuserv
@@ -10320,7 +11895,6 @@ maybe-check-gnuserv: check-gnuserv
  check-gnuserv:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/gnuserv && \
           $(MAKE) $(FLAGS_TO_PASS)  check)
@@ -10335,10 +11909,9 @@ maybe-install-gnuserv: install-gnuserv
  install-gnuserv: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/gnuserv && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS)  install)
  
  @endif gnuserv
  
@@ -10354,7 +11927,6 @@ info-gnuserv: \
         @[ -f ./gnuserv/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -10380,7 +11952,6 @@ dvi-gnuserv: \
         @[ -f ./gnuserv/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -10406,7 +11977,6 @@ html-gnuserv: \
         @[ -f ./gnuserv/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -10432,7 +12002,6 @@ TAGS-gnuserv: \
         @[ -f ./gnuserv/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -10459,7 +12028,6 @@ install-info-gnuserv: \
         @[ -f ./gnuserv/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -10485,7 +12053,6 @@ installcheck-gnuserv: \
         @[ -f ./gnuserv/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -10510,7 +12077,6 @@ mostlyclean-gnuserv:
         @[ -f ./gnuserv/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -10535,7 +12101,6 @@ clean-gnuserv:
         @[ -f ./gnuserv/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -10560,7 +12125,6 @@ distclean-gnuserv:
         @[ -f ./gnuserv/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -10585,7 +12149,6 @@ maintainer-clean-gnuserv:
         @[ -f ./gnuserv/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -10602,18 +12165,19 @@ maintainer-clean-gnuserv:
  @endif gnuserv
  
  
+
  .PHONY: configure-gprof maybe-configure-gprof
  maybe-configure-gprof:
  @if gprof
  maybe-configure-gprof: configure-gprof
-configure-gprof:
+configure-gprof: 
         @test ! -f $(HOST_SUBDIR)/gprof/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gprof ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       echo Configuring in gprof; \
-       cd $(HOST_SUBDIR)/gprof || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/gprof; \
+       cd "$(HOST_SUBDIR)/gprof" || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/gprof/ | \
@@ -10626,6 +12190,10 @@ configure-gprof:
           || exit 1
  @endif gprof
  
+
+
+
+
  .PHONY: all-gprof maybe-all-gprof
  maybe-all-gprof:
  @if gprof
@@ -10634,12 +12202,14 @@ maybe-all-gprof: all-gprof
  all-gprof: configure-gprof
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/gprof && \
           $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-gprof))
  @endif gprof
  
+
+
+
  .PHONY: check-gprof maybe-check-gprof
  maybe-check-gprof:
  @if gprof
@@ -10648,7 +12218,6 @@ maybe-check-gprof: check-gprof
  check-gprof:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/gprof && \
           $(MAKE) $(FLAGS_TO_PASS)  check)
@@ -10663,10 +12232,9 @@ maybe-install-gprof: install-gprof
  install-gprof: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/gprof && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS)  install)
  
  @endif gprof
  
@@ -10682,7 +12250,6 @@ info-gprof: \
         @[ -f ./gprof/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -10708,7 +12275,6 @@ dvi-gprof: \
         @[ -f ./gprof/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -10734,7 +12300,6 @@ html-gprof: \
         @[ -f ./gprof/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -10760,7 +12325,6 @@ TAGS-gprof: \
         @[ -f ./gprof/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -10787,7 +12351,6 @@ install-info-gprof: \
         @[ -f ./gprof/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -10813,7 +12376,6 @@ installcheck-gprof: \
         @[ -f ./gprof/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -10838,7 +12400,6 @@ mostlyclean-gprof:
         @[ -f ./gprof/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -10863,7 +12424,6 @@ clean-gprof:
         @[ -f ./gprof/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -10888,7 +12448,6 @@ distclean-gprof:
         @[ -f ./gprof/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -10913,7 +12472,6 @@ maintainer-clean-gprof:
         @[ -f ./gprof/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -10930,18 +12488,19 @@ maintainer-clean-gprof:
  @endif gprof
  
  
+
  .PHONY: configure-gzip maybe-configure-gzip
  maybe-configure-gzip:
  @if gzip
  maybe-configure-gzip: configure-gzip
-configure-gzip:
+configure-gzip: 
         @test ! -f $(HOST_SUBDIR)/gzip/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gzip ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       echo Configuring in gzip; \
-       cd $(HOST_SUBDIR)/gzip || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/gzip; \
+       cd "$(HOST_SUBDIR)/gzip" || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/gzip/ | \
@@ -10954,6 +12513,10 @@ configure-gzip:
           || exit 1
  @endif gzip
  
+
+
+
+
  .PHONY: all-gzip maybe-all-gzip
  maybe-all-gzip:
  @if gzip
@@ -10962,12 +12525,14 @@ maybe-all-gzip: all-gzip
  all-gzip: configure-gzip
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/gzip && \
           $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-gzip))
  @endif gzip
  
+
+
+
  .PHONY: check-gzip maybe-check-gzip
  maybe-check-gzip:
  @if gzip
@@ -10976,7 +12541,6 @@ maybe-check-gzip: check-gzip
  check-gzip:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/gzip && \
           $(MAKE) $(FLAGS_TO_PASS)  check)
@@ -10991,10 +12555,9 @@ maybe-install-gzip: install-gzip
  install-gzip: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/gzip && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS)  install)
  
  @endif gzip
  
@@ -11010,7 +12573,6 @@ info-gzip: \
         @[ -f ./gzip/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -11036,7 +12598,6 @@ dvi-gzip: \
         @[ -f ./gzip/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -11062,7 +12623,6 @@ html-gzip: \
         @[ -f ./gzip/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -11088,7 +12648,6 @@ TAGS-gzip: \
         @[ -f ./gzip/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -11115,7 +12674,6 @@ install-info-gzip: \
         @[ -f ./gzip/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -11141,7 +12699,6 @@ installcheck-gzip: \
         @[ -f ./gzip/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -11166,7 +12723,6 @@ mostlyclean-gzip:
         @[ -f ./gzip/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -11191,7 +12747,6 @@ clean-gzip:
         @[ -f ./gzip/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -11216,7 +12771,6 @@ distclean-gzip:
         @[ -f ./gzip/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -11241,7 +12795,6 @@ maintainer-clean-gzip:
         @[ -f ./gzip/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -11258,18 +12811,19 @@ maintainer-clean-gzip:
  @endif gzip
  
  
+
  .PHONY: configure-hello maybe-configure-hello
  maybe-configure-hello:
  @if hello
  maybe-configure-hello: configure-hello
-configure-hello:
+configure-hello: 
         @test ! -f $(HOST_SUBDIR)/hello/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/hello ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       echo Configuring in hello; \
-       cd $(HOST_SUBDIR)/hello || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/hello; \
+       cd "$(HOST_SUBDIR)/hello" || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/hello/ | \
@@ -11282,6 +12836,10 @@ configure-hello:
           || exit 1
  @endif hello
  
+
+
+
+
  .PHONY: all-hello maybe-all-hello
  maybe-all-hello:
  @if hello
@@ -11290,12 +12848,14 @@ maybe-all-hello: all-hello
  all-hello: configure-hello
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/hello && \
           $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-hello))
  @endif hello
  
+
+
+
  .PHONY: check-hello maybe-check-hello
  maybe-check-hello:
  @if hello
@@ -11304,7 +12864,6 @@ maybe-check-hello: check-hello
  check-hello:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/hello && \
           $(MAKE) $(FLAGS_TO_PASS)  check)
@@ -11319,10 +12878,9 @@ maybe-install-hello: install-hello
  install-hello: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/hello && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS)  install)
  
  @endif hello
  
@@ -11338,7 +12896,6 @@ info-hello: \
         @[ -f ./hello/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -11364,7 +12921,6 @@ dvi-hello: \
         @[ -f ./hello/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -11390,7 +12946,6 @@ html-hello: \
         @[ -f ./hello/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -11416,7 +12971,6 @@ TAGS-hello: \
         @[ -f ./hello/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -11443,7 +12997,6 @@ install-info-hello: \
         @[ -f ./hello/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -11469,7 +13022,6 @@ installcheck-hello: \
         @[ -f ./hello/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -11494,7 +13046,6 @@ mostlyclean-hello:
         @[ -f ./hello/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -11519,7 +13070,6 @@ clean-hello:
         @[ -f ./hello/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -11544,7 +13094,6 @@ distclean-hello:
         @[ -f ./hello/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -11569,7 +13118,6 @@ maintainer-clean-hello:
         @[ -f ./hello/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -11586,18 +13134,19 @@ maintainer-clean-hello:
  @endif hello
  
  
+
  .PHONY: configure-indent maybe-configure-indent
  maybe-configure-indent:
  @if indent
  maybe-configure-indent: configure-indent
-configure-indent:
+configure-indent: 
         @test ! -f $(HOST_SUBDIR)/indent/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/indent ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       echo Configuring in indent; \
-       cd $(HOST_SUBDIR)/indent || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/indent; \
+       cd "$(HOST_SUBDIR)/indent" || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/indent/ | \
@@ -11610,6 +13159,10 @@ configure-indent:
           || exit 1
  @endif indent
  
+
+
+
+
  .PHONY: all-indent maybe-all-indent
  maybe-all-indent:
  @if indent
@@ -11618,12 +13171,14 @@ maybe-all-indent: all-indent
  all-indent: configure-indent
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/indent && \
           $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-indent))
  @endif indent
  
+
+
+
  .PHONY: check-indent maybe-check-indent
  maybe-check-indent:
  @if indent
@@ -11632,7 +13187,6 @@ maybe-check-indent: check-indent
  check-indent:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/indent && \
           $(MAKE) $(FLAGS_TO_PASS)  check)
@@ -11647,10 +13201,9 @@ maybe-install-indent: install-indent
  install-indent: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/indent && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS)  install)
  
  @endif indent
  
@@ -11666,7 +13219,6 @@ info-indent: \
         @[ -f ./indent/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -11692,7 +13244,6 @@ dvi-indent: \
         @[ -f ./indent/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -11718,7 +13269,6 @@ html-indent: \
         @[ -f ./indent/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -11744,7 +13294,6 @@ TAGS-indent: \
         @[ -f ./indent/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -11771,7 +13320,6 @@ install-info-indent: \
         @[ -f ./indent/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -11797,7 +13345,6 @@ installcheck-indent: \
         @[ -f ./indent/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -11822,7 +13369,6 @@ mostlyclean-indent:
         @[ -f ./indent/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -11847,7 +13393,6 @@ clean-indent:
         @[ -f ./indent/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -11872,7 +13417,6 @@ distclean-indent:
         @[ -f ./indent/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -11897,7 +13441,6 @@ maintainer-clean-indent:
         @[ -f ./indent/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -11914,19 +13457,20 @@ maintainer-clean-indent:
  @endif indent
  
  
+
  .PHONY: configure-intl maybe-configure-intl
  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 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       echo Configuring in intl; \
-       cd $(HOST_SUBDIR)/intl || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/intl; \
+       cd "$(HOST_SUBDIR)/intl" || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/intl/ | \
@@ -11939,6 +13483,161 @@ configure-intl:
           || exit 1
  @endif intl
  
+
+
+.PHONY: configure-stage1-intl maybe-configure-stage1-intl
+maybe-configure-stage1-intl:
+@if intl-bootstrap
+maybe-configure-stage1-intl: configure-stage1-intl
+configure-stage1-intl: 
+       @$(MAKE) stage1-start
+       @[ -f $(HOST_SUBDIR)/intl/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       echo Configuring stage 1 in $(HOST_SUBDIR)/intl ; \
+       cd $(HOST_SUBDIR)/intl || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/intl/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/intl"; \
+       libsrcdir="$$s/intl"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         --disable-intermodule           --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" 
+@endif intl-bootstrap
+
+.PHONY: configure-stage2-intl maybe-configure-stage2-intl
+maybe-configure-stage2-intl:
+@if intl-bootstrap
+maybe-configure-stage2-intl: configure-stage2-intl
+configure-stage2-intl: 
+       @$(MAKE) stage2-start
+       @[ -f $(HOST_SUBDIR)/intl/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       echo Configuring stage 2 in $(HOST_SUBDIR)/intl ; \
+       cd $(HOST_SUBDIR)/intl || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/intl/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/intl"; \
+       libsrcdir="$$s/intl"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+@endif intl-bootstrap
+
+.PHONY: configure-stage3-intl maybe-configure-stage3-intl
+maybe-configure-stage3-intl:
+@if intl-bootstrap
+maybe-configure-stage3-intl: configure-stage3-intl
+configure-stage3-intl: 
+       @$(MAKE) stage3-start
+       @[ -f $(HOST_SUBDIR)/intl/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       echo Configuring stage 3 in $(HOST_SUBDIR)/intl ; \
+       cd $(HOST_SUBDIR)/intl || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/intl/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/intl"; \
+       libsrcdir="$$s/intl"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+@endif intl-bootstrap
+
+.PHONY: configure-stage4-intl maybe-configure-stage4-intl
+maybe-configure-stage4-intl:
+@if intl-bootstrap
+maybe-configure-stage4-intl: configure-stage4-intl
+configure-stage4-intl: 
+       @$(MAKE) stage4-start
+       @[ -f $(HOST_SUBDIR)/intl/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       echo Configuring stage 4 in $(HOST_SUBDIR)/intl ; \
+       cd $(HOST_SUBDIR)/intl || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/intl/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/intl"; \
+       libsrcdir="$$s/intl"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+@endif intl-bootstrap
+
+.PHONY: configure-stageprofile-intl maybe-configure-stageprofile-intl
+maybe-configure-stageprofile-intl:
+@if intl-bootstrap
+maybe-configure-stageprofile-intl: configure-stageprofile-intl
+configure-stageprofile-intl: 
+       @$(MAKE) stageprofile-start
+       @[ -f $(HOST_SUBDIR)/intl/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       echo Configuring stage profile in $(HOST_SUBDIR)/intl ; \
+       cd $(HOST_SUBDIR)/intl || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/intl/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/intl"; \
+       libsrcdir="$$s/intl"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+@endif intl-bootstrap
+
+.PHONY: configure-stagefeedback-intl maybe-configure-stagefeedback-intl
+maybe-configure-stagefeedback-intl:
+@if intl-bootstrap
+maybe-configure-stagefeedback-intl: configure-stagefeedback-intl
+configure-stagefeedback-intl: 
+       @$(MAKE) stagefeedback-start
+       @[ -f $(HOST_SUBDIR)/intl/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       echo Configuring stage feedback in $(HOST_SUBDIR)/intl ; \
+       cd $(HOST_SUBDIR)/intl || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/intl/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/intl"; \
+       libsrcdir="$$s/intl"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+@endif intl-bootstrap
+
+
+
+
+
  .PHONY: all-intl maybe-all-intl
  maybe-all-intl:
  @if intl
@@ -11948,12 +13647,188 @@ all-intl: configure-intl
         @test -f stage_last && exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/intl && \
           $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-intl))
  @endif intl
  
+
+
+.PHONY: all-stage1-intl maybe-all-stage1-intl
+.PHONY: clean-stage1-intl maybe-clean-stage1-intl
+maybe-all-stage1-intl:
+maybe-clean-stage1-intl:
+@if intl-bootstrap
+maybe-all-stage1-intl: all-stage1-intl
+all-stage1: all-stage1-intl
+all-stage1-intl: configure-stage1-intl
+       @$(MAKE) stage1-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       cd $(HOST_SUBDIR)/intl && \
+       $(MAKE) $(FLAGS_TO_PASS)  CFLAGS="$(STAGE1_CFLAGS)" 
+
+maybe-clean-stage1-intl: clean-stage1-intl
+clean-stage1: clean-stage1-intl
+clean-stage1-intl:
+       @[ -f $(HOST_SUBDIR)/intl/Makefile ] || [ -f $(HOST_SUBDIR)/stage1-intl/Makefile ] \
+         || exit 0 ; \
+       [ -f $(HOST_SUBDIR)/intl/Makefile ] || $(MAKE) stage1-start ; \
+       cd $(HOST_SUBDIR)/intl && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               CFLAGS="$(STAGE1_CFLAGS)"  clean
+@endif intl-bootstrap
+
+
+.PHONY: all-stage2-intl maybe-all-stage2-intl
+.PHONY: clean-stage2-intl maybe-clean-stage2-intl
+maybe-all-stage2-intl:
+maybe-clean-stage2-intl:
+@if intl-bootstrap
+maybe-all-stage2-intl: all-stage2-intl
+all-stage2: all-stage2-intl
+all-stage2-intl: configure-stage2-intl
+       @$(MAKE) stage2-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       cd $(HOST_SUBDIR)/intl && \
+       $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)  
+
+maybe-clean-stage2-intl: clean-stage2-intl
+clean-stage2: clean-stage2-intl
+clean-stage2-intl:
+       @[ -f $(HOST_SUBDIR)/intl/Makefile ] || [ -f $(HOST_SUBDIR)/stage2-intl/Makefile ] \
+         || exit 0 ; \
+       [ -f $(HOST_SUBDIR)/intl/Makefile ] || $(MAKE) stage2-start ; \
+       cd $(HOST_SUBDIR)/intl && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                 clean
+@endif intl-bootstrap
+
+
+.PHONY: all-stage3-intl maybe-all-stage3-intl
+.PHONY: clean-stage3-intl maybe-clean-stage3-intl
+maybe-all-stage3-intl:
+maybe-clean-stage3-intl:
+@if intl-bootstrap
+maybe-all-stage3-intl: all-stage3-intl
+all-stage3: all-stage3-intl
+all-stage3-intl: configure-stage3-intl
+       @$(MAKE) stage3-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       cd $(HOST_SUBDIR)/intl && \
+       $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)  
+
+maybe-clean-stage3-intl: clean-stage3-intl
+clean-stage3: clean-stage3-intl
+clean-stage3-intl:
+       @[ -f $(HOST_SUBDIR)/intl/Makefile ] || [ -f $(HOST_SUBDIR)/stage3-intl/Makefile ] \
+         || exit 0 ; \
+       [ -f $(HOST_SUBDIR)/intl/Makefile ] || $(MAKE) stage3-start ; \
+       cd $(HOST_SUBDIR)/intl && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                 clean
+@endif intl-bootstrap
+
+
+.PHONY: all-stage4-intl maybe-all-stage4-intl
+.PHONY: clean-stage4-intl maybe-clean-stage4-intl
+maybe-all-stage4-intl:
+maybe-clean-stage4-intl:
+@if intl-bootstrap
+maybe-all-stage4-intl: all-stage4-intl
+all-stage4: all-stage4-intl
+all-stage4-intl: configure-stage4-intl
+       @$(MAKE) stage4-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       cd $(HOST_SUBDIR)/intl && \
+       $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)  
+
+maybe-clean-stage4-intl: clean-stage4-intl
+clean-stage4: clean-stage4-intl
+clean-stage4-intl:
+       @[ -f $(HOST_SUBDIR)/intl/Makefile ] || [ -f $(HOST_SUBDIR)/stage4-intl/Makefile ] \
+         || exit 0 ; \
+       [ -f $(HOST_SUBDIR)/intl/Makefile ] || $(MAKE) stage4-start ; \
+       cd $(HOST_SUBDIR)/intl && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                 clean
+@endif intl-bootstrap
+
+
+.PHONY: all-stageprofile-intl maybe-all-stageprofile-intl
+.PHONY: clean-stageprofile-intl maybe-clean-stageprofile-intl
+maybe-all-stageprofile-intl:
+maybe-clean-stageprofile-intl:
+@if intl-bootstrap
+maybe-all-stageprofile-intl: all-stageprofile-intl
+all-stageprofile: all-stageprofile-intl
+all-stageprofile-intl: configure-stageprofile-intl
+       @$(MAKE) stageprofile-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       cd $(HOST_SUBDIR)/intl && \
+       $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" 
+
+maybe-clean-stageprofile-intl: clean-stageprofile-intl
+clean-stageprofile: clean-stageprofile-intl
+clean-stageprofile-intl:
+       @[ -f $(HOST_SUBDIR)/intl/Makefile ] || [ -f $(HOST_SUBDIR)/stageprofile-intl/Makefile ] \
+         || exit 0 ; \
+       [ -f $(HOST_SUBDIR)/intl/Makefile ] || $(MAKE) stageprofile-start ; \
+       cd $(HOST_SUBDIR)/intl && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-generate"  clean
+@endif intl-bootstrap
+
+
+.PHONY: all-stagefeedback-intl maybe-all-stagefeedback-intl
+.PHONY: clean-stagefeedback-intl maybe-clean-stagefeedback-intl
+maybe-all-stagefeedback-intl:
+maybe-clean-stagefeedback-intl:
+@if intl-bootstrap
+maybe-all-stagefeedback-intl: all-stagefeedback-intl
+all-stagefeedback: all-stagefeedback-intl
+all-stagefeedback-intl: configure-stagefeedback-intl
+       @$(MAKE) stagefeedback-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       cd $(HOST_SUBDIR)/intl && \
+       $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-use" 
+
+maybe-clean-stagefeedback-intl: clean-stagefeedback-intl
+clean-stagefeedback: clean-stagefeedback-intl
+clean-stagefeedback-intl:
+       @[ -f $(HOST_SUBDIR)/intl/Makefile ] || [ -f $(HOST_SUBDIR)/stagefeedback-intl/Makefile ] \
+         || exit 0 ; \
+       [ -f $(HOST_SUBDIR)/intl/Makefile ] || $(MAKE) stagefeedback-start ; \
+       cd $(HOST_SUBDIR)/intl && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-use"  clean
+@endif intl-bootstrap
+
+
+
+
+
  .PHONY: check-intl maybe-check-intl
  maybe-check-intl:
  @if intl
@@ -11962,7 +13837,6 @@ maybe-check-intl: check-intl
  check-intl:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/intl && \
           $(MAKE) $(FLAGS_TO_PASS)  check)
@@ -11977,10 +13851,9 @@ maybe-install-intl: install-intl
  install-intl: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/intl && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS)  install)
  
  @endif intl
  
@@ -11996,7 +13869,6 @@ info-intl: \
         @[ -f ./intl/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -12022,7 +13894,6 @@ dvi-intl: \
         @[ -f ./intl/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -12048,7 +13919,6 @@ html-intl: \
         @[ -f ./intl/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -12074,7 +13944,6 @@ TAGS-intl: \
         @[ -f ./intl/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -12101,7 +13970,6 @@ install-info-intl: \
         @[ -f ./intl/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -12127,7 +13995,6 @@ installcheck-intl: \
         @[ -f ./intl/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -12152,7 +14019,6 @@ mostlyclean-intl:
         @[ -f ./intl/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -12177,7 +14043,6 @@ clean-intl:
         @[ -f ./intl/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -12202,7 +14067,6 @@ distclean-intl:
         @[ -f ./intl/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -12227,7 +14091,6 @@ maintainer-clean-intl:
         @[ -f ./intl/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -12244,18 +14107,19 @@ maintainer-clean-intl:
  @endif intl
  
  
+
  .PHONY: configure-tcl maybe-configure-tcl
  maybe-configure-tcl:
  @if tcl
  maybe-configure-tcl: configure-tcl
-configure-tcl:
+configure-tcl: 
         @test ! -f $(HOST_SUBDIR)/tcl/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/tcl ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       echo Configuring in tcl; \
-       cd $(HOST_SUBDIR)/tcl || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/tcl; \
+       cd "$(HOST_SUBDIR)/tcl" || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/tcl/ | \
@@ -12268,6 +14132,10 @@ configure-tcl:
           || exit 1
  @endif tcl
  
+
+
+
+
  .PHONY: all-tcl maybe-all-tcl
  maybe-all-tcl:
  @if tcl
@@ -12276,12 +14144,14 @@ maybe-all-tcl: all-tcl
  all-tcl: configure-tcl
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/tcl && \
           $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-tcl))
  @endif tcl
  
+
+
+
  .PHONY: check-tcl maybe-check-tcl
  maybe-check-tcl:
  @if tcl
@@ -12290,7 +14160,6 @@ maybe-check-tcl: check-tcl
  check-tcl:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/tcl && \
           $(MAKE) $(FLAGS_TO_PASS)  check)
@@ -12305,10 +14174,9 @@ maybe-install-tcl: install-tcl
  install-tcl: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/tcl && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS)  install)
  
  @endif tcl
  
@@ -12324,7 +14192,6 @@ info-tcl: \
         @[ -f ./tcl/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -12350,7 +14217,6 @@ dvi-tcl: \
         @[ -f ./tcl/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -12376,7 +14242,6 @@ html-tcl: \
         @[ -f ./tcl/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -12402,7 +14267,6 @@ TAGS-tcl: \
         @[ -f ./tcl/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -12429,7 +14293,6 @@ install-info-tcl: \
         @[ -f ./tcl/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -12455,7 +14318,6 @@ installcheck-tcl: \
         @[ -f ./tcl/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -12490,7 +14352,6 @@ clean-tcl:
         @[ -f ./tcl/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -12515,7 +14376,6 @@ distclean-tcl:
         @[ -f ./tcl/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -12540,7 +14400,6 @@ maintainer-clean-tcl:
         @[ -f ./tcl/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -12557,18 +14416,19 @@ maintainer-clean-tcl:
  @endif tcl
  
  
+
  .PHONY: configure-itcl maybe-configure-itcl
  maybe-configure-itcl:
  @if itcl
  maybe-configure-itcl: configure-itcl
-configure-itcl:
+configure-itcl: 
         @test ! -f $(HOST_SUBDIR)/itcl/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/itcl ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       echo Configuring in itcl; \
-       cd $(HOST_SUBDIR)/itcl || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/itcl; \
+       cd "$(HOST_SUBDIR)/itcl" || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/itcl/ | \
@@ -12581,6 +14441,10 @@ configure-itcl:
           || exit 1
  @endif itcl
  
+
+
+
+
  .PHONY: all-itcl maybe-all-itcl
  maybe-all-itcl:
  @if itcl
@@ -12589,12 +14453,14 @@ maybe-all-itcl: all-itcl
  all-itcl: configure-itcl
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/itcl && \
           $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-itcl))
  @endif itcl
  
+
+
+
  .PHONY: check-itcl maybe-check-itcl
  maybe-check-itcl:
  @if itcl
@@ -12603,7 +14469,6 @@ maybe-check-itcl: check-itcl
  check-itcl:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/itcl && \
           $(MAKE) $(FLAGS_TO_PASS)  check)
@@ -12618,10 +14483,9 @@ maybe-install-itcl: install-itcl
  install-itcl: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/itcl && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS)  install)
  
  @endif itcl
  
@@ -12637,7 +14501,6 @@ info-itcl: \
         @[ -f ./itcl/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -12663,7 +14526,6 @@ dvi-itcl: \
         @[ -f ./itcl/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -12689,7 +14551,6 @@ html-itcl: \
         @[ -f ./itcl/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -12715,7 +14576,6 @@ TAGS-itcl: \
         @[ -f ./itcl/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -12742,7 +14602,6 @@ install-info-itcl: \
         @[ -f ./itcl/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -12768,7 +14627,6 @@ installcheck-itcl: \
         @[ -f ./itcl/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -12793,7 +14651,6 @@ mostlyclean-itcl:
         @[ -f ./itcl/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -12818,7 +14675,6 @@ clean-itcl:
         @[ -f ./itcl/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -12843,7 +14699,6 @@ distclean-itcl:
         @[ -f ./itcl/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -12868,7 +14723,6 @@ maintainer-clean-itcl:
         @[ -f ./itcl/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -12885,19 +14739,20 @@ maintainer-clean-itcl:
  @endif itcl
  
  
+
  .PHONY: configure-ld maybe-configure-ld
  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 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       echo Configuring in ld; \
-       cd $(HOST_SUBDIR)/ld || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/ld; \
+       cd "$(HOST_SUBDIR)/ld" || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/ld/ | \
@@ -12910,6 +14765,161 @@ configure-ld:
           || exit 1
  @endif ld
  
+
+
+.PHONY: configure-stage1-ld maybe-configure-stage1-ld
+maybe-configure-stage1-ld:
+@if ld-bootstrap
+maybe-configure-stage1-ld: configure-stage1-ld
+configure-stage1-ld: 
+       @$(MAKE) stage1-start
+       @[ -f $(HOST_SUBDIR)/ld/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       echo Configuring stage 1 in $(HOST_SUBDIR)/ld ; \
+       cd $(HOST_SUBDIR)/ld || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/ld/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/ld"; \
+       libsrcdir="$$s/ld"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         --disable-intermodule           --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" 
+@endif ld-bootstrap
+
+.PHONY: configure-stage2-ld maybe-configure-stage2-ld
+maybe-configure-stage2-ld:
+@if ld-bootstrap
+maybe-configure-stage2-ld: configure-stage2-ld
+configure-stage2-ld: 
+       @$(MAKE) stage2-start
+       @[ -f $(HOST_SUBDIR)/ld/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       echo Configuring stage 2 in $(HOST_SUBDIR)/ld ; \
+       cd $(HOST_SUBDIR)/ld || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/ld/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/ld"; \
+       libsrcdir="$$s/ld"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+@endif ld-bootstrap
+
+.PHONY: configure-stage3-ld maybe-configure-stage3-ld
+maybe-configure-stage3-ld:
+@if ld-bootstrap
+maybe-configure-stage3-ld: configure-stage3-ld
+configure-stage3-ld: 
+       @$(MAKE) stage3-start
+       @[ -f $(HOST_SUBDIR)/ld/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       echo Configuring stage 3 in $(HOST_SUBDIR)/ld ; \
+       cd $(HOST_SUBDIR)/ld || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/ld/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/ld"; \
+       libsrcdir="$$s/ld"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+@endif ld-bootstrap
+
+.PHONY: configure-stage4-ld maybe-configure-stage4-ld
+maybe-configure-stage4-ld:
+@if ld-bootstrap
+maybe-configure-stage4-ld: configure-stage4-ld
+configure-stage4-ld: 
+       @$(MAKE) stage4-start
+       @[ -f $(HOST_SUBDIR)/ld/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       echo Configuring stage 4 in $(HOST_SUBDIR)/ld ; \
+       cd $(HOST_SUBDIR)/ld || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/ld/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/ld"; \
+       libsrcdir="$$s/ld"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+@endif ld-bootstrap
+
+.PHONY: configure-stageprofile-ld maybe-configure-stageprofile-ld
+maybe-configure-stageprofile-ld:
+@if ld-bootstrap
+maybe-configure-stageprofile-ld: configure-stageprofile-ld
+configure-stageprofile-ld: 
+       @$(MAKE) stageprofile-start
+       @[ -f $(HOST_SUBDIR)/ld/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       echo Configuring stage profile in $(HOST_SUBDIR)/ld ; \
+       cd $(HOST_SUBDIR)/ld || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/ld/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/ld"; \
+       libsrcdir="$$s/ld"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+@endif ld-bootstrap
+
+.PHONY: configure-stagefeedback-ld maybe-configure-stagefeedback-ld
+maybe-configure-stagefeedback-ld:
+@if ld-bootstrap
+maybe-configure-stagefeedback-ld: configure-stagefeedback-ld
+configure-stagefeedback-ld: 
+       @$(MAKE) stagefeedback-start
+       @[ -f $(HOST_SUBDIR)/ld/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       echo Configuring stage feedback in $(HOST_SUBDIR)/ld ; \
+       cd $(HOST_SUBDIR)/ld || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/ld/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/ld"; \
+       libsrcdir="$$s/ld"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+@endif ld-bootstrap
+
+
+
+
+
  .PHONY: all-ld maybe-all-ld
  maybe-all-ld:
  @if ld
@@ -12919,12 +14929,188 @@ all-ld: configure-ld
         @test -f stage_last && exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/ld && \
           $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-ld))
  @endif ld
  
+
+
+.PHONY: all-stage1-ld maybe-all-stage1-ld
+.PHONY: clean-stage1-ld maybe-clean-stage1-ld
+maybe-all-stage1-ld:
+maybe-clean-stage1-ld:
+@if ld-bootstrap
+maybe-all-stage1-ld: all-stage1-ld
+all-stage1: all-stage1-ld
+all-stage1-ld: configure-stage1-ld
+       @$(MAKE) stage1-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       cd $(HOST_SUBDIR)/ld && \
+       $(MAKE) $(FLAGS_TO_PASS)  CFLAGS="$(STAGE1_CFLAGS)" 
+
+maybe-clean-stage1-ld: clean-stage1-ld
+clean-stage1: clean-stage1-ld
+clean-stage1-ld:
+       @[ -f $(HOST_SUBDIR)/ld/Makefile ] || [ -f $(HOST_SUBDIR)/stage1-ld/Makefile ] \
+         || exit 0 ; \
+       [ -f $(HOST_SUBDIR)/ld/Makefile ] || $(MAKE) stage1-start ; \
+       cd $(HOST_SUBDIR)/ld && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               CFLAGS="$(STAGE1_CFLAGS)"  clean
+@endif ld-bootstrap
+
+
+.PHONY: all-stage2-ld maybe-all-stage2-ld
+.PHONY: clean-stage2-ld maybe-clean-stage2-ld
+maybe-all-stage2-ld:
+maybe-clean-stage2-ld:
+@if ld-bootstrap
+maybe-all-stage2-ld: all-stage2-ld
+all-stage2: all-stage2-ld
+all-stage2-ld: configure-stage2-ld
+       @$(MAKE) stage2-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       cd $(HOST_SUBDIR)/ld && \
+       $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)  
+
+maybe-clean-stage2-ld: clean-stage2-ld
+clean-stage2: clean-stage2-ld
+clean-stage2-ld:
+       @[ -f $(HOST_SUBDIR)/ld/Makefile ] || [ -f $(HOST_SUBDIR)/stage2-ld/Makefile ] \
+         || exit 0 ; \
+       [ -f $(HOST_SUBDIR)/ld/Makefile ] || $(MAKE) stage2-start ; \
+       cd $(HOST_SUBDIR)/ld && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                 clean
+@endif ld-bootstrap
+
+
+.PHONY: all-stage3-ld maybe-all-stage3-ld
+.PHONY: clean-stage3-ld maybe-clean-stage3-ld
+maybe-all-stage3-ld:
+maybe-clean-stage3-ld:
+@if ld-bootstrap
+maybe-all-stage3-ld: all-stage3-ld
+all-stage3: all-stage3-ld
+all-stage3-ld: configure-stage3-ld
+       @$(MAKE) stage3-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       cd $(HOST_SUBDIR)/ld && \
+       $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)  
+
+maybe-clean-stage3-ld: clean-stage3-ld
+clean-stage3: clean-stage3-ld
+clean-stage3-ld:
+       @[ -f $(HOST_SUBDIR)/ld/Makefile ] || [ -f $(HOST_SUBDIR)/stage3-ld/Makefile ] \
+         || exit 0 ; \
+       [ -f $(HOST_SUBDIR)/ld/Makefile ] || $(MAKE) stage3-start ; \
+       cd $(HOST_SUBDIR)/ld && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                 clean
+@endif ld-bootstrap
+
+
+.PHONY: all-stage4-ld maybe-all-stage4-ld
+.PHONY: clean-stage4-ld maybe-clean-stage4-ld
+maybe-all-stage4-ld:
+maybe-clean-stage4-ld:
+@if ld-bootstrap
+maybe-all-stage4-ld: all-stage4-ld
+all-stage4: all-stage4-ld
+all-stage4-ld: configure-stage4-ld
+       @$(MAKE) stage4-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       cd $(HOST_SUBDIR)/ld && \
+       $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)  
+
+maybe-clean-stage4-ld: clean-stage4-ld
+clean-stage4: clean-stage4-ld
+clean-stage4-ld:
+       @[ -f $(HOST_SUBDIR)/ld/Makefile ] || [ -f $(HOST_SUBDIR)/stage4-ld/Makefile ] \
+         || exit 0 ; \
+       [ -f $(HOST_SUBDIR)/ld/Makefile ] || $(MAKE) stage4-start ; \
+       cd $(HOST_SUBDIR)/ld && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                 clean
+@endif ld-bootstrap
+
+
+.PHONY: all-stageprofile-ld maybe-all-stageprofile-ld
+.PHONY: clean-stageprofile-ld maybe-clean-stageprofile-ld
+maybe-all-stageprofile-ld:
+maybe-clean-stageprofile-ld:
+@if ld-bootstrap
+maybe-all-stageprofile-ld: all-stageprofile-ld
+all-stageprofile: all-stageprofile-ld
+all-stageprofile-ld: configure-stageprofile-ld
+       @$(MAKE) stageprofile-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       cd $(HOST_SUBDIR)/ld && \
+       $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" 
+
+maybe-clean-stageprofile-ld: clean-stageprofile-ld
+clean-stageprofile: clean-stageprofile-ld
+clean-stageprofile-ld:
+       @[ -f $(HOST_SUBDIR)/ld/Makefile ] || [ -f $(HOST_SUBDIR)/stageprofile-ld/Makefile ] \
+         || exit 0 ; \
+       [ -f $(HOST_SUBDIR)/ld/Makefile ] || $(MAKE) stageprofile-start ; \
+       cd $(HOST_SUBDIR)/ld && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-generate"  clean
+@endif ld-bootstrap
+
+
+.PHONY: all-stagefeedback-ld maybe-all-stagefeedback-ld
+.PHONY: clean-stagefeedback-ld maybe-clean-stagefeedback-ld
+maybe-all-stagefeedback-ld:
+maybe-clean-stagefeedback-ld:
+@if ld-bootstrap
+maybe-all-stagefeedback-ld: all-stagefeedback-ld
+all-stagefeedback: all-stagefeedback-ld
+all-stagefeedback-ld: configure-stagefeedback-ld
+       @$(MAKE) stagefeedback-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       cd $(HOST_SUBDIR)/ld && \
+       $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-use" 
+
+maybe-clean-stagefeedback-ld: clean-stagefeedback-ld
+clean-stagefeedback: clean-stagefeedback-ld
+clean-stagefeedback-ld:
+       @[ -f $(HOST_SUBDIR)/ld/Makefile ] || [ -f $(HOST_SUBDIR)/stagefeedback-ld/Makefile ] \
+         || exit 0 ; \
+       [ -f $(HOST_SUBDIR)/ld/Makefile ] || $(MAKE) stagefeedback-start ; \
+       cd $(HOST_SUBDIR)/ld && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-use"  clean
+@endif ld-bootstrap
+
+
+
+
+
  .PHONY: check-ld maybe-check-ld
  maybe-check-ld:
  @if ld
@@ -12933,7 +15119,6 @@ maybe-check-ld: check-ld
  check-ld:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/ld && \
           $(MAKE) $(FLAGS_TO_PASS)  check)
@@ -12948,10 +15133,9 @@ maybe-install-ld: install-ld
  install-ld: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/ld && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS)  install)
  
  @endif ld
  
@@ -12967,7 +15151,6 @@ info-ld: \
         @[ -f ./ld/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -12993,7 +15176,6 @@ dvi-ld: \
         @[ -f ./ld/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -13019,7 +15201,6 @@ html-ld: \
         @[ -f ./ld/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -13045,7 +15226,6 @@ TAGS-ld: \
         @[ -f ./ld/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -13072,7 +15252,6 @@ install-info-ld: \
         @[ -f ./ld/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -13098,7 +15277,6 @@ installcheck-ld: \
         @[ -f ./ld/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -13123,7 +15301,6 @@ mostlyclean-ld:
         @[ -f ./ld/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -13148,7 +15325,6 @@ clean-ld:
         @[ -f ./ld/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -13173,7 +15349,6 @@ distclean-ld:
         @[ -f ./ld/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -13198,7 +15373,6 @@ maintainer-clean-ld:
         @[ -f ./ld/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -13215,19 +15389,20 @@ maintainer-clean-ld:
  @endif ld
  
  
+
  .PHONY: configure-libcpp maybe-configure-libcpp
  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 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       echo Configuring in libcpp; \
-       cd $(HOST_SUBDIR)/libcpp || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/libcpp; \
+       cd "$(HOST_SUBDIR)/libcpp" || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/libcpp/ | \
@@ -13240,6 +15415,161 @@ configure-libcpp:
           || exit 1
  @endif libcpp
  
+
+
+.PHONY: configure-stage1-libcpp maybe-configure-stage1-libcpp
+maybe-configure-stage1-libcpp:
+@if libcpp-bootstrap
+maybe-configure-stage1-libcpp: configure-stage1-libcpp
+configure-stage1-libcpp: 
+       @$(MAKE) stage1-start
+       @[ -f $(HOST_SUBDIR)/libcpp/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       echo Configuring stage 1 in $(HOST_SUBDIR)/libcpp ; \
+       cd $(HOST_SUBDIR)/libcpp || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/libcpp/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/libcpp"; \
+       libsrcdir="$$s/libcpp"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         --disable-intermodule           --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" 
+@endif libcpp-bootstrap
+
+.PHONY: configure-stage2-libcpp maybe-configure-stage2-libcpp
+maybe-configure-stage2-libcpp:
+@if libcpp-bootstrap
+maybe-configure-stage2-libcpp: configure-stage2-libcpp
+configure-stage2-libcpp: 
+       @$(MAKE) stage2-start
+       @[ -f $(HOST_SUBDIR)/libcpp/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       echo Configuring stage 2 in $(HOST_SUBDIR)/libcpp ; \
+       cd $(HOST_SUBDIR)/libcpp || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/libcpp/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/libcpp"; \
+       libsrcdir="$$s/libcpp"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+@endif libcpp-bootstrap
+
+.PHONY: configure-stage3-libcpp maybe-configure-stage3-libcpp
+maybe-configure-stage3-libcpp:
+@if libcpp-bootstrap
+maybe-configure-stage3-libcpp: configure-stage3-libcpp
+configure-stage3-libcpp: 
+       @$(MAKE) stage3-start
+       @[ -f $(HOST_SUBDIR)/libcpp/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       echo Configuring stage 3 in $(HOST_SUBDIR)/libcpp ; \
+       cd $(HOST_SUBDIR)/libcpp || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/libcpp/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/libcpp"; \
+       libsrcdir="$$s/libcpp"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+@endif libcpp-bootstrap
+
+.PHONY: configure-stage4-libcpp maybe-configure-stage4-libcpp
+maybe-configure-stage4-libcpp:
+@if libcpp-bootstrap
+maybe-configure-stage4-libcpp: configure-stage4-libcpp
+configure-stage4-libcpp: 
+       @$(MAKE) stage4-start
+       @[ -f $(HOST_SUBDIR)/libcpp/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       echo Configuring stage 4 in $(HOST_SUBDIR)/libcpp ; \
+       cd $(HOST_SUBDIR)/libcpp || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/libcpp/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/libcpp"; \
+       libsrcdir="$$s/libcpp"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+@endif libcpp-bootstrap
+
+.PHONY: configure-stageprofile-libcpp maybe-configure-stageprofile-libcpp
+maybe-configure-stageprofile-libcpp:
+@if libcpp-bootstrap
+maybe-configure-stageprofile-libcpp: configure-stageprofile-libcpp
+configure-stageprofile-libcpp: 
+       @$(MAKE) stageprofile-start
+       @[ -f $(HOST_SUBDIR)/libcpp/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       echo Configuring stage profile in $(HOST_SUBDIR)/libcpp ; \
+       cd $(HOST_SUBDIR)/libcpp || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/libcpp/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/libcpp"; \
+       libsrcdir="$$s/libcpp"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+@endif libcpp-bootstrap
+
+.PHONY: configure-stagefeedback-libcpp maybe-configure-stagefeedback-libcpp
+maybe-configure-stagefeedback-libcpp:
+@if libcpp-bootstrap
+maybe-configure-stagefeedback-libcpp: configure-stagefeedback-libcpp
+configure-stagefeedback-libcpp: 
+       @$(MAKE) stagefeedback-start
+       @[ -f $(HOST_SUBDIR)/libcpp/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       echo Configuring stage feedback in $(HOST_SUBDIR)/libcpp ; \
+       cd $(HOST_SUBDIR)/libcpp || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/libcpp/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/libcpp"; \
+       libsrcdir="$$s/libcpp"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+@endif libcpp-bootstrap
+
+
+
+
+
  .PHONY: all-libcpp maybe-all-libcpp
  maybe-all-libcpp:
  @if libcpp
@@ -13249,12 +15579,188 @@ all-libcpp: configure-libcpp
         @test -f stage_last && exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/libcpp && \
           $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-libcpp))
  @endif libcpp
  
+
+
+.PHONY: all-stage1-libcpp maybe-all-stage1-libcpp
+.PHONY: clean-stage1-libcpp maybe-clean-stage1-libcpp
+maybe-all-stage1-libcpp:
+maybe-clean-stage1-libcpp:
+@if libcpp-bootstrap
+maybe-all-stage1-libcpp: all-stage1-libcpp
+all-stage1: all-stage1-libcpp
+all-stage1-libcpp: configure-stage1-libcpp
+       @$(MAKE) stage1-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       cd $(HOST_SUBDIR)/libcpp && \
+       $(MAKE) $(FLAGS_TO_PASS)  CFLAGS="$(STAGE1_CFLAGS)" 
+
+maybe-clean-stage1-libcpp: clean-stage1-libcpp
+clean-stage1: clean-stage1-libcpp
+clean-stage1-libcpp:
+       @[ -f $(HOST_SUBDIR)/libcpp/Makefile ] || [ -f $(HOST_SUBDIR)/stage1-libcpp/Makefile ] \
+         || exit 0 ; \
+       [ -f $(HOST_SUBDIR)/libcpp/Makefile ] || $(MAKE) stage1-start ; \
+       cd $(HOST_SUBDIR)/libcpp && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               CFLAGS="$(STAGE1_CFLAGS)"  clean
+@endif libcpp-bootstrap
+
+
+.PHONY: all-stage2-libcpp maybe-all-stage2-libcpp
+.PHONY: clean-stage2-libcpp maybe-clean-stage2-libcpp
+maybe-all-stage2-libcpp:
+maybe-clean-stage2-libcpp:
+@if libcpp-bootstrap
+maybe-all-stage2-libcpp: all-stage2-libcpp
+all-stage2: all-stage2-libcpp
+all-stage2-libcpp: configure-stage2-libcpp
+       @$(MAKE) stage2-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       cd $(HOST_SUBDIR)/libcpp && \
+       $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)  
+
+maybe-clean-stage2-libcpp: clean-stage2-libcpp
+clean-stage2: clean-stage2-libcpp
+clean-stage2-libcpp:
+       @[ -f $(HOST_SUBDIR)/libcpp/Makefile ] || [ -f $(HOST_SUBDIR)/stage2-libcpp/Makefile ] \
+         || exit 0 ; \
+       [ -f $(HOST_SUBDIR)/libcpp/Makefile ] || $(MAKE) stage2-start ; \
+       cd $(HOST_SUBDIR)/libcpp && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                 clean
+@endif libcpp-bootstrap
+
+
+.PHONY: all-stage3-libcpp maybe-all-stage3-libcpp
+.PHONY: clean-stage3-libcpp maybe-clean-stage3-libcpp
+maybe-all-stage3-libcpp:
+maybe-clean-stage3-libcpp:
+@if libcpp-bootstrap
+maybe-all-stage3-libcpp: all-stage3-libcpp
+all-stage3: all-stage3-libcpp
+all-stage3-libcpp: configure-stage3-libcpp
+       @$(MAKE) stage3-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       cd $(HOST_SUBDIR)/libcpp && \
+       $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)  
+
+maybe-clean-stage3-libcpp: clean-stage3-libcpp
+clean-stage3: clean-stage3-libcpp
+clean-stage3-libcpp:
+       @[ -f $(HOST_SUBDIR)/libcpp/Makefile ] || [ -f $(HOST_SUBDIR)/stage3-libcpp/Makefile ] \
+         || exit 0 ; \
+       [ -f $(HOST_SUBDIR)/libcpp/Makefile ] || $(MAKE) stage3-start ; \
+       cd $(HOST_SUBDIR)/libcpp && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                 clean
+@endif libcpp-bootstrap
+
+
+.PHONY: all-stage4-libcpp maybe-all-stage4-libcpp
+.PHONY: clean-stage4-libcpp maybe-clean-stage4-libcpp
+maybe-all-stage4-libcpp:
+maybe-clean-stage4-libcpp:
+@if libcpp-bootstrap
+maybe-all-stage4-libcpp: all-stage4-libcpp
+all-stage4: all-stage4-libcpp
+all-stage4-libcpp: configure-stage4-libcpp
+       @$(MAKE) stage4-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       cd $(HOST_SUBDIR)/libcpp && \
+       $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)  
+
+maybe-clean-stage4-libcpp: clean-stage4-libcpp
+clean-stage4: clean-stage4-libcpp
+clean-stage4-libcpp:
+       @[ -f $(HOST_SUBDIR)/libcpp/Makefile ] || [ -f $(HOST_SUBDIR)/stage4-libcpp/Makefile ] \
+         || exit 0 ; \
+       [ -f $(HOST_SUBDIR)/libcpp/Makefile ] || $(MAKE) stage4-start ; \
+       cd $(HOST_SUBDIR)/libcpp && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                 clean
+@endif libcpp-bootstrap
+
+
+.PHONY: all-stageprofile-libcpp maybe-all-stageprofile-libcpp
+.PHONY: clean-stageprofile-libcpp maybe-clean-stageprofile-libcpp
+maybe-all-stageprofile-libcpp:
+maybe-clean-stageprofile-libcpp:
+@if libcpp-bootstrap
+maybe-all-stageprofile-libcpp: all-stageprofile-libcpp
+all-stageprofile: all-stageprofile-libcpp
+all-stageprofile-libcpp: configure-stageprofile-libcpp
+       @$(MAKE) stageprofile-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       cd $(HOST_SUBDIR)/libcpp && \
+       $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" 
+
+maybe-clean-stageprofile-libcpp: clean-stageprofile-libcpp
+clean-stageprofile: clean-stageprofile-libcpp
+clean-stageprofile-libcpp:
+       @[ -f $(HOST_SUBDIR)/libcpp/Makefile ] || [ -f $(HOST_SUBDIR)/stageprofile-libcpp/Makefile ] \
+         || exit 0 ; \
+       [ -f $(HOST_SUBDIR)/libcpp/Makefile ] || $(MAKE) stageprofile-start ; \
+       cd $(HOST_SUBDIR)/libcpp && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-generate"  clean
+@endif libcpp-bootstrap
+
+
+.PHONY: all-stagefeedback-libcpp maybe-all-stagefeedback-libcpp
+.PHONY: clean-stagefeedback-libcpp maybe-clean-stagefeedback-libcpp
+maybe-all-stagefeedback-libcpp:
+maybe-clean-stagefeedback-libcpp:
+@if libcpp-bootstrap
+maybe-all-stagefeedback-libcpp: all-stagefeedback-libcpp
+all-stagefeedback: all-stagefeedback-libcpp
+all-stagefeedback-libcpp: configure-stagefeedback-libcpp
+       @$(MAKE) stagefeedback-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       cd $(HOST_SUBDIR)/libcpp && \
+       $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-use" 
+
+maybe-clean-stagefeedback-libcpp: clean-stagefeedback-libcpp
+clean-stagefeedback: clean-stagefeedback-libcpp
+clean-stagefeedback-libcpp:
+       @[ -f $(HOST_SUBDIR)/libcpp/Makefile ] || [ -f $(HOST_SUBDIR)/stagefeedback-libcpp/Makefile ] \
+         || exit 0 ; \
+       [ -f $(HOST_SUBDIR)/libcpp/Makefile ] || $(MAKE) stagefeedback-start ; \
+       cd $(HOST_SUBDIR)/libcpp && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-use"  clean
+@endif libcpp-bootstrap
+
+
+
+
+
  .PHONY: check-libcpp maybe-check-libcpp
  maybe-check-libcpp:
  @if libcpp
@@ -13263,7 +15769,6 @@ maybe-check-libcpp: check-libcpp
  check-libcpp:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/libcpp && \
           $(MAKE) $(FLAGS_TO_PASS)  check)
@@ -13278,10 +15783,9 @@ maybe-install-libcpp: install-libcpp
  install-libcpp: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/libcpp && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS)  install)
  
  @endif libcpp
  
@@ -13297,7 +15801,6 @@ info-libcpp: \
         @[ -f ./libcpp/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -13323,7 +15826,6 @@ dvi-libcpp: \
         @[ -f ./libcpp/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -13349,7 +15851,6 @@ html-libcpp: \
         @[ -f ./libcpp/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -13375,7 +15876,6 @@ TAGS-libcpp: \
         @[ -f ./libcpp/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -13402,7 +15902,6 @@ install-info-libcpp: \
         @[ -f ./libcpp/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -13428,7 +15927,6 @@ installcheck-libcpp: \
         @[ -f ./libcpp/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -13453,7 +15951,6 @@ mostlyclean-libcpp:
         @[ -f ./libcpp/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -13478,7 +15975,6 @@ clean-libcpp:
         @[ -f ./libcpp/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -13503,7 +15999,6 @@ distclean-libcpp:
         @[ -f ./libcpp/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -13528,7 +16023,6 @@ maintainer-clean-libcpp:
         @[ -f ./libcpp/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -13545,18 +16039,19 @@ maintainer-clean-libcpp:
  @endif libcpp
  
  
+
  .PHONY: configure-libgui maybe-configure-libgui
  maybe-configure-libgui:
  @if libgui
  maybe-configure-libgui: configure-libgui
-configure-libgui:
+configure-libgui: 
         @test ! -f $(HOST_SUBDIR)/libgui/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libgui ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       echo Configuring in libgui; \
-       cd $(HOST_SUBDIR)/libgui || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/libgui; \
+       cd "$(HOST_SUBDIR)/libgui" || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/libgui/ | \
@@ -13569,6 +16064,10 @@ configure-libgui:
           || exit 1
  @endif libgui
  
+
+
+
+
  .PHONY: all-libgui maybe-all-libgui
  maybe-all-libgui:
  @if libgui
@@ -13577,12 +16076,14 @@ maybe-all-libgui: all-libgui
  all-libgui: configure-libgui
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/libgui && \
           $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-libgui))
  @endif libgui
  
+
+
+
  .PHONY: check-libgui maybe-check-libgui
  maybe-check-libgui:
  @if libgui
@@ -13591,7 +16092,6 @@ maybe-check-libgui: check-libgui
  check-libgui:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/libgui && \
           $(MAKE) $(FLAGS_TO_PASS)  check)
@@ -13606,10 +16106,9 @@ maybe-install-libgui: install-libgui
  install-libgui: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/libgui && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS)  install)
  
  @endif libgui
  
@@ -13625,7 +16124,6 @@ info-libgui: \
         @[ -f ./libgui/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -13651,7 +16149,6 @@ dvi-libgui: \
         @[ -f ./libgui/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -13677,7 +16174,6 @@ html-libgui: \
         @[ -f ./libgui/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -13703,7 +16199,6 @@ TAGS-libgui: \
         @[ -f ./libgui/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -13730,7 +16225,6 @@ install-info-libgui: \
         @[ -f ./libgui/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -13756,7 +16250,6 @@ installcheck-libgui: \
         @[ -f ./libgui/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -13781,7 +16274,6 @@ mostlyclean-libgui:
         @[ -f ./libgui/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -13806,7 +16298,6 @@ clean-libgui:
         @[ -f ./libgui/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -13831,7 +16322,6 @@ distclean-libgui:
         @[ -f ./libgui/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -13856,7 +16346,6 @@ maintainer-clean-libgui:
         @[ -f ./libgui/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -13873,19 +16362,20 @@ maintainer-clean-libgui:
  @endif libgui
  
  
+
  .PHONY: configure-libiberty maybe-configure-libiberty
  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 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       echo Configuring in libiberty; \
-       cd $(HOST_SUBDIR)/libiberty || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/libiberty; \
+       cd "$(HOST_SUBDIR)/libiberty" || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/libiberty/ | \
@@ -13898,6 +16388,161 @@ configure-libiberty:
           || exit 1
  @endif libiberty
  
+
+
+.PHONY: configure-stage1-libiberty maybe-configure-stage1-libiberty
+maybe-configure-stage1-libiberty:
+@if libiberty-bootstrap
+maybe-configure-stage1-libiberty: configure-stage1-libiberty
+configure-stage1-libiberty: 
+       @$(MAKE) stage1-start
+       @[ -f $(HOST_SUBDIR)/libiberty/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       echo Configuring stage 1 in $(HOST_SUBDIR)/libiberty ; \
+       cd $(HOST_SUBDIR)/libiberty || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/libiberty/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/libiberty"; \
+       libsrcdir="$$s/libiberty"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         --disable-intermodule           --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" 
+@endif libiberty-bootstrap
+
+.PHONY: configure-stage2-libiberty maybe-configure-stage2-libiberty
+maybe-configure-stage2-libiberty:
+@if libiberty-bootstrap
+maybe-configure-stage2-libiberty: configure-stage2-libiberty
+configure-stage2-libiberty: 
+       @$(MAKE) stage2-start
+       @[ -f $(HOST_SUBDIR)/libiberty/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       echo Configuring stage 2 in $(HOST_SUBDIR)/libiberty ; \
+       cd $(HOST_SUBDIR)/libiberty || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/libiberty/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/libiberty"; \
+       libsrcdir="$$s/libiberty"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+@endif libiberty-bootstrap
+
+.PHONY: configure-stage3-libiberty maybe-configure-stage3-libiberty
+maybe-configure-stage3-libiberty:
+@if libiberty-bootstrap
+maybe-configure-stage3-libiberty: configure-stage3-libiberty
+configure-stage3-libiberty: 
+       @$(MAKE) stage3-start
+       @[ -f $(HOST_SUBDIR)/libiberty/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       echo Configuring stage 3 in $(HOST_SUBDIR)/libiberty ; \
+       cd $(HOST_SUBDIR)/libiberty || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/libiberty/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/libiberty"; \
+       libsrcdir="$$s/libiberty"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+@endif libiberty-bootstrap
+
+.PHONY: configure-stage4-libiberty maybe-configure-stage4-libiberty
+maybe-configure-stage4-libiberty:
+@if libiberty-bootstrap
+maybe-configure-stage4-libiberty: configure-stage4-libiberty
+configure-stage4-libiberty: 
+       @$(MAKE) stage4-start
+       @[ -f $(HOST_SUBDIR)/libiberty/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       echo Configuring stage 4 in $(HOST_SUBDIR)/libiberty ; \
+       cd $(HOST_SUBDIR)/libiberty || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/libiberty/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/libiberty"; \
+       libsrcdir="$$s/libiberty"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+@endif libiberty-bootstrap
+
+.PHONY: configure-stageprofile-libiberty maybe-configure-stageprofile-libiberty
+maybe-configure-stageprofile-libiberty:
+@if libiberty-bootstrap
+maybe-configure-stageprofile-libiberty: configure-stageprofile-libiberty
+configure-stageprofile-libiberty: 
+       @$(MAKE) stageprofile-start
+       @[ -f $(HOST_SUBDIR)/libiberty/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       echo Configuring stage profile in $(HOST_SUBDIR)/libiberty ; \
+       cd $(HOST_SUBDIR)/libiberty || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/libiberty/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/libiberty"; \
+       libsrcdir="$$s/libiberty"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+@endif libiberty-bootstrap
+
+.PHONY: configure-stagefeedback-libiberty maybe-configure-stagefeedback-libiberty
+maybe-configure-stagefeedback-libiberty:
+@if libiberty-bootstrap
+maybe-configure-stagefeedback-libiberty: configure-stagefeedback-libiberty
+configure-stagefeedback-libiberty: 
+       @$(MAKE) stagefeedback-start
+       @[ -f $(HOST_SUBDIR)/libiberty/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       echo Configuring stage feedback in $(HOST_SUBDIR)/libiberty ; \
+       cd $(HOST_SUBDIR)/libiberty || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/libiberty/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/libiberty"; \
+       libsrcdir="$$s/libiberty"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+@endif libiberty-bootstrap
+
+
+
+
+
  .PHONY: all-libiberty maybe-all-libiberty
  maybe-all-libiberty:
  @if libiberty
@@ -13907,12 +16552,188 @@ all-libiberty: configure-libiberty
         @test -f stage_last && exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/libiberty && \
           $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-libiberty))
  @endif libiberty
  
+
+
+.PHONY: all-stage1-libiberty maybe-all-stage1-libiberty
+.PHONY: clean-stage1-libiberty maybe-clean-stage1-libiberty
+maybe-all-stage1-libiberty:
+maybe-clean-stage1-libiberty:
+@if libiberty-bootstrap
+maybe-all-stage1-libiberty: all-stage1-libiberty
+all-stage1: all-stage1-libiberty
+all-stage1-libiberty: configure-stage1-libiberty
+       @$(MAKE) stage1-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       cd $(HOST_SUBDIR)/libiberty && \
+       $(MAKE) $(FLAGS_TO_PASS)  CFLAGS="$(STAGE1_CFLAGS)" 
+
+maybe-clean-stage1-libiberty: clean-stage1-libiberty
+clean-stage1: clean-stage1-libiberty
+clean-stage1-libiberty:
+       @[ -f $(HOST_SUBDIR)/libiberty/Makefile ] || [ -f $(HOST_SUBDIR)/stage1-libiberty/Makefile ] \
+         || exit 0 ; \
+       [ -f $(HOST_SUBDIR)/libiberty/Makefile ] || $(MAKE) stage1-start ; \
+       cd $(HOST_SUBDIR)/libiberty && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               CFLAGS="$(STAGE1_CFLAGS)"  clean
+@endif libiberty-bootstrap
+
+
+.PHONY: all-stage2-libiberty maybe-all-stage2-libiberty
+.PHONY: clean-stage2-libiberty maybe-clean-stage2-libiberty
+maybe-all-stage2-libiberty:
+maybe-clean-stage2-libiberty:
+@if libiberty-bootstrap
+maybe-all-stage2-libiberty: all-stage2-libiberty
+all-stage2: all-stage2-libiberty
+all-stage2-libiberty: configure-stage2-libiberty
+       @$(MAKE) stage2-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       cd $(HOST_SUBDIR)/libiberty && \
+       $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)  
+
+maybe-clean-stage2-libiberty: clean-stage2-libiberty
+clean-stage2: clean-stage2-libiberty
+clean-stage2-libiberty:
+       @[ -f $(HOST_SUBDIR)/libiberty/Makefile ] || [ -f $(HOST_SUBDIR)/stage2-libiberty/Makefile ] \
+         || exit 0 ; \
+       [ -f $(HOST_SUBDIR)/libiberty/Makefile ] || $(MAKE) stage2-start ; \
+       cd $(HOST_SUBDIR)/libiberty && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                 clean
+@endif libiberty-bootstrap
+
+
+.PHONY: all-stage3-libiberty maybe-all-stage3-libiberty
+.PHONY: clean-stage3-libiberty maybe-clean-stage3-libiberty
+maybe-all-stage3-libiberty:
+maybe-clean-stage3-libiberty:
+@if libiberty-bootstrap
+maybe-all-stage3-libiberty: all-stage3-libiberty
+all-stage3: all-stage3-libiberty
+all-stage3-libiberty: configure-stage3-libiberty
+       @$(MAKE) stage3-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       cd $(HOST_SUBDIR)/libiberty && \
+       $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)  
+
+maybe-clean-stage3-libiberty: clean-stage3-libiberty
+clean-stage3: clean-stage3-libiberty
+clean-stage3-libiberty:
+       @[ -f $(HOST_SUBDIR)/libiberty/Makefile ] || [ -f $(HOST_SUBDIR)/stage3-libiberty/Makefile ] \
+         || exit 0 ; \
+       [ -f $(HOST_SUBDIR)/libiberty/Makefile ] || $(MAKE) stage3-start ; \
+       cd $(HOST_SUBDIR)/libiberty && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                 clean
+@endif libiberty-bootstrap
+
+
+.PHONY: all-stage4-libiberty maybe-all-stage4-libiberty
+.PHONY: clean-stage4-libiberty maybe-clean-stage4-libiberty
+maybe-all-stage4-libiberty:
+maybe-clean-stage4-libiberty:
+@if libiberty-bootstrap
+maybe-all-stage4-libiberty: all-stage4-libiberty
+all-stage4: all-stage4-libiberty
+all-stage4-libiberty: configure-stage4-libiberty
+       @$(MAKE) stage4-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       cd $(HOST_SUBDIR)/libiberty && \
+       $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)  
+
+maybe-clean-stage4-libiberty: clean-stage4-libiberty
+clean-stage4: clean-stage4-libiberty
+clean-stage4-libiberty:
+       @[ -f $(HOST_SUBDIR)/libiberty/Makefile ] || [ -f $(HOST_SUBDIR)/stage4-libiberty/Makefile ] \
+         || exit 0 ; \
+       [ -f $(HOST_SUBDIR)/libiberty/Makefile ] || $(MAKE) stage4-start ; \
+       cd $(HOST_SUBDIR)/libiberty && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                 clean
+@endif libiberty-bootstrap
+
+
+.PHONY: all-stageprofile-libiberty maybe-all-stageprofile-libiberty
+.PHONY: clean-stageprofile-libiberty maybe-clean-stageprofile-libiberty
+maybe-all-stageprofile-libiberty:
+maybe-clean-stageprofile-libiberty:
+@if libiberty-bootstrap
+maybe-all-stageprofile-libiberty: all-stageprofile-libiberty
+all-stageprofile: all-stageprofile-libiberty
+all-stageprofile-libiberty: configure-stageprofile-libiberty
+       @$(MAKE) stageprofile-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       cd $(HOST_SUBDIR)/libiberty && \
+       $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" 
+
+maybe-clean-stageprofile-libiberty: clean-stageprofile-libiberty
+clean-stageprofile: clean-stageprofile-libiberty
+clean-stageprofile-libiberty:
+       @[ -f $(HOST_SUBDIR)/libiberty/Makefile ] || [ -f $(HOST_SUBDIR)/stageprofile-libiberty/Makefile ] \
+         || exit 0 ; \
+       [ -f $(HOST_SUBDIR)/libiberty/Makefile ] || $(MAKE) stageprofile-start ; \
+       cd $(HOST_SUBDIR)/libiberty && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-generate"  clean
+@endif libiberty-bootstrap
+
+
+.PHONY: all-stagefeedback-libiberty maybe-all-stagefeedback-libiberty
+.PHONY: clean-stagefeedback-libiberty maybe-clean-stagefeedback-libiberty
+maybe-all-stagefeedback-libiberty:
+maybe-clean-stagefeedback-libiberty:
+@if libiberty-bootstrap
+maybe-all-stagefeedback-libiberty: all-stagefeedback-libiberty
+all-stagefeedback: all-stagefeedback-libiberty
+all-stagefeedback-libiberty: configure-stagefeedback-libiberty
+       @$(MAKE) stagefeedback-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       cd $(HOST_SUBDIR)/libiberty && \
+       $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-use" 
+
+maybe-clean-stagefeedback-libiberty: clean-stagefeedback-libiberty
+clean-stagefeedback: clean-stagefeedback-libiberty
+clean-stagefeedback-libiberty:
+       @[ -f $(HOST_SUBDIR)/libiberty/Makefile ] || [ -f $(HOST_SUBDIR)/stagefeedback-libiberty/Makefile ] \
+         || exit 0 ; \
+       [ -f $(HOST_SUBDIR)/libiberty/Makefile ] || $(MAKE) stagefeedback-start ; \
+       cd $(HOST_SUBDIR)/libiberty && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-use"  clean
+@endif libiberty-bootstrap
+
+
+
+
+
  .PHONY: check-libiberty maybe-check-libiberty
  maybe-check-libiberty:
  @if libiberty
@@ -13921,7 +16742,6 @@ maybe-check-libiberty: check-libiberty
  check-libiberty:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/libiberty && \
           $(MAKE) $(FLAGS_TO_PASS)  check)
@@ -13936,10 +16756,9 @@ maybe-install-libiberty: install-libiberty
  install-libiberty: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/libiberty && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS)  install)
  
  @endif libiberty
  
@@ -13955,7 +16774,6 @@ info-libiberty: \
         @[ -f ./libiberty/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -13981,7 +16799,6 @@ dvi-libiberty: \
         @[ -f ./libiberty/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -14007,7 +16824,6 @@ html-libiberty: \
         @[ -f ./libiberty/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -14033,7 +16849,6 @@ TAGS-libiberty: \
         @[ -f ./libiberty/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -14060,7 +16875,6 @@ install-info-libiberty: \
         @[ -f ./libiberty/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -14086,7 +16900,6 @@ installcheck-libiberty: \
         @[ -f ./libiberty/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -14111,7 +16924,6 @@ mostlyclean-libiberty:
         @[ -f ./libiberty/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -14136,7 +16948,6 @@ clean-libiberty:
         @[ -f ./libiberty/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -14161,7 +16972,6 @@ distclean-libiberty:
         @[ -f ./libiberty/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -14186,7 +16996,6 @@ maintainer-clean-libiberty:
         @[ -f ./libiberty/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -14203,18 +17012,19 @@ maintainer-clean-libiberty:
  @endif libiberty
  
  
+
  .PHONY: configure-libtool maybe-configure-libtool
  maybe-configure-libtool:
  @if libtool
  maybe-configure-libtool: configure-libtool
-configure-libtool:
+configure-libtool: 
         @test ! -f $(HOST_SUBDIR)/libtool/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libtool ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       echo Configuring in libtool; \
-       cd $(HOST_SUBDIR)/libtool || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/libtool; \
+       cd "$(HOST_SUBDIR)/libtool" || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/libtool/ | \
@@ -14227,6 +17037,10 @@ configure-libtool:
           || exit 1
  @endif libtool
  
+
+
+
+
  .PHONY: all-libtool maybe-all-libtool
  maybe-all-libtool:
  @if libtool
@@ -14235,12 +17049,14 @@ maybe-all-libtool: all-libtool
  all-libtool: configure-libtool
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/libtool && \
           $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-libtool))
  @endif libtool
  
+
+
+
  .PHONY: check-libtool maybe-check-libtool
  maybe-check-libtool:
  @if libtool
@@ -14249,7 +17065,6 @@ maybe-check-libtool: check-libtool
  check-libtool:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/libtool && \
           $(MAKE) $(FLAGS_TO_PASS)  check)
@@ -14264,10 +17079,9 @@ maybe-install-libtool: install-libtool
  install-libtool: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/libtool && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS)  install)
  
  @endif libtool
  
@@ -14283,7 +17097,6 @@ info-libtool: \
         @[ -f ./libtool/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -14309,7 +17122,6 @@ dvi-libtool: \
         @[ -f ./libtool/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -14335,7 +17147,6 @@ html-libtool: \
         @[ -f ./libtool/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -14361,7 +17172,6 @@ TAGS-libtool: \
         @[ -f ./libtool/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -14388,7 +17198,6 @@ install-info-libtool: \
         @[ -f ./libtool/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -14414,7 +17223,6 @@ installcheck-libtool: \
         @[ -f ./libtool/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -14439,7 +17247,6 @@ mostlyclean-libtool:
         @[ -f ./libtool/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -14464,7 +17271,6 @@ clean-libtool:
         @[ -f ./libtool/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -14489,7 +17295,6 @@ distclean-libtool:
         @[ -f ./libtool/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -14514,7 +17319,6 @@ maintainer-clean-libtool:
         @[ -f ./libtool/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -14531,18 +17335,19 @@ maintainer-clean-libtool:
  @endif libtool
  
  
+
  .PHONY: configure-m4 maybe-configure-m4
  maybe-configure-m4:
  @if m4
  maybe-configure-m4: configure-m4
-configure-m4:
+configure-m4: 
         @test ! -f $(HOST_SUBDIR)/m4/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/m4 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       echo Configuring in m4; \
-       cd $(HOST_SUBDIR)/m4 || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/m4; \
+       cd "$(HOST_SUBDIR)/m4" || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/m4/ | \
@@ -14555,6 +17360,10 @@ configure-m4:
           || exit 1
  @endif m4
  
+
+
+
+
  .PHONY: all-m4 maybe-all-m4
  maybe-all-m4:
  @if m4
@@ -14563,12 +17372,14 @@ maybe-all-m4: all-m4
  all-m4: configure-m4
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/m4 && \
           $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-m4))
  @endif m4
  
+
+
+
  .PHONY: check-m4 maybe-check-m4
  maybe-check-m4:
  @if m4
@@ -14577,7 +17388,6 @@ maybe-check-m4: check-m4
  check-m4:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/m4 && \
           $(MAKE) $(FLAGS_TO_PASS)  check)
@@ -14592,10 +17402,9 @@ maybe-install-m4: install-m4
  install-m4: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/m4 && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS)  install)
  
  @endif m4
  
@@ -14611,7 +17420,6 @@ info-m4: \
         @[ -f ./m4/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -14637,7 +17445,6 @@ dvi-m4: \
         @[ -f ./m4/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -14663,7 +17470,6 @@ html-m4: \
         @[ -f ./m4/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -14689,7 +17495,6 @@ TAGS-m4: \
         @[ -f ./m4/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -14716,7 +17521,6 @@ install-info-m4: \
         @[ -f ./m4/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -14742,7 +17546,6 @@ installcheck-m4: \
         @[ -f ./m4/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -14767,7 +17570,6 @@ mostlyclean-m4:
         @[ -f ./m4/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -14792,7 +17594,6 @@ clean-m4:
         @[ -f ./m4/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -14817,7 +17618,6 @@ distclean-m4:
         @[ -f ./m4/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -14842,7 +17642,6 @@ maintainer-clean-m4:
         @[ -f ./m4/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -14859,18 +17658,19 @@ maintainer-clean-m4:
  @endif m4
  
  
+
  .PHONY: configure-make maybe-configure-make
  maybe-configure-make:
  @if make
  maybe-configure-make: configure-make
-configure-make:
+configure-make: 
         @test ! -f $(HOST_SUBDIR)/make/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/make ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       echo Configuring in make; \
-       cd $(HOST_SUBDIR)/make || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/make; \
+       cd "$(HOST_SUBDIR)/make" || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/make/ | \
@@ -14883,6 +17683,10 @@ configure-make:
           || exit 1
  @endif make
  
+
+
+
+
  .PHONY: all-make maybe-all-make
  maybe-all-make:
  @if make
@@ -14891,12 +17695,14 @@ maybe-all-make: all-make
  all-make: configure-make
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/make && \
           $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-make))
  @endif make
  
+
+
+
  .PHONY: check-make maybe-check-make
  maybe-check-make:
  @if make
@@ -14905,7 +17711,6 @@ maybe-check-make: check-make
  check-make:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/make && \
           $(MAKE) $(FLAGS_TO_PASS)  check)
@@ -14920,10 +17725,9 @@ maybe-install-make: install-make
  install-make: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/make && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS)  install)
  
  @endif make
  
@@ -14939,7 +17743,6 @@ info-make: \
         @[ -f ./make/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -14965,7 +17768,6 @@ dvi-make: \
         @[ -f ./make/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -14991,7 +17793,6 @@ html-make: \
         @[ -f ./make/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -15017,7 +17818,6 @@ TAGS-make: \
         @[ -f ./make/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -15044,7 +17844,6 @@ install-info-make: \
         @[ -f ./make/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -15070,7 +17869,6 @@ installcheck-make: \
         @[ -f ./make/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -15095,7 +17893,6 @@ mostlyclean-make:
         @[ -f ./make/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -15120,7 +17917,6 @@ clean-make:
         @[ -f ./make/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -15145,7 +17941,6 @@ distclean-make:
         @[ -f ./make/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -15170,7 +17965,6 @@ maintainer-clean-make:
         @[ -f ./make/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -15187,18 +17981,19 @@ maintainer-clean-make:
  @endif make
  
  
+
  .PHONY: configure-mmalloc maybe-configure-mmalloc
  maybe-configure-mmalloc:
  @if mmalloc
  maybe-configure-mmalloc: configure-mmalloc
-configure-mmalloc:
+configure-mmalloc: 
         @test ! -f $(HOST_SUBDIR)/mmalloc/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mmalloc ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       echo Configuring in mmalloc; \
-       cd $(HOST_SUBDIR)/mmalloc || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/mmalloc; \
+       cd "$(HOST_SUBDIR)/mmalloc" || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/mmalloc/ | \
@@ -15211,6 +18006,10 @@ configure-mmalloc:
           || exit 1
  @endif mmalloc
  
+
+
+
+
  .PHONY: all-mmalloc maybe-all-mmalloc
  maybe-all-mmalloc:
  @if mmalloc
@@ -15219,12 +18018,14 @@ maybe-all-mmalloc: all-mmalloc
  all-mmalloc: configure-mmalloc
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/mmalloc && \
           $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-mmalloc))
  @endif mmalloc
  
+
+
+
  .PHONY: check-mmalloc maybe-check-mmalloc
  maybe-check-mmalloc:
  @if mmalloc
@@ -15242,10 +18043,9 @@ maybe-install-mmalloc: install-mmalloc
  install-mmalloc: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/mmalloc && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS)  install)
  
  @endif mmalloc
  
@@ -15261,7 +18061,6 @@ info-mmalloc: \
         @[ -f ./mmalloc/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -15287,7 +18086,6 @@ dvi-mmalloc: \
         @[ -f ./mmalloc/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -15313,7 +18111,6 @@ html-mmalloc: \
         @[ -f ./mmalloc/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -15339,7 +18136,6 @@ TAGS-mmalloc: \
         @[ -f ./mmalloc/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -15366,7 +18162,6 @@ install-info-mmalloc: \
         @[ -f ./mmalloc/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -15392,7 +18187,6 @@ installcheck-mmalloc: \
         @[ -f ./mmalloc/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -15417,7 +18211,6 @@ mostlyclean-mmalloc:
         @[ -f ./mmalloc/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -15442,7 +18235,6 @@ clean-mmalloc:
         @[ -f ./mmalloc/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -15467,7 +18259,6 @@ distclean-mmalloc:
         @[ -f ./mmalloc/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -15492,7 +18283,6 @@ maintainer-clean-mmalloc:
         @[ -f ./mmalloc/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -15509,18 +18299,19 @@ maintainer-clean-mmalloc:
  @endif mmalloc
  
  
+
  .PHONY: configure-patch maybe-configure-patch
  maybe-configure-patch:
  @if patch
  maybe-configure-patch: configure-patch
-configure-patch:
+configure-patch: 
         @test ! -f $(HOST_SUBDIR)/patch/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/patch ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       echo Configuring in patch; \
-       cd $(HOST_SUBDIR)/patch || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/patch; \
+       cd "$(HOST_SUBDIR)/patch" || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/patch/ | \
@@ -15533,6 +18324,10 @@ configure-patch:
           || exit 1
  @endif patch
  
+
+
+
+
  .PHONY: all-patch maybe-all-patch
  maybe-all-patch:
  @if patch
@@ -15541,12 +18336,14 @@ maybe-all-patch: all-patch
  all-patch: configure-patch
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/patch && \
           $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-patch))
  @endif patch
  
+
+
+
  .PHONY: check-patch maybe-check-patch
  maybe-check-patch:
  @if patch
@@ -15555,7 +18352,6 @@ maybe-check-patch: check-patch
  check-patch:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/patch && \
           $(MAKE) $(FLAGS_TO_PASS)  check)
@@ -15570,10 +18366,9 @@ maybe-install-patch: install-patch
  install-patch: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/patch && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS)  install)
  
  @endif patch
  
@@ -15589,7 +18384,6 @@ info-patch: \
         @[ -f ./patch/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -15615,7 +18409,6 @@ dvi-patch: \
         @[ -f ./patch/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -15641,7 +18434,6 @@ html-patch: \
         @[ -f ./patch/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -15667,7 +18459,6 @@ TAGS-patch: \
         @[ -f ./patch/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -15694,7 +18485,6 @@ install-info-patch: \
         @[ -f ./patch/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -15720,7 +18510,6 @@ installcheck-patch: \
         @[ -f ./patch/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -15745,7 +18534,6 @@ mostlyclean-patch:
         @[ -f ./patch/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -15770,7 +18558,6 @@ clean-patch:
         @[ -f ./patch/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -15795,7 +18582,6 @@ distclean-patch:
         @[ -f ./patch/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -15820,7 +18606,6 @@ maintainer-clean-patch:
         @[ -f ./patch/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -15837,18 +18622,19 @@ maintainer-clean-patch:
  @endif patch
  
  
+
  .PHONY: configure-perl maybe-configure-perl
  maybe-configure-perl:
  @if perl
  maybe-configure-perl: configure-perl
-configure-perl:
+configure-perl: 
         @test ! -f $(HOST_SUBDIR)/perl/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/perl ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       echo Configuring in perl; \
-       cd $(HOST_SUBDIR)/perl || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/perl; \
+       cd "$(HOST_SUBDIR)/perl" || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/perl/ | \
@@ -15861,6 +18647,10 @@ configure-perl:
           || exit 1
  @endif perl
  
+
+
+
+
  .PHONY: all-perl maybe-all-perl
  maybe-all-perl:
  @if perl
@@ -15869,12 +18659,14 @@ maybe-all-perl: all-perl
  all-perl: configure-perl
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/perl && \
           $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-perl))
  @endif perl
  
+
+
+
  .PHONY: check-perl maybe-check-perl
  maybe-check-perl:
  @if perl
@@ -15883,7 +18675,6 @@ maybe-check-perl: check-perl
  check-perl:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/perl && \
           $(MAKE) $(FLAGS_TO_PASS)  check)
@@ -15898,10 +18689,9 @@ maybe-install-perl: install-perl
  install-perl: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/perl && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS)  install)
  
  @endif perl
  
@@ -15917,7 +18707,6 @@ info-perl: \
         @[ -f ./perl/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -15943,7 +18732,6 @@ dvi-perl: \
         @[ -f ./perl/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -15969,7 +18757,6 @@ html-perl: \
         @[ -f ./perl/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -15995,7 +18782,6 @@ TAGS-perl: \
         @[ -f ./perl/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -16022,7 +18808,6 @@ install-info-perl: \
         @[ -f ./perl/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -16048,7 +18833,6 @@ installcheck-perl: \
         @[ -f ./perl/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -16073,7 +18857,6 @@ mostlyclean-perl:
         @[ -f ./perl/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -16098,7 +18881,6 @@ clean-perl:
         @[ -f ./perl/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -16123,7 +18905,6 @@ distclean-perl:
         @[ -f ./perl/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -16148,7 +18929,6 @@ maintainer-clean-perl:
         @[ -f ./perl/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -16165,18 +18945,19 @@ maintainer-clean-perl:
  @endif perl
  
  
+
  .PHONY: configure-prms maybe-configure-prms
  maybe-configure-prms:
  @if prms
  maybe-configure-prms: configure-prms
-configure-prms:
+configure-prms: 
         @test ! -f $(HOST_SUBDIR)/prms/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/prms ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       echo Configuring in prms; \
-       cd $(HOST_SUBDIR)/prms || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/prms; \
+       cd "$(HOST_SUBDIR)/prms" || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/prms/ | \
@@ -16189,6 +18970,10 @@ configure-prms:
           || exit 1
  @endif prms
  
+
+
+
+
  .PHONY: all-prms maybe-all-prms
  maybe-all-prms:
  @if prms
@@ -16197,12 +18982,14 @@ maybe-all-prms: all-prms
  all-prms: configure-prms
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/prms && \
           $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-prms))
  @endif prms
  
+
+
+
  .PHONY: check-prms maybe-check-prms
  maybe-check-prms:
  @if prms
@@ -16211,7 +18998,6 @@ maybe-check-prms: check-prms
  check-prms:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/prms && \
           $(MAKE) $(FLAGS_TO_PASS)  check)
@@ -16226,10 +19012,9 @@ maybe-install-prms: install-prms
  install-prms: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/prms && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS)  install)
  
  @endif prms
  
@@ -16245,7 +19030,6 @@ info-prms: \
         @[ -f ./prms/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -16271,7 +19055,6 @@ dvi-prms: \
         @[ -f ./prms/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -16297,7 +19080,6 @@ html-prms: \
         @[ -f ./prms/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -16323,7 +19105,6 @@ TAGS-prms: \
         @[ -f ./prms/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -16350,7 +19131,6 @@ install-info-prms: \
         @[ -f ./prms/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -16376,7 +19156,6 @@ installcheck-prms: \
         @[ -f ./prms/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -16401,7 +19180,6 @@ mostlyclean-prms:
         @[ -f ./prms/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -16426,7 +19204,6 @@ clean-prms:
         @[ -f ./prms/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -16451,7 +19228,6 @@ distclean-prms:
         @[ -f ./prms/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -16476,7 +19252,6 @@ maintainer-clean-prms:
         @[ -f ./prms/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -16493,18 +19268,19 @@ maintainer-clean-prms:
  @endif prms
  
  
+
  .PHONY: configure-rcs maybe-configure-rcs
  maybe-configure-rcs:
  @if rcs
  maybe-configure-rcs: configure-rcs
-configure-rcs:
+configure-rcs: 
         @test ! -f $(HOST_SUBDIR)/rcs/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/rcs ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       echo Configuring in rcs; \
-       cd $(HOST_SUBDIR)/rcs || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/rcs; \
+       cd "$(HOST_SUBDIR)/rcs" || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/rcs/ | \
@@ -16517,6 +19293,10 @@ configure-rcs:
           || exit 1
  @endif rcs
  
+
+
+
+
  .PHONY: all-rcs maybe-all-rcs
  maybe-all-rcs:
  @if rcs
@@ -16525,12 +19305,14 @@ maybe-all-rcs: all-rcs
  all-rcs: configure-rcs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/rcs && \
           $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-rcs))
  @endif rcs
  
+
+
+
  .PHONY: check-rcs maybe-check-rcs
  maybe-check-rcs:
  @if rcs
@@ -16539,7 +19321,6 @@ maybe-check-rcs: check-rcs
  check-rcs:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/rcs && \
           $(MAKE) $(FLAGS_TO_PASS)  check)
@@ -16554,10 +19335,9 @@ maybe-install-rcs: install-rcs
  install-rcs: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/rcs && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS)  install)
  
  @endif rcs
  
@@ -16573,7 +19353,6 @@ info-rcs: \
         @[ -f ./rcs/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -16599,7 +19378,6 @@ dvi-rcs: \
         @[ -f ./rcs/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -16625,7 +19403,6 @@ html-rcs: \
         @[ -f ./rcs/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -16651,7 +19428,6 @@ TAGS-rcs: \
         @[ -f ./rcs/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -16678,7 +19454,6 @@ install-info-rcs: \
         @[ -f ./rcs/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -16704,7 +19479,6 @@ installcheck-rcs: \
         @[ -f ./rcs/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -16729,7 +19503,6 @@ mostlyclean-rcs:
         @[ -f ./rcs/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -16754,7 +19527,6 @@ clean-rcs:
         @[ -f ./rcs/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -16779,7 +19551,6 @@ distclean-rcs:
         @[ -f ./rcs/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -16804,7 +19575,6 @@ maintainer-clean-rcs:
         @[ -f ./rcs/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -16821,18 +19591,19 @@ maintainer-clean-rcs:
  @endif rcs
  
  
+
  .PHONY: configure-readline maybe-configure-readline
  maybe-configure-readline:
  @if readline
  maybe-configure-readline: configure-readline
-configure-readline:
+configure-readline: 
         @test ! -f $(HOST_SUBDIR)/readline/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/readline ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       echo Configuring in readline; \
-       cd $(HOST_SUBDIR)/readline || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/readline; \
+       cd "$(HOST_SUBDIR)/readline" || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/readline/ | \
@@ -16845,6 +19616,10 @@ configure-readline:
           || exit 1
  @endif readline
  
+
+
+
+
  .PHONY: all-readline maybe-all-readline
  maybe-all-readline:
  @if readline
@@ -16853,12 +19628,14 @@ maybe-all-readline: all-readline
  all-readline: configure-readline
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/readline && \
           $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-readline))
  @endif readline
  
+
+
+
  .PHONY: check-readline maybe-check-readline
  maybe-check-readline:
  @if readline
@@ -16867,7 +19644,6 @@ maybe-check-readline: check-readline
  check-readline:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/readline && \
           $(MAKE) $(FLAGS_TO_PASS)  check)
@@ -16882,10 +19658,9 @@ maybe-install-readline: install-readline
  install-readline: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/readline && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS)  install)
  
  @endif readline
  
@@ -16901,7 +19676,6 @@ info-readline: \
         @[ -f ./readline/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -16927,7 +19701,6 @@ dvi-readline: \
         @[ -f ./readline/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -16953,7 +19726,6 @@ html-readline: \
         @[ -f ./readline/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -16979,7 +19751,6 @@ TAGS-readline: \
         @[ -f ./readline/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -17006,7 +19777,6 @@ install-info-readline: \
         @[ -f ./readline/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -17032,7 +19802,6 @@ installcheck-readline: \
         @[ -f ./readline/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -17057,7 +19826,6 @@ mostlyclean-readline:
         @[ -f ./readline/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -17082,7 +19850,6 @@ clean-readline:
         @[ -f ./readline/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -17107,7 +19874,6 @@ distclean-readline:
         @[ -f ./readline/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -17132,7 +19898,6 @@ maintainer-clean-readline:
         @[ -f ./readline/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -17149,18 +19914,19 @@ maintainer-clean-readline:
  @endif readline
  
  
+
  .PHONY: configure-release maybe-configure-release
  maybe-configure-release:
  @if release
  maybe-configure-release: configure-release
-configure-release:
+configure-release: 
         @test ! -f $(HOST_SUBDIR)/release/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/release ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       echo Configuring in release; \
-       cd $(HOST_SUBDIR)/release || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/release; \
+       cd "$(HOST_SUBDIR)/release" || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/release/ | \
@@ -17173,6 +19939,10 @@ configure-release:
           || exit 1
  @endif release
  
+
+
+
+
  .PHONY: all-release maybe-all-release
  maybe-all-release:
  @if release
@@ -17181,12 +19951,14 @@ maybe-all-release: all-release
  all-release: configure-release
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/release && \
           $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-release))
  @endif release
  
+
+
+
  .PHONY: check-release maybe-check-release
  maybe-check-release:
  @if release
@@ -17217,7 +19989,6 @@ info-release: \
         @[ -f ./release/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -17243,7 +20014,6 @@ dvi-release: \
         @[ -f ./release/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -17269,7 +20039,6 @@ html-release: \
         @[ -f ./release/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -17295,7 +20064,6 @@ TAGS-release: \
         @[ -f ./release/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -17322,7 +20090,6 @@ install-info-release: \
         @[ -f ./release/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -17348,7 +20115,6 @@ installcheck-release: \
         @[ -f ./release/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -17373,7 +20139,6 @@ mostlyclean-release:
         @[ -f ./release/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -17398,7 +20163,6 @@ clean-release:
         @[ -f ./release/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -17423,7 +20187,6 @@ distclean-release:
         @[ -f ./release/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -17448,7 +20211,6 @@ maintainer-clean-release:
         @[ -f ./release/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -17465,18 +20227,19 @@ maintainer-clean-release:
  @endif release
  
  
+
  .PHONY: configure-recode maybe-configure-recode
  maybe-configure-recode:
  @if recode
  maybe-configure-recode: configure-recode
-configure-recode:
+configure-recode: 
         @test ! -f $(HOST_SUBDIR)/recode/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/recode ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       echo Configuring in recode; \
-       cd $(HOST_SUBDIR)/recode || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/recode; \
+       cd "$(HOST_SUBDIR)/recode" || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/recode/ | \
@@ -17489,6 +20252,10 @@ configure-recode:
           || exit 1
  @endif recode
  
+
+
+
+
  .PHONY: all-recode maybe-all-recode
  maybe-all-recode:
  @if recode
@@ -17497,12 +20264,14 @@ maybe-all-recode: all-recode
  all-recode: configure-recode
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/recode && \
           $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-recode))
  @endif recode
  
+
+
+
  .PHONY: check-recode maybe-check-recode
  maybe-check-recode:
  @if recode
@@ -17511,7 +20280,6 @@ maybe-check-recode: check-recode
  check-recode:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/recode && \
           $(MAKE) $(FLAGS_TO_PASS)  check)
@@ -17526,10 +20294,9 @@ maybe-install-recode: install-recode
  install-recode: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/recode && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS)  install)
  
  @endif recode
  
@@ -17545,7 +20312,6 @@ info-recode: \
         @[ -f ./recode/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -17571,7 +20337,6 @@ dvi-recode: \
         @[ -f ./recode/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -17597,7 +20362,6 @@ html-recode: \
         @[ -f ./recode/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -17623,7 +20387,6 @@ TAGS-recode: \
         @[ -f ./recode/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -17650,7 +20413,6 @@ install-info-recode: \
         @[ -f ./recode/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -17676,7 +20438,6 @@ installcheck-recode: \
         @[ -f ./recode/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -17701,7 +20462,6 @@ mostlyclean-recode:
         @[ -f ./recode/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -17726,7 +20486,6 @@ clean-recode:
         @[ -f ./recode/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -17751,7 +20510,6 @@ distclean-recode:
         @[ -f ./recode/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -17776,7 +20534,6 @@ maintainer-clean-recode:
         @[ -f ./recode/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -17793,18 +20550,19 @@ maintainer-clean-recode:
  @endif recode
  
  
+
  .PHONY: configure-sed maybe-configure-sed
  maybe-configure-sed:
  @if sed
  maybe-configure-sed: configure-sed
-configure-sed:
+configure-sed: 
         @test ! -f $(HOST_SUBDIR)/sed/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/sed ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       echo Configuring in sed; \
-       cd $(HOST_SUBDIR)/sed || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/sed; \
+       cd "$(HOST_SUBDIR)/sed" || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/sed/ | \
@@ -17817,6 +20575,10 @@ configure-sed:
           || exit 1
  @endif sed
  
+
+
+
+
  .PHONY: all-sed maybe-all-sed
  maybe-all-sed:
  @if sed
@@ -17825,12 +20587,14 @@ maybe-all-sed: all-sed
  all-sed: configure-sed
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/sed && \
           $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-sed))
  @endif sed
  
+
+
+
  .PHONY: check-sed maybe-check-sed
  maybe-check-sed:
  @if sed
@@ -17839,7 +20603,6 @@ maybe-check-sed: check-sed
  check-sed:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/sed && \
           $(MAKE) $(FLAGS_TO_PASS)  check)
@@ -17854,10 +20617,9 @@ maybe-install-sed: install-sed
  install-sed: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/sed && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS)  install)
  
  @endif sed
  
@@ -17873,7 +20635,6 @@ info-sed: \
         @[ -f ./sed/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -17899,7 +20660,6 @@ dvi-sed: \
         @[ -f ./sed/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -17925,7 +20685,6 @@ html-sed: \
         @[ -f ./sed/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -17951,7 +20710,6 @@ TAGS-sed: \
         @[ -f ./sed/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -17978,7 +20736,6 @@ install-info-sed: \
         @[ -f ./sed/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -18004,7 +20761,6 @@ installcheck-sed: \
         @[ -f ./sed/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -18029,7 +20785,6 @@ mostlyclean-sed:
         @[ -f ./sed/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -18054,7 +20809,6 @@ clean-sed:
         @[ -f ./sed/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -18079,7 +20833,6 @@ distclean-sed:
         @[ -f ./sed/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -18104,7 +20857,6 @@ maintainer-clean-sed:
         @[ -f ./sed/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -18121,18 +20873,19 @@ maintainer-clean-sed:
  @endif sed
  
  
+
  .PHONY: configure-send-pr maybe-configure-send-pr
  maybe-configure-send-pr:
  @if send-pr
  maybe-configure-send-pr: configure-send-pr
-configure-send-pr:
+configure-send-pr: 
         @test ! -f $(HOST_SUBDIR)/send-pr/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/send-pr ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       echo Configuring in send-pr; \
-       cd $(HOST_SUBDIR)/send-pr || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/send-pr; \
+       cd "$(HOST_SUBDIR)/send-pr" || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/send-pr/ | \
@@ -18145,6 +20898,10 @@ configure-send-pr:
           || exit 1
  @endif send-pr
  
+
+
+
+
  .PHONY: all-send-pr maybe-all-send-pr
  maybe-all-send-pr:
  @if send-pr
@@ -18153,12 +20910,14 @@ maybe-all-send-pr: all-send-pr
  all-send-pr: configure-send-pr
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/send-pr && \
           $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-send-pr))
  @endif send-pr
  
+
+
+
  .PHONY: check-send-pr maybe-check-send-pr
  maybe-check-send-pr:
  @if send-pr
@@ -18167,7 +20926,6 @@ maybe-check-send-pr: check-send-pr
  check-send-pr:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/send-pr && \
           $(MAKE) $(FLAGS_TO_PASS)  check)
@@ -18182,10 +20940,9 @@ maybe-install-send-pr: install-send-pr
  install-send-pr: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/send-pr && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS)  install)
  
  @endif send-pr
  
@@ -18201,7 +20958,6 @@ info-send-pr: \
         @[ -f ./send-pr/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -18227,7 +20983,6 @@ dvi-send-pr: \
         @[ -f ./send-pr/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -18253,7 +21008,6 @@ html-send-pr: \
         @[ -f ./send-pr/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -18279,7 +21033,6 @@ TAGS-send-pr: \
         @[ -f ./send-pr/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -18306,7 +21059,6 @@ install-info-send-pr: \
         @[ -f ./send-pr/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -18332,7 +21084,6 @@ installcheck-send-pr: \
         @[ -f ./send-pr/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -18357,7 +21108,6 @@ mostlyclean-send-pr:
         @[ -f ./send-pr/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -18382,7 +21132,6 @@ clean-send-pr:
         @[ -f ./send-pr/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -18407,7 +21156,6 @@ distclean-send-pr:
         @[ -f ./send-pr/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -18432,7 +21180,6 @@ maintainer-clean-send-pr:
         @[ -f ./send-pr/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -18449,18 +21196,19 @@ maintainer-clean-send-pr:
  @endif send-pr
  
  
+
  .PHONY: configure-shellutils maybe-configure-shellutils
  maybe-configure-shellutils:
  @if shellutils
  maybe-configure-shellutils: configure-shellutils
-configure-shellutils:
+configure-shellutils: 
         @test ! -f $(HOST_SUBDIR)/shellutils/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/shellutils ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       echo Configuring in shellutils; \
-       cd $(HOST_SUBDIR)/shellutils || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/shellutils; \
+       cd "$(HOST_SUBDIR)/shellutils" || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/shellutils/ | \
@@ -18473,6 +21221,10 @@ configure-shellutils:
           || exit 1
  @endif shellutils
  
+
+
+
+
  .PHONY: all-shellutils maybe-all-shellutils
  maybe-all-shellutils:
  @if shellutils
@@ -18481,12 +21233,14 @@ maybe-all-shellutils: all-shellutils
  all-shellutils: configure-shellutils
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/shellutils && \
           $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-shellutils))
  @endif shellutils
  
+
+
+
  .PHONY: check-shellutils maybe-check-shellutils
  maybe-check-shellutils:
  @if shellutils
@@ -18495,7 +21249,6 @@ maybe-check-shellutils: check-shellutils
  check-shellutils:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/shellutils && \
           $(MAKE) $(FLAGS_TO_PASS)  check)
@@ -18510,10 +21263,9 @@ maybe-install-shellutils: install-shellutils
  install-shellutils: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/shellutils && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS)  install)
  
  @endif shellutils
  
@@ -18529,7 +21281,6 @@ info-shellutils: \
         @[ -f ./shellutils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -18555,7 +21306,6 @@ dvi-shellutils: \
         @[ -f ./shellutils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -18581,7 +21331,6 @@ html-shellutils: \
         @[ -f ./shellutils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -18607,7 +21356,6 @@ TAGS-shellutils: \
         @[ -f ./shellutils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -18634,7 +21382,6 @@ install-info-shellutils: \
         @[ -f ./shellutils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -18660,7 +21407,6 @@ installcheck-shellutils: \
         @[ -f ./shellutils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -18685,7 +21431,6 @@ mostlyclean-shellutils:
         @[ -f ./shellutils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -18710,7 +21455,6 @@ clean-shellutils:
         @[ -f ./shellutils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -18735,7 +21479,6 @@ distclean-shellutils:
         @[ -f ./shellutils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -18760,7 +21503,6 @@ maintainer-clean-shellutils:
         @[ -f ./shellutils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -18777,18 +21519,19 @@ maintainer-clean-shellutils:
  @endif shellutils
  
  
+
  .PHONY: configure-sid maybe-configure-sid
  maybe-configure-sid:
  @if sid
  maybe-configure-sid: configure-sid
-configure-sid:
+configure-sid: 
         @test ! -f $(HOST_SUBDIR)/sid/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/sid ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       echo Configuring in sid; \
-       cd $(HOST_SUBDIR)/sid || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/sid; \
+       cd "$(HOST_SUBDIR)/sid" || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/sid/ | \
@@ -18801,6 +21544,10 @@ configure-sid:
           || exit 1
  @endif sid
  
+
+
+
+
  .PHONY: all-sid maybe-all-sid
  maybe-all-sid:
  @if sid
@@ -18809,12 +21556,14 @@ maybe-all-sid: all-sid
  all-sid: configure-sid
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/sid && \
           $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-sid))
  @endif sid
  
+
+
+
  .PHONY: check-sid maybe-check-sid
  maybe-check-sid:
  @if sid
@@ -18823,7 +21572,6 @@ maybe-check-sid: check-sid
  check-sid:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/sid && \
           $(MAKE) $(FLAGS_TO_PASS)  check)
@@ -18838,10 +21586,9 @@ maybe-install-sid: install-sid
  install-sid: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/sid && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS)  install)
  
  @endif sid
  
@@ -18857,7 +21604,6 @@ info-sid: \
         @[ -f ./sid/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -18883,7 +21629,6 @@ dvi-sid: \
         @[ -f ./sid/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -18909,7 +21654,6 @@ html-sid: \
         @[ -f ./sid/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -18935,7 +21679,6 @@ TAGS-sid: \
         @[ -f ./sid/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -18962,7 +21705,6 @@ install-info-sid: \
         @[ -f ./sid/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -18988,7 +21730,6 @@ installcheck-sid: \
         @[ -f ./sid/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -19013,7 +21754,6 @@ mostlyclean-sid:
         @[ -f ./sid/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -19038,7 +21778,6 @@ clean-sid:
         @[ -f ./sid/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -19063,7 +21802,6 @@ distclean-sid:
         @[ -f ./sid/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -19088,7 +21826,6 @@ maintainer-clean-sid:
         @[ -f ./sid/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -19105,18 +21842,19 @@ maintainer-clean-sid:
  @endif sid
  
  
+
  .PHONY: configure-sim maybe-configure-sim
  maybe-configure-sim:
  @if sim
  maybe-configure-sim: configure-sim
-configure-sim:
+configure-sim: 
         @test ! -f $(HOST_SUBDIR)/sim/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/sim ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       echo Configuring in sim; \
-       cd $(HOST_SUBDIR)/sim || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/sim; \
+       cd "$(HOST_SUBDIR)/sim" || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/sim/ | \
@@ -19129,6 +21867,10 @@ configure-sim:
           || exit 1
  @endif sim
  
+
+
+
+
  .PHONY: all-sim maybe-all-sim
  maybe-all-sim:
  @if sim
@@ -19137,12 +21879,14 @@ maybe-all-sim: all-sim
  all-sim: configure-sim
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/sim && \
           $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-sim))
  @endif sim
  
+
+
+
  .PHONY: check-sim maybe-check-sim
  maybe-check-sim:
  @if sim
@@ -19151,7 +21895,6 @@ maybe-check-sim: check-sim
  check-sim:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/sim && \
           $(MAKE) $(FLAGS_TO_PASS)  check)
@@ -19166,10 +21909,9 @@ maybe-install-sim: install-sim
  install-sim: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/sim && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS)  install)
  
  @endif sim
  
@@ -19185,7 +21927,6 @@ info-sim: \
         @[ -f ./sim/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -19211,7 +21952,6 @@ dvi-sim: \
         @[ -f ./sim/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -19237,7 +21977,6 @@ html-sim: \
         @[ -f ./sim/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -19263,7 +22002,6 @@ TAGS-sim: \
         @[ -f ./sim/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -19290,7 +22028,6 @@ install-info-sim: \
         @[ -f ./sim/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -19316,7 +22053,6 @@ installcheck-sim: \
         @[ -f ./sim/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -19341,7 +22077,6 @@ mostlyclean-sim:
         @[ -f ./sim/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -19366,7 +22101,6 @@ clean-sim:
         @[ -f ./sim/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -19391,7 +22125,6 @@ distclean-sim:
         @[ -f ./sim/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -19416,7 +22149,6 @@ maintainer-clean-sim:
         @[ -f ./sim/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -19433,18 +22165,19 @@ maintainer-clean-sim:
  @endif sim
  
  
+
  .PHONY: configure-tar maybe-configure-tar
  maybe-configure-tar:
  @if tar
  maybe-configure-tar: configure-tar
-configure-tar:
+configure-tar: 
         @test ! -f $(HOST_SUBDIR)/tar/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/tar ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       echo Configuring in tar; \
-       cd $(HOST_SUBDIR)/tar || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/tar; \
+       cd "$(HOST_SUBDIR)/tar" || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/tar/ | \
@@ -19457,6 +22190,10 @@ configure-tar:
           || exit 1
  @endif tar
  
+
+
+
+
  .PHONY: all-tar maybe-all-tar
  maybe-all-tar:
  @if tar
@@ -19465,12 +22202,14 @@ maybe-all-tar: all-tar
  all-tar: configure-tar
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/tar && \
           $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-tar))
  @endif tar
  
+
+
+
  .PHONY: check-tar maybe-check-tar
  maybe-check-tar:
  @if tar
@@ -19479,7 +22218,6 @@ maybe-check-tar: check-tar
  check-tar:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/tar && \
           $(MAKE) $(FLAGS_TO_PASS)  check)
@@ -19494,10 +22232,9 @@ maybe-install-tar: install-tar
  install-tar: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/tar && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS)  install)
  
  @endif tar
  
@@ -19513,7 +22250,6 @@ info-tar: \
         @[ -f ./tar/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -19539,7 +22275,6 @@ dvi-tar: \
         @[ -f ./tar/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -19565,7 +22300,6 @@ html-tar: \
         @[ -f ./tar/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -19591,7 +22325,6 @@ TAGS-tar: \
         @[ -f ./tar/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -19618,7 +22351,6 @@ install-info-tar: \
         @[ -f ./tar/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -19644,7 +22376,6 @@ installcheck-tar: \
         @[ -f ./tar/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -19669,7 +22400,6 @@ mostlyclean-tar:
         @[ -f ./tar/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -19694,7 +22424,6 @@ clean-tar:
         @[ -f ./tar/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -19719,7 +22448,6 @@ distclean-tar:
         @[ -f ./tar/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -19744,7 +22472,6 @@ maintainer-clean-tar:
         @[ -f ./tar/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -19761,18 +22488,19 @@ maintainer-clean-tar:
  @endif tar
  
  
+
  .PHONY: configure-texinfo maybe-configure-texinfo
  maybe-configure-texinfo:
  @if texinfo
  maybe-configure-texinfo: configure-texinfo
-configure-texinfo:
+configure-texinfo: 
         @test ! -f $(HOST_SUBDIR)/texinfo/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/texinfo ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       echo Configuring in texinfo; \
-       cd $(HOST_SUBDIR)/texinfo || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/texinfo; \
+       cd "$(HOST_SUBDIR)/texinfo" || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/texinfo/ | \
@@ -19785,6 +22513,10 @@ configure-texinfo:
           || exit 1
  @endif texinfo
  
+
+
+
+
  .PHONY: all-texinfo maybe-all-texinfo
  maybe-all-texinfo:
  @if texinfo
@@ -19793,12 +22525,14 @@ maybe-all-texinfo: all-texinfo
  all-texinfo: configure-texinfo
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/texinfo && \
           $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-texinfo))
  @endif texinfo
  
+
+
+
  .PHONY: check-texinfo maybe-check-texinfo
  maybe-check-texinfo:
  @if texinfo
@@ -19807,7 +22541,6 @@ maybe-check-texinfo: check-texinfo
  check-texinfo:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/texinfo && \
           $(MAKE) $(FLAGS_TO_PASS)  check)
@@ -19835,7 +22568,6 @@ info-texinfo: \
         @[ -f ./texinfo/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -19861,7 +22593,6 @@ dvi-texinfo: \
         @[ -f ./texinfo/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -19887,7 +22618,6 @@ html-texinfo: \
         @[ -f ./texinfo/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -19913,7 +22643,6 @@ TAGS-texinfo: \
         @[ -f ./texinfo/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -19940,7 +22669,6 @@ install-info-texinfo: \
         @[ -f ./texinfo/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -19966,7 +22694,6 @@ installcheck-texinfo: \
         @[ -f ./texinfo/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -19991,7 +22718,6 @@ mostlyclean-texinfo:
         @[ -f ./texinfo/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -20016,7 +22742,6 @@ clean-texinfo:
         @[ -f ./texinfo/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -20041,7 +22766,6 @@ distclean-texinfo:
         @[ -f ./texinfo/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -20066,7 +22790,6 @@ maintainer-clean-texinfo:
         @[ -f ./texinfo/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -20083,18 +22806,19 @@ maintainer-clean-texinfo:
  @endif texinfo
  
  
+
  .PHONY: configure-textutils maybe-configure-textutils
  maybe-configure-textutils:
  @if textutils
  maybe-configure-textutils: configure-textutils
-configure-textutils:
+configure-textutils: 
         @test ! -f $(HOST_SUBDIR)/textutils/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/textutils ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       echo Configuring in textutils; \
-       cd $(HOST_SUBDIR)/textutils || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/textutils; \
+       cd "$(HOST_SUBDIR)/textutils" || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/textutils/ | \
@@ -20107,6 +22831,10 @@ configure-textutils:
           || exit 1
  @endif textutils
  
+
+
+
+
  .PHONY: all-textutils maybe-all-textutils
  maybe-all-textutils:
  @if textutils
@@ -20115,12 +22843,14 @@ maybe-all-textutils: all-textutils
  all-textutils: configure-textutils
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/textutils && \
           $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-textutils))
  @endif textutils
  
+
+
+
  .PHONY: check-textutils maybe-check-textutils
  maybe-check-textutils:
  @if textutils
@@ -20129,7 +22859,6 @@ maybe-check-textutils: check-textutils
  check-textutils:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/textutils && \
           $(MAKE) $(FLAGS_TO_PASS)  check)
@@ -20144,10 +22873,9 @@ maybe-install-textutils: install-textutils
  install-textutils: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/textutils && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS)  install)
  
  @endif textutils
  
@@ -20163,7 +22891,6 @@ info-textutils: \
         @[ -f ./textutils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -20189,7 +22916,6 @@ dvi-textutils: \
         @[ -f ./textutils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -20215,7 +22941,6 @@ html-textutils: \
         @[ -f ./textutils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -20241,7 +22966,6 @@ TAGS-textutils: \
         @[ -f ./textutils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -20268,7 +22992,6 @@ install-info-textutils: \
         @[ -f ./textutils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -20294,7 +23017,6 @@ installcheck-textutils: \
         @[ -f ./textutils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -20319,7 +23041,6 @@ mostlyclean-textutils:
         @[ -f ./textutils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -20344,7 +23065,6 @@ clean-textutils:
         @[ -f ./textutils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -20369,7 +23089,6 @@ distclean-textutils:
         @[ -f ./textutils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -20394,7 +23113,6 @@ maintainer-clean-textutils:
         @[ -f ./textutils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -20411,18 +23129,19 @@ maintainer-clean-textutils:
  @endif textutils
  
  
+
  .PHONY: configure-time maybe-configure-time
  maybe-configure-time:
  @if time
  maybe-configure-time: configure-time
-configure-time:
+configure-time: 
         @test ! -f $(HOST_SUBDIR)/time/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/time ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       echo Configuring in time; \
-       cd $(HOST_SUBDIR)/time || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/time; \
+       cd "$(HOST_SUBDIR)/time" || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/time/ | \
@@ -20435,6 +23154,10 @@ configure-time:
           || exit 1
  @endif time
  
+
+
+
+
  .PHONY: all-time maybe-all-time
  maybe-all-time:
  @if time
@@ -20443,12 +23166,14 @@ maybe-all-time: all-time
  all-time: configure-time
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/time && \
           $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-time))
  @endif time
  
+
+
+
  .PHONY: check-time maybe-check-time
  maybe-check-time:
  @if time
@@ -20457,7 +23182,6 @@ maybe-check-time: check-time
  check-time:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/time && \
           $(MAKE) $(FLAGS_TO_PASS)  check)
@@ -20472,10 +23196,9 @@ maybe-install-time: install-time
  install-time: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/time && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS)  install)
  
  @endif time
  
@@ -20491,7 +23214,6 @@ info-time: \
         @[ -f ./time/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -20517,7 +23239,6 @@ dvi-time: \
         @[ -f ./time/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -20543,7 +23264,6 @@ html-time: \
         @[ -f ./time/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -20569,7 +23289,6 @@ TAGS-time: \
         @[ -f ./time/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -20596,7 +23315,6 @@ install-info-time: \
         @[ -f ./time/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -20622,7 +23340,6 @@ installcheck-time: \
         @[ -f ./time/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -20647,7 +23364,6 @@ mostlyclean-time:
         @[ -f ./time/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -20672,7 +23388,6 @@ clean-time:
         @[ -f ./time/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -20697,7 +23412,6 @@ distclean-time:
         @[ -f ./time/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -20722,7 +23436,6 @@ maintainer-clean-time:
         @[ -f ./time/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -20739,18 +23452,19 @@ maintainer-clean-time:
  @endif time
  
  
+
  .PHONY: configure-uudecode maybe-configure-uudecode
  maybe-configure-uudecode:
  @if uudecode
  maybe-configure-uudecode: configure-uudecode
-configure-uudecode:
+configure-uudecode: 
         @test ! -f $(HOST_SUBDIR)/uudecode/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/uudecode ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       echo Configuring in uudecode; \
-       cd $(HOST_SUBDIR)/uudecode || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/uudecode; \
+       cd "$(HOST_SUBDIR)/uudecode" || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/uudecode/ | \
@@ -20763,6 +23477,10 @@ configure-uudecode:
           || exit 1
  @endif uudecode
  
+
+
+
+
  .PHONY: all-uudecode maybe-all-uudecode
  maybe-all-uudecode:
  @if uudecode
@@ -20771,12 +23489,14 @@ maybe-all-uudecode: all-uudecode
  all-uudecode: configure-uudecode
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/uudecode && \
           $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-uudecode))
  @endif uudecode
  
+
+
+
  .PHONY: check-uudecode maybe-check-uudecode
  maybe-check-uudecode:
  @if uudecode
@@ -20785,7 +23505,6 @@ maybe-check-uudecode: check-uudecode
  check-uudecode:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/uudecode && \
           $(MAKE) $(FLAGS_TO_PASS)  check)
@@ -20800,10 +23519,9 @@ maybe-install-uudecode: install-uudecode
  install-uudecode: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/uudecode && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS)  install)
  
  @endif uudecode
  
@@ -20819,7 +23537,6 @@ info-uudecode: \
         @[ -f ./uudecode/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -20845,7 +23562,6 @@ dvi-uudecode: \
         @[ -f ./uudecode/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -20871,7 +23587,6 @@ html-uudecode: \
         @[ -f ./uudecode/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -20897,7 +23612,6 @@ TAGS-uudecode: \
         @[ -f ./uudecode/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -20924,7 +23638,6 @@ install-info-uudecode: \
         @[ -f ./uudecode/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -20950,7 +23663,6 @@ installcheck-uudecode: \
         @[ -f ./uudecode/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -20975,7 +23687,6 @@ mostlyclean-uudecode:
         @[ -f ./uudecode/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -21000,7 +23711,6 @@ clean-uudecode:
         @[ -f ./uudecode/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -21025,7 +23735,6 @@ distclean-uudecode:
         @[ -f ./uudecode/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -21050,7 +23759,6 @@ maintainer-clean-uudecode:
         @[ -f ./uudecode/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -21067,18 +23775,19 @@ maintainer-clean-uudecode:
  @endif uudecode
  
  
+
  .PHONY: configure-wdiff maybe-configure-wdiff
  maybe-configure-wdiff:
  @if wdiff
  maybe-configure-wdiff: configure-wdiff
-configure-wdiff:
+configure-wdiff: 
         @test ! -f $(HOST_SUBDIR)/wdiff/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/wdiff ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       echo Configuring in wdiff; \
-       cd $(HOST_SUBDIR)/wdiff || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/wdiff; \
+       cd "$(HOST_SUBDIR)/wdiff" || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/wdiff/ | \
@@ -21091,6 +23800,10 @@ configure-wdiff:
           || exit 1
  @endif wdiff
  
+
+
+
+
  .PHONY: all-wdiff maybe-all-wdiff
  maybe-all-wdiff:
  @if wdiff
@@ -21099,12 +23812,14 @@ maybe-all-wdiff: all-wdiff
  all-wdiff: configure-wdiff
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/wdiff && \
           $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-wdiff))
  @endif wdiff
  
+
+
+
  .PHONY: check-wdiff maybe-check-wdiff
  maybe-check-wdiff:
  @if wdiff
@@ -21113,7 +23828,6 @@ maybe-check-wdiff: check-wdiff
  check-wdiff:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/wdiff && \
           $(MAKE) $(FLAGS_TO_PASS)  check)
@@ -21128,10 +23842,9 @@ maybe-install-wdiff: install-wdiff
  install-wdiff: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/wdiff && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS)  install)
  
  @endif wdiff
  
@@ -21147,7 +23860,6 @@ info-wdiff: \
         @[ -f ./wdiff/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -21173,7 +23885,6 @@ dvi-wdiff: \
         @[ -f ./wdiff/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -21199,7 +23910,6 @@ html-wdiff: \
         @[ -f ./wdiff/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -21225,7 +23935,6 @@ TAGS-wdiff: \
         @[ -f ./wdiff/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -21252,7 +23961,6 @@ install-info-wdiff: \
         @[ -f ./wdiff/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -21278,7 +23986,6 @@ installcheck-wdiff: \
         @[ -f ./wdiff/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -21303,7 +24010,6 @@ mostlyclean-wdiff:
         @[ -f ./wdiff/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -21328,7 +24034,6 @@ clean-wdiff:
         @[ -f ./wdiff/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -21353,7 +24058,6 @@ distclean-wdiff:
         @[ -f ./wdiff/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -21378,7 +24082,6 @@ maintainer-clean-wdiff:
         @[ -f ./wdiff/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -21395,18 +24098,19 @@ maintainer-clean-wdiff:
  @endif wdiff
  
  
+
  .PHONY: configure-zip maybe-configure-zip
  maybe-configure-zip:
  @if zip
  maybe-configure-zip: configure-zip
-configure-zip:
+configure-zip: 
         @test ! -f $(HOST_SUBDIR)/zip/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zip ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       echo Configuring in zip; \
-       cd $(HOST_SUBDIR)/zip || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/zip; \
+       cd "$(HOST_SUBDIR)/zip" || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/zip/ | \
@@ -21419,6 +24123,10 @@ configure-zip:
           || exit 1
  @endif zip
  
+
+
+
+
  .PHONY: all-zip maybe-all-zip
  maybe-all-zip:
  @if zip
@@ -21427,12 +24135,14 @@ maybe-all-zip: all-zip
  all-zip: configure-zip
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/zip && \
           $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-zip))
  @endif zip
  
+
+
+
  .PHONY: check-zip maybe-check-zip
  maybe-check-zip:
  @if zip
@@ -21443,10 +24153,9 @@ check-zip:
         @if [ '$(host)' = '$(target)' ] ; then \
           r=`${PWD_COMMAND}`; export r; \
           s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-         $(SET_LIB_PATH) \
           $(HOST_EXPORTS) \
           (cd $(HOST_SUBDIR)/zip && \
-           $(MAKE) $(FLAGS_TO_PASS)  check)
+           $(MAKE) $(FLAGS_TO_PASS)  check); \
         fi
  
  @endif zip
@@ -21459,10 +24168,9 @@ maybe-install-zip: install-zip
  install-zip: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/zip && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS)  install)
  
  @endif zip
  
@@ -21478,7 +24186,6 @@ info-zip: \
         @[ -f ./zip/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -21504,7 +24211,6 @@ dvi-zip: \
         @[ -f ./zip/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -21530,7 +24236,6 @@ html-zip: \
         @[ -f ./zip/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -21556,7 +24261,6 @@ TAGS-zip: \
         @[ -f ./zip/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -21583,7 +24287,6 @@ install-info-zip: \
         @[ -f ./zip/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -21609,7 +24312,6 @@ installcheck-zip: \
         @[ -f ./zip/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -21634,7 +24336,6 @@ mostlyclean-zip:
         @[ -f ./zip/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -21659,7 +24360,6 @@ clean-zip:
         @[ -f ./zip/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -21684,7 +24384,6 @@ distclean-zip:
         @[ -f ./zip/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -21709,7 +24408,6 @@ maintainer-clean-zip:
         @[ -f ./zip/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -21726,19 +24424,20 @@ maintainer-clean-zip:
  @endif zip
  
  
+
  .PHONY: configure-zlib maybe-configure-zlib
  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 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       echo Configuring in zlib; \
-       cd $(HOST_SUBDIR)/zlib || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/zlib; \
+       cd "$(HOST_SUBDIR)/zlib" || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/zlib/ | \
@@ -21751,6 +24450,161 @@ configure-zlib:
           || exit 1
  @endif zlib
  
+
+
+.PHONY: configure-stage1-zlib maybe-configure-stage1-zlib
+maybe-configure-stage1-zlib:
+@if zlib-bootstrap
+maybe-configure-stage1-zlib: configure-stage1-zlib
+configure-stage1-zlib: 
+       @$(MAKE) stage1-start
+       @[ -f $(HOST_SUBDIR)/zlib/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       echo Configuring stage 1 in $(HOST_SUBDIR)/zlib ; \
+       cd $(HOST_SUBDIR)/zlib || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/zlib/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/zlib"; \
+       libsrcdir="$$s/zlib"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         --disable-intermodule           --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" 
+@endif zlib-bootstrap
+
+.PHONY: configure-stage2-zlib maybe-configure-stage2-zlib
+maybe-configure-stage2-zlib:
+@if zlib-bootstrap
+maybe-configure-stage2-zlib: configure-stage2-zlib
+configure-stage2-zlib: 
+       @$(MAKE) stage2-start
+       @[ -f $(HOST_SUBDIR)/zlib/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       echo Configuring stage 2 in $(HOST_SUBDIR)/zlib ; \
+       cd $(HOST_SUBDIR)/zlib || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/zlib/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/zlib"; \
+       libsrcdir="$$s/zlib"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+@endif zlib-bootstrap
+
+.PHONY: configure-stage3-zlib maybe-configure-stage3-zlib
+maybe-configure-stage3-zlib:
+@if zlib-bootstrap
+maybe-configure-stage3-zlib: configure-stage3-zlib
+configure-stage3-zlib: 
+       @$(MAKE) stage3-start
+       @[ -f $(HOST_SUBDIR)/zlib/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       echo Configuring stage 3 in $(HOST_SUBDIR)/zlib ; \
+       cd $(HOST_SUBDIR)/zlib || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/zlib/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/zlib"; \
+       libsrcdir="$$s/zlib"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+@endif zlib-bootstrap
+
+.PHONY: configure-stage4-zlib maybe-configure-stage4-zlib
+maybe-configure-stage4-zlib:
+@if zlib-bootstrap
+maybe-configure-stage4-zlib: configure-stage4-zlib
+configure-stage4-zlib: 
+       @$(MAKE) stage4-start
+       @[ -f $(HOST_SUBDIR)/zlib/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       echo Configuring stage 4 in $(HOST_SUBDIR)/zlib ; \
+       cd $(HOST_SUBDIR)/zlib || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/zlib/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/zlib"; \
+       libsrcdir="$$s/zlib"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+@endif zlib-bootstrap
+
+.PHONY: configure-stageprofile-zlib maybe-configure-stageprofile-zlib
+maybe-configure-stageprofile-zlib:
+@if zlib-bootstrap
+maybe-configure-stageprofile-zlib: configure-stageprofile-zlib
+configure-stageprofile-zlib: 
+       @$(MAKE) stageprofile-start
+       @[ -f $(HOST_SUBDIR)/zlib/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       echo Configuring stage profile in $(HOST_SUBDIR)/zlib ; \
+       cd $(HOST_SUBDIR)/zlib || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/zlib/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/zlib"; \
+       libsrcdir="$$s/zlib"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+@endif zlib-bootstrap
+
+.PHONY: configure-stagefeedback-zlib maybe-configure-stagefeedback-zlib
+maybe-configure-stagefeedback-zlib:
+@if zlib-bootstrap
+maybe-configure-stagefeedback-zlib: configure-stagefeedback-zlib
+configure-stagefeedback-zlib: 
+       @$(MAKE) stagefeedback-start
+       @[ -f $(HOST_SUBDIR)/zlib/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       echo Configuring stage feedback in $(HOST_SUBDIR)/zlib ; \
+       cd $(HOST_SUBDIR)/zlib || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/zlib/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/zlib"; \
+       libsrcdir="$$s/zlib"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+@endif zlib-bootstrap
+
+
+
+
+
  .PHONY: all-zlib maybe-all-zlib
  maybe-all-zlib:
  @if zlib
@@ -21760,12 +24614,188 @@ all-zlib: configure-zlib
         @test -f stage_last && exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/zlib && \
           $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-zlib))
  @endif zlib
  
+
+
+.PHONY: all-stage1-zlib maybe-all-stage1-zlib
+.PHONY: clean-stage1-zlib maybe-clean-stage1-zlib
+maybe-all-stage1-zlib:
+maybe-clean-stage1-zlib:
+@if zlib-bootstrap
+maybe-all-stage1-zlib: all-stage1-zlib
+all-stage1: all-stage1-zlib
+all-stage1-zlib: configure-stage1-zlib
+       @$(MAKE) stage1-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       cd $(HOST_SUBDIR)/zlib && \
+       $(MAKE) $(FLAGS_TO_PASS)  CFLAGS="$(STAGE1_CFLAGS)" 
+
+maybe-clean-stage1-zlib: clean-stage1-zlib
+clean-stage1: clean-stage1-zlib
+clean-stage1-zlib:
+       @[ -f $(HOST_SUBDIR)/zlib/Makefile ] || [ -f $(HOST_SUBDIR)/stage1-zlib/Makefile ] \
+         || exit 0 ; \
+       [ -f $(HOST_SUBDIR)/zlib/Makefile ] || $(MAKE) stage1-start ; \
+       cd $(HOST_SUBDIR)/zlib && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               CFLAGS="$(STAGE1_CFLAGS)"  clean
+@endif zlib-bootstrap
+
+
+.PHONY: all-stage2-zlib maybe-all-stage2-zlib
+.PHONY: clean-stage2-zlib maybe-clean-stage2-zlib
+maybe-all-stage2-zlib:
+maybe-clean-stage2-zlib:
+@if zlib-bootstrap
+maybe-all-stage2-zlib: all-stage2-zlib
+all-stage2: all-stage2-zlib
+all-stage2-zlib: configure-stage2-zlib
+       @$(MAKE) stage2-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       cd $(HOST_SUBDIR)/zlib && \
+       $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)  
+
+maybe-clean-stage2-zlib: clean-stage2-zlib
+clean-stage2: clean-stage2-zlib
+clean-stage2-zlib:
+       @[ -f $(HOST_SUBDIR)/zlib/Makefile ] || [ -f $(HOST_SUBDIR)/stage2-zlib/Makefile ] \
+         || exit 0 ; \
+       [ -f $(HOST_SUBDIR)/zlib/Makefile ] || $(MAKE) stage2-start ; \
+       cd $(HOST_SUBDIR)/zlib && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                 clean
+@endif zlib-bootstrap
+
+
+.PHONY: all-stage3-zlib maybe-all-stage3-zlib
+.PHONY: clean-stage3-zlib maybe-clean-stage3-zlib
+maybe-all-stage3-zlib:
+maybe-clean-stage3-zlib:
+@if zlib-bootstrap
+maybe-all-stage3-zlib: all-stage3-zlib
+all-stage3: all-stage3-zlib
+all-stage3-zlib: configure-stage3-zlib
+       @$(MAKE) stage3-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       cd $(HOST_SUBDIR)/zlib && \
+       $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)  
+
+maybe-clean-stage3-zlib: clean-stage3-zlib
+clean-stage3: clean-stage3-zlib
+clean-stage3-zlib:
+       @[ -f $(HOST_SUBDIR)/zlib/Makefile ] || [ -f $(HOST_SUBDIR)/stage3-zlib/Makefile ] \
+         || exit 0 ; \
+       [ -f $(HOST_SUBDIR)/zlib/Makefile ] || $(MAKE) stage3-start ; \
+       cd $(HOST_SUBDIR)/zlib && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                 clean
+@endif zlib-bootstrap
+
+
+.PHONY: all-stage4-zlib maybe-all-stage4-zlib
+.PHONY: clean-stage4-zlib maybe-clean-stage4-zlib
+maybe-all-stage4-zlib:
+maybe-clean-stage4-zlib:
+@if zlib-bootstrap
+maybe-all-stage4-zlib: all-stage4-zlib
+all-stage4: all-stage4-zlib
+all-stage4-zlib: configure-stage4-zlib
+       @$(MAKE) stage4-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       cd $(HOST_SUBDIR)/zlib && \
+       $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)  
+
+maybe-clean-stage4-zlib: clean-stage4-zlib
+clean-stage4: clean-stage4-zlib
+clean-stage4-zlib:
+       @[ -f $(HOST_SUBDIR)/zlib/Makefile ] || [ -f $(HOST_SUBDIR)/stage4-zlib/Makefile ] \
+         || exit 0 ; \
+       [ -f $(HOST_SUBDIR)/zlib/Makefile ] || $(MAKE) stage4-start ; \
+       cd $(HOST_SUBDIR)/zlib && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                 clean
+@endif zlib-bootstrap
+
+
+.PHONY: all-stageprofile-zlib maybe-all-stageprofile-zlib
+.PHONY: clean-stageprofile-zlib maybe-clean-stageprofile-zlib
+maybe-all-stageprofile-zlib:
+maybe-clean-stageprofile-zlib:
+@if zlib-bootstrap
+maybe-all-stageprofile-zlib: all-stageprofile-zlib
+all-stageprofile: all-stageprofile-zlib
+all-stageprofile-zlib: configure-stageprofile-zlib
+       @$(MAKE) stageprofile-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       cd $(HOST_SUBDIR)/zlib && \
+       $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" 
+
+maybe-clean-stageprofile-zlib: clean-stageprofile-zlib
+clean-stageprofile: clean-stageprofile-zlib
+clean-stageprofile-zlib:
+       @[ -f $(HOST_SUBDIR)/zlib/Makefile ] || [ -f $(HOST_SUBDIR)/stageprofile-zlib/Makefile ] \
+         || exit 0 ; \
+       [ -f $(HOST_SUBDIR)/zlib/Makefile ] || $(MAKE) stageprofile-start ; \
+       cd $(HOST_SUBDIR)/zlib && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-generate"  clean
+@endif zlib-bootstrap
+
+
+.PHONY: all-stagefeedback-zlib maybe-all-stagefeedback-zlib
+.PHONY: clean-stagefeedback-zlib maybe-clean-stagefeedback-zlib
+maybe-all-stagefeedback-zlib:
+maybe-clean-stagefeedback-zlib:
+@if zlib-bootstrap
+maybe-all-stagefeedback-zlib: all-stagefeedback-zlib
+all-stagefeedback: all-stagefeedback-zlib
+all-stagefeedback-zlib: configure-stagefeedback-zlib
+       @$(MAKE) stagefeedback-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       cd $(HOST_SUBDIR)/zlib && \
+       $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-use" 
+
+maybe-clean-stagefeedback-zlib: clean-stagefeedback-zlib
+clean-stagefeedback: clean-stagefeedback-zlib
+clean-stagefeedback-zlib:
+       @[ -f $(HOST_SUBDIR)/zlib/Makefile ] || [ -f $(HOST_SUBDIR)/stagefeedback-zlib/Makefile ] \
+         || exit 0 ; \
+       [ -f $(HOST_SUBDIR)/zlib/Makefile ] || $(MAKE) stagefeedback-start ; \
+       cd $(HOST_SUBDIR)/zlib && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-use"  clean
+@endif zlib-bootstrap
+
+
+
+
+
  .PHONY: check-zlib maybe-check-zlib
  maybe-check-zlib:
  @if zlib
@@ -21796,7 +24826,6 @@ info-zlib: \
         @[ -f ./zlib/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -21822,7 +24851,6 @@ dvi-zlib: \
         @[ -f ./zlib/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -21848,7 +24876,6 @@ html-zlib: \
         @[ -f ./zlib/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -21874,7 +24901,6 @@ TAGS-zlib: \
         @[ -f ./zlib/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -21901,7 +24927,6 @@ install-info-zlib: \
         @[ -f ./zlib/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -21927,7 +24952,6 @@ installcheck-zlib: \
         @[ -f ./zlib/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -21952,7 +24976,6 @@ mostlyclean-zlib:
         @[ -f ./zlib/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -21977,7 +25000,6 @@ clean-zlib:
         @[ -f ./zlib/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -22002,7 +25024,6 @@ distclean-zlib:
         @[ -f ./zlib/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -22027,7 +25048,6 @@ maintainer-clean-zlib:
         @[ -f ./zlib/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -22044,18 +25064,19 @@ maintainer-clean-zlib:
  @endif zlib
  
  
+
  .PHONY: configure-gdb maybe-configure-gdb
  maybe-configure-gdb:
  @if gdb
  maybe-configure-gdb: configure-gdb
-configure-gdb:
+configure-gdb: 
         @test ! -f $(HOST_SUBDIR)/gdb/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gdb ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       echo Configuring in gdb; \
-       cd $(HOST_SUBDIR)/gdb || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/gdb; \
+       cd "$(HOST_SUBDIR)/gdb" || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/gdb/ | \
@@ -22068,6 +25089,10 @@ configure-gdb:
           || exit 1
  @endif gdb
  
+
+
+
+
  .PHONY: all-gdb maybe-all-gdb
  maybe-all-gdb:
  @if gdb
@@ -22076,12 +25101,14 @@ maybe-all-gdb: all-gdb
  all-gdb: configure-gdb
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/gdb && \
           $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) $(TARGET-gdb))
  @endif gdb
  
+
+
+
  .PHONY: check-gdb maybe-check-gdb
  maybe-check-gdb:
  @if gdb
@@ -22090,7 +25117,6 @@ maybe-check-gdb: check-gdb
  check-gdb:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/gdb && \
           $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) check)
@@ -22105,10 +25131,9 @@ maybe-install-gdb: install-gdb
  install-gdb: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/gdb && \
-         $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) check)
+         $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) install)
  
  @endif gdb
  
@@ -22124,7 +25149,6 @@ info-gdb: \
         @[ -f ./gdb/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -22150,7 +25174,6 @@ dvi-gdb: \
         @[ -f ./gdb/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -22176,7 +25199,6 @@ html-gdb: \
         @[ -f ./gdb/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -22202,7 +25224,6 @@ TAGS-gdb: \
         @[ -f ./gdb/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -22229,7 +25250,6 @@ install-info-gdb: \
         @[ -f ./gdb/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -22255,7 +25275,6 @@ installcheck-gdb: \
         @[ -f ./gdb/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -22280,7 +25299,6 @@ mostlyclean-gdb:
         @[ -f ./gdb/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -22305,7 +25323,6 @@ clean-gdb:
         @[ -f ./gdb/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -22330,7 +25347,6 @@ distclean-gdb:
         @[ -f ./gdb/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -22355,7 +25371,6 @@ maintainer-clean-gdb:
         @[ -f ./gdb/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -22372,18 +25387,19 @@ maintainer-clean-gdb:
  @endif gdb
  
  
+
  .PHONY: configure-expect maybe-configure-expect
  maybe-configure-expect:
  @if expect
  maybe-configure-expect: configure-expect
-configure-expect:
+configure-expect: 
         @test ! -f $(HOST_SUBDIR)/expect/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/expect ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       echo Configuring in expect; \
-       cd $(HOST_SUBDIR)/expect || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/expect; \
+       cd "$(HOST_SUBDIR)/expect" || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/expect/ | \
@@ -22396,6 +25412,10 @@ configure-expect:
           || exit 1
  @endif expect
  
+
+
+
+
  .PHONY: all-expect maybe-all-expect
  maybe-all-expect:
  @if expect
@@ -22404,12 +25424,14 @@ maybe-all-expect: all-expect
  all-expect: configure-expect
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/expect && \
           $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) $(TARGET-expect))
  @endif expect
  
+
+
+
  .PHONY: check-expect maybe-check-expect
  maybe-check-expect:
  @if expect
@@ -22418,7 +25440,6 @@ maybe-check-expect: check-expect
  check-expect:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/expect && \
           $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) check)
@@ -22433,10 +25454,9 @@ maybe-install-expect: install-expect
  install-expect: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/expect && \
-         $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) check)
+         $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) install)
  
  @endif expect
  
@@ -22452,7 +25472,6 @@ info-expect: \
         @[ -f ./expect/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -22478,7 +25497,6 @@ dvi-expect: \
         @[ -f ./expect/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -22504,7 +25522,6 @@ html-expect: \
         @[ -f ./expect/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -22530,7 +25547,6 @@ TAGS-expect: \
         @[ -f ./expect/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -22557,7 +25573,6 @@ install-info-expect: \
         @[ -f ./expect/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -22583,7 +25598,6 @@ installcheck-expect: \
         @[ -f ./expect/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -22608,7 +25622,6 @@ mostlyclean-expect:
         @[ -f ./expect/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -22633,7 +25646,6 @@ clean-expect:
         @[ -f ./expect/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -22658,7 +25670,6 @@ distclean-expect:
         @[ -f ./expect/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -22683,7 +25694,6 @@ maintainer-clean-expect:
         @[ -f ./expect/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -22700,18 +25710,19 @@ maintainer-clean-expect:
  @endif expect
  
  
+
  .PHONY: configure-guile maybe-configure-guile
  maybe-configure-guile:
  @if guile
  maybe-configure-guile: configure-guile
-configure-guile:
+configure-guile: 
         @test ! -f $(HOST_SUBDIR)/guile/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/guile ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       echo Configuring in guile; \
-       cd $(HOST_SUBDIR)/guile || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/guile; \
+       cd "$(HOST_SUBDIR)/guile" || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/guile/ | \
@@ -22724,6 +25735,10 @@ configure-guile:
           || exit 1
  @endif guile
  
+
+
+
+
  .PHONY: all-guile maybe-all-guile
  maybe-all-guile:
  @if guile
@@ -22732,12 +25747,14 @@ maybe-all-guile: all-guile
  all-guile: configure-guile
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/guile && \
           $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) $(TARGET-guile))
  @endif guile
  
+
+
+
  .PHONY: check-guile maybe-check-guile
  maybe-check-guile:
  @if guile
@@ -22746,7 +25763,6 @@ maybe-check-guile: check-guile
  check-guile:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/guile && \
           $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) check)
@@ -22761,10 +25777,9 @@ maybe-install-guile: install-guile
  install-guile: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/guile && \
-         $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) check)
+         $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) install)
  
  @endif guile
  
@@ -22780,7 +25795,6 @@ info-guile: \
         @[ -f ./guile/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -22806,7 +25820,6 @@ dvi-guile: \
         @[ -f ./guile/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -22832,7 +25845,6 @@ html-guile: \
         @[ -f ./guile/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -22858,7 +25870,6 @@ TAGS-guile: \
         @[ -f ./guile/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -22885,7 +25896,6 @@ install-info-guile: \
         @[ -f ./guile/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -22911,7 +25921,6 @@ installcheck-guile: \
         @[ -f ./guile/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -22936,7 +25945,6 @@ mostlyclean-guile:
         @[ -f ./guile/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -22961,7 +25969,6 @@ clean-guile:
         @[ -f ./guile/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -22986,7 +25993,6 @@ distclean-guile:
         @[ -f ./guile/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -23011,7 +26017,6 @@ maintainer-clean-guile:
         @[ -f ./guile/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -23028,18 +26033,19 @@ maintainer-clean-guile:
  @endif guile
  
  
+
  .PHONY: configure-tk maybe-configure-tk
  maybe-configure-tk:
  @if tk
  maybe-configure-tk: configure-tk
-configure-tk:
+configure-tk: 
         @test ! -f $(HOST_SUBDIR)/tk/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/tk ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       echo Configuring in tk; \
-       cd $(HOST_SUBDIR)/tk || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/tk; \
+       cd "$(HOST_SUBDIR)/tk" || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/tk/ | \
@@ -23052,6 +26058,10 @@ configure-tk:
           || exit 1
  @endif tk
  
+
+
+
+
  .PHONY: all-tk maybe-all-tk
  maybe-all-tk:
  @if tk
@@ -23060,12 +26070,14 @@ maybe-all-tk: all-tk
  all-tk: configure-tk
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/tk && \
           $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) $(TARGET-tk))
  @endif tk
  
+
+
+
  .PHONY: check-tk maybe-check-tk
  maybe-check-tk:
  @if tk
@@ -23074,7 +26086,6 @@ maybe-check-tk: check-tk
  check-tk:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/tk && \
           $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) check)
@@ -23089,10 +26100,9 @@ maybe-install-tk: install-tk
  install-tk: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/tk && \
-         $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) check)
+         $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) install)
  
  @endif tk
  
@@ -23108,7 +26118,6 @@ info-tk: \
         @[ -f ./tk/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -23134,7 +26143,6 @@ dvi-tk: \
         @[ -f ./tk/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -23160,7 +26168,6 @@ html-tk: \
         @[ -f ./tk/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -23186,7 +26193,6 @@ TAGS-tk: \
         @[ -f ./tk/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -23213,7 +26219,6 @@ install-info-tk: \
         @[ -f ./tk/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -23239,7 +26244,6 @@ installcheck-tk: \
         @[ -f ./tk/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -23264,7 +26268,6 @@ mostlyclean-tk:
         @[ -f ./tk/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -23289,7 +26292,6 @@ clean-tk:
         @[ -f ./tk/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -23314,7 +26316,6 @@ distclean-tk:
         @[ -f ./tk/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -23339,7 +26340,6 @@ maintainer-clean-tk:
         @[ -f ./tk/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -23356,18 +26356,19 @@ maintainer-clean-tk:
  @endif tk
  
  
+
  .PHONY: configure-libtermcap maybe-configure-libtermcap
  maybe-configure-libtermcap:
  @if libtermcap
  maybe-configure-libtermcap: configure-libtermcap
-configure-libtermcap:
+configure-libtermcap: 
         @test ! -f $(HOST_SUBDIR)/libtermcap/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libtermcap ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       echo Configuring in libtermcap; \
-       cd $(HOST_SUBDIR)/libtermcap || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/libtermcap; \
+       cd "$(HOST_SUBDIR)/libtermcap" || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/libtermcap/ | \
@@ -23380,6 +26381,10 @@ configure-libtermcap:
           || exit 1
  @endif libtermcap
  
+
+
+
+
  .PHONY: all-libtermcap maybe-all-libtermcap
  maybe-all-libtermcap:
  @if libtermcap
@@ -23388,12 +26393,14 @@ maybe-all-libtermcap: all-libtermcap
  all-libtermcap: configure-libtermcap
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/libtermcap && \
           $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-libtermcap))
  @endif libtermcap
  
+
+
+
  .PHONY: check-libtermcap maybe-check-libtermcap
  maybe-check-libtermcap:
  @if libtermcap
@@ -23411,10 +26418,9 @@ maybe-install-libtermcap: install-libtermcap
  install-libtermcap: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/libtermcap && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS)  install)
  
  @endif libtermcap
  
@@ -23430,7 +26436,6 @@ info-libtermcap: \
         @[ -f ./libtermcap/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -23456,7 +26461,6 @@ dvi-libtermcap: \
         @[ -f ./libtermcap/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -23482,7 +26486,6 @@ html-libtermcap: \
         @[ -f ./libtermcap/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -23508,7 +26511,6 @@ TAGS-libtermcap: \
         @[ -f ./libtermcap/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -23535,7 +26537,6 @@ install-info-libtermcap: \
         @[ -f ./libtermcap/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -23561,7 +26562,6 @@ installcheck-libtermcap: \
         @[ -f ./libtermcap/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -23618,18 +26618,19 @@ maintainer-clean-libtermcap:
  @endif libtermcap
  
  
+
  .PHONY: configure-utils maybe-configure-utils
  maybe-configure-utils:
  @if utils
  maybe-configure-utils: configure-utils
-configure-utils:
+configure-utils: 
         @test ! -f $(HOST_SUBDIR)/utils/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/utils ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       echo Configuring in utils; \
-       cd $(HOST_SUBDIR)/utils || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/utils; \
+       cd "$(HOST_SUBDIR)/utils" || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/utils/ | \
@@ -23642,6 +26643,10 @@ configure-utils:
           || exit 1
  @endif utils
  
+
+
+
+
  .PHONY: all-utils maybe-all-utils
  maybe-all-utils:
  @if utils
@@ -23650,12 +26655,14 @@ maybe-all-utils: all-utils
  all-utils: configure-utils
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/utils && \
           $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-utils))
  @endif utils
  
+
+
+
  .PHONY: check-utils maybe-check-utils
  maybe-check-utils:
  @if utils
@@ -23673,10 +26680,9 @@ maybe-install-utils: install-utils
  install-utils: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/utils && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS)  install)
  
  @endif utils
  
@@ -23692,7 +26698,6 @@ info-utils: \
         @[ -f ./utils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -23718,7 +26723,6 @@ dvi-utils: \
         @[ -f ./utils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -23744,7 +26748,6 @@ html-utils: \
         @[ -f ./utils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -23770,7 +26773,6 @@ TAGS-utils: \
         @[ -f ./utils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -23797,7 +26799,6 @@ install-info-utils: \
         @[ -f ./utils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -23823,7 +26824,6 @@ installcheck-utils: \
         @[ -f ./utils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -23848,7 +26848,6 @@ mostlyclean-utils:
         @[ -f ./utils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -23873,7 +26872,6 @@ clean-utils:
         @[ -f ./utils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -23898,7 +26896,6 @@ distclean-utils:
         @[ -f ./utils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -23923,7 +26920,6 @@ maintainer-clean-utils:
         @[ -f ./utils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -23940,34 +26936,35 @@ maintainer-clean-utils:
  @endif utils
  
  
+
  .PHONY: configure-gnattools maybe-configure-gnattools
  maybe-configure-gnattools:
  @if gnattools
  maybe-configure-gnattools: configure-gnattools
-configure-gnattools:
-       @test ! -f gnattools/Makefile || exit 0; \
-       [ -d gnattools ] || mkdir gnattools; \
+configure-gnattools: 
+       @test ! -f $(HOST_SUBDIR)/gnattools/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gnattools ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       echo Configuring in gnattools; \
-       cd gnattools || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/gnattools; \
+       cd "$(HOST_SUBDIR)/gnattools" || exit 1; \
         case $(srcdir) in \
-         \.) \
-           srcdiroption="--srcdir=."; \
-           libsrcdir=".";; \
-         /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/gnattools"; \
-           libsrcdir="$$s/gnattools";; \
-         *) \
-           srcdiroption="--srcdir=../$(srcdir)/gnattools"; \
-           libsrcdir="$$s/gnattools";; \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/gnattools/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
+       srcdiroption="--srcdir=$${topdir}/gnattools"; \
+       libsrcdir="$$s/gnattools"; \
         $(SHELL) $${libsrcdir}/configure \
           $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
  @endif gnattools
  
+
+
+
+
  .PHONY: all-gnattools maybe-all-gnattools
  maybe-all-gnattools:
  @if gnattools
@@ -23976,12 +26973,14 @@ maybe-all-gnattools: all-gnattools
  all-gnattools: configure-gnattools
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
-       (cd gnattools && $(MAKE) $(FLAGS_TO_PASS)  \
-         $(TARGET-gnattools))
+       (cd $(HOST_SUBDIR)/gnattools && \
+         $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-gnattools))
  @endif gnattools
  
+
+
+
  .PHONY: check-gnattools maybe-check-gnattools
  maybe-check-gnattools:
  @if gnattools
@@ -23990,9 +26989,9 @@ maybe-check-gnattools: check-gnattools
  check-gnattools:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
-       (cd gnattools && $(MAKE) $(FLAGS_TO_PASS) check)
+       (cd $(HOST_SUBDIR)/gnattools && \
+         $(MAKE) $(FLAGS_TO_PASS)  check)
  
  @endif gnattools
  
@@ -24004,9 +27003,9 @@ maybe-install-gnattools: install-gnattools
  install-gnattools: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
-       (cd gnattools && $(MAKE) $(FLAGS_TO_PASS) install)
+       (cd $(HOST_SUBDIR)/gnattools && \
+         $(MAKE) $(FLAGS_TO_PASS)  install)
  
  @endif gnattools
  
@@ -24022,13 +27021,12 @@ info-gnattools: \
         @[ -f ./gnattools/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing info in gnattools" ; \
-       (cd gnattools && \
+       (cd $(HOST_SUBDIR)/gnattools && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -24048,13 +27046,12 @@ dvi-gnattools: \
         @[ -f ./gnattools/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing dvi in gnattools" ; \
-       (cd gnattools && \
+       (cd $(HOST_SUBDIR)/gnattools && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -24074,13 +27071,12 @@ html-gnattools: \
         @[ -f ./gnattools/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing html in gnattools" ; \
-       (cd gnattools && \
+       (cd $(HOST_SUBDIR)/gnattools && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -24100,13 +27096,12 @@ TAGS-gnattools: \
         @[ -f ./gnattools/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing TAGS in gnattools" ; \
-       (cd gnattools && \
+       (cd $(HOST_SUBDIR)/gnattools && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -24127,13 +27122,12 @@ install-info-gnattools: \
         @[ -f ./gnattools/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(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 gnattools" ; \
-       (cd gnattools && \
+       (cd $(HOST_SUBDIR)/gnattools && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -24153,13 +27147,12 @@ installcheck-gnattools: \
         @[ -f ./gnattools/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing installcheck in gnattools" ; \
-       (cd gnattools && \
+       (cd $(HOST_SUBDIR)/gnattools && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -24178,13 +27171,12 @@ mostlyclean-gnattools:
         @[ -f ./gnattools/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing mostlyclean in gnattools" ; \
-       (cd gnattools && \
+       (cd $(HOST_SUBDIR)/gnattools && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -24203,13 +27195,12 @@ clean-gnattools:
         @[ -f ./gnattools/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing clean in gnattools" ; \
-       (cd gnattools && \
+       (cd $(HOST_SUBDIR)/gnattools && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -24228,13 +27219,12 @@ distclean-gnattools:
         @[ -f ./gnattools/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing distclean in gnattools" ; \
-       (cd gnattools && \
+       (cd $(HOST_SUBDIR)/gnattools && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -24253,13 +27243,12 @@ maintainer-clean-gnattools:
         @[ -f ./gnattools/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(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 gnattools" ; \
-       (cd gnattools && \
+       (cd $(HOST_SUBDIR)/gnattools && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -24275,23 +27264,26 @@ maintainer-clean-gnattools:
  # Modules which run on the target machine
  # ---------------------------------------
  
-.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
  
  # 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
         @test ! -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(RAW_CXX_TARGET_EXPORTS) \
         echo Configuring in $(TARGET_SUBDIR)/libstdc++-v3; \
         cd "$(TARGET_SUBDIR)/libstdc++-v3" || exit 1; \
@@ -24304,11 +27296,14 @@ configure-target-libstdc++-v3: $(TARGET_SUBDIR)/libstdc++-v3/multilib.out
         libsrcdir="$$s/libstdc++-v3"; \
         rm -f no-such-file || : ; \
         CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
-         $(TARGET_CONFIGARGS) $${srcdiroption} \
-         --with-target-subdir="$(TARGET_SUBDIR)"  \
+         $(TARGET_CONFIGARGS) $${srcdiroption}  \
           || exit 1
  @endif target-libstdc++-v3
  
+
+
+
+
  .PHONY: all-target-libstdc++-v3 maybe-all-target-libstdc++-v3
  maybe-all-target-libstdc++-v3:
  @if target-libstdc++-v3
@@ -24317,12 +27312,15 @@ maybe-all-target-libstdc++-v3: all-target-libstdc++-v3
  all-target-libstdc++-v3: configure-target-libstdc++-v3
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(RAW_CXX_TARGET_EXPORTS) \
         (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)  'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   $(TARGET-target-libstdc++-v3))
+         $(MAKE) $(TARGET_FLAGS_TO_PASS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'  $(TARGET-target-libstdc++-v3))
  @endif target-libstdc++-v3
  
+
+
+
+
  .PHONY: check-target-libstdc++-v3 maybe-check-target-libstdc++-v3
  maybe-check-target-libstdc++-v3:
  @if target-libstdc++-v3
@@ -24331,7 +27329,6 @@ maybe-check-target-libstdc++-v3: check-target-libstdc++-v3
  check-target-libstdc++-v3:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(RAW_CXX_TARGET_EXPORTS) \
         (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
           $(MAKE) $(TARGET_FLAGS_TO_PASS)  'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   check)
@@ -24346,7 +27343,6 @@ maybe-install-target-libstdc++-v3: install-target-libstdc++-v3
  install-target-libstdc++-v3: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(RAW_CXX_TARGET_EXPORTS) \
         (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
           $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
@@ -24365,7 +27361,6 @@ info-target-libstdc++-v3: \
         @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(RAW_CXX_TARGET_EXPORTS) \
         echo "Doing info in $(TARGET_SUBDIR)/libstdc++-v3" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -24391,7 +27386,6 @@ dvi-target-libstdc++-v3: \
         @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(RAW_CXX_TARGET_EXPORTS) \
         echo "Doing dvi in $(TARGET_SUBDIR)/libstdc++-v3" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -24417,7 +27411,6 @@ html-target-libstdc++-v3: \
         @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(RAW_CXX_TARGET_EXPORTS) \
         echo "Doing html in $(TARGET_SUBDIR)/libstdc++-v3" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -24443,7 +27436,6 @@ TAGS-target-libstdc++-v3: \
         @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(RAW_CXX_TARGET_EXPORTS) \
         echo "Doing TAGS in $(TARGET_SUBDIR)/libstdc++-v3" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -24470,7 +27462,6 @@ install-info-target-libstdc++-v3: \
         @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(RAW_CXX_TARGET_EXPORTS) \
         echo "Doing install-info in $(TARGET_SUBDIR)/libstdc++-v3" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -24496,7 +27487,6 @@ installcheck-target-libstdc++-v3: \
         @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(RAW_CXX_TARGET_EXPORTS) \
         echo "Doing installcheck in $(TARGET_SUBDIR)/libstdc++-v3" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -24521,7 +27511,6 @@ mostlyclean-target-libstdc++-v3:
         @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(RAW_CXX_TARGET_EXPORTS) \
         echo "Doing mostlyclean in $(TARGET_SUBDIR)/libstdc++-v3" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -24546,7 +27535,6 @@ clean-target-libstdc++-v3:
         @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(RAW_CXX_TARGET_EXPORTS) \
         echo "Doing clean in $(TARGET_SUBDIR)/libstdc++-v3" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -24571,7 +27559,6 @@ distclean-target-libstdc++-v3:
         @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(RAW_CXX_TARGET_EXPORTS) \
         echo "Doing distclean in $(TARGET_SUBDIR)/libstdc++-v3" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -24596,7 +27583,6 @@ maintainer-clean-target-libstdc++-v3:
         @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(RAW_CXX_TARGET_EXPORTS) \
         echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libstdc++-v3" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -24613,23 +27599,26 @@ maintainer-clean-target-libstdc++-v3:
  @endif target-libstdc++-v3
  
  
-.PHONY: configure-target-libmudflap maybe-configure-target-libmudflap
-maybe-configure-target-libmudflap:
-@if target-libmudflap
-maybe-configure-target-libmudflap: configure-target-libmudflap
  
  # 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
         @test ! -f $(TARGET_SUBDIR)/libmudflap/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libmudflap ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo Configuring in $(TARGET_SUBDIR)/libmudflap; \
         cd "$(TARGET_SUBDIR)/libmudflap" || exit 1; \
@@ -24642,11 +27631,14 @@ configure-target-libmudflap: $(TARGET_SUBDIR)/libmudflap/multilib.out
         libsrcdir="$$s/libmudflap"; \
         rm -f no-such-file || : ; \
         CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
-         $(TARGET_CONFIGARGS) $${srcdiroption} \
-         --with-target-subdir="$(TARGET_SUBDIR)"  \
+         $(TARGET_CONFIGARGS) $${srcdiroption}  \
           || exit 1
  @endif target-libmudflap
  
+
+
+
+
  .PHONY: all-target-libmudflap maybe-all-target-libmudflap
  maybe-all-target-libmudflap:
  @if target-libmudflap
@@ -24655,12 +27647,15 @@ maybe-all-target-libmudflap: all-target-libmudflap
  all-target-libmudflap: configure-target-libmudflap
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         (cd $(TARGET_SUBDIR)/libmudflap && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)   $(TARGET-target-libmudflap))
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  $(TARGET-target-libmudflap))
  @endif target-libmudflap
  
+
+
+
+
  .PHONY: check-target-libmudflap maybe-check-target-libmudflap
  maybe-check-target-libmudflap:
  @if target-libmudflap
@@ -24669,7 +27664,6 @@ maybe-check-target-libmudflap: check-target-libmudflap
  check-target-libmudflap:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         (cd $(TARGET_SUBDIR)/libmudflap && \
           $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
@@ -24684,7 +27678,6 @@ maybe-install-target-libmudflap: install-target-libmudflap
  install-target-libmudflap: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         (cd $(TARGET_SUBDIR)/libmudflap && \
           $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
@@ -24703,7 +27696,6 @@ info-target-libmudflap: \
         @[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing info in $(TARGET_SUBDIR)/libmudflap" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -24729,7 +27721,6 @@ dvi-target-libmudflap: \
         @[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing dvi in $(TARGET_SUBDIR)/libmudflap" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -24755,7 +27746,6 @@ html-target-libmudflap: \
         @[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing html in $(TARGET_SUBDIR)/libmudflap" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -24781,7 +27771,6 @@ TAGS-target-libmudflap: \
         @[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing TAGS in $(TARGET_SUBDIR)/libmudflap" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -24808,7 +27797,6 @@ install-info-target-libmudflap: \
         @[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing install-info in $(TARGET_SUBDIR)/libmudflap" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -24834,7 +27822,6 @@ installcheck-target-libmudflap: \
         @[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing installcheck in $(TARGET_SUBDIR)/libmudflap" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -24859,7 +27846,6 @@ mostlyclean-target-libmudflap:
         @[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing mostlyclean in $(TARGET_SUBDIR)/libmudflap" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -24884,7 +27870,6 @@ clean-target-libmudflap:
         @[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing clean in $(TARGET_SUBDIR)/libmudflap" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -24909,7 +27894,6 @@ distclean-target-libmudflap:
         @[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing distclean in $(TARGET_SUBDIR)/libmudflap" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -24934,7 +27918,6 @@ maintainer-clean-target-libmudflap:
         @[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libmudflap" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -24951,23 +27934,26 @@ maintainer-clean-target-libmudflap:
  @endif target-libmudflap
  
  
-.PHONY: configure-target-newlib maybe-configure-target-newlib
-maybe-configure-target-newlib:
-@if target-newlib
-maybe-configure-target-newlib: configure-target-newlib
  
  # 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
         @test ! -f $(TARGET_SUBDIR)/newlib/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/newlib ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo Configuring in $(TARGET_SUBDIR)/newlib; \
         cd "$(TARGET_SUBDIR)/newlib" || exit 1; \
@@ -24980,11 +27966,14 @@ configure-target-newlib: $(TARGET_SUBDIR)/newlib/multilib.out
         libsrcdir="$$s/newlib"; \
         rm -f no-such-file || : ; \
         CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
-         $(TARGET_CONFIGARGS) $${srcdiroption} \
-         --with-target-subdir="$(TARGET_SUBDIR)"  \
+         $(TARGET_CONFIGARGS) $${srcdiroption}  \
           || exit 1
  @endif target-newlib
  
+
+
+
+
  .PHONY: all-target-newlib maybe-all-target-newlib
  maybe-all-target-newlib:
  @if target-newlib
@@ -24993,12 +27982,15 @@ maybe-all-target-newlib: all-target-newlib
  all-target-newlib: configure-target-newlib
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         (cd $(TARGET_SUBDIR)/newlib && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)   $(TARGET-target-newlib))
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  $(TARGET-target-newlib))
  @endif target-newlib
  
+
+
+
+
  .PHONY: check-target-newlib maybe-check-target-newlib
  maybe-check-target-newlib:
  @if target-newlib
@@ -25007,7 +27999,6 @@ maybe-check-target-newlib: check-target-newlib
  check-target-newlib:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         (cd $(TARGET_SUBDIR)/newlib && \
           $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
@@ -25022,7 +28013,6 @@ maybe-install-target-newlib: install-target-newlib
  install-target-newlib: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         (cd $(TARGET_SUBDIR)/newlib && \
           $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
@@ -25041,7 +28031,6 @@ info-target-newlib: \
         @[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing info in $(TARGET_SUBDIR)/newlib" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -25067,7 +28056,6 @@ dvi-target-newlib: \
         @[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing dvi in $(TARGET_SUBDIR)/newlib" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -25093,7 +28081,6 @@ html-target-newlib: \
         @[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing html in $(TARGET_SUBDIR)/newlib" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -25119,7 +28106,6 @@ TAGS-target-newlib: \
         @[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing TAGS in $(TARGET_SUBDIR)/newlib" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -25146,7 +28132,6 @@ install-info-target-newlib: \
         @[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing install-info in $(TARGET_SUBDIR)/newlib" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -25172,7 +28157,6 @@ installcheck-target-newlib: \
         @[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing installcheck in $(TARGET_SUBDIR)/newlib" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -25197,7 +28181,6 @@ mostlyclean-target-newlib:
         @[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing mostlyclean in $(TARGET_SUBDIR)/newlib" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -25222,7 +28205,6 @@ clean-target-newlib:
         @[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing clean in $(TARGET_SUBDIR)/newlib" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -25247,7 +28229,6 @@ distclean-target-newlib:
         @[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing distclean in $(TARGET_SUBDIR)/newlib" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -25272,7 +28253,6 @@ maintainer-clean-target-newlib:
         @[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing maintainer-clean in $(TARGET_SUBDIR)/newlib" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -25289,23 +28269,26 @@ maintainer-clean-target-newlib:
  @endif target-newlib
  
  
-.PHONY: configure-target-libgfortran maybe-configure-target-libgfortran
-maybe-configure-target-libgfortran:
-@if target-libgfortran
-maybe-configure-target-libgfortran: configure-target-libgfortran
  
  # 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
         @test ! -f $(TARGET_SUBDIR)/libgfortran/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgfortran ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo Configuring in $(TARGET_SUBDIR)/libgfortran; \
         cd "$(TARGET_SUBDIR)/libgfortran" || exit 1; \
@@ -25318,11 +28301,14 @@ configure-target-libgfortran: $(TARGET_SUBDIR)/libgfortran/multilib.out
         libsrcdir="$$s/libgfortran"; \
         rm -f no-such-file || : ; \
         CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
-         $(TARGET_CONFIGARGS) $${srcdiroption} \
-         --with-target-subdir="$(TARGET_SUBDIR)"  \
+         $(TARGET_CONFIGARGS) $${srcdiroption}  \
           || exit 1
  @endif target-libgfortran
  
+
+
+
+
  .PHONY: all-target-libgfortran maybe-all-target-libgfortran
  maybe-all-target-libgfortran:
  @if target-libgfortran
@@ -25331,12 +28317,15 @@ maybe-all-target-libgfortran: all-target-libgfortran
  all-target-libgfortran: configure-target-libgfortran
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         (cd $(TARGET_SUBDIR)/libgfortran && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)   $(TARGET-target-libgfortran))
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  $(TARGET-target-libgfortran))
  @endif target-libgfortran
  
+
+
+
+
  .PHONY: check-target-libgfortran maybe-check-target-libgfortran
  maybe-check-target-libgfortran:
  @if target-libgfortran
@@ -25345,7 +28334,6 @@ maybe-check-target-libgfortran: check-target-libgfortran
  check-target-libgfortran:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         (cd $(TARGET_SUBDIR)/libgfortran && \
           $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
@@ -25360,7 +28348,6 @@ maybe-install-target-libgfortran: install-target-libgfortran
  install-target-libgfortran: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         (cd $(TARGET_SUBDIR)/libgfortran && \
           $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
@@ -25379,7 +28366,6 @@ info-target-libgfortran: \
         @[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing info in $(TARGET_SUBDIR)/libgfortran" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -25405,7 +28391,6 @@ dvi-target-libgfortran: \
         @[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing dvi in $(TARGET_SUBDIR)/libgfortran" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -25431,7 +28416,6 @@ html-target-libgfortran: \
         @[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing html in $(TARGET_SUBDIR)/libgfortran" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -25457,7 +28441,6 @@ TAGS-target-libgfortran: \
         @[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing TAGS in $(TARGET_SUBDIR)/libgfortran" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -25484,7 +28467,6 @@ install-info-target-libgfortran: \
         @[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing install-info in $(TARGET_SUBDIR)/libgfortran" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -25510,7 +28492,6 @@ installcheck-target-libgfortran: \
         @[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing installcheck in $(TARGET_SUBDIR)/libgfortran" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -25535,7 +28516,6 @@ mostlyclean-target-libgfortran:
         @[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing mostlyclean in $(TARGET_SUBDIR)/libgfortran" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -25560,7 +28540,6 @@ clean-target-libgfortran:
         @[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing clean in $(TARGET_SUBDIR)/libgfortran" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -25585,7 +28564,6 @@ distclean-target-libgfortran:
         @[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing distclean in $(TARGET_SUBDIR)/libgfortran" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -25610,7 +28588,6 @@ maintainer-clean-target-libgfortran:
         @[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libgfortran" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -25627,23 +28604,26 @@ maintainer-clean-target-libgfortran:
  @endif target-libgfortran
  
  
-.PHONY: configure-target-libobjc maybe-configure-target-libobjc
-maybe-configure-target-libobjc:
-@if target-libobjc
-maybe-configure-target-libobjc: configure-target-libobjc
  
  # 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
         @test ! -f $(TARGET_SUBDIR)/libobjc/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libobjc ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo Configuring in $(TARGET_SUBDIR)/libobjc; \
         cd "$(TARGET_SUBDIR)/libobjc" || exit 1; \
@@ -25656,11 +28636,14 @@ configure-target-libobjc: $(TARGET_SUBDIR)/libobjc/multilib.out
         libsrcdir="$$s/libobjc"; \
         rm -f no-such-file || : ; \
         CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
-         $(TARGET_CONFIGARGS) $${srcdiroption} \
-         --with-target-subdir="$(TARGET_SUBDIR)"  \
+         $(TARGET_CONFIGARGS) $${srcdiroption}  \
           || exit 1
  @endif target-libobjc
  
+
+
+
+
  .PHONY: all-target-libobjc maybe-all-target-libobjc
  maybe-all-target-libobjc:
  @if target-libobjc
@@ -25669,12 +28652,15 @@ maybe-all-target-libobjc: all-target-libobjc
  all-target-libobjc: configure-target-libobjc
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         (cd $(TARGET_SUBDIR)/libobjc && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)   $(TARGET-target-libobjc))
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  $(TARGET-target-libobjc))
  @endif target-libobjc
  
+
+
+
+
  .PHONY: check-target-libobjc maybe-check-target-libobjc
  maybe-check-target-libobjc:
  @if target-libobjc
@@ -25683,7 +28669,6 @@ maybe-check-target-libobjc: check-target-libobjc
  check-target-libobjc:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         (cd $(TARGET_SUBDIR)/libobjc && \
           $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
@@ -25698,7 +28683,6 @@ maybe-install-target-libobjc: install-target-libobjc
  install-target-libobjc: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         (cd $(TARGET_SUBDIR)/libobjc && \
           $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
@@ -25717,7 +28701,6 @@ info-target-libobjc: \
         @[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing info in $(TARGET_SUBDIR)/libobjc" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -25743,7 +28726,6 @@ dvi-target-libobjc: \
         @[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing dvi in $(TARGET_SUBDIR)/libobjc" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -25769,7 +28751,6 @@ html-target-libobjc: \
         @[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing html in $(TARGET_SUBDIR)/libobjc" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -25795,7 +28776,6 @@ TAGS-target-libobjc: \
         @[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing TAGS in $(TARGET_SUBDIR)/libobjc" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -25822,7 +28802,6 @@ install-info-target-libobjc: \
         @[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing install-info in $(TARGET_SUBDIR)/libobjc" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -25848,7 +28827,6 @@ installcheck-target-libobjc: \
         @[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing installcheck in $(TARGET_SUBDIR)/libobjc" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -25873,7 +28851,6 @@ mostlyclean-target-libobjc:
         @[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing mostlyclean in $(TARGET_SUBDIR)/libobjc" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -25898,7 +28875,6 @@ clean-target-libobjc:
         @[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing clean in $(TARGET_SUBDIR)/libobjc" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -25923,7 +28899,6 @@ distclean-target-libobjc:
         @[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing distclean in $(TARGET_SUBDIR)/libobjc" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -25948,7 +28923,6 @@ maintainer-clean-target-libobjc:
         @[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libobjc" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -25965,23 +28939,26 @@ maintainer-clean-target-libobjc:
  @endif target-libobjc
  
  
-.PHONY: configure-target-libtermcap maybe-configure-target-libtermcap
-maybe-configure-target-libtermcap:
-@if target-libtermcap
-maybe-configure-target-libtermcap: configure-target-libtermcap
  
  # 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
         @test ! -f $(TARGET_SUBDIR)/libtermcap/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libtermcap ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo Configuring in $(TARGET_SUBDIR)/libtermcap; \
         cd "$(TARGET_SUBDIR)/libtermcap" || exit 1; \
@@ -25994,11 +28971,14 @@ configure-target-libtermcap: $(TARGET_SUBDIR)/libtermcap/multilib.out
         libsrcdir="$$s/libtermcap"; \
         rm -f no-such-file || : ; \
         CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
-         $(TARGET_CONFIGARGS) $${srcdiroption} \
-         --with-target-subdir="$(TARGET_SUBDIR)"  \
+         $(TARGET_CONFIGARGS) $${srcdiroption}  \
           || exit 1
  @endif target-libtermcap
  
+
+
+
+
  .PHONY: all-target-libtermcap maybe-all-target-libtermcap
  maybe-all-target-libtermcap:
  @if target-libtermcap
@@ -26007,12 +28987,15 @@ maybe-all-target-libtermcap: all-target-libtermcap
  all-target-libtermcap: configure-target-libtermcap
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         (cd $(TARGET_SUBDIR)/libtermcap && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)   $(TARGET-target-libtermcap))
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  $(TARGET-target-libtermcap))
  @endif target-libtermcap
  
+
+
+
+
  .PHONY: check-target-libtermcap maybe-check-target-libtermcap
  maybe-check-target-libtermcap:
  @if target-libtermcap
@@ -26031,7 +29014,6 @@ maybe-install-target-libtermcap: install-target-libtermcap
  install-target-libtermcap: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         (cd $(TARGET_SUBDIR)/libtermcap && \
           $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
@@ -26050,7 +29032,6 @@ info-target-libtermcap: \
         @[ -f $(TARGET_SUBDIR)/libtermcap/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing info in $(TARGET_SUBDIR)/libtermcap" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -26076,7 +29057,6 @@ dvi-target-libtermcap: \
         @[ -f $(TARGET_SUBDIR)/libtermcap/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing dvi in $(TARGET_SUBDIR)/libtermcap" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -26102,7 +29082,6 @@ html-target-libtermcap: \
         @[ -f $(TARGET_SUBDIR)/libtermcap/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing html in $(TARGET_SUBDIR)/libtermcap" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -26128,7 +29107,6 @@ TAGS-target-libtermcap: \
         @[ -f $(TARGET_SUBDIR)/libtermcap/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing TAGS in $(TARGET_SUBDIR)/libtermcap" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -26155,7 +29133,6 @@ install-info-target-libtermcap: \
         @[ -f $(TARGET_SUBDIR)/libtermcap/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing install-info in $(TARGET_SUBDIR)/libtermcap" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -26181,7 +29158,6 @@ installcheck-target-libtermcap: \
         @[ -f $(TARGET_SUBDIR)/libtermcap/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing installcheck in $(TARGET_SUBDIR)/libtermcap" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -26238,23 +29214,26 @@ maintainer-clean-target-libtermcap:
  @endif target-libtermcap
  
  
-.PHONY: configure-target-winsup maybe-configure-target-winsup
-maybe-configure-target-winsup:
-@if target-winsup
-maybe-configure-target-winsup: configure-target-winsup
  
  # 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
         @test ! -f $(TARGET_SUBDIR)/winsup/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/winsup ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo Configuring in $(TARGET_SUBDIR)/winsup; \
         cd "$(TARGET_SUBDIR)/winsup" || exit 1; \
@@ -26267,11 +29246,14 @@ configure-target-winsup: $(TARGET_SUBDIR)/winsup/multilib.out
         libsrcdir="$$s/winsup"; \
         rm -f no-such-file || : ; \
         CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
-         $(TARGET_CONFIGARGS) $${srcdiroption} \
-         --with-target-subdir="$(TARGET_SUBDIR)"  \
+         $(TARGET_CONFIGARGS) $${srcdiroption}  \
           || exit 1
  @endif target-winsup
  
+
+
+
+
  .PHONY: all-target-winsup maybe-all-target-winsup
  maybe-all-target-winsup:
  @if target-winsup
@@ -26280,12 +29262,15 @@ maybe-all-target-winsup: all-target-winsup
  all-target-winsup: configure-target-winsup
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         (cd $(TARGET_SUBDIR)/winsup && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)   $(TARGET-target-winsup))
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  $(TARGET-target-winsup))
  @endif target-winsup
  
+
+
+
+
  .PHONY: check-target-winsup maybe-check-target-winsup
  maybe-check-target-winsup:
  @if target-winsup
@@ -26294,7 +29279,6 @@ maybe-check-target-winsup: check-target-winsup
  check-target-winsup:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         (cd $(TARGET_SUBDIR)/winsup && \
           $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
@@ -26309,7 +29293,6 @@ maybe-install-target-winsup: install-target-winsup
  install-target-winsup: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         (cd $(TARGET_SUBDIR)/winsup && \
           $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
@@ -26328,7 +29311,6 @@ info-target-winsup: \
         @[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing info in $(TARGET_SUBDIR)/winsup" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -26354,7 +29336,6 @@ dvi-target-winsup: \
         @[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing dvi in $(TARGET_SUBDIR)/winsup" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -26380,7 +29361,6 @@ html-target-winsup: \
         @[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing html in $(TARGET_SUBDIR)/winsup" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -26406,7 +29386,6 @@ TAGS-target-winsup: \
         @[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing TAGS in $(TARGET_SUBDIR)/winsup" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -26433,7 +29412,6 @@ install-info-target-winsup: \
         @[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing install-info in $(TARGET_SUBDIR)/winsup" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -26459,7 +29437,6 @@ installcheck-target-winsup: \
         @[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing installcheck in $(TARGET_SUBDIR)/winsup" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -26484,7 +29461,6 @@ mostlyclean-target-winsup:
         @[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing mostlyclean in $(TARGET_SUBDIR)/winsup" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -26509,7 +29485,6 @@ clean-target-winsup:
         @[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing clean in $(TARGET_SUBDIR)/winsup" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -26534,7 +29509,6 @@ distclean-target-winsup:
         @[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing distclean in $(TARGET_SUBDIR)/winsup" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -26559,7 +29533,6 @@ maintainer-clean-target-winsup:
         @[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing maintainer-clean in $(TARGET_SUBDIR)/winsup" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -26576,23 +29549,26 @@ maintainer-clean-target-winsup:
  @endif target-winsup
  
  
-.PHONY: configure-target-libgloss maybe-configure-target-libgloss
-maybe-configure-target-libgloss:
-@if target-libgloss
-maybe-configure-target-libgloss: configure-target-libgloss
  
  # 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
         @test ! -f $(TARGET_SUBDIR)/libgloss/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgloss ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo Configuring in $(TARGET_SUBDIR)/libgloss; \
         cd "$(TARGET_SUBDIR)/libgloss" || exit 1; \
@@ -26605,11 +29581,14 @@ configure-target-libgloss: $(TARGET_SUBDIR)/libgloss/multilib.out
         libsrcdir="$$s/libgloss"; \
         rm -f no-such-file || : ; \
         CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
-         $(TARGET_CONFIGARGS) $${srcdiroption} \
-         --with-target-subdir="$(TARGET_SUBDIR)"  \
+         $(TARGET_CONFIGARGS) $${srcdiroption}  \
           || exit 1
  @endif target-libgloss
  
+
+
+
+
  .PHONY: all-target-libgloss maybe-all-target-libgloss
  maybe-all-target-libgloss:
  @if target-libgloss
@@ -26618,12 +29597,15 @@ maybe-all-target-libgloss: all-target-libgloss
  all-target-libgloss: configure-target-libgloss
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         (cd $(TARGET_SUBDIR)/libgloss && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)   $(TARGET-target-libgloss))
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  $(TARGET-target-libgloss))
  @endif target-libgloss
  
+
+
+
+
  .PHONY: check-target-libgloss maybe-check-target-libgloss
  maybe-check-target-libgloss:
  @if target-libgloss
@@ -26642,7 +29624,6 @@ maybe-install-target-libgloss: install-target-libgloss
  install-target-libgloss: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         (cd $(TARGET_SUBDIR)/libgloss && \
           $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
@@ -26661,7 +29642,6 @@ info-target-libgloss: \
         @[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing info in $(TARGET_SUBDIR)/libgloss" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -26687,7 +29667,6 @@ dvi-target-libgloss: \
         @[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing dvi in $(TARGET_SUBDIR)/libgloss" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -26713,7 +29692,6 @@ html-target-libgloss: \
         @[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing html in $(TARGET_SUBDIR)/libgloss" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -26739,7 +29717,6 @@ TAGS-target-libgloss: \
         @[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing TAGS in $(TARGET_SUBDIR)/libgloss" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -26766,7 +29743,6 @@ install-info-target-libgloss: \
         @[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing install-info in $(TARGET_SUBDIR)/libgloss" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -26792,7 +29768,6 @@ installcheck-target-libgloss: \
         @[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing installcheck in $(TARGET_SUBDIR)/libgloss" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -26817,7 +29792,6 @@ mostlyclean-target-libgloss:
         @[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing mostlyclean in $(TARGET_SUBDIR)/libgloss" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -26842,7 +29816,6 @@ clean-target-libgloss:
         @[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing clean in $(TARGET_SUBDIR)/libgloss" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -26867,7 +29840,6 @@ distclean-target-libgloss:
         @[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing distclean in $(TARGET_SUBDIR)/libgloss" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -26892,7 +29864,6 @@ maintainer-clean-target-libgloss:
         @[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libgloss" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -26909,23 +29880,26 @@ maintainer-clean-target-libgloss:
  @endif target-libgloss
  
  
-.PHONY: configure-target-libiberty maybe-configure-target-libiberty
-maybe-configure-target-libiberty:
-@if target-libiberty
-maybe-configure-target-libiberty: configure-target-libiberty
  
  # 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
         @test ! -f $(TARGET_SUBDIR)/libiberty/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libiberty ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo Configuring in $(TARGET_SUBDIR)/libiberty; \
         cd "$(TARGET_SUBDIR)/libiberty" || exit 1; \
@@ -26938,11 +29912,14 @@ configure-target-libiberty: $(TARGET_SUBDIR)/libiberty/multilib.out
         libsrcdir="$$s/libiberty"; \
         rm -f no-such-file || : ; \
         CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
-         $(TARGET_CONFIGARGS) $${srcdiroption} \
-         --with-target-subdir="$(TARGET_SUBDIR)"  \
+         $(TARGET_CONFIGARGS) $${srcdiroption}  \
           || exit 1
  @endif target-libiberty
  
+
+
+
+
  .PHONY: all-target-libiberty maybe-all-target-libiberty
  maybe-all-target-libiberty:
  @if target-libiberty
@@ -26951,12 +29928,15 @@ maybe-all-target-libiberty: all-target-libiberty
  all-target-libiberty: configure-target-libiberty
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         (cd $(TARGET_SUBDIR)/libiberty && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)   $(TARGET-target-libiberty))
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  $(TARGET-target-libiberty))
  @endif target-libiberty
  
+
+
+
+
  .PHONY: check-target-libiberty maybe-check-target-libiberty
  maybe-check-target-libiberty:
  @if target-libiberty
@@ -26965,7 +29945,6 @@ maybe-check-target-libiberty: check-target-libiberty
  check-target-libiberty:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         (cd $(TARGET_SUBDIR)/libiberty && \
           $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
@@ -26980,7 +29959,6 @@ maybe-install-target-libiberty: install-target-libiberty
  install-target-libiberty: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         (cd $(TARGET_SUBDIR)/libiberty && \
           $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
@@ -26999,7 +29977,6 @@ info-target-libiberty: \
         @[ -f $(TARGET_SUBDIR)/libiberty/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing info in $(TARGET_SUBDIR)/libiberty" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -27025,7 +30002,6 @@ dvi-target-libiberty: \
         @[ -f $(TARGET_SUBDIR)/libiberty/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing dvi in $(TARGET_SUBDIR)/libiberty" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -27051,7 +30027,6 @@ html-target-libiberty: \
         @[ -f $(TARGET_SUBDIR)/libiberty/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing html in $(TARGET_SUBDIR)/libiberty" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -27077,7 +30052,6 @@ TAGS-target-libiberty: \
         @[ -f $(TARGET_SUBDIR)/libiberty/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing TAGS in $(TARGET_SUBDIR)/libiberty" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -27104,7 +30078,6 @@ install-info-target-libiberty: \
         @[ -f $(TARGET_SUBDIR)/libiberty/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing install-info in $(TARGET_SUBDIR)/libiberty" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -27130,7 +30103,6 @@ installcheck-target-libiberty: \
         @[ -f $(TARGET_SUBDIR)/libiberty/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing installcheck in $(TARGET_SUBDIR)/libiberty" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -27155,7 +30127,6 @@ mostlyclean-target-libiberty:
         @[ -f $(TARGET_SUBDIR)/libiberty/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing mostlyclean in $(TARGET_SUBDIR)/libiberty" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -27180,7 +30151,6 @@ clean-target-libiberty:
         @[ -f $(TARGET_SUBDIR)/libiberty/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing clean in $(TARGET_SUBDIR)/libiberty" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -27205,7 +30175,6 @@ distclean-target-libiberty:
         @[ -f $(TARGET_SUBDIR)/libiberty/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing distclean in $(TARGET_SUBDIR)/libiberty" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -27230,7 +30199,6 @@ maintainer-clean-target-libiberty:
         @[ -f $(TARGET_SUBDIR)/libiberty/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libiberty" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -27247,23 +30215,26 @@ maintainer-clean-target-libiberty:
  @endif target-libiberty
  
  
-.PHONY: configure-target-gperf maybe-configure-target-gperf
-maybe-configure-target-gperf:
-@if target-gperf
-maybe-configure-target-gperf: configure-target-gperf
  
  # 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
         @test ! -f $(TARGET_SUBDIR)/gperf/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/gperf ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo Configuring in $(TARGET_SUBDIR)/gperf; \
         cd "$(TARGET_SUBDIR)/gperf" || exit 1; \
@@ -27276,11 +30247,14 @@ configure-target-gperf: $(TARGET_SUBDIR)/gperf/multilib.out
         libsrcdir="$$s/gperf"; \
         rm -f no-such-file || : ; \
         CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
-         $(TARGET_CONFIGARGS) $${srcdiroption} \
-         --with-target-subdir="$(TARGET_SUBDIR)"  \
+         $(TARGET_CONFIGARGS) $${srcdiroption}  \
           || exit 1
  @endif target-gperf
  
+
+
+
+
  .PHONY: all-target-gperf maybe-all-target-gperf
  maybe-all-target-gperf:
  @if target-gperf
@@ -27289,12 +30263,15 @@ maybe-all-target-gperf: all-target-gperf
  all-target-gperf: configure-target-gperf
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         (cd $(TARGET_SUBDIR)/gperf && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)   $(TARGET-target-gperf))
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  $(TARGET-target-gperf))
  @endif target-gperf
  
+
+
+
+
  .PHONY: check-target-gperf maybe-check-target-gperf
  maybe-check-target-gperf:
  @if target-gperf
@@ -27303,7 +30280,6 @@ maybe-check-target-gperf: check-target-gperf
  check-target-gperf:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         (cd $(TARGET_SUBDIR)/gperf && \
           $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
@@ -27318,7 +30294,6 @@ maybe-install-target-gperf: install-target-gperf
  install-target-gperf: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         (cd $(TARGET_SUBDIR)/gperf && \
           $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
@@ -27337,7 +30312,6 @@ info-target-gperf: \
         @[ -f $(TARGET_SUBDIR)/gperf/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing info in $(TARGET_SUBDIR)/gperf" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -27363,7 +30337,6 @@ dvi-target-gperf: \
         @[ -f $(TARGET_SUBDIR)/gperf/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing dvi in $(TARGET_SUBDIR)/gperf" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -27389,7 +30362,6 @@ html-target-gperf: \
         @[ -f $(TARGET_SUBDIR)/gperf/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing html in $(TARGET_SUBDIR)/gperf" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -27415,7 +30387,6 @@ TAGS-target-gperf: \
         @[ -f $(TARGET_SUBDIR)/gperf/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing TAGS in $(TARGET_SUBDIR)/gperf" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -27442,7 +30413,6 @@ install-info-target-gperf: \
         @[ -f $(TARGET_SUBDIR)/gperf/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing install-info in $(TARGET_SUBDIR)/gperf" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -27468,7 +30438,6 @@ installcheck-target-gperf: \
         @[ -f $(TARGET_SUBDIR)/gperf/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing installcheck in $(TARGET_SUBDIR)/gperf" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -27493,7 +30462,6 @@ mostlyclean-target-gperf:
         @[ -f $(TARGET_SUBDIR)/gperf/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing mostlyclean in $(TARGET_SUBDIR)/gperf" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -27518,7 +30486,6 @@ clean-target-gperf:
         @[ -f $(TARGET_SUBDIR)/gperf/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing clean in $(TARGET_SUBDIR)/gperf" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -27543,7 +30510,6 @@ distclean-target-gperf:
         @[ -f $(TARGET_SUBDIR)/gperf/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing distclean in $(TARGET_SUBDIR)/gperf" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -27568,7 +30534,6 @@ maintainer-clean-target-gperf:
         @[ -f $(TARGET_SUBDIR)/gperf/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing maintainer-clean in $(TARGET_SUBDIR)/gperf" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -27585,23 +30550,26 @@ maintainer-clean-target-gperf:
  @endif target-gperf
  
  
-.PHONY: configure-target-examples maybe-configure-target-examples
-maybe-configure-target-examples:
-@if target-examples
-maybe-configure-target-examples: configure-target-examples
  
  # 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
         @test ! -f $(TARGET_SUBDIR)/examples/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/examples ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo Configuring in $(TARGET_SUBDIR)/examples; \
         cd "$(TARGET_SUBDIR)/examples" || exit 1; \
@@ -27614,11 +30582,14 @@ configure-target-examples: $(TARGET_SUBDIR)/examples/multilib.out
         libsrcdir="$$s/examples"; \
         rm -f no-such-file || : ; \
         CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
-         $(TARGET_CONFIGARGS) $${srcdiroption} \
-         --with-target-subdir="$(TARGET_SUBDIR)"  \
+         $(TARGET_CONFIGARGS) $${srcdiroption}  \
           || exit 1
  @endif target-examples
  
+
+
+
+
  .PHONY: all-target-examples maybe-all-target-examples
  maybe-all-target-examples:
  @if target-examples
@@ -27627,12 +30598,15 @@ maybe-all-target-examples: all-target-examples
  all-target-examples: configure-target-examples
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         (cd $(TARGET_SUBDIR)/examples && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)   $(TARGET-target-examples))
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  $(TARGET-target-examples))
  @endif target-examples
  
+
+
+
+
  .PHONY: check-target-examples maybe-check-target-examples
  maybe-check-target-examples:
  @if target-examples
@@ -27665,7 +30639,6 @@ info-target-examples: \
         @[ -f $(TARGET_SUBDIR)/examples/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing info in $(TARGET_SUBDIR)/examples" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -27691,7 +30664,6 @@ dvi-target-examples: \
         @[ -f $(TARGET_SUBDIR)/examples/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing dvi in $(TARGET_SUBDIR)/examples" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -27717,7 +30689,6 @@ html-target-examples: \
         @[ -f $(TARGET_SUBDIR)/examples/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing html in $(TARGET_SUBDIR)/examples" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -27743,7 +30714,6 @@ TAGS-target-examples: \
         @[ -f $(TARGET_SUBDIR)/examples/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing TAGS in $(TARGET_SUBDIR)/examples" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -27770,7 +30740,6 @@ install-info-target-examples: \
         @[ -f $(TARGET_SUBDIR)/examples/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing install-info in $(TARGET_SUBDIR)/examples" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -27796,7 +30765,6 @@ installcheck-target-examples: \
         @[ -f $(TARGET_SUBDIR)/examples/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing installcheck in $(TARGET_SUBDIR)/examples" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -27821,7 +30789,6 @@ mostlyclean-target-examples:
         @[ -f $(TARGET_SUBDIR)/examples/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing mostlyclean in $(TARGET_SUBDIR)/examples" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -27846,7 +30813,6 @@ clean-target-examples:
         @[ -f $(TARGET_SUBDIR)/examples/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing clean in $(TARGET_SUBDIR)/examples" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -27871,7 +30837,6 @@ distclean-target-examples:
         @[ -f $(TARGET_SUBDIR)/examples/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing distclean in $(TARGET_SUBDIR)/examples" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -27896,7 +30861,6 @@ maintainer-clean-target-examples:
         @[ -f $(TARGET_SUBDIR)/examples/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing maintainer-clean in $(TARGET_SUBDIR)/examples" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -27913,23 +30877,26 @@ maintainer-clean-target-examples:
  @endif target-examples
  
  
-.PHONY: configure-target-libffi maybe-configure-target-libffi
-maybe-configure-target-libffi:
-@if target-libffi
-maybe-configure-target-libffi: configure-target-libffi
  
  # 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
         @test ! -f $(TARGET_SUBDIR)/libffi/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libffi ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo Configuring in $(TARGET_SUBDIR)/libffi; \
         cd "$(TARGET_SUBDIR)/libffi" || exit 1; \
@@ -27942,11 +30909,14 @@ configure-target-libffi: $(TARGET_SUBDIR)/libffi/multilib.out
         libsrcdir="$$s/libffi"; \
         rm -f no-such-file || : ; \
         CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
-         $(TARGET_CONFIGARGS) $${srcdiroption} \
-         --with-target-subdir="$(TARGET_SUBDIR)"  \
+         $(TARGET_CONFIGARGS) $${srcdiroption}  \
           || exit 1
  @endif target-libffi
  
+
+
+
+
  .PHONY: all-target-libffi maybe-all-target-libffi
  maybe-all-target-libffi:
  @if target-libffi
@@ -27955,12 +30925,15 @@ maybe-all-target-libffi: all-target-libffi
  all-target-libffi: configure-target-libffi
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         (cd $(TARGET_SUBDIR)/libffi && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)   $(TARGET-target-libffi))
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  $(TARGET-target-libffi))
  @endif target-libffi
  
+
+
+
+
  .PHONY: check-target-libffi maybe-check-target-libffi
  maybe-check-target-libffi:
  @if target-libffi
@@ -27969,7 +30942,6 @@ maybe-check-target-libffi: check-target-libffi
  check-target-libffi:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         (cd $(TARGET_SUBDIR)/libffi && \
           $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
@@ -27984,7 +30956,6 @@ maybe-install-target-libffi: install-target-libffi
  install-target-libffi: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         (cd $(TARGET_SUBDIR)/libffi && \
           $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
@@ -28003,7 +30974,6 @@ info-target-libffi: \
         @[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing info in $(TARGET_SUBDIR)/libffi" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -28029,7 +30999,6 @@ dvi-target-libffi: \
         @[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing dvi in $(TARGET_SUBDIR)/libffi" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -28055,7 +31024,6 @@ html-target-libffi: \
         @[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing html in $(TARGET_SUBDIR)/libffi" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -28081,7 +31049,6 @@ TAGS-target-libffi: \
         @[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing TAGS in $(TARGET_SUBDIR)/libffi" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -28108,7 +31075,6 @@ install-info-target-libffi: \
         @[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing install-info in $(TARGET_SUBDIR)/libffi" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -28134,7 +31100,6 @@ installcheck-target-libffi: \
         @[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing installcheck in $(TARGET_SUBDIR)/libffi" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -28159,7 +31124,6 @@ mostlyclean-target-libffi:
         @[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing mostlyclean in $(TARGET_SUBDIR)/libffi" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -28184,7 +31148,6 @@ clean-target-libffi:
         @[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing clean in $(TARGET_SUBDIR)/libffi" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -28209,7 +31172,6 @@ distclean-target-libffi:
         @[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing distclean in $(TARGET_SUBDIR)/libffi" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -28234,7 +31196,6 @@ maintainer-clean-target-libffi:
         @[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libffi" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -28251,23 +31212,26 @@ maintainer-clean-target-libffi:
  @endif target-libffi
  
  
-.PHONY: configure-target-libjava maybe-configure-target-libjava
-maybe-configure-target-libjava:
-@if target-libjava
-maybe-configure-target-libjava: configure-target-libjava
  
  # 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
         @test ! -f $(TARGET_SUBDIR)/libjava/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libjava ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(RAW_CXX_TARGET_EXPORTS) \
         echo Configuring in $(TARGET_SUBDIR)/libjava; \
         cd "$(TARGET_SUBDIR)/libjava" || exit 1; \
@@ -28280,11 +31244,14 @@ configure-target-libjava: $(TARGET_SUBDIR)/libjava/multilib.out
         libsrcdir="$$s/libjava"; \
         rm -f no-such-file || : ; \
         CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
-         $(TARGET_CONFIGARGS) $${srcdiroption} \
-         --with-target-subdir="$(TARGET_SUBDIR)"  \
+         $(TARGET_CONFIGARGS) $${srcdiroption}  \
           || exit 1
  @endif target-libjava
  
+
+
+
+
  .PHONY: all-target-libjava maybe-all-target-libjava
  maybe-all-target-libjava:
  @if target-libjava
@@ -28293,12 +31260,15 @@ maybe-all-target-libjava: all-target-libjava
  all-target-libjava: configure-target-libjava
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(RAW_CXX_TARGET_EXPORTS) \
         (cd $(TARGET_SUBDIR)/libjava && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)  'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   $(TARGET-target-libjava))
+         $(MAKE) $(TARGET_FLAGS_TO_PASS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'  $(TARGET-target-libjava))
  @endif target-libjava
  
+
+
+
+
  .PHONY: check-target-libjava maybe-check-target-libjava
  maybe-check-target-libjava:
  @if target-libjava
@@ -28307,7 +31277,6 @@ maybe-check-target-libjava: check-target-libjava
  check-target-libjava:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(RAW_CXX_TARGET_EXPORTS) \
         (cd $(TARGET_SUBDIR)/libjava && \
           $(MAKE) $(TARGET_FLAGS_TO_PASS)  'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   check)
@@ -28322,7 +31291,6 @@ maybe-install-target-libjava: install-target-libjava
  install-target-libjava: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(RAW_CXX_TARGET_EXPORTS) \
         (cd $(TARGET_SUBDIR)/libjava && \
           $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
@@ -28341,7 +31309,6 @@ info-target-libjava: \
         @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(RAW_CXX_TARGET_EXPORTS) \
         echo "Doing info in $(TARGET_SUBDIR)/libjava" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -28367,7 +31334,6 @@ dvi-target-libjava: \
         @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(RAW_CXX_TARGET_EXPORTS) \
         echo "Doing dvi in $(TARGET_SUBDIR)/libjava" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -28393,7 +31359,6 @@ html-target-libjava: \
         @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(RAW_CXX_TARGET_EXPORTS) \
         echo "Doing html in $(TARGET_SUBDIR)/libjava" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -28419,7 +31384,6 @@ TAGS-target-libjava: \
         @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(RAW_CXX_TARGET_EXPORTS) \
         echo "Doing TAGS in $(TARGET_SUBDIR)/libjava" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -28446,7 +31410,6 @@ install-info-target-libjava: \
         @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(RAW_CXX_TARGET_EXPORTS) \
         echo "Doing install-info in $(TARGET_SUBDIR)/libjava" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -28472,7 +31435,6 @@ installcheck-target-libjava: \
         @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(RAW_CXX_TARGET_EXPORTS) \
         echo "Doing installcheck in $(TARGET_SUBDIR)/libjava" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -28497,7 +31459,6 @@ mostlyclean-target-libjava:
         @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(RAW_CXX_TARGET_EXPORTS) \
         echo "Doing mostlyclean in $(TARGET_SUBDIR)/libjava" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -28522,7 +31483,6 @@ clean-target-libjava:
         @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(RAW_CXX_TARGET_EXPORTS) \
         echo "Doing clean in $(TARGET_SUBDIR)/libjava" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -28547,7 +31507,6 @@ distclean-target-libjava:
         @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(RAW_CXX_TARGET_EXPORTS) \
         echo "Doing distclean in $(TARGET_SUBDIR)/libjava" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -28572,7 +31531,6 @@ maintainer-clean-target-libjava:
         @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(RAW_CXX_TARGET_EXPORTS) \
         echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libjava" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -28589,23 +31547,26 @@ maintainer-clean-target-libjava:
  @endif target-libjava
  
  
-.PHONY: configure-target-zlib maybe-configure-target-zlib
-maybe-configure-target-zlib:
-@if target-zlib
-maybe-configure-target-zlib: configure-target-zlib
  
  # 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
         @test ! -f $(TARGET_SUBDIR)/zlib/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/zlib ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo Configuring in $(TARGET_SUBDIR)/zlib; \
         cd "$(TARGET_SUBDIR)/zlib" || exit 1; \
@@ -28618,11 +31579,14 @@ configure-target-zlib: $(TARGET_SUBDIR)/zlib/multilib.out
         libsrcdir="$$s/zlib"; \
         rm -f no-such-file || : ; \
         CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
-         $(TARGET_CONFIGARGS) $${srcdiroption} \
-         --with-target-subdir="$(TARGET_SUBDIR)"  \
+         $(TARGET_CONFIGARGS) $${srcdiroption}  \
           || exit 1
  @endif target-zlib
  
+
+
+
+
  .PHONY: all-target-zlib maybe-all-target-zlib
  maybe-all-target-zlib:
  @if target-zlib
@@ -28631,12 +31595,15 @@ maybe-all-target-zlib: all-target-zlib
  all-target-zlib: configure-target-zlib
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         (cd $(TARGET_SUBDIR)/zlib && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)   $(TARGET-target-zlib))
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  $(TARGET-target-zlib))
  @endif target-zlib
  
+
+
+
+
  .PHONY: check-target-zlib maybe-check-target-zlib
  maybe-check-target-zlib:
  @if target-zlib
@@ -28645,7 +31612,6 @@ maybe-check-target-zlib: check-target-zlib
  check-target-zlib:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         (cd $(TARGET_SUBDIR)/zlib && \
           $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
@@ -28660,7 +31626,6 @@ maybe-install-target-zlib: install-target-zlib
  install-target-zlib: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         (cd $(TARGET_SUBDIR)/zlib && \
           $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
@@ -28679,7 +31644,6 @@ info-target-zlib: \
         @[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing info in $(TARGET_SUBDIR)/zlib" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -28705,7 +31669,6 @@ dvi-target-zlib: \
         @[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing dvi in $(TARGET_SUBDIR)/zlib" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -28731,7 +31694,6 @@ html-target-zlib: \
         @[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing html in $(TARGET_SUBDIR)/zlib" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -28757,7 +31719,6 @@ TAGS-target-zlib: \
         @[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing TAGS in $(TARGET_SUBDIR)/zlib" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -28784,7 +31745,6 @@ install-info-target-zlib: \
         @[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing install-info in $(TARGET_SUBDIR)/zlib" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -28810,7 +31770,6 @@ installcheck-target-zlib: \
         @[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing installcheck in $(TARGET_SUBDIR)/zlib" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -28835,7 +31794,6 @@ mostlyclean-target-zlib:
         @[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing mostlyclean in $(TARGET_SUBDIR)/zlib" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -28860,7 +31818,6 @@ clean-target-zlib:
         @[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing clean in $(TARGET_SUBDIR)/zlib" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -28885,7 +31842,6 @@ distclean-target-zlib:
         @[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing distclean in $(TARGET_SUBDIR)/zlib" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -28910,7 +31866,6 @@ maintainer-clean-target-zlib:
         @[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing maintainer-clean in $(TARGET_SUBDIR)/zlib" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -28927,23 +31882,26 @@ maintainer-clean-target-zlib:
  @endif target-zlib
  
  
-.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
  
  # 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
         @test ! -f $(TARGET_SUBDIR)/boehm-gc/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/boehm-gc ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo Configuring in $(TARGET_SUBDIR)/boehm-gc; \
         cd "$(TARGET_SUBDIR)/boehm-gc" || exit 1; \
@@ -28956,11 +31914,14 @@ configure-target-boehm-gc: $(TARGET_SUBDIR)/boehm-gc/multilib.out
         libsrcdir="$$s/boehm-gc"; \
         rm -f no-such-file || : ; \
         CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
-         $(TARGET_CONFIGARGS) $${srcdiroption} \
-         --with-target-subdir="$(TARGET_SUBDIR)"  \
+         $(TARGET_CONFIGARGS) $${srcdiroption}  \
           || exit 1
  @endif target-boehm-gc
  
+
+
+
+
  .PHONY: all-target-boehm-gc maybe-all-target-boehm-gc
  maybe-all-target-boehm-gc:
  @if target-boehm-gc
@@ -28969,12 +31930,15 @@ maybe-all-target-boehm-gc: all-target-boehm-gc
  all-target-boehm-gc: configure-target-boehm-gc
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         (cd $(TARGET_SUBDIR)/boehm-gc && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)   $(TARGET-target-boehm-gc))
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  $(TARGET-target-boehm-gc))
  @endif target-boehm-gc
  
+
+
+
+
  .PHONY: check-target-boehm-gc maybe-check-target-boehm-gc
  maybe-check-target-boehm-gc:
  @if target-boehm-gc
@@ -28983,7 +31947,6 @@ maybe-check-target-boehm-gc: check-target-boehm-gc
  check-target-boehm-gc:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         (cd $(TARGET_SUBDIR)/boehm-gc && \
           $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
@@ -28998,7 +31961,6 @@ maybe-install-target-boehm-gc: install-target-boehm-gc
  install-target-boehm-gc: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         (cd $(TARGET_SUBDIR)/boehm-gc && \
           $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
@@ -29017,7 +31979,6 @@ info-target-boehm-gc: \
         @[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing info in $(TARGET_SUBDIR)/boehm-gc" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -29043,7 +32004,6 @@ dvi-target-boehm-gc: \
         @[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing dvi in $(TARGET_SUBDIR)/boehm-gc" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -29069,7 +32029,6 @@ html-target-boehm-gc: \
         @[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing html in $(TARGET_SUBDIR)/boehm-gc" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -29095,7 +32054,6 @@ TAGS-target-boehm-gc: \
         @[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing TAGS in $(TARGET_SUBDIR)/boehm-gc" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -29122,7 +32080,6 @@ install-info-target-boehm-gc: \
         @[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing install-info in $(TARGET_SUBDIR)/boehm-gc" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -29148,7 +32105,6 @@ installcheck-target-boehm-gc: \
         @[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing installcheck in $(TARGET_SUBDIR)/boehm-gc" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -29173,7 +32129,6 @@ mostlyclean-target-boehm-gc:
         @[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing mostlyclean in $(TARGET_SUBDIR)/boehm-gc" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -29198,7 +32153,6 @@ clean-target-boehm-gc:
         @[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing clean in $(TARGET_SUBDIR)/boehm-gc" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -29223,7 +32177,6 @@ distclean-target-boehm-gc:
         @[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing distclean in $(TARGET_SUBDIR)/boehm-gc" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -29248,7 +32201,6 @@ maintainer-clean-target-boehm-gc:
         @[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing maintainer-clean in $(TARGET_SUBDIR)/boehm-gc" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -29265,23 +32217,26 @@ maintainer-clean-target-boehm-gc:
  @endif target-boehm-gc
  
  
-.PHONY: configure-target-qthreads maybe-configure-target-qthreads
-maybe-configure-target-qthreads:
-@if target-qthreads
-maybe-configure-target-qthreads: configure-target-qthreads
  
  # 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
         @test ! -f $(TARGET_SUBDIR)/qthreads/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/qthreads ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo Configuring in $(TARGET_SUBDIR)/qthreads; \
         cd "$(TARGET_SUBDIR)/qthreads" || exit 1; \
@@ -29294,11 +32249,14 @@ configure-target-qthreads: $(TARGET_SUBDIR)/qthreads/multilib.out
         libsrcdir="$$s/qthreads"; \
         rm -f no-such-file || : ; \
         CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
-         $(TARGET_CONFIGARGS) $${srcdiroption} \
-         --with-target-subdir="$(TARGET_SUBDIR)"  \
+         $(TARGET_CONFIGARGS) $${srcdiroption}  \
           || exit 1
  @endif target-qthreads
  
+
+
+
+
  .PHONY: all-target-qthreads maybe-all-target-qthreads
  maybe-all-target-qthreads:
  @if target-qthreads
@@ -29307,12 +32265,15 @@ maybe-all-target-qthreads: all-target-qthreads
  all-target-qthreads: configure-target-qthreads
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         (cd $(TARGET_SUBDIR)/qthreads && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)   $(TARGET-target-qthreads))
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  $(TARGET-target-qthreads))
  @endif target-qthreads
  
+
+
+
+
  .PHONY: check-target-qthreads maybe-check-target-qthreads
  maybe-check-target-qthreads:
  @if target-qthreads
@@ -29321,7 +32282,6 @@ maybe-check-target-qthreads: check-target-qthreads
  check-target-qthreads:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         (cd $(TARGET_SUBDIR)/qthreads && \
           $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
@@ -29336,7 +32296,6 @@ maybe-install-target-qthreads: install-target-qthreads
  install-target-qthreads: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         (cd $(TARGET_SUBDIR)/qthreads && \
           $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
@@ -29355,7 +32314,6 @@ info-target-qthreads: \
         @[ -f $(TARGET_SUBDIR)/qthreads/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing info in $(TARGET_SUBDIR)/qthreads" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -29381,7 +32339,6 @@ dvi-target-qthreads: \
         @[ -f $(TARGET_SUBDIR)/qthreads/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing dvi in $(TARGET_SUBDIR)/qthreads" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -29407,7 +32364,6 @@ html-target-qthreads: \
         @[ -f $(TARGET_SUBDIR)/qthreads/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing html in $(TARGET_SUBDIR)/qthreads" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -29433,7 +32389,6 @@ TAGS-target-qthreads: \
         @[ -f $(TARGET_SUBDIR)/qthreads/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing TAGS in $(TARGET_SUBDIR)/qthreads" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -29460,7 +32415,6 @@ install-info-target-qthreads: \
         @[ -f $(TARGET_SUBDIR)/qthreads/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing install-info in $(TARGET_SUBDIR)/qthreads" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -29486,7 +32440,6 @@ installcheck-target-qthreads: \
         @[ -f $(TARGET_SUBDIR)/qthreads/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing installcheck in $(TARGET_SUBDIR)/qthreads" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -29511,7 +32464,6 @@ mostlyclean-target-qthreads:
         @[ -f $(TARGET_SUBDIR)/qthreads/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing mostlyclean in $(TARGET_SUBDIR)/qthreads" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -29536,7 +32488,6 @@ clean-target-qthreads:
         @[ -f $(TARGET_SUBDIR)/qthreads/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing clean in $(TARGET_SUBDIR)/qthreads" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -29561,7 +32512,6 @@ distclean-target-qthreads:
         @[ -f $(TARGET_SUBDIR)/qthreads/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing distclean in $(TARGET_SUBDIR)/qthreads" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -29586,7 +32536,6 @@ maintainer-clean-target-qthreads:
         @[ -f $(TARGET_SUBDIR)/qthreads/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing maintainer-clean in $(TARGET_SUBDIR)/qthreads" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -29603,23 +32552,26 @@ maintainer-clean-target-qthreads:
  @endif target-qthreads
  
  
-.PHONY: configure-target-rda maybe-configure-target-rda
-maybe-configure-target-rda:
-@if target-rda
-maybe-configure-target-rda: configure-target-rda
  
  # 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
         @test ! -f $(TARGET_SUBDIR)/rda/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/rda ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo Configuring in $(TARGET_SUBDIR)/rda; \
         cd "$(TARGET_SUBDIR)/rda" || exit 1; \
@@ -29632,11 +32584,14 @@ configure-target-rda: $(TARGET_SUBDIR)/rda/multilib.out
         libsrcdir="$$s/rda"; \
         rm -f no-such-file || : ; \
         CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
-         $(TARGET_CONFIGARGS) $${srcdiroption} \
-         --with-target-subdir="$(TARGET_SUBDIR)"  \
+         $(TARGET_CONFIGARGS) $${srcdiroption}  \
           || exit 1
  @endif target-rda
  
+
+
+
+
  .PHONY: all-target-rda maybe-all-target-rda
  maybe-all-target-rda:
  @if target-rda
@@ -29645,12 +32600,15 @@ maybe-all-target-rda: all-target-rda
  all-target-rda: configure-target-rda
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         (cd $(TARGET_SUBDIR)/rda && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)   $(TARGET-target-rda))
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  $(TARGET-target-rda))
  @endif target-rda
  
+
+
+
+
  .PHONY: check-target-rda maybe-check-target-rda
  maybe-check-target-rda:
  @if target-rda
@@ -29659,7 +32617,6 @@ maybe-check-target-rda: check-target-rda
  check-target-rda:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         (cd $(TARGET_SUBDIR)/rda && \
           $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
@@ -29674,7 +32631,6 @@ maybe-install-target-rda: install-target-rda
  install-target-rda: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         (cd $(TARGET_SUBDIR)/rda && \
           $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
@@ -29693,7 +32649,6 @@ info-target-rda: \
         @[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing info in $(TARGET_SUBDIR)/rda" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -29719,7 +32674,6 @@ dvi-target-rda: \
         @[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing dvi in $(TARGET_SUBDIR)/rda" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -29745,7 +32699,6 @@ html-target-rda: \
         @[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing html in $(TARGET_SUBDIR)/rda" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -29771,7 +32724,6 @@ TAGS-target-rda: \
         @[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing TAGS in $(TARGET_SUBDIR)/rda" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -29798,7 +32750,6 @@ install-info-target-rda: \
         @[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing install-info in $(TARGET_SUBDIR)/rda" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -29824,7 +32775,6 @@ installcheck-target-rda: \
         @[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing installcheck in $(TARGET_SUBDIR)/rda" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -29849,7 +32799,6 @@ mostlyclean-target-rda:
         @[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing mostlyclean in $(TARGET_SUBDIR)/rda" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -29874,7 +32823,6 @@ clean-target-rda:
         @[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing clean in $(TARGET_SUBDIR)/rda" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -29899,7 +32847,6 @@ distclean-target-rda:
         @[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing distclean in $(TARGET_SUBDIR)/rda" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -29924,7 +32871,6 @@ maintainer-clean-target-rda:
         @[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing maintainer-clean in $(TARGET_SUBDIR)/rda" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -29941,23 +32887,26 @@ maintainer-clean-target-rda:
  @endif target-rda
  
  
-.PHONY: configure-target-libada maybe-configure-target-libada
-maybe-configure-target-libada:
-@if target-libada
-maybe-configure-target-libada: configure-target-libada
  
  # 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
         @test ! -f $(TARGET_SUBDIR)/libada/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libada ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo Configuring in $(TARGET_SUBDIR)/libada; \
         cd "$(TARGET_SUBDIR)/libada" || exit 1; \
@@ -29970,11 +32919,14 @@ configure-target-libada: $(TARGET_SUBDIR)/libada/multilib.out
         libsrcdir="$$s/libada"; \
         rm -f no-such-file || : ; \
         CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
-         $(TARGET_CONFIGARGS) $${srcdiroption} \
-         --with-target-subdir="$(TARGET_SUBDIR)"  \
+         $(TARGET_CONFIGARGS) $${srcdiroption}  \
           || exit 1
  @endif target-libada
  
+
+
+
+
  .PHONY: all-target-libada maybe-all-target-libada
  maybe-all-target-libada:
  @if target-libada
@@ -29983,12 +32935,15 @@ maybe-all-target-libada: all-target-libada
  all-target-libada: configure-target-libada
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         (cd $(TARGET_SUBDIR)/libada && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)   $(TARGET-target-libada))
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  $(TARGET-target-libada))
  @endif target-libada
  
+
+
+
+
  .PHONY: check-target-libada maybe-check-target-libada
  maybe-check-target-libada:
  @if target-libada
@@ -29997,7 +32952,6 @@ maybe-check-target-libada: check-target-libada
  check-target-libada:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         (cd $(TARGET_SUBDIR)/libada && \
           $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
@@ -30012,7 +32966,6 @@ maybe-install-target-libada: install-target-libada
  install-target-libada: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         (cd $(TARGET_SUBDIR)/libada && \
           $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
@@ -30031,7 +32984,6 @@ info-target-libada: \
         @[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing info in $(TARGET_SUBDIR)/libada" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -30057,7 +33009,6 @@ dvi-target-libada: \
         @[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing dvi in $(TARGET_SUBDIR)/libada" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -30083,7 +33034,6 @@ html-target-libada: \
         @[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing html in $(TARGET_SUBDIR)/libada" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -30109,7 +33059,6 @@ TAGS-target-libada: \
         @[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing TAGS in $(TARGET_SUBDIR)/libada" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -30136,7 +33085,6 @@ install-info-target-libada: \
         @[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing install-info in $(TARGET_SUBDIR)/libada" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -30162,7 +33110,6 @@ installcheck-target-libada: \
         @[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing installcheck in $(TARGET_SUBDIR)/libada" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -30187,7 +33134,6 @@ mostlyclean-target-libada:
         @[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing mostlyclean in $(TARGET_SUBDIR)/libada" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -30212,7 +33158,6 @@ clean-target-libada:
         @[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing clean in $(TARGET_SUBDIR)/libada" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -30237,7 +33182,6 @@ distclean-target-libada:
         @[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing distclean in $(TARGET_SUBDIR)/libada" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -30262,7 +33206,6 @@ maintainer-clean-target-libada:
         @[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(NORMAL_TARGET_EXPORTS) \
         echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libada" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -30294,9 +33237,9 @@ GCC_STRAP_TARGETS = bootstrap bootstrap-lean bootstrap2 bootstrap2-lean bootstra
  $(GCC_STRAP_TARGETS): all-prebootstrap configure-gcc
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         echo "Bootstrapping the compiler"; \
+       $(RPATH_ENVVAR)=`echo "$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,:[ :]*,:,g;s,^[ :]*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); \
         cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) $@
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -30314,32 +33257,28 @@ $(GCC_STRAP_TARGETS): all-prebootstrap configure-gcc
             msg="Comparing stage2 and stage3 of the compiler"; \
             compare=compare ;; \
         esac; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         echo "$$msg"; \
         cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) $$compare
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}` ; export s; \
-       $(SET_LIB_PATH) \
         echo "Building runtime libraries"; \
         $(MAKE) $(RECURSE_FLAGS_TO_PASS) all
  
  profiledbootstrap: all-prebootstrap configure-gcc
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
+       $(RPATH_ENVVAR)=`echo "$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,:[ :]*,:,g;s,^[ :]*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); \
         echo "Bootstrapping training compiler"; \
         cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) stageprofile_build
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         echo "Building feedback based compiler"; \
         cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) stagefeedback_build
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}` ; export s; \
-       $(SET_LIB_PATH) \
         echo "Building runtime libraries"; \
         $(MAKE) $(RECURSE_FLAGS_TO_PASS) all
  
@@ -30347,13 +33286,11 @@ profiledbootstrap: all-prebootstrap configure-gcc
  cross: all-build all-gas all-ld
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         echo "Building the C and C++ compiler"; \
         cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) LANGUAGES="c c++"
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}` ; export s; \
-       $(SET_LIB_PATH) \
         echo "Building runtime libraries"; \
         $(MAKE) $(RECURSE_FLAGS_TO_PASS) LANGUAGES="c c++" all
  @endif gcc-no-bootstrap
@@ -30364,7 +33301,6 @@ check-gcc-c++:
         @if [ -f ./gcc/Makefile ] ; then \
           r=`${PWD_COMMAND}`; export r; \
           s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-         $(SET_LIB_PATH) \
           $(HOST_EXPORTS) \
           (cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) check-c++); \
         else \
@@ -30388,7 +33324,6 @@ gcc-no-fixedincludes:
           rm -f gcc/stmp-headers gcc/stmp-int-hdrs; \
           r=`${PWD_COMMAND}`; export r; \
           s=`cd $(srcdir); ${PWD_COMMAND}` ; export s; \
-         $(SET_LIB_PATH) \
           $(HOST_EXPORTS) \
           (cd ./gcc && \
            $(MAKE) $(GCC_FLAGS_TO_PASS) install); \
@@ -30479,7 +33414,7 @@ stage1-start::
         @[ -f stage_current ] && $(MAKE) `cat stage_current`-end || : ; \
         echo stage1 > stage_current ; \
         echo stage1 > stage_last; \
-       $(mkinstalldirs) $(HOST_SUBDIR)
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)
  @if bfd
         @cd $(HOST_SUBDIR); [ -d stage1-bfd ] || \
           mkdir stage1-bfd; \
@@ -30596,1289 +33531,219 @@ stage1-bubble::
         fi
  
  .PHONY: all-stage1 clean-stage1
-all-stage1:     \
-  maybe-all-stage1-bfd \
-  maybe-all-stage1-opcodes \
-  maybe-all-stage1-binutils              \
-  maybe-all-stage1-gas \
-  maybe-all-stage1-gcc        \
-  maybe-all-stage1-intl   \
-  maybe-all-stage1-ld \
-  maybe-all-stage1-libcpp  \
-  maybe-all-stage1-libiberty                        \
-  maybe-all-stage1-zlib        
-
  do-clean: clean-stage1
-clean-stage1:     \
-  maybe-clean-stage1-bfd \
-  maybe-clean-stage1-opcodes \
-  maybe-clean-stage1-binutils              \
-  maybe-clean-stage1-gas \
-  maybe-clean-stage1-gcc        \
-  maybe-clean-stage1-intl   \
-  maybe-clean-stage1-ld \
-  maybe-clean-stage1-libcpp  \
-  maybe-clean-stage1-libiberty                        \
-  maybe-clean-stage1-zlib        
-
-
-.PHONY: configure-stage1-bfd maybe-configure-stage1-bfd
-.PHONY: all-stage1-bfd maybe-all-stage1-bfd
-.PHONY: clean-stage1-bfd maybe-clean-stage1-bfd
-
-maybe-configure-stage1-bfd:
-maybe-all-stage1-bfd:
-maybe-clean-stage1-bfd:
-
-@if bfd-bootstrap
-maybe-configure-stage1-bfd: configure-stage1-bfd
-configure-stage1-bfd:
-       @$(MAKE) stage1-start
-       @[ -f bfd/Makefile ] && exit 0 || : ; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-       $(HOST_EXPORTS)  \
-       echo Configuring stage 1 in bfd ; \
-       cd $(HOST_SUBDIR)/bfd || exit 1; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/bfd/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       srcdiroption="--srcdir=$${topdir}/bfd"; \
-       libsrcdir="$$s/bfd"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
-         --disable-intermodule           --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" 
-
-maybe-all-stage1-bfd: all-stage1-bfd
-all-stage1-bfd: configure-stage1-bfd
-       @$(MAKE) stage1-start
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-       $(HOST_EXPORTS)  \
-       cd $(HOST_SUBDIR)/bfd && \
-       $(MAKE) $(FLAGS_TO_PASS)  \
-               CFLAGS="$(STAGE1_CFLAGS)" 
  
-maybe-clean-stage1-bfd: clean-stage1-bfd
-clean-stage1-bfd:
-       @[ -f bfd/Makefile ] || [ -f stage1-bfd/Makefile ] \
-         || exit 0 ; \
-       [ -f bfd/Makefile ] || $(MAKE) stage1-start ; \
-       cd $(HOST_SUBDIR)/bfd && \
-       $(MAKE) $(FLAGS_TO_PASS)  \
-               CFLAGS="$(STAGE1_CFLAGS)"  clean
-@endif bfd-bootstrap
+# FIXME: Will not need to be conditional when toplevel bootstrap is the
+# only possibility, but now it conflicts with no-bootstrap rules
+@if gcc-bootstrap
  
  
-.PHONY: configure-stage1-opcodes maybe-configure-stage1-opcodes
-.PHONY: all-stage1-opcodes maybe-all-stage1-opcodes
-.PHONY: clean-stage1-opcodes maybe-clean-stage1-opcodes
  
-maybe-configure-stage1-opcodes:
-maybe-all-stage1-opcodes:
-maybe-clean-stage1-opcodes:
  
-@if opcodes-bootstrap
-maybe-configure-stage1-opcodes: configure-stage1-opcodes
-configure-stage1-opcodes:
-       @$(MAKE) stage1-start
-       @[ -f opcodes/Makefile ] && exit 0 || : ; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-       $(HOST_EXPORTS)  \
-       echo Configuring stage 1 in opcodes ; \
-       cd $(HOST_SUBDIR)/opcodes || exit 1; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/opcodes/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       srcdiroption="--srcdir=$${topdir}/opcodes"; \
-       libsrcdir="$$s/opcodes"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
-         --disable-intermodule           --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" 
+# Rules to wipe a stage and all the following ones, also used for cleanstrap
  
-maybe-all-stage1-opcodes: all-stage1-opcodes
-all-stage1-opcodes: configure-stage1-opcodes
-       @$(MAKE) stage1-start
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-       $(HOST_EXPORTS)  \
-       cd $(HOST_SUBDIR)/opcodes && \
-       $(MAKE) $(FLAGS_TO_PASS)  \
-               CFLAGS="$(STAGE1_CFLAGS)" 
+.PHONY: distclean-stage1
+distclean-stage1::
+       [ -f stage_current ] && $(MAKE) `cat stage_current`-end || :
+       rm -rf stage1-* 
  
-maybe-clean-stage1-opcodes: clean-stage1-opcodes
-clean-stage1-opcodes:
-       @[ -f opcodes/Makefile ] || [ -f stage1-opcodes/Makefile ] \
-         || exit 0 ; \
-       [ -f opcodes/Makefile ] || $(MAKE) stage1-start ; \
-       cd $(HOST_SUBDIR)/opcodes && \
-       $(MAKE) $(FLAGS_TO_PASS)  \
-               CFLAGS="$(STAGE1_CFLAGS)"  clean
-@endif opcodes-bootstrap
  
+@endif gcc-bootstrap
  
-.PHONY: configure-stage1-binutils maybe-configure-stage1-binutils
-.PHONY: all-stage1-binutils maybe-all-stage1-binutils
-.PHONY: clean-stage1-binutils maybe-clean-stage1-binutils
  
-maybe-configure-stage1-binutils:
-maybe-all-stage1-binutils:
-maybe-clean-stage1-binutils:
+.PHONY: stage2-start stage2-end
  
-@if binutils-bootstrap
-maybe-configure-stage1-binutils: configure-stage1-binutils
-configure-stage1-binutils:
-       @$(MAKE) stage1-start
-       @[ -f binutils/Makefile ] && exit 0 || : ; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-       $(HOST_EXPORTS)  \
-       echo Configuring stage 1 in binutils ; \
-       cd $(HOST_SUBDIR)/binutils || exit 1; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/binutils/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       srcdiroption="--srcdir=$${topdir}/binutils"; \
-       libsrcdir="$$s/binutils"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
-         --disable-intermodule           --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" 
+stage2-start::
+       @[ -f stage_current ] && $(MAKE) `cat stage_current`-end || : ; \
+       echo stage2 > stage_current ; \
+       echo stage2 > stage_last; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)
+@if bfd
+       @cd $(HOST_SUBDIR); [ -d stage2-bfd ] || \
+         mkdir stage2-bfd; \
+       set stage2-bfd bfd ; \
+       @CREATE_LINK_TO_DIR@  ; \
+       set stage1-bfd prev-bfd ; \
+       @CREATE_LINK_TO_DIR@ 
+@endif bfd
+@if opcodes
+       @cd $(HOST_SUBDIR); [ -d stage2-opcodes ] || \
+         mkdir stage2-opcodes; \
+       set stage2-opcodes opcodes ; \
+       @CREATE_LINK_TO_DIR@  ; \
+       set stage1-opcodes prev-opcodes ; \
+       @CREATE_LINK_TO_DIR@ 
+@endif opcodes
+@if binutils
+       @cd $(HOST_SUBDIR); [ -d stage2-binutils ] || \
+         mkdir stage2-binutils; \
+       set stage2-binutils binutils ; \
+       @CREATE_LINK_TO_DIR@  ; \
+       set stage1-binutils prev-binutils ; \
+       @CREATE_LINK_TO_DIR@ 
+@endif binutils
+@if gas
+       @cd $(HOST_SUBDIR); [ -d stage2-gas ] || \
+         mkdir stage2-gas; \
+       set stage2-gas gas ; \
+       @CREATE_LINK_TO_DIR@  ; \
+       set stage1-gas prev-gas ; \
+       @CREATE_LINK_TO_DIR@ 
+@endif gas
+@if gcc
+       @cd $(HOST_SUBDIR); [ -d stage2-gcc ] || \
+         mkdir stage2-gcc; \
+       set stage2-gcc gcc ; \
+       @CREATE_LINK_TO_DIR@  ; \
+       set stage1-gcc prev-gcc ; \
+       @CREATE_LINK_TO_DIR@ 
+@endif gcc
+@if intl
+       @cd $(HOST_SUBDIR); [ -d stage2-intl ] || \
+         mkdir stage2-intl; \
+       set stage2-intl intl ; \
+       @CREATE_LINK_TO_DIR@  ; \
+       set stage1-intl prev-intl ; \
+       @CREATE_LINK_TO_DIR@ 
+@endif intl
+@if ld
+       @cd $(HOST_SUBDIR); [ -d stage2-ld ] || \
+         mkdir stage2-ld; \
+       set stage2-ld ld ; \
+       @CREATE_LINK_TO_DIR@  ; \
+       set stage1-ld prev-ld ; \
+       @CREATE_LINK_TO_DIR@ 
+@endif ld
+@if libcpp
+       @cd $(HOST_SUBDIR); [ -d stage2-libcpp ] || \
+         mkdir stage2-libcpp; \
+       set stage2-libcpp libcpp ; \
+       @CREATE_LINK_TO_DIR@  ; \
+       set stage1-libcpp prev-libcpp ; \
+       @CREATE_LINK_TO_DIR@ 
+@endif libcpp
+@if libiberty
+       @cd $(HOST_SUBDIR); [ -d stage2-libiberty ] || \
+         mkdir stage2-libiberty; \
+       set stage2-libiberty libiberty ; \
+       @CREATE_LINK_TO_DIR@  ; \
+       set stage1-libiberty prev-libiberty ; \
+       @CREATE_LINK_TO_DIR@ 
+@endif libiberty
+@if zlib
+       @cd $(HOST_SUBDIR); [ -d stage2-zlib ] || \
+         mkdir stage2-zlib; \
+       set stage2-zlib zlib ; \
+       @CREATE_LINK_TO_DIR@  ; \
+       set stage1-zlib prev-zlib ; \
+       @CREATE_LINK_TO_DIR@ 
+@endif zlib
  
-maybe-all-stage1-binutils: all-stage1-binutils
-all-stage1-binutils: configure-stage1-binutils
-       @$(MAKE) stage1-start
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-       $(HOST_EXPORTS)  \
-       cd $(HOST_SUBDIR)/binutils && \
-       $(MAKE) $(FLAGS_TO_PASS)  \
-               CFLAGS="$(STAGE1_CFLAGS)" 
+stage2-end::
+       @rm -f stage_current
+@if bfd
+       @cd $(HOST_SUBDIR); set bfd stage2-bfd ; \
+       @UNDO_LINK_TO_DIR@  ; \
+       set prev-bfd stage1-bfd ; \
+       @UNDO_LINK_TO_DIR@ 
+@endif bfd
+@if opcodes
+       @cd $(HOST_SUBDIR); set opcodes stage2-opcodes ; \
+       @UNDO_LINK_TO_DIR@  ; \
+       set prev-opcodes stage1-opcodes ; \
+       @UNDO_LINK_TO_DIR@ 
+@endif opcodes
+@if binutils
+       @cd $(HOST_SUBDIR); set binutils stage2-binutils ; \
+       @UNDO_LINK_TO_DIR@  ; \
+       set prev-binutils stage1-binutils ; \
+       @UNDO_LINK_TO_DIR@ 
+@endif binutils
+@if gas
+       @cd $(HOST_SUBDIR); set gas stage2-gas ; \
+       @UNDO_LINK_TO_DIR@  ; \
+       set prev-gas stage1-gas ; \
+       @UNDO_LINK_TO_DIR@ 
+@endif gas
+@if gcc
+       @cd $(HOST_SUBDIR); set gcc stage2-gcc ; \
+       @UNDO_LINK_TO_DIR@  ; \
+       set prev-gcc stage1-gcc ; \
+       @UNDO_LINK_TO_DIR@ 
+@endif gcc
+@if intl
+       @cd $(HOST_SUBDIR); set intl stage2-intl ; \
+       @UNDO_LINK_TO_DIR@  ; \
+       set prev-intl stage1-intl ; \
+       @UNDO_LINK_TO_DIR@ 
+@endif intl
+@if ld
+       @cd $(HOST_SUBDIR); set ld stage2-ld ; \
+       @UNDO_LINK_TO_DIR@  ; \
+       set prev-ld stage1-ld ; \
+       @UNDO_LINK_TO_DIR@ 
+@endif ld
+@if libcpp
+       @cd $(HOST_SUBDIR); set libcpp stage2-libcpp ; \
+       @UNDO_LINK_TO_DIR@  ; \
+       set prev-libcpp stage1-libcpp ; \
+       @UNDO_LINK_TO_DIR@ 
+@endif libcpp
+@if libiberty
+       @cd $(HOST_SUBDIR); set libiberty stage2-libiberty ; \
+       @UNDO_LINK_TO_DIR@  ; \
+       set prev-libiberty stage1-libiberty ; \
+       @UNDO_LINK_TO_DIR@ 
+@endif libiberty
+@if zlib
+       @cd $(HOST_SUBDIR); set zlib stage2-zlib ; \
+       @UNDO_LINK_TO_DIR@  ; \
+       set prev-zlib stage1-zlib ; \
+       @UNDO_LINK_TO_DIR@ 
+@endif zlib
  
-maybe-clean-stage1-binutils: clean-stage1-binutils
-clean-stage1-binutils:
-       @[ -f binutils/Makefile ] || [ -f stage1-binutils/Makefile ] \
-         || exit 0 ; \
-       [ -f binutils/Makefile ] || $(MAKE) stage1-start ; \
-       cd $(HOST_SUBDIR)/binutils && \
-       $(MAKE) $(FLAGS_TO_PASS)  \
-               CFLAGS="$(STAGE1_CFLAGS)"  clean
-@endif binutils-bootstrap
+# Bubble a bugfix through all the stages up to stage 2.  They
+# are remade, but not reconfigured.  The next stage (if any) will not
+# be reconfigured as well.
+.PHONY: stage2-bubble
+stage2-bubble:: stage1-bubble
+       @if test -f stage2-lean || test -f stage1-lean  ; then \
+         echo Skipping rebuild of stage2 ; \
+       else \
+         $(MAKE) $(RECURSE_FLAGS_TO_PASS) NOTPARALLEL= all-stage2; \
+       fi
  
+.PHONY: all-stage2 clean-stage2
+do-clean: clean-stage2
  
-.PHONY: configure-stage1-gas maybe-configure-stage1-gas
-.PHONY: all-stage1-gas maybe-all-stage1-gas
-.PHONY: clean-stage1-gas maybe-clean-stage1-gas
+# FIXME: Will not need to be conditional when toplevel bootstrap is the
+# only possibility, but now it conflicts with no-bootstrap rules
+@if gcc-bootstrap
  
-maybe-configure-stage1-gas:
-maybe-all-stage1-gas:
-maybe-clean-stage1-gas:
  
-@if gas-bootstrap
-maybe-configure-stage1-gas: configure-stage1-gas
-configure-stage1-gas:
-       @$(MAKE) stage1-start
-       @[ -f gas/Makefile ] && exit 0 || : ; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-       $(HOST_EXPORTS)  \
-       echo Configuring stage 1 in gas ; \
-       cd $(HOST_SUBDIR)/gas || exit 1; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/gas/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       srcdiroption="--srcdir=$${topdir}/gas"; \
-       libsrcdir="$$s/gas"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
-         --disable-intermodule           --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" 
  
-maybe-all-stage1-gas: all-stage1-gas
-all-stage1-gas: configure-stage1-gas
-       @$(MAKE) stage1-start
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-       $(HOST_EXPORTS)  \
-       cd $(HOST_SUBDIR)/gas && \
-       $(MAKE) $(FLAGS_TO_PASS)  \
-               CFLAGS="$(STAGE1_CFLAGS)" 
+.PHONY: bootstrap2
+bootstrap2: stage2-bubble  all
  
-maybe-clean-stage1-gas: clean-stage1-gas
-clean-stage1-gas:
-       @[ -f gas/Makefile ] || [ -f stage1-gas/Makefile ] \
-         || exit 0 ; \
-       [ -f gas/Makefile ] || $(MAKE) stage1-start ; \
-       cd $(HOST_SUBDIR)/gas && \
-       $(MAKE) $(FLAGS_TO_PASS)  \
-               CFLAGS="$(STAGE1_CFLAGS)"  clean
-@endif gas-bootstrap
  
+# 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 || :
+       rm -rf stage2-* 
  
-.PHONY: configure-stage1-gcc maybe-configure-stage1-gcc
-.PHONY: all-stage1-gcc maybe-all-stage1-gcc
-.PHONY: clean-stage1-gcc maybe-clean-stage1-gcc
  
-maybe-configure-stage1-gcc:
-maybe-all-stage1-gcc:
-maybe-clean-stage1-gcc:
+@endif gcc-bootstrap
  
-@if gcc-bootstrap
-maybe-configure-stage1-gcc: configure-stage1-gcc
-configure-stage1-gcc:
-       @$(MAKE) stage1-start
-       @[ -f gcc/Makefile ] && exit 0 || : ; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-       $(HOST_EXPORTS)  \
-       echo Configuring stage 1 in gcc ; \
-       cd $(HOST_SUBDIR)/gcc || exit 1; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/gcc/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       srcdiroption="--srcdir=$${topdir}/gcc"; \
-       libsrcdir="$$s/gcc"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
-         --disable-intermodule           --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" 
  
-maybe-all-stage1-gcc: all-stage1-gcc
-all-stage1-gcc: configure-stage1-gcc
-       @$(MAKE) stage1-start
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-       $(HOST_EXPORTS)  \
-       cd $(HOST_SUBDIR)/gcc && \
-       $(MAKE) $(FLAGS_TO_PASS)  \
-               CFLAGS="$(STAGE1_CFLAGS)" $(EXTRA_GCC_FLAGS)
-
-maybe-clean-stage1-gcc: clean-stage1-gcc
-clean-stage1-gcc:
-       @[ -f gcc/Makefile ] || [ -f stage1-gcc/Makefile ] \
-         || exit 0 ; \
-       [ -f gcc/Makefile ] || $(MAKE) stage1-start ; \
-       cd $(HOST_SUBDIR)/gcc && \
-       $(MAKE) $(FLAGS_TO_PASS)  \
-               CFLAGS="$(STAGE1_CFLAGS)" $(EXTRA_GCC_FLAGS) clean
-@endif gcc-bootstrap
-
-
-.PHONY: configure-stage1-intl maybe-configure-stage1-intl
-.PHONY: all-stage1-intl maybe-all-stage1-intl
-.PHONY: clean-stage1-intl maybe-clean-stage1-intl
-
-maybe-configure-stage1-intl:
-maybe-all-stage1-intl:
-maybe-clean-stage1-intl:
-
-@if intl-bootstrap
-maybe-configure-stage1-intl: configure-stage1-intl
-configure-stage1-intl:
-       @$(MAKE) stage1-start
-       @[ -f intl/Makefile ] && exit 0 || : ; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-       $(HOST_EXPORTS)  \
-       echo Configuring stage 1 in intl ; \
-       cd $(HOST_SUBDIR)/intl || exit 1; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/intl/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       srcdiroption="--srcdir=$${topdir}/intl"; \
-       libsrcdir="$$s/intl"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
-         --disable-intermodule           --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" 
-
-maybe-all-stage1-intl: all-stage1-intl
-all-stage1-intl: configure-stage1-intl
-       @$(MAKE) stage1-start
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-       $(HOST_EXPORTS)  \
-       cd $(HOST_SUBDIR)/intl && \
-       $(MAKE) $(FLAGS_TO_PASS)  \
-               CFLAGS="$(STAGE1_CFLAGS)" 
-
-maybe-clean-stage1-intl: clean-stage1-intl
-clean-stage1-intl:
-       @[ -f intl/Makefile ] || [ -f stage1-intl/Makefile ] \
-         || exit 0 ; \
-       [ -f intl/Makefile ] || $(MAKE) stage1-start ; \
-       cd $(HOST_SUBDIR)/intl && \
-       $(MAKE) $(FLAGS_TO_PASS)  \
-               CFLAGS="$(STAGE1_CFLAGS)"  clean
-@endif intl-bootstrap
-
-
-.PHONY: configure-stage1-ld maybe-configure-stage1-ld
-.PHONY: all-stage1-ld maybe-all-stage1-ld
-.PHONY: clean-stage1-ld maybe-clean-stage1-ld
-
-maybe-configure-stage1-ld:
-maybe-all-stage1-ld:
-maybe-clean-stage1-ld:
-
-@if ld-bootstrap
-maybe-configure-stage1-ld: configure-stage1-ld
-configure-stage1-ld:
-       @$(MAKE) stage1-start
-       @[ -f ld/Makefile ] && exit 0 || : ; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-       $(HOST_EXPORTS)  \
-       echo Configuring stage 1 in ld ; \
-       cd $(HOST_SUBDIR)/ld || exit 1; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/ld/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       srcdiroption="--srcdir=$${topdir}/ld"; \
-       libsrcdir="$$s/ld"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
-         --disable-intermodule           --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" 
-
-maybe-all-stage1-ld: all-stage1-ld
-all-stage1-ld: configure-stage1-ld
-       @$(MAKE) stage1-start
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-       $(HOST_EXPORTS)  \
-       cd $(HOST_SUBDIR)/ld && \
-       $(MAKE) $(FLAGS_TO_PASS)  \
-               CFLAGS="$(STAGE1_CFLAGS)" 
-
-maybe-clean-stage1-ld: clean-stage1-ld
-clean-stage1-ld:
-       @[ -f ld/Makefile ] || [ -f stage1-ld/Makefile ] \
-         || exit 0 ; \
-       [ -f ld/Makefile ] || $(MAKE) stage1-start ; \
-       cd $(HOST_SUBDIR)/ld && \
-       $(MAKE) $(FLAGS_TO_PASS)  \
-               CFLAGS="$(STAGE1_CFLAGS)"  clean
-@endif ld-bootstrap
-
-
-.PHONY: configure-stage1-libcpp maybe-configure-stage1-libcpp
-.PHONY: all-stage1-libcpp maybe-all-stage1-libcpp
-.PHONY: clean-stage1-libcpp maybe-clean-stage1-libcpp
-
-maybe-configure-stage1-libcpp:
-maybe-all-stage1-libcpp:
-maybe-clean-stage1-libcpp:
-
-@if libcpp-bootstrap
-maybe-configure-stage1-libcpp: configure-stage1-libcpp
-configure-stage1-libcpp:
-       @$(MAKE) stage1-start
-       @[ -f libcpp/Makefile ] && exit 0 || : ; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-       $(HOST_EXPORTS)  \
-       echo Configuring stage 1 in libcpp ; \
-       cd $(HOST_SUBDIR)/libcpp || exit 1; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/libcpp/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       srcdiroption="--srcdir=$${topdir}/libcpp"; \
-       libsrcdir="$$s/libcpp"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
-         --disable-intermodule           --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" 
-
-maybe-all-stage1-libcpp: all-stage1-libcpp
-all-stage1-libcpp: configure-stage1-libcpp
-       @$(MAKE) stage1-start
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-       $(HOST_EXPORTS)  \
-       cd $(HOST_SUBDIR)/libcpp && \
-       $(MAKE) $(FLAGS_TO_PASS)  \
-               CFLAGS="$(STAGE1_CFLAGS)" 
-
-maybe-clean-stage1-libcpp: clean-stage1-libcpp
-clean-stage1-libcpp:
-       @[ -f libcpp/Makefile ] || [ -f stage1-libcpp/Makefile ] \
-         || exit 0 ; \
-       [ -f libcpp/Makefile ] || $(MAKE) stage1-start ; \
-       cd $(HOST_SUBDIR)/libcpp && \
-       $(MAKE) $(FLAGS_TO_PASS)  \
-               CFLAGS="$(STAGE1_CFLAGS)"  clean
-@endif libcpp-bootstrap
-
-
-.PHONY: configure-stage1-libiberty maybe-configure-stage1-libiberty
-.PHONY: all-stage1-libiberty maybe-all-stage1-libiberty
-.PHONY: clean-stage1-libiberty maybe-clean-stage1-libiberty
-
-maybe-configure-stage1-libiberty:
-maybe-all-stage1-libiberty:
-maybe-clean-stage1-libiberty:
-
-@if libiberty-bootstrap
-maybe-configure-stage1-libiberty: configure-stage1-libiberty
-configure-stage1-libiberty:
-       @$(MAKE) stage1-start
-       @[ -f libiberty/Makefile ] && exit 0 || : ; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-       $(HOST_EXPORTS)  \
-       echo Configuring stage 1 in libiberty ; \
-       cd $(HOST_SUBDIR)/libiberty || exit 1; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/libiberty/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       srcdiroption="--srcdir=$${topdir}/libiberty"; \
-       libsrcdir="$$s/libiberty"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
-         --disable-intermodule           --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" 
-
-maybe-all-stage1-libiberty: all-stage1-libiberty
-all-stage1-libiberty: configure-stage1-libiberty
-       @$(MAKE) stage1-start
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-       $(HOST_EXPORTS)  \
-       cd $(HOST_SUBDIR)/libiberty && \
-       $(MAKE) $(FLAGS_TO_PASS)  \
-               CFLAGS="$(STAGE1_CFLAGS)" 
-
-maybe-clean-stage1-libiberty: clean-stage1-libiberty
-clean-stage1-libiberty:
-       @[ -f libiberty/Makefile ] || [ -f stage1-libiberty/Makefile ] \
-         || exit 0 ; \
-       [ -f libiberty/Makefile ] || $(MAKE) stage1-start ; \
-       cd $(HOST_SUBDIR)/libiberty && \
-       $(MAKE) $(FLAGS_TO_PASS)  \
-               CFLAGS="$(STAGE1_CFLAGS)"  clean
-@endif libiberty-bootstrap
-
-
-.PHONY: configure-stage1-zlib maybe-configure-stage1-zlib
-.PHONY: all-stage1-zlib maybe-all-stage1-zlib
-.PHONY: clean-stage1-zlib maybe-clean-stage1-zlib
-
-maybe-configure-stage1-zlib:
-maybe-all-stage1-zlib:
-maybe-clean-stage1-zlib:
-
-@if zlib-bootstrap
-maybe-configure-stage1-zlib: configure-stage1-zlib
-configure-stage1-zlib:
-       @$(MAKE) stage1-start
-       @[ -f zlib/Makefile ] && exit 0 || : ; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-       $(HOST_EXPORTS)  \
-       echo Configuring stage 1 in zlib ; \
-       cd $(HOST_SUBDIR)/zlib || exit 1; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/zlib/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       srcdiroption="--srcdir=$${topdir}/zlib"; \
-       libsrcdir="$$s/zlib"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
-         --disable-intermodule           --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" 
-
-maybe-all-stage1-zlib: all-stage1-zlib
-all-stage1-zlib: configure-stage1-zlib
-       @$(MAKE) stage1-start
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-       $(HOST_EXPORTS)  \
-       cd $(HOST_SUBDIR)/zlib && \
-       $(MAKE) $(FLAGS_TO_PASS)  \
-               CFLAGS="$(STAGE1_CFLAGS)" 
-
-maybe-clean-stage1-zlib: clean-stage1-zlib
-clean-stage1-zlib:
-       @[ -f zlib/Makefile ] || [ -f stage1-zlib/Makefile ] \
-         || exit 0 ; \
-       [ -f zlib/Makefile ] || $(MAKE) stage1-start ; \
-       cd $(HOST_SUBDIR)/zlib && \
-       $(MAKE) $(FLAGS_TO_PASS)  \
-               CFLAGS="$(STAGE1_CFLAGS)"  clean
-@endif zlib-bootstrap
-
-
-
-# FIXME: Will not need to be conditional when toplevel bootstrap is the
-# only possibility, but now it conflicts with no-bootstrap rules
-@if gcc-bootstrap
-
-
-
-
-# Rules to wipe a stage and all the following ones, also used for cleanstrap
-
-.PHONY: distclean-stage1
-distclean-stage1::
-       [ -f stage_current ] && $(MAKE) `cat stage_current`-end || :
-       rm -rf stage1-* 
-
-
-@endif gcc-bootstrap
-
-
-.PHONY: stage2-start stage2-end
-
-stage2-start::
-       @[ -f stage_current ] && $(MAKE) `cat stage_current`-end || : ; \
-       echo stage2 > stage_current ; \
-       echo stage2 > stage_last; \
-       $(mkinstalldirs) $(HOST_SUBDIR)
-@if bfd
-       @cd $(HOST_SUBDIR); [ -d stage2-bfd ] || \
-         mkdir stage2-bfd; \
-       set stage2-bfd bfd ; \
-       @CREATE_LINK_TO_DIR@  ; \
-       set stage1-bfd prev-bfd ; \
-       @CREATE_LINK_TO_DIR@ 
-@endif bfd
-@if opcodes
-       @cd $(HOST_SUBDIR); [ -d stage2-opcodes ] || \
-         mkdir stage2-opcodes; \
-       set stage2-opcodes opcodes ; \
-       @CREATE_LINK_TO_DIR@  ; \
-       set stage1-opcodes prev-opcodes ; \
-       @CREATE_LINK_TO_DIR@ 
-@endif opcodes
-@if binutils
-       @cd $(HOST_SUBDIR); [ -d stage2-binutils ] || \
-         mkdir stage2-binutils; \
-       set stage2-binutils binutils ; \
-       @CREATE_LINK_TO_DIR@  ; \
-       set stage1-binutils prev-binutils ; \
-       @CREATE_LINK_TO_DIR@ 
-@endif binutils
-@if gas
-       @cd $(HOST_SUBDIR); [ -d stage2-gas ] || \
-         mkdir stage2-gas; \
-       set stage2-gas gas ; \
-       @CREATE_LINK_TO_DIR@  ; \
-       set stage1-gas prev-gas ; \
-       @CREATE_LINK_TO_DIR@ 
-@endif gas
-@if gcc
-       @cd $(HOST_SUBDIR); [ -d stage2-gcc ] || \
-         mkdir stage2-gcc; \
-       set stage2-gcc gcc ; \
-       @CREATE_LINK_TO_DIR@  ; \
-       set stage1-gcc prev-gcc ; \
-       @CREATE_LINK_TO_DIR@ 
-@endif gcc
-@if intl
-       @cd $(HOST_SUBDIR); [ -d stage2-intl ] || \
-         mkdir stage2-intl; \
-       set stage2-intl intl ; \
-       @CREATE_LINK_TO_DIR@  ; \
-       set stage1-intl prev-intl ; \
-       @CREATE_LINK_TO_DIR@ 
-@endif intl
-@if ld
-       @cd $(HOST_SUBDIR); [ -d stage2-ld ] || \
-         mkdir stage2-ld; \
-       set stage2-ld ld ; \
-       @CREATE_LINK_TO_DIR@  ; \
-       set stage1-ld prev-ld ; \
-       @CREATE_LINK_TO_DIR@ 
-@endif ld
-@if libcpp
-       @cd $(HOST_SUBDIR); [ -d stage2-libcpp ] || \
-         mkdir stage2-libcpp; \
-       set stage2-libcpp libcpp ; \
-       @CREATE_LINK_TO_DIR@  ; \
-       set stage1-libcpp prev-libcpp ; \
-       @CREATE_LINK_TO_DIR@ 
-@endif libcpp
-@if libiberty
-       @cd $(HOST_SUBDIR); [ -d stage2-libiberty ] || \
-         mkdir stage2-libiberty; \
-       set stage2-libiberty libiberty ; \
-       @CREATE_LINK_TO_DIR@  ; \
-       set stage1-libiberty prev-libiberty ; \
-       @CREATE_LINK_TO_DIR@ 
-@endif libiberty
-@if zlib
-       @cd $(HOST_SUBDIR); [ -d stage2-zlib ] || \
-         mkdir stage2-zlib; \
-       set stage2-zlib zlib ; \
-       @CREATE_LINK_TO_DIR@  ; \
-       set stage1-zlib prev-zlib ; \
-       @CREATE_LINK_TO_DIR@ 
-@endif zlib
-
-stage2-end::
-       @rm -f stage_current
-@if bfd
-       @cd $(HOST_SUBDIR); set bfd stage2-bfd ; \
-       @UNDO_LINK_TO_DIR@  ; \
-       set prev-bfd stage1-bfd ; \
-       @UNDO_LINK_TO_DIR@ 
-@endif bfd
-@if opcodes
-       @cd $(HOST_SUBDIR); set opcodes stage2-opcodes ; \
-       @UNDO_LINK_TO_DIR@  ; \
-       set prev-opcodes stage1-opcodes ; \
-       @UNDO_LINK_TO_DIR@ 
-@endif opcodes
-@if binutils
-       @cd $(HOST_SUBDIR); set binutils stage2-binutils ; \
-       @UNDO_LINK_TO_DIR@  ; \
-       set prev-binutils stage1-binutils ; \
-       @UNDO_LINK_TO_DIR@ 
-@endif binutils
-@if gas
-       @cd $(HOST_SUBDIR); set gas stage2-gas ; \
-       @UNDO_LINK_TO_DIR@  ; \
-       set prev-gas stage1-gas ; \
-       @UNDO_LINK_TO_DIR@ 
-@endif gas
-@if gcc
-       @cd $(HOST_SUBDIR); set gcc stage2-gcc ; \
-       @UNDO_LINK_TO_DIR@  ; \
-       set prev-gcc stage1-gcc ; \
-       @UNDO_LINK_TO_DIR@ 
-@endif gcc
-@if intl
-       @cd $(HOST_SUBDIR); set intl stage2-intl ; \
-       @UNDO_LINK_TO_DIR@  ; \
-       set prev-intl stage1-intl ; \
-       @UNDO_LINK_TO_DIR@ 
-@endif intl
-@if ld
-       @cd $(HOST_SUBDIR); set ld stage2-ld ; \
-       @UNDO_LINK_TO_DIR@  ; \
-       set prev-ld stage1-ld ; \
-       @UNDO_LINK_TO_DIR@ 
-@endif ld
-@if libcpp
-       @cd $(HOST_SUBDIR); set libcpp stage2-libcpp ; \
-       @UNDO_LINK_TO_DIR@  ; \
-       set prev-libcpp stage1-libcpp ; \
-       @UNDO_LINK_TO_DIR@ 
-@endif libcpp
-@if libiberty
-       @cd $(HOST_SUBDIR); set libiberty stage2-libiberty ; \
-       @UNDO_LINK_TO_DIR@  ; \
-       set prev-libiberty stage1-libiberty ; \
-       @UNDO_LINK_TO_DIR@ 
-@endif libiberty
-@if zlib
-       @cd $(HOST_SUBDIR); set zlib stage2-zlib ; \
-       @UNDO_LINK_TO_DIR@  ; \
-       set prev-zlib stage1-zlib ; \
-       @UNDO_LINK_TO_DIR@ 
-@endif zlib
-
-# Bubble a bugfix through all the stages up to stage 2.  They
-# are remade, but not reconfigured.  The next stage (if any) will not
-# be reconfigured as well.
-.PHONY: stage2-bubble
-stage2-bubble:: stage1-bubble
-       @if test -f stage2-lean || test -f stage1-lean  ; then \
-         echo Skipping rebuild of stage2 ; \
-       else \
-         $(MAKE) $(RECURSE_FLAGS_TO_PASS) NOTPARALLEL= all-stage2; \
-       fi
-
-.PHONY: all-stage2 clean-stage2
-all-stage2:     \
-  maybe-all-stage2-bfd \
-  maybe-all-stage2-opcodes \
-  maybe-all-stage2-binutils              \
-  maybe-all-stage2-gas \
-  maybe-all-stage2-gcc        \
-  maybe-all-stage2-intl   \
-  maybe-all-stage2-ld \
-  maybe-all-stage2-libcpp  \
-  maybe-all-stage2-libiberty                        \
-  maybe-all-stage2-zlib        
-
-do-clean: clean-stage2
-clean-stage2:     \
-  maybe-clean-stage2-bfd \
-  maybe-clean-stage2-opcodes \
-  maybe-clean-stage2-binutils              \
-  maybe-clean-stage2-gas \
-  maybe-clean-stage2-gcc        \
-  maybe-clean-stage2-intl   \
-  maybe-clean-stage2-ld \
-  maybe-clean-stage2-libcpp  \
-  maybe-clean-stage2-libiberty                        \
-  maybe-clean-stage2-zlib        
-
-
-.PHONY: configure-stage2-bfd maybe-configure-stage2-bfd
-.PHONY: all-stage2-bfd maybe-all-stage2-bfd
-.PHONY: clean-stage2-bfd maybe-clean-stage2-bfd
-
-maybe-configure-stage2-bfd:
-maybe-all-stage2-bfd:
-maybe-clean-stage2-bfd:
-
-@if bfd-bootstrap
-maybe-configure-stage2-bfd: configure-stage2-bfd
-configure-stage2-bfd:
-       @$(MAKE) stage2-start
-       @[ -f bfd/Makefile ] && exit 0 || : ; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-       $(STAGE_HOST_EXPORTS)  \
-       echo Configuring stage 2 in bfd ; \
-       cd $(HOST_SUBDIR)/bfd || exit 1; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/bfd/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       srcdiroption="--srcdir=$${topdir}/bfd"; \
-       libsrcdir="$$s/bfd"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
-         @stage2_werror_flag@ 
-
-maybe-all-stage2-bfd: all-stage2-bfd
-all-stage2-bfd: configure-stage2-bfd
-       @$(MAKE) stage2-start
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-       $(STAGE_HOST_EXPORTS)  \
-       cd $(HOST_SUBDIR)/bfd && \
-       $(MAKE) $(FLAGS_TO_PASS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                
-
-maybe-clean-stage2-bfd: clean-stage2-bfd
-clean-stage2-bfd:
-       @[ -f bfd/Makefile ] || [ -f stage2-bfd/Makefile ] \
-         || exit 0 ; \
-       [ -f bfd/Makefile ] || $(MAKE) stage2-start ; \
-       cd $(HOST_SUBDIR)/bfd && \
-       $(MAKE) $(FLAGS_TO_PASS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                 clean
-@endif bfd-bootstrap
-
-
-.PHONY: configure-stage2-opcodes maybe-configure-stage2-opcodes
-.PHONY: all-stage2-opcodes maybe-all-stage2-opcodes
-.PHONY: clean-stage2-opcodes maybe-clean-stage2-opcodes
-
-maybe-configure-stage2-opcodes:
-maybe-all-stage2-opcodes:
-maybe-clean-stage2-opcodes:
-
-@if opcodes-bootstrap
-maybe-configure-stage2-opcodes: configure-stage2-opcodes
-configure-stage2-opcodes:
-       @$(MAKE) stage2-start
-       @[ -f opcodes/Makefile ] && exit 0 || : ; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-       $(STAGE_HOST_EXPORTS)  \
-       echo Configuring stage 2 in opcodes ; \
-       cd $(HOST_SUBDIR)/opcodes || exit 1; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/opcodes/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       srcdiroption="--srcdir=$${topdir}/opcodes"; \
-       libsrcdir="$$s/opcodes"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
-         @stage2_werror_flag@ 
-
-maybe-all-stage2-opcodes: all-stage2-opcodes
-all-stage2-opcodes: configure-stage2-opcodes
-       @$(MAKE) stage2-start
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-       $(STAGE_HOST_EXPORTS)  \
-       cd $(HOST_SUBDIR)/opcodes && \
-       $(MAKE) $(FLAGS_TO_PASS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                
-
-maybe-clean-stage2-opcodes: clean-stage2-opcodes
-clean-stage2-opcodes:
-       @[ -f opcodes/Makefile ] || [ -f stage2-opcodes/Makefile ] \
-         || exit 0 ; \
-       [ -f opcodes/Makefile ] || $(MAKE) stage2-start ; \
-       cd $(HOST_SUBDIR)/opcodes && \
-       $(MAKE) $(FLAGS_TO_PASS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                 clean
-@endif opcodes-bootstrap
-
-
-.PHONY: configure-stage2-binutils maybe-configure-stage2-binutils
-.PHONY: all-stage2-binutils maybe-all-stage2-binutils
-.PHONY: clean-stage2-binutils maybe-clean-stage2-binutils
-
-maybe-configure-stage2-binutils:
-maybe-all-stage2-binutils:
-maybe-clean-stage2-binutils:
-
-@if binutils-bootstrap
-maybe-configure-stage2-binutils: configure-stage2-binutils
-configure-stage2-binutils:
-       @$(MAKE) stage2-start
-       @[ -f binutils/Makefile ] && exit 0 || : ; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-       $(STAGE_HOST_EXPORTS)  \
-       echo Configuring stage 2 in binutils ; \
-       cd $(HOST_SUBDIR)/binutils || exit 1; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/binutils/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       srcdiroption="--srcdir=$${topdir}/binutils"; \
-       libsrcdir="$$s/binutils"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
-         @stage2_werror_flag@ 
-
-maybe-all-stage2-binutils: all-stage2-binutils
-all-stage2-binutils: configure-stage2-binutils
-       @$(MAKE) stage2-start
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-       $(STAGE_HOST_EXPORTS)  \
-       cd $(HOST_SUBDIR)/binutils && \
-       $(MAKE) $(FLAGS_TO_PASS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                
-
-maybe-clean-stage2-binutils: clean-stage2-binutils
-clean-stage2-binutils:
-       @[ -f binutils/Makefile ] || [ -f stage2-binutils/Makefile ] \
-         || exit 0 ; \
-       [ -f binutils/Makefile ] || $(MAKE) stage2-start ; \
-       cd $(HOST_SUBDIR)/binutils && \
-       $(MAKE) $(FLAGS_TO_PASS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                 clean
-@endif binutils-bootstrap
-
-
-.PHONY: configure-stage2-gas maybe-configure-stage2-gas
-.PHONY: all-stage2-gas maybe-all-stage2-gas
-.PHONY: clean-stage2-gas maybe-clean-stage2-gas
-
-maybe-configure-stage2-gas:
-maybe-all-stage2-gas:
-maybe-clean-stage2-gas:
-
-@if gas-bootstrap
-maybe-configure-stage2-gas: configure-stage2-gas
-configure-stage2-gas:
-       @$(MAKE) stage2-start
-       @[ -f gas/Makefile ] && exit 0 || : ; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-       $(STAGE_HOST_EXPORTS)  \
-       echo Configuring stage 2 in gas ; \
-       cd $(HOST_SUBDIR)/gas || exit 1; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/gas/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       srcdiroption="--srcdir=$${topdir}/gas"; \
-       libsrcdir="$$s/gas"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
-         @stage2_werror_flag@ 
-
-maybe-all-stage2-gas: all-stage2-gas
-all-stage2-gas: configure-stage2-gas
-       @$(MAKE) stage2-start
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-       $(STAGE_HOST_EXPORTS)  \
-       cd $(HOST_SUBDIR)/gas && \
-       $(MAKE) $(FLAGS_TO_PASS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                
-
-maybe-clean-stage2-gas: clean-stage2-gas
-clean-stage2-gas:
-       @[ -f gas/Makefile ] || [ -f stage2-gas/Makefile ] \
-         || exit 0 ; \
-       [ -f gas/Makefile ] || $(MAKE) stage2-start ; \
-       cd $(HOST_SUBDIR)/gas && \
-       $(MAKE) $(FLAGS_TO_PASS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                 clean
-@endif gas-bootstrap
-
-
-.PHONY: configure-stage2-gcc maybe-configure-stage2-gcc
-.PHONY: all-stage2-gcc maybe-all-stage2-gcc
-.PHONY: clean-stage2-gcc maybe-clean-stage2-gcc
-
-maybe-configure-stage2-gcc:
-maybe-all-stage2-gcc:
-maybe-clean-stage2-gcc:
-
-@if gcc-bootstrap
-maybe-configure-stage2-gcc: configure-stage2-gcc
-configure-stage2-gcc:
-       @$(MAKE) stage2-start
-       @[ -f gcc/Makefile ] && exit 0 || : ; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-       $(STAGE_HOST_EXPORTS)  \
-       echo Configuring stage 2 in gcc ; \
-       cd $(HOST_SUBDIR)/gcc || exit 1; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/gcc/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       srcdiroption="--srcdir=$${topdir}/gcc"; \
-       libsrcdir="$$s/gcc"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
-         @stage2_werror_flag@ 
-
-maybe-all-stage2-gcc: all-stage2-gcc
-all-stage2-gcc: configure-stage2-gcc
-       @$(MAKE) stage2-start
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-       $(STAGE_HOST_EXPORTS)  \
-       cd $(HOST_SUBDIR)/gcc && \
-       $(MAKE) $(FLAGS_TO_PASS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                $(EXTRA_GCC_FLAGS)
-
-maybe-clean-stage2-gcc: clean-stage2-gcc
-clean-stage2-gcc:
-       @[ -f gcc/Makefile ] || [ -f stage2-gcc/Makefile ] \
-         || exit 0 ; \
-       [ -f gcc/Makefile ] || $(MAKE) stage2-start ; \
-       cd $(HOST_SUBDIR)/gcc && \
-       $(MAKE) $(FLAGS_TO_PASS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                $(EXTRA_GCC_FLAGS) clean
-@endif gcc-bootstrap
-
-
-.PHONY: configure-stage2-intl maybe-configure-stage2-intl
-.PHONY: all-stage2-intl maybe-all-stage2-intl
-.PHONY: clean-stage2-intl maybe-clean-stage2-intl
-
-maybe-configure-stage2-intl:
-maybe-all-stage2-intl:
-maybe-clean-stage2-intl:
-
-@if intl-bootstrap
-maybe-configure-stage2-intl: configure-stage2-intl
-configure-stage2-intl:
-       @$(MAKE) stage2-start
-       @[ -f intl/Makefile ] && exit 0 || : ; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-       $(STAGE_HOST_EXPORTS)  \
-       echo Configuring stage 2 in intl ; \
-       cd $(HOST_SUBDIR)/intl || exit 1; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/intl/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       srcdiroption="--srcdir=$${topdir}/intl"; \
-       libsrcdir="$$s/intl"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
-         @stage2_werror_flag@ 
-
-maybe-all-stage2-intl: all-stage2-intl
-all-stage2-intl: configure-stage2-intl
-       @$(MAKE) stage2-start
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-       $(STAGE_HOST_EXPORTS)  \
-       cd $(HOST_SUBDIR)/intl && \
-       $(MAKE) $(FLAGS_TO_PASS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                
-
-maybe-clean-stage2-intl: clean-stage2-intl
-clean-stage2-intl:
-       @[ -f intl/Makefile ] || [ -f stage2-intl/Makefile ] \
-         || exit 0 ; \
-       [ -f intl/Makefile ] || $(MAKE) stage2-start ; \
-       cd $(HOST_SUBDIR)/intl && \
-       $(MAKE) $(FLAGS_TO_PASS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                 clean
-@endif intl-bootstrap
-
-
-.PHONY: configure-stage2-ld maybe-configure-stage2-ld
-.PHONY: all-stage2-ld maybe-all-stage2-ld
-.PHONY: clean-stage2-ld maybe-clean-stage2-ld
-
-maybe-configure-stage2-ld:
-maybe-all-stage2-ld:
-maybe-clean-stage2-ld:
-
-@if ld-bootstrap
-maybe-configure-stage2-ld: configure-stage2-ld
-configure-stage2-ld:
-       @$(MAKE) stage2-start
-       @[ -f ld/Makefile ] && exit 0 || : ; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-       $(STAGE_HOST_EXPORTS)  \
-       echo Configuring stage 2 in ld ; \
-       cd $(HOST_SUBDIR)/ld || exit 1; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/ld/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       srcdiroption="--srcdir=$${topdir}/ld"; \
-       libsrcdir="$$s/ld"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
-         @stage2_werror_flag@ 
-
-maybe-all-stage2-ld: all-stage2-ld
-all-stage2-ld: configure-stage2-ld
-       @$(MAKE) stage2-start
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-       $(STAGE_HOST_EXPORTS)  \
-       cd $(HOST_SUBDIR)/ld && \
-       $(MAKE) $(FLAGS_TO_PASS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                
-
-maybe-clean-stage2-ld: clean-stage2-ld
-clean-stage2-ld:
-       @[ -f ld/Makefile ] || [ -f stage2-ld/Makefile ] \
-         || exit 0 ; \
-       [ -f ld/Makefile ] || $(MAKE) stage2-start ; \
-       cd $(HOST_SUBDIR)/ld && \
-       $(MAKE) $(FLAGS_TO_PASS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                 clean
-@endif ld-bootstrap
-
-
-.PHONY: configure-stage2-libcpp maybe-configure-stage2-libcpp
-.PHONY: all-stage2-libcpp maybe-all-stage2-libcpp
-.PHONY: clean-stage2-libcpp maybe-clean-stage2-libcpp
-
-maybe-configure-stage2-libcpp:
-maybe-all-stage2-libcpp:
-maybe-clean-stage2-libcpp:
-
-@if libcpp-bootstrap
-maybe-configure-stage2-libcpp: configure-stage2-libcpp
-configure-stage2-libcpp:
-       @$(MAKE) stage2-start
-       @[ -f libcpp/Makefile ] && exit 0 || : ; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-       $(STAGE_HOST_EXPORTS)  \
-       echo Configuring stage 2 in libcpp ; \
-       cd $(HOST_SUBDIR)/libcpp || exit 1; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/libcpp/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       srcdiroption="--srcdir=$${topdir}/libcpp"; \
-       libsrcdir="$$s/libcpp"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
-         @stage2_werror_flag@ 
-
-maybe-all-stage2-libcpp: all-stage2-libcpp
-all-stage2-libcpp: configure-stage2-libcpp
-       @$(MAKE) stage2-start
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-       $(STAGE_HOST_EXPORTS)  \
-       cd $(HOST_SUBDIR)/libcpp && \
-       $(MAKE) $(FLAGS_TO_PASS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                
-
-maybe-clean-stage2-libcpp: clean-stage2-libcpp
-clean-stage2-libcpp:
-       @[ -f libcpp/Makefile ] || [ -f stage2-libcpp/Makefile ] \
-         || exit 0 ; \
-       [ -f libcpp/Makefile ] || $(MAKE) stage2-start ; \
-       cd $(HOST_SUBDIR)/libcpp && \
-       $(MAKE) $(FLAGS_TO_PASS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                 clean
-@endif libcpp-bootstrap
-
-
-.PHONY: configure-stage2-libiberty maybe-configure-stage2-libiberty
-.PHONY: all-stage2-libiberty maybe-all-stage2-libiberty
-.PHONY: clean-stage2-libiberty maybe-clean-stage2-libiberty
-
-maybe-configure-stage2-libiberty:
-maybe-all-stage2-libiberty:
-maybe-clean-stage2-libiberty:
-
-@if libiberty-bootstrap
-maybe-configure-stage2-libiberty: configure-stage2-libiberty
-configure-stage2-libiberty:
-       @$(MAKE) stage2-start
-       @[ -f libiberty/Makefile ] && exit 0 || : ; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-       $(STAGE_HOST_EXPORTS)  \
-       echo Configuring stage 2 in libiberty ; \
-       cd $(HOST_SUBDIR)/libiberty || exit 1; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/libiberty/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       srcdiroption="--srcdir=$${topdir}/libiberty"; \
-       libsrcdir="$$s/libiberty"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
-         @stage2_werror_flag@ 
-
-maybe-all-stage2-libiberty: all-stage2-libiberty
-all-stage2-libiberty: configure-stage2-libiberty
-       @$(MAKE) stage2-start
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-       $(STAGE_HOST_EXPORTS)  \
-       cd $(HOST_SUBDIR)/libiberty && \
-       $(MAKE) $(FLAGS_TO_PASS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                
-
-maybe-clean-stage2-libiberty: clean-stage2-libiberty
-clean-stage2-libiberty:
-       @[ -f libiberty/Makefile ] || [ -f stage2-libiberty/Makefile ] \
-         || exit 0 ; \
-       [ -f libiberty/Makefile ] || $(MAKE) stage2-start ; \
-       cd $(HOST_SUBDIR)/libiberty && \
-       $(MAKE) $(FLAGS_TO_PASS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                 clean
-@endif libiberty-bootstrap
-
-
-.PHONY: configure-stage2-zlib maybe-configure-stage2-zlib
-.PHONY: all-stage2-zlib maybe-all-stage2-zlib
-.PHONY: clean-stage2-zlib maybe-clean-stage2-zlib
-
-maybe-configure-stage2-zlib:
-maybe-all-stage2-zlib:
-maybe-clean-stage2-zlib:
-
-@if zlib-bootstrap
-maybe-configure-stage2-zlib: configure-stage2-zlib
-configure-stage2-zlib:
-       @$(MAKE) stage2-start
-       @[ -f zlib/Makefile ] && exit 0 || : ; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-       $(STAGE_HOST_EXPORTS)  \
-       echo Configuring stage 2 in zlib ; \
-       cd $(HOST_SUBDIR)/zlib || exit 1; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/zlib/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       srcdiroption="--srcdir=$${topdir}/zlib"; \
-       libsrcdir="$$s/zlib"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
-         @stage2_werror_flag@ 
-
-maybe-all-stage2-zlib: all-stage2-zlib
-all-stage2-zlib: configure-stage2-zlib
-       @$(MAKE) stage2-start
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-       $(STAGE_HOST_EXPORTS)  \
-       cd $(HOST_SUBDIR)/zlib && \
-       $(MAKE) $(FLAGS_TO_PASS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                
-
-maybe-clean-stage2-zlib: clean-stage2-zlib
-clean-stage2-zlib:
-       @[ -f zlib/Makefile ] || [ -f stage2-zlib/Makefile ] \
-         || exit 0 ; \
-       [ -f zlib/Makefile ] || $(MAKE) stage2-start ; \
-       cd $(HOST_SUBDIR)/zlib && \
-       $(MAKE) $(FLAGS_TO_PASS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                 clean
-@endif zlib-bootstrap
-
-
-
-# FIXME: Will not need to be conditional when toplevel bootstrap is the
-# only possibility, but now it conflicts with no-bootstrap rules
-@if gcc-bootstrap
-
-
-
-.PHONY: bootstrap2
-bootstrap2: stage2-bubble  all
-
-
-# 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 || :
-       rm -rf stage2-* 
-
-
-@endif gcc-bootstrap
-
-
-.PHONY: stage3-start stage3-end
+.PHONY: stage3-start stage3-end
  
  stage3-start::
         @[ -f stage_current ] && $(MAKE) `cat stage_current`-end || : ; \
         echo stage3 > stage_current ; \
         echo stage3 > stage_last; \
-       $(mkinstalldirs) $(HOST_SUBDIR)
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)
  @if bfd
         @cd $(HOST_SUBDIR); [ -d stage3-bfd ] || \
           mkdir stage3-bfd; \
@@ -31962,626 +33827,81 @@ stage3-start::
  
  stage3-end::
         @rm -f stage_current
-@if bfd
-       @cd $(HOST_SUBDIR); set bfd stage3-bfd ; \
-       @UNDO_LINK_TO_DIR@  ; \
-       set prev-bfd stage2-bfd ; \
-       @UNDO_LINK_TO_DIR@ 
-@endif bfd
-@if opcodes
-       @cd $(HOST_SUBDIR); set opcodes stage3-opcodes ; \
-       @UNDO_LINK_TO_DIR@  ; \
-       set prev-opcodes stage2-opcodes ; \
-       @UNDO_LINK_TO_DIR@ 
-@endif opcodes
-@if binutils
-       @cd $(HOST_SUBDIR); set binutils stage3-binutils ; \
-       @UNDO_LINK_TO_DIR@  ; \
-       set prev-binutils stage2-binutils ; \
-       @UNDO_LINK_TO_DIR@ 
-@endif binutils
-@if gas
-       @cd $(HOST_SUBDIR); set gas stage3-gas ; \
-       @UNDO_LINK_TO_DIR@  ; \
-       set prev-gas stage2-gas ; \
-       @UNDO_LINK_TO_DIR@ 
-@endif gas
-@if gcc
-       @cd $(HOST_SUBDIR); set gcc stage3-gcc ; \
-       @UNDO_LINK_TO_DIR@  ; \
-       set prev-gcc stage2-gcc ; \
-       @UNDO_LINK_TO_DIR@ 
-@endif gcc
-@if intl
-       @cd $(HOST_SUBDIR); set intl stage3-intl ; \
-       @UNDO_LINK_TO_DIR@  ; \
-       set prev-intl stage2-intl ; \
-       @UNDO_LINK_TO_DIR@ 
-@endif intl
-@if ld
-       @cd $(HOST_SUBDIR); set ld stage3-ld ; \
-       @UNDO_LINK_TO_DIR@  ; \
-       set prev-ld stage2-ld ; \
-       @UNDO_LINK_TO_DIR@ 
-@endif ld
-@if libcpp
-       @cd $(HOST_SUBDIR); set libcpp stage3-libcpp ; \
-       @UNDO_LINK_TO_DIR@  ; \
-       set prev-libcpp stage2-libcpp ; \
-       @UNDO_LINK_TO_DIR@ 
-@endif libcpp
-@if libiberty
-       @cd $(HOST_SUBDIR); set libiberty stage3-libiberty ; \
-       @UNDO_LINK_TO_DIR@  ; \
-       set prev-libiberty stage2-libiberty ; \
-       @UNDO_LINK_TO_DIR@ 
-@endif libiberty
-@if zlib
-       @cd $(HOST_SUBDIR); set zlib stage3-zlib ; \
-       @UNDO_LINK_TO_DIR@  ; \
-       set prev-zlib stage2-zlib ; \
-       @UNDO_LINK_TO_DIR@ 
-@endif zlib
-
-# Bubble a bugfix through all the stages up to stage 3.  They
-# are remade, but not reconfigured.  The next stage (if any) will not
-# be reconfigured as well.
-.PHONY: stage3-bubble
-stage3-bubble:: stage2-bubble
-       @bootstrap_lean@-rm -rf stage1-* ; $(STAMP) stage1-lean
-       @if test -f stage3-lean || test -f stage2-lean  ; then \
-         echo Skipping rebuild of stage3 ; \
-       else \
-         $(MAKE) $(RECURSE_FLAGS_TO_PASS) NOTPARALLEL= all-stage3; \
-       fi
-
-.PHONY: all-stage3 clean-stage3
-all-stage3:     \
-  maybe-all-stage3-bfd \
-  maybe-all-stage3-opcodes \
-  maybe-all-stage3-binutils              \
-  maybe-all-stage3-gas \
-  maybe-all-stage3-gcc        \
-  maybe-all-stage3-intl   \
-  maybe-all-stage3-ld \
-  maybe-all-stage3-libcpp  \
-  maybe-all-stage3-libiberty                        \
-  maybe-all-stage3-zlib        
-
-do-clean: clean-stage3
-clean-stage3:     \
-  maybe-clean-stage3-bfd \
-  maybe-clean-stage3-opcodes \
-  maybe-clean-stage3-binutils              \
-  maybe-clean-stage3-gas \
-  maybe-clean-stage3-gcc        \
-  maybe-clean-stage3-intl   \
-  maybe-clean-stage3-ld \
-  maybe-clean-stage3-libcpp  \
-  maybe-clean-stage3-libiberty                        \
-  maybe-clean-stage3-zlib        
-
-
-.PHONY: configure-stage3-bfd maybe-configure-stage3-bfd
-.PHONY: all-stage3-bfd maybe-all-stage3-bfd
-.PHONY: clean-stage3-bfd maybe-clean-stage3-bfd
-
-maybe-configure-stage3-bfd:
-maybe-all-stage3-bfd:
-maybe-clean-stage3-bfd:
-
-@if bfd-bootstrap
-maybe-configure-stage3-bfd: configure-stage3-bfd
-configure-stage3-bfd:
-       @$(MAKE) stage3-start
-       @[ -f bfd/Makefile ] && exit 0 || : ; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-       $(STAGE_HOST_EXPORTS)  \
-       echo Configuring stage 3 in bfd ; \
-       cd $(HOST_SUBDIR)/bfd || exit 1; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/bfd/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       srcdiroption="--srcdir=$${topdir}/bfd"; \
-       libsrcdir="$$s/bfd"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
-         @stage2_werror_flag@ 
-
-maybe-all-stage3-bfd: all-stage3-bfd
-all-stage3-bfd: configure-stage3-bfd
-       @$(MAKE) stage3-start
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-       $(STAGE_HOST_EXPORTS)  \
-       cd $(HOST_SUBDIR)/bfd && \
-       $(MAKE) $(FLAGS_TO_PASS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                
-
-maybe-clean-stage3-bfd: clean-stage3-bfd
-clean-stage3-bfd:
-       @[ -f bfd/Makefile ] || [ -f stage3-bfd/Makefile ] \
-         || exit 0 ; \
-       [ -f bfd/Makefile ] || $(MAKE) stage3-start ; \
-       cd $(HOST_SUBDIR)/bfd && \
-       $(MAKE) $(FLAGS_TO_PASS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                 clean
-@endif bfd-bootstrap
-
-
-.PHONY: configure-stage3-opcodes maybe-configure-stage3-opcodes
-.PHONY: all-stage3-opcodes maybe-all-stage3-opcodes
-.PHONY: clean-stage3-opcodes maybe-clean-stage3-opcodes
-
-maybe-configure-stage3-opcodes:
-maybe-all-stage3-opcodes:
-maybe-clean-stage3-opcodes:
-
-@if opcodes-bootstrap
-maybe-configure-stage3-opcodes: configure-stage3-opcodes
-configure-stage3-opcodes:
-       @$(MAKE) stage3-start
-       @[ -f opcodes/Makefile ] && exit 0 || : ; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-       $(STAGE_HOST_EXPORTS)  \
-       echo Configuring stage 3 in opcodes ; \
-       cd $(HOST_SUBDIR)/opcodes || exit 1; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/opcodes/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       srcdiroption="--srcdir=$${topdir}/opcodes"; \
-       libsrcdir="$$s/opcodes"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
-         @stage2_werror_flag@ 
-
-maybe-all-stage3-opcodes: all-stage3-opcodes
-all-stage3-opcodes: configure-stage3-opcodes
-       @$(MAKE) stage3-start
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-       $(STAGE_HOST_EXPORTS)  \
-       cd $(HOST_SUBDIR)/opcodes && \
-       $(MAKE) $(FLAGS_TO_PASS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                
-
-maybe-clean-stage3-opcodes: clean-stage3-opcodes
-clean-stage3-opcodes:
-       @[ -f opcodes/Makefile ] || [ -f stage3-opcodes/Makefile ] \
-         || exit 0 ; \
-       [ -f opcodes/Makefile ] || $(MAKE) stage3-start ; \
-       cd $(HOST_SUBDIR)/opcodes && \
-       $(MAKE) $(FLAGS_TO_PASS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                 clean
-@endif opcodes-bootstrap
-
-
-.PHONY: configure-stage3-binutils maybe-configure-stage3-binutils
-.PHONY: all-stage3-binutils maybe-all-stage3-binutils
-.PHONY: clean-stage3-binutils maybe-clean-stage3-binutils
-
-maybe-configure-stage3-binutils:
-maybe-all-stage3-binutils:
-maybe-clean-stage3-binutils:
-
-@if binutils-bootstrap
-maybe-configure-stage3-binutils: configure-stage3-binutils
-configure-stage3-binutils:
-       @$(MAKE) stage3-start
-       @[ -f binutils/Makefile ] && exit 0 || : ; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-       $(STAGE_HOST_EXPORTS)  \
-       echo Configuring stage 3 in binutils ; \
-       cd $(HOST_SUBDIR)/binutils || exit 1; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/binutils/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       srcdiroption="--srcdir=$${topdir}/binutils"; \
-       libsrcdir="$$s/binutils"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
-         @stage2_werror_flag@ 
-
-maybe-all-stage3-binutils: all-stage3-binutils
-all-stage3-binutils: configure-stage3-binutils
-       @$(MAKE) stage3-start
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-       $(STAGE_HOST_EXPORTS)  \
-       cd $(HOST_SUBDIR)/binutils && \
-       $(MAKE) $(FLAGS_TO_PASS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                
-
-maybe-clean-stage3-binutils: clean-stage3-binutils
-clean-stage3-binutils:
-       @[ -f binutils/Makefile ] || [ -f stage3-binutils/Makefile ] \
-         || exit 0 ; \
-       [ -f binutils/Makefile ] || $(MAKE) stage3-start ; \
-       cd $(HOST_SUBDIR)/binutils && \
-       $(MAKE) $(FLAGS_TO_PASS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                 clean
-@endif binutils-bootstrap
-
-
-.PHONY: configure-stage3-gas maybe-configure-stage3-gas
-.PHONY: all-stage3-gas maybe-all-stage3-gas
-.PHONY: clean-stage3-gas maybe-clean-stage3-gas
-
-maybe-configure-stage3-gas:
-maybe-all-stage3-gas:
-maybe-clean-stage3-gas:
-
-@if gas-bootstrap
-maybe-configure-stage3-gas: configure-stage3-gas
-configure-stage3-gas:
-       @$(MAKE) stage3-start
-       @[ -f gas/Makefile ] && exit 0 || : ; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-       $(STAGE_HOST_EXPORTS)  \
-       echo Configuring stage 3 in gas ; \
-       cd $(HOST_SUBDIR)/gas || exit 1; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/gas/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       srcdiroption="--srcdir=$${topdir}/gas"; \
-       libsrcdir="$$s/gas"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
-         @stage2_werror_flag@ 
-
-maybe-all-stage3-gas: all-stage3-gas
-all-stage3-gas: configure-stage3-gas
-       @$(MAKE) stage3-start
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-       $(STAGE_HOST_EXPORTS)  \
-       cd $(HOST_SUBDIR)/gas && \
-       $(MAKE) $(FLAGS_TO_PASS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                
-
-maybe-clean-stage3-gas: clean-stage3-gas
-clean-stage3-gas:
-       @[ -f gas/Makefile ] || [ -f stage3-gas/Makefile ] \
-         || exit 0 ; \
-       [ -f gas/Makefile ] || $(MAKE) stage3-start ; \
-       cd $(HOST_SUBDIR)/gas && \
-       $(MAKE) $(FLAGS_TO_PASS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                 clean
-@endif gas-bootstrap
-
-
-.PHONY: configure-stage3-gcc maybe-configure-stage3-gcc
-.PHONY: all-stage3-gcc maybe-all-stage3-gcc
-.PHONY: clean-stage3-gcc maybe-clean-stage3-gcc
-
-maybe-configure-stage3-gcc:
-maybe-all-stage3-gcc:
-maybe-clean-stage3-gcc:
-
-@if gcc-bootstrap
-maybe-configure-stage3-gcc: configure-stage3-gcc
-configure-stage3-gcc:
-       @$(MAKE) stage3-start
-       @[ -f gcc/Makefile ] && exit 0 || : ; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-       $(STAGE_HOST_EXPORTS)  \
-       echo Configuring stage 3 in gcc ; \
-       cd $(HOST_SUBDIR)/gcc || exit 1; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/gcc/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       srcdiroption="--srcdir=$${topdir}/gcc"; \
-       libsrcdir="$$s/gcc"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
-         @stage2_werror_flag@ 
-
-maybe-all-stage3-gcc: all-stage3-gcc
-all-stage3-gcc: configure-stage3-gcc
-       @$(MAKE) stage3-start
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-       $(STAGE_HOST_EXPORTS)  \
-       cd $(HOST_SUBDIR)/gcc && \
-       $(MAKE) $(FLAGS_TO_PASS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                $(EXTRA_GCC_FLAGS)
-
-maybe-clean-stage3-gcc: clean-stage3-gcc
-clean-stage3-gcc:
-       @[ -f gcc/Makefile ] || [ -f stage3-gcc/Makefile ] \
-         || exit 0 ; \
-       [ -f gcc/Makefile ] || $(MAKE) stage3-start ; \
-       cd $(HOST_SUBDIR)/gcc && \
-       $(MAKE) $(FLAGS_TO_PASS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                $(EXTRA_GCC_FLAGS) clean
-@endif gcc-bootstrap
-
-
-.PHONY: configure-stage3-intl maybe-configure-stage3-intl
-.PHONY: all-stage3-intl maybe-all-stage3-intl
-.PHONY: clean-stage3-intl maybe-clean-stage3-intl
-
-maybe-configure-stage3-intl:
-maybe-all-stage3-intl:
-maybe-clean-stage3-intl:
-
-@if intl-bootstrap
-maybe-configure-stage3-intl: configure-stage3-intl
-configure-stage3-intl:
-       @$(MAKE) stage3-start
-       @[ -f intl/Makefile ] && exit 0 || : ; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-       $(STAGE_HOST_EXPORTS)  \
-       echo Configuring stage 3 in intl ; \
-       cd $(HOST_SUBDIR)/intl || exit 1; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/intl/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       srcdiroption="--srcdir=$${topdir}/intl"; \
-       libsrcdir="$$s/intl"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
-         @stage2_werror_flag@ 
-
-maybe-all-stage3-intl: all-stage3-intl
-all-stage3-intl: configure-stage3-intl
-       @$(MAKE) stage3-start
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-       $(STAGE_HOST_EXPORTS)  \
-       cd $(HOST_SUBDIR)/intl && \
-       $(MAKE) $(FLAGS_TO_PASS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                
-
-maybe-clean-stage3-intl: clean-stage3-intl
-clean-stage3-intl:
-       @[ -f intl/Makefile ] || [ -f stage3-intl/Makefile ] \
-         || exit 0 ; \
-       [ -f intl/Makefile ] || $(MAKE) stage3-start ; \
-       cd $(HOST_SUBDIR)/intl && \
-       $(MAKE) $(FLAGS_TO_PASS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                 clean
-@endif intl-bootstrap
-
-
-.PHONY: configure-stage3-ld maybe-configure-stage3-ld
-.PHONY: all-stage3-ld maybe-all-stage3-ld
-.PHONY: clean-stage3-ld maybe-clean-stage3-ld
-
-maybe-configure-stage3-ld:
-maybe-all-stage3-ld:
-maybe-clean-stage3-ld:
-
-@if ld-bootstrap
-maybe-configure-stage3-ld: configure-stage3-ld
-configure-stage3-ld:
-       @$(MAKE) stage3-start
-       @[ -f ld/Makefile ] && exit 0 || : ; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-       $(STAGE_HOST_EXPORTS)  \
-       echo Configuring stage 3 in ld ; \
-       cd $(HOST_SUBDIR)/ld || exit 1; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/ld/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       srcdiroption="--srcdir=$${topdir}/ld"; \
-       libsrcdir="$$s/ld"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
-         @stage2_werror_flag@ 
-
-maybe-all-stage3-ld: all-stage3-ld
-all-stage3-ld: configure-stage3-ld
-       @$(MAKE) stage3-start
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-       $(STAGE_HOST_EXPORTS)  \
-       cd $(HOST_SUBDIR)/ld && \
-       $(MAKE) $(FLAGS_TO_PASS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                
-
-maybe-clean-stage3-ld: clean-stage3-ld
-clean-stage3-ld:
-       @[ -f ld/Makefile ] || [ -f stage3-ld/Makefile ] \
-         || exit 0 ; \
-       [ -f ld/Makefile ] || $(MAKE) stage3-start ; \
-       cd $(HOST_SUBDIR)/ld && \
-       $(MAKE) $(FLAGS_TO_PASS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                 clean
-@endif ld-bootstrap
-
-
-.PHONY: configure-stage3-libcpp maybe-configure-stage3-libcpp
-.PHONY: all-stage3-libcpp maybe-all-stage3-libcpp
-.PHONY: clean-stage3-libcpp maybe-clean-stage3-libcpp
-
-maybe-configure-stage3-libcpp:
-maybe-all-stage3-libcpp:
-maybe-clean-stage3-libcpp:
-
-@if libcpp-bootstrap
-maybe-configure-stage3-libcpp: configure-stage3-libcpp
-configure-stage3-libcpp:
-       @$(MAKE) stage3-start
-       @[ -f libcpp/Makefile ] && exit 0 || : ; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-       $(STAGE_HOST_EXPORTS)  \
-       echo Configuring stage 3 in libcpp ; \
-       cd $(HOST_SUBDIR)/libcpp || exit 1; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/libcpp/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       srcdiroption="--srcdir=$${topdir}/libcpp"; \
-       libsrcdir="$$s/libcpp"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
-         @stage2_werror_flag@ 
-
-maybe-all-stage3-libcpp: all-stage3-libcpp
-all-stage3-libcpp: configure-stage3-libcpp
-       @$(MAKE) stage3-start
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-       $(STAGE_HOST_EXPORTS)  \
-       cd $(HOST_SUBDIR)/libcpp && \
-       $(MAKE) $(FLAGS_TO_PASS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                
-
-maybe-clean-stage3-libcpp: clean-stage3-libcpp
-clean-stage3-libcpp:
-       @[ -f libcpp/Makefile ] || [ -f stage3-libcpp/Makefile ] \
-         || exit 0 ; \
-       [ -f libcpp/Makefile ] || $(MAKE) stage3-start ; \
-       cd $(HOST_SUBDIR)/libcpp && \
-       $(MAKE) $(FLAGS_TO_PASS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                 clean
-@endif libcpp-bootstrap
-
-
-.PHONY: configure-stage3-libiberty maybe-configure-stage3-libiberty
-.PHONY: all-stage3-libiberty maybe-all-stage3-libiberty
-.PHONY: clean-stage3-libiberty maybe-clean-stage3-libiberty
-
-maybe-configure-stage3-libiberty:
-maybe-all-stage3-libiberty:
-maybe-clean-stage3-libiberty:
-
-@if libiberty-bootstrap
-maybe-configure-stage3-libiberty: configure-stage3-libiberty
-configure-stage3-libiberty:
-       @$(MAKE) stage3-start
-       @[ -f libiberty/Makefile ] && exit 0 || : ; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-       $(STAGE_HOST_EXPORTS)  \
-       echo Configuring stage 3 in libiberty ; \
-       cd $(HOST_SUBDIR)/libiberty || exit 1; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/libiberty/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       srcdiroption="--srcdir=$${topdir}/libiberty"; \
-       libsrcdir="$$s/libiberty"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
-         @stage2_werror_flag@ 
-
-maybe-all-stage3-libiberty: all-stage3-libiberty
-all-stage3-libiberty: configure-stage3-libiberty
-       @$(MAKE) stage3-start
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-       $(STAGE_HOST_EXPORTS)  \
-       cd $(HOST_SUBDIR)/libiberty && \
-       $(MAKE) $(FLAGS_TO_PASS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                
-
-maybe-clean-stage3-libiberty: clean-stage3-libiberty
-clean-stage3-libiberty:
-       @[ -f libiberty/Makefile ] || [ -f stage3-libiberty/Makefile ] \
-         || exit 0 ; \
-       [ -f libiberty/Makefile ] || $(MAKE) stage3-start ; \
-       cd $(HOST_SUBDIR)/libiberty && \
-       $(MAKE) $(FLAGS_TO_PASS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                 clean
-@endif libiberty-bootstrap
-
-
-.PHONY: configure-stage3-zlib maybe-configure-stage3-zlib
-.PHONY: all-stage3-zlib maybe-all-stage3-zlib
-.PHONY: clean-stage3-zlib maybe-clean-stage3-zlib
-
-maybe-configure-stage3-zlib:
-maybe-all-stage3-zlib:
-maybe-clean-stage3-zlib:
-
-@if zlib-bootstrap
-maybe-configure-stage3-zlib: configure-stage3-zlib
-configure-stage3-zlib:
-       @$(MAKE) stage3-start
-       @[ -f zlib/Makefile ] && exit 0 || : ; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-       $(STAGE_HOST_EXPORTS)  \
-       echo Configuring stage 3 in zlib ; \
-       cd $(HOST_SUBDIR)/zlib || exit 1; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/zlib/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       srcdiroption="--srcdir=$${topdir}/zlib"; \
-       libsrcdir="$$s/zlib"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
-         @stage2_werror_flag@ 
-
-maybe-all-stage3-zlib: all-stage3-zlib
-all-stage3-zlib: configure-stage3-zlib
-       @$(MAKE) stage3-start
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-       $(STAGE_HOST_EXPORTS)  \
-       cd $(HOST_SUBDIR)/zlib && \
-       $(MAKE) $(FLAGS_TO_PASS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                
-
-maybe-clean-stage3-zlib: clean-stage3-zlib
-clean-stage3-zlib:
-       @[ -f zlib/Makefile ] || [ -f stage3-zlib/Makefile ] \
-         || exit 0 ; \
-       [ -f zlib/Makefile ] || $(MAKE) stage3-start ; \
-       cd $(HOST_SUBDIR)/zlib && \
-       $(MAKE) $(FLAGS_TO_PASS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                 clean
-@endif zlib-bootstrap
+@if bfd
+       @cd $(HOST_SUBDIR); set bfd stage3-bfd ; \
+       @UNDO_LINK_TO_DIR@  ; \
+       set prev-bfd stage2-bfd ; \
+       @UNDO_LINK_TO_DIR@ 
+@endif bfd
+@if opcodes
+       @cd $(HOST_SUBDIR); set opcodes stage3-opcodes ; \
+       @UNDO_LINK_TO_DIR@  ; \
+       set prev-opcodes stage2-opcodes ; \
+       @UNDO_LINK_TO_DIR@ 
+@endif opcodes
+@if binutils
+       @cd $(HOST_SUBDIR); set binutils stage3-binutils ; \
+       @UNDO_LINK_TO_DIR@  ; \
+       set prev-binutils stage2-binutils ; \
+       @UNDO_LINK_TO_DIR@ 
+@endif binutils
+@if gas
+       @cd $(HOST_SUBDIR); set gas stage3-gas ; \
+       @UNDO_LINK_TO_DIR@  ; \
+       set prev-gas stage2-gas ; \
+       @UNDO_LINK_TO_DIR@ 
+@endif gas
+@if gcc
+       @cd $(HOST_SUBDIR); set gcc stage3-gcc ; \
+       @UNDO_LINK_TO_DIR@  ; \
+       set prev-gcc stage2-gcc ; \
+       @UNDO_LINK_TO_DIR@ 
+@endif gcc
+@if intl
+       @cd $(HOST_SUBDIR); set intl stage3-intl ; \
+       @UNDO_LINK_TO_DIR@  ; \
+       set prev-intl stage2-intl ; \
+       @UNDO_LINK_TO_DIR@ 
+@endif intl
+@if ld
+       @cd $(HOST_SUBDIR); set ld stage3-ld ; \
+       @UNDO_LINK_TO_DIR@  ; \
+       set prev-ld stage2-ld ; \
+       @UNDO_LINK_TO_DIR@ 
+@endif ld
+@if libcpp
+       @cd $(HOST_SUBDIR); set libcpp stage3-libcpp ; \
+       @UNDO_LINK_TO_DIR@  ; \
+       set prev-libcpp stage2-libcpp ; \
+       @UNDO_LINK_TO_DIR@ 
+@endif libcpp
+@if libiberty
+       @cd $(HOST_SUBDIR); set libiberty stage3-libiberty ; \
+       @UNDO_LINK_TO_DIR@  ; \
+       set prev-libiberty stage2-libiberty ; \
+       @UNDO_LINK_TO_DIR@ 
+@endif libiberty
+@if zlib
+       @cd $(HOST_SUBDIR); set zlib stage3-zlib ; \
+       @UNDO_LINK_TO_DIR@  ; \
+       set prev-zlib stage2-zlib ; \
+       @UNDO_LINK_TO_DIR@ 
+@endif zlib
  
+# Bubble a bugfix through all the stages up to stage 3.  They
+# are remade, but not reconfigured.  The next stage (if any) will not
+# be reconfigured as well.
+.PHONY: stage3-bubble
+stage3-bubble:: stage2-bubble
+       @bootstrap_lean@-rm -rf stage1-* ; $(STAMP) stage1-lean
+       @if test -f stage3-lean || test -f stage2-lean  ; then \
+         echo Skipping rebuild of stage3 ; \
+       else \
+         $(MAKE) $(RECURSE_FLAGS_TO_PASS) NOTPARALLEL= all-stage3; \
+       fi
  
+.PHONY: all-stage3 clean-stage3
+do-clean: clean-stage3
  
  # FIXME: Will not need to be conditional when toplevel bootstrap is the
  # only possibility, but now it conflicts with no-bootstrap rules
@@ -32640,7 +33960,7 @@ stage4-start::
         @[ -f stage_current ] && $(MAKE) `cat stage_current`-end || : ; \
         echo stage4 > stage_current ; \
         echo stage4 > stage_last; \
-       $(mkinstalldirs) $(HOST_SUBDIR)
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)
  @if bfd
         @cd $(HOST_SUBDIR); [ -d stage4-bfd ] || \
           mkdir stage4-bfd; \
@@ -32781,569 +34101,24 @@ stage4-end::
  @if zlib
         @cd $(HOST_SUBDIR); set zlib stage4-zlib ; \
         @UNDO_LINK_TO_DIR@  ; \
-       set prev-zlib stage3-zlib ; \
-       @UNDO_LINK_TO_DIR@ 
-@endif zlib
-
-# Bubble a bugfix through all the stages up to stage 4.  They
-# are remade, but not reconfigured.  The next stage (if any) will not
-# be reconfigured as well.
-.PHONY: stage4-bubble
-stage4-bubble:: stage3-bubble
-       @bootstrap_lean@-rm -rf stage2-* ; $(STAMP) stage2-lean
-       @if test -f stage4-lean || test -f stage3-lean  ; then \
-         echo Skipping rebuild of stage4 ; \
-       else \
-         $(MAKE) $(RECURSE_FLAGS_TO_PASS) NOTPARALLEL= all-stage4; \
-       fi
-
-.PHONY: all-stage4 clean-stage4
-all-stage4:     \
-  maybe-all-stage4-bfd \
-  maybe-all-stage4-opcodes \
-  maybe-all-stage4-binutils              \
-  maybe-all-stage4-gas \
-  maybe-all-stage4-gcc        \
-  maybe-all-stage4-intl   \
-  maybe-all-stage4-ld \
-  maybe-all-stage4-libcpp  \
-  maybe-all-stage4-libiberty                        \
-  maybe-all-stage4-zlib        
-
-do-clean: clean-stage4
-clean-stage4:     \
-  maybe-clean-stage4-bfd \
-  maybe-clean-stage4-opcodes \
-  maybe-clean-stage4-binutils              \
-  maybe-clean-stage4-gas \
-  maybe-clean-stage4-gcc        \
-  maybe-clean-stage4-intl   \
-  maybe-clean-stage4-ld \
-  maybe-clean-stage4-libcpp  \
-  maybe-clean-stage4-libiberty                        \
-  maybe-clean-stage4-zlib        
-
-
-.PHONY: configure-stage4-bfd maybe-configure-stage4-bfd
-.PHONY: all-stage4-bfd maybe-all-stage4-bfd
-.PHONY: clean-stage4-bfd maybe-clean-stage4-bfd
-
-maybe-configure-stage4-bfd:
-maybe-all-stage4-bfd:
-maybe-clean-stage4-bfd:
-
-@if bfd-bootstrap
-maybe-configure-stage4-bfd: configure-stage4-bfd
-configure-stage4-bfd:
-       @$(MAKE) stage4-start
-       @[ -f bfd/Makefile ] && exit 0 || : ; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-       $(STAGE_HOST_EXPORTS)  \
-       echo Configuring stage 4 in bfd ; \
-       cd $(HOST_SUBDIR)/bfd || exit 1; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/bfd/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       srcdiroption="--srcdir=$${topdir}/bfd"; \
-       libsrcdir="$$s/bfd"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
-         @stage2_werror_flag@ 
-
-maybe-all-stage4-bfd: all-stage4-bfd
-all-stage4-bfd: configure-stage4-bfd
-       @$(MAKE) stage4-start
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-       $(STAGE_HOST_EXPORTS)  \
-       cd $(HOST_SUBDIR)/bfd && \
-       $(MAKE) $(FLAGS_TO_PASS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                
-
-maybe-clean-stage4-bfd: clean-stage4-bfd
-clean-stage4-bfd:
-       @[ -f bfd/Makefile ] || [ -f stage4-bfd/Makefile ] \
-         || exit 0 ; \
-       [ -f bfd/Makefile ] || $(MAKE) stage4-start ; \
-       cd $(HOST_SUBDIR)/bfd && \
-       $(MAKE) $(FLAGS_TO_PASS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                 clean
-@endif bfd-bootstrap
-
-
-.PHONY: configure-stage4-opcodes maybe-configure-stage4-opcodes
-.PHONY: all-stage4-opcodes maybe-all-stage4-opcodes
-.PHONY: clean-stage4-opcodes maybe-clean-stage4-opcodes
-
-maybe-configure-stage4-opcodes:
-maybe-all-stage4-opcodes:
-maybe-clean-stage4-opcodes:
-
-@if opcodes-bootstrap
-maybe-configure-stage4-opcodes: configure-stage4-opcodes
-configure-stage4-opcodes:
-       @$(MAKE) stage4-start
-       @[ -f opcodes/Makefile ] && exit 0 || : ; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-       $(STAGE_HOST_EXPORTS)  \
-       echo Configuring stage 4 in opcodes ; \
-       cd $(HOST_SUBDIR)/opcodes || exit 1; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/opcodes/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       srcdiroption="--srcdir=$${topdir}/opcodes"; \
-       libsrcdir="$$s/opcodes"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
-         @stage2_werror_flag@ 
-
-maybe-all-stage4-opcodes: all-stage4-opcodes
-all-stage4-opcodes: configure-stage4-opcodes
-       @$(MAKE) stage4-start
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-       $(STAGE_HOST_EXPORTS)  \
-       cd $(HOST_SUBDIR)/opcodes && \
-       $(MAKE) $(FLAGS_TO_PASS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                
-
-maybe-clean-stage4-opcodes: clean-stage4-opcodes
-clean-stage4-opcodes:
-       @[ -f opcodes/Makefile ] || [ -f stage4-opcodes/Makefile ] \
-         || exit 0 ; \
-       [ -f opcodes/Makefile ] || $(MAKE) stage4-start ; \
-       cd $(HOST_SUBDIR)/opcodes && \
-       $(MAKE) $(FLAGS_TO_PASS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                 clean
-@endif opcodes-bootstrap
-
-
-.PHONY: configure-stage4-binutils maybe-configure-stage4-binutils
-.PHONY: all-stage4-binutils maybe-all-stage4-binutils
-.PHONY: clean-stage4-binutils maybe-clean-stage4-binutils
-
-maybe-configure-stage4-binutils:
-maybe-all-stage4-binutils:
-maybe-clean-stage4-binutils:
-
-@if binutils-bootstrap
-maybe-configure-stage4-binutils: configure-stage4-binutils
-configure-stage4-binutils:
-       @$(MAKE) stage4-start
-       @[ -f binutils/Makefile ] && exit 0 || : ; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-       $(STAGE_HOST_EXPORTS)  \
-       echo Configuring stage 4 in binutils ; \
-       cd $(HOST_SUBDIR)/binutils || exit 1; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/binutils/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       srcdiroption="--srcdir=$${topdir}/binutils"; \
-       libsrcdir="$$s/binutils"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
-         @stage2_werror_flag@ 
-
-maybe-all-stage4-binutils: all-stage4-binutils
-all-stage4-binutils: configure-stage4-binutils
-       @$(MAKE) stage4-start
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-       $(STAGE_HOST_EXPORTS)  \
-       cd $(HOST_SUBDIR)/binutils && \
-       $(MAKE) $(FLAGS_TO_PASS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                
-
-maybe-clean-stage4-binutils: clean-stage4-binutils
-clean-stage4-binutils:
-       @[ -f binutils/Makefile ] || [ -f stage4-binutils/Makefile ] \
-         || exit 0 ; \
-       [ -f binutils/Makefile ] || $(MAKE) stage4-start ; \
-       cd $(HOST_SUBDIR)/binutils && \
-       $(MAKE) $(FLAGS_TO_PASS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                 clean
-@endif binutils-bootstrap
-
-
-.PHONY: configure-stage4-gas maybe-configure-stage4-gas
-.PHONY: all-stage4-gas maybe-all-stage4-gas
-.PHONY: clean-stage4-gas maybe-clean-stage4-gas
-
-maybe-configure-stage4-gas:
-maybe-all-stage4-gas:
-maybe-clean-stage4-gas:
-
-@if gas-bootstrap
-maybe-configure-stage4-gas: configure-stage4-gas
-configure-stage4-gas:
-       @$(MAKE) stage4-start
-       @[ -f gas/Makefile ] && exit 0 || : ; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-       $(STAGE_HOST_EXPORTS)  \
-       echo Configuring stage 4 in gas ; \
-       cd $(HOST_SUBDIR)/gas || exit 1; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/gas/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       srcdiroption="--srcdir=$${topdir}/gas"; \
-       libsrcdir="$$s/gas"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
-         @stage2_werror_flag@ 
-
-maybe-all-stage4-gas: all-stage4-gas
-all-stage4-gas: configure-stage4-gas
-       @$(MAKE) stage4-start
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-       $(STAGE_HOST_EXPORTS)  \
-       cd $(HOST_SUBDIR)/gas && \
-       $(MAKE) $(FLAGS_TO_PASS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                
-
-maybe-clean-stage4-gas: clean-stage4-gas
-clean-stage4-gas:
-       @[ -f gas/Makefile ] || [ -f stage4-gas/Makefile ] \
-         || exit 0 ; \
-       [ -f gas/Makefile ] || $(MAKE) stage4-start ; \
-       cd $(HOST_SUBDIR)/gas && \
-       $(MAKE) $(FLAGS_TO_PASS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                 clean
-@endif gas-bootstrap
-
-
-.PHONY: configure-stage4-gcc maybe-configure-stage4-gcc
-.PHONY: all-stage4-gcc maybe-all-stage4-gcc
-.PHONY: clean-stage4-gcc maybe-clean-stage4-gcc
-
-maybe-configure-stage4-gcc:
-maybe-all-stage4-gcc:
-maybe-clean-stage4-gcc:
-
-@if gcc-bootstrap
-maybe-configure-stage4-gcc: configure-stage4-gcc
-configure-stage4-gcc:
-       @$(MAKE) stage4-start
-       @[ -f gcc/Makefile ] && exit 0 || : ; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-       $(STAGE_HOST_EXPORTS)  \
-       echo Configuring stage 4 in gcc ; \
-       cd $(HOST_SUBDIR)/gcc || exit 1; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/gcc/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       srcdiroption="--srcdir=$${topdir}/gcc"; \
-       libsrcdir="$$s/gcc"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
-         @stage2_werror_flag@ 
-
-maybe-all-stage4-gcc: all-stage4-gcc
-all-stage4-gcc: configure-stage4-gcc
-       @$(MAKE) stage4-start
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-       $(STAGE_HOST_EXPORTS)  \
-       cd $(HOST_SUBDIR)/gcc && \
-       $(MAKE) $(FLAGS_TO_PASS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                $(EXTRA_GCC_FLAGS)
-
-maybe-clean-stage4-gcc: clean-stage4-gcc
-clean-stage4-gcc:
-       @[ -f gcc/Makefile ] || [ -f stage4-gcc/Makefile ] \
-         || exit 0 ; \
-       [ -f gcc/Makefile ] || $(MAKE) stage4-start ; \
-       cd $(HOST_SUBDIR)/gcc && \
-       $(MAKE) $(FLAGS_TO_PASS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                $(EXTRA_GCC_FLAGS) clean
-@endif gcc-bootstrap
-
-
-.PHONY: configure-stage4-intl maybe-configure-stage4-intl
-.PHONY: all-stage4-intl maybe-all-stage4-intl
-.PHONY: clean-stage4-intl maybe-clean-stage4-intl
-
-maybe-configure-stage4-intl:
-maybe-all-stage4-intl:
-maybe-clean-stage4-intl:
-
-@if intl-bootstrap
-maybe-configure-stage4-intl: configure-stage4-intl
-configure-stage4-intl:
-       @$(MAKE) stage4-start
-       @[ -f intl/Makefile ] && exit 0 || : ; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-       $(STAGE_HOST_EXPORTS)  \
-       echo Configuring stage 4 in intl ; \
-       cd $(HOST_SUBDIR)/intl || exit 1; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/intl/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       srcdiroption="--srcdir=$${topdir}/intl"; \
-       libsrcdir="$$s/intl"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
-         @stage2_werror_flag@ 
-
-maybe-all-stage4-intl: all-stage4-intl
-all-stage4-intl: configure-stage4-intl
-       @$(MAKE) stage4-start
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-       $(STAGE_HOST_EXPORTS)  \
-       cd $(HOST_SUBDIR)/intl && \
-       $(MAKE) $(FLAGS_TO_PASS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                
-
-maybe-clean-stage4-intl: clean-stage4-intl
-clean-stage4-intl:
-       @[ -f intl/Makefile ] || [ -f stage4-intl/Makefile ] \
-         || exit 0 ; \
-       [ -f intl/Makefile ] || $(MAKE) stage4-start ; \
-       cd $(HOST_SUBDIR)/intl && \
-       $(MAKE) $(FLAGS_TO_PASS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                 clean
-@endif intl-bootstrap
-
-
-.PHONY: configure-stage4-ld maybe-configure-stage4-ld
-.PHONY: all-stage4-ld maybe-all-stage4-ld
-.PHONY: clean-stage4-ld maybe-clean-stage4-ld
-
-maybe-configure-stage4-ld:
-maybe-all-stage4-ld:
-maybe-clean-stage4-ld:
-
-@if ld-bootstrap
-maybe-configure-stage4-ld: configure-stage4-ld
-configure-stage4-ld:
-       @$(MAKE) stage4-start
-       @[ -f ld/Makefile ] && exit 0 || : ; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-       $(STAGE_HOST_EXPORTS)  \
-       echo Configuring stage 4 in ld ; \
-       cd $(HOST_SUBDIR)/ld || exit 1; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/ld/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       srcdiroption="--srcdir=$${topdir}/ld"; \
-       libsrcdir="$$s/ld"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
-         @stage2_werror_flag@ 
-
-maybe-all-stage4-ld: all-stage4-ld
-all-stage4-ld: configure-stage4-ld
-       @$(MAKE) stage4-start
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-       $(STAGE_HOST_EXPORTS)  \
-       cd $(HOST_SUBDIR)/ld && \
-       $(MAKE) $(FLAGS_TO_PASS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                
-
-maybe-clean-stage4-ld: clean-stage4-ld
-clean-stage4-ld:
-       @[ -f ld/Makefile ] || [ -f stage4-ld/Makefile ] \
-         || exit 0 ; \
-       [ -f ld/Makefile ] || $(MAKE) stage4-start ; \
-       cd $(HOST_SUBDIR)/ld && \
-       $(MAKE) $(FLAGS_TO_PASS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                 clean
-@endif ld-bootstrap
-
-
-.PHONY: configure-stage4-libcpp maybe-configure-stage4-libcpp
-.PHONY: all-stage4-libcpp maybe-all-stage4-libcpp
-.PHONY: clean-stage4-libcpp maybe-clean-stage4-libcpp
-
-maybe-configure-stage4-libcpp:
-maybe-all-stage4-libcpp:
-maybe-clean-stage4-libcpp:
-
-@if libcpp-bootstrap
-maybe-configure-stage4-libcpp: configure-stage4-libcpp
-configure-stage4-libcpp:
-       @$(MAKE) stage4-start
-       @[ -f libcpp/Makefile ] && exit 0 || : ; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-       $(STAGE_HOST_EXPORTS)  \
-       echo Configuring stage 4 in libcpp ; \
-       cd $(HOST_SUBDIR)/libcpp || exit 1; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/libcpp/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       srcdiroption="--srcdir=$${topdir}/libcpp"; \
-       libsrcdir="$$s/libcpp"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
-         @stage2_werror_flag@ 
-
-maybe-all-stage4-libcpp: all-stage4-libcpp
-all-stage4-libcpp: configure-stage4-libcpp
-       @$(MAKE) stage4-start
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-       $(STAGE_HOST_EXPORTS)  \
-       cd $(HOST_SUBDIR)/libcpp && \
-       $(MAKE) $(FLAGS_TO_PASS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                
-
-maybe-clean-stage4-libcpp: clean-stage4-libcpp
-clean-stage4-libcpp:
-       @[ -f libcpp/Makefile ] || [ -f stage4-libcpp/Makefile ] \
-         || exit 0 ; \
-       [ -f libcpp/Makefile ] || $(MAKE) stage4-start ; \
-       cd $(HOST_SUBDIR)/libcpp && \
-       $(MAKE) $(FLAGS_TO_PASS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                 clean
-@endif libcpp-bootstrap
-
-
-.PHONY: configure-stage4-libiberty maybe-configure-stage4-libiberty
-.PHONY: all-stage4-libiberty maybe-all-stage4-libiberty
-.PHONY: clean-stage4-libiberty maybe-clean-stage4-libiberty
-
-maybe-configure-stage4-libiberty:
-maybe-all-stage4-libiberty:
-maybe-clean-stage4-libiberty:
-
-@if libiberty-bootstrap
-maybe-configure-stage4-libiberty: configure-stage4-libiberty
-configure-stage4-libiberty:
-       @$(MAKE) stage4-start
-       @[ -f libiberty/Makefile ] && exit 0 || : ; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-       $(STAGE_HOST_EXPORTS)  \
-       echo Configuring stage 4 in libiberty ; \
-       cd $(HOST_SUBDIR)/libiberty || exit 1; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/libiberty/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       srcdiroption="--srcdir=$${topdir}/libiberty"; \
-       libsrcdir="$$s/libiberty"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
-         @stage2_werror_flag@ 
-
-maybe-all-stage4-libiberty: all-stage4-libiberty
-all-stage4-libiberty: configure-stage4-libiberty
-       @$(MAKE) stage4-start
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-       $(STAGE_HOST_EXPORTS)  \
-       cd $(HOST_SUBDIR)/libiberty && \
-       $(MAKE) $(FLAGS_TO_PASS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                
-
-maybe-clean-stage4-libiberty: clean-stage4-libiberty
-clean-stage4-libiberty:
-       @[ -f libiberty/Makefile ] || [ -f stage4-libiberty/Makefile ] \
-         || exit 0 ; \
-       [ -f libiberty/Makefile ] || $(MAKE) stage4-start ; \
-       cd $(HOST_SUBDIR)/libiberty && \
-       $(MAKE) $(FLAGS_TO_PASS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                 clean
-@endif libiberty-bootstrap
-
-
-.PHONY: configure-stage4-zlib maybe-configure-stage4-zlib
-.PHONY: all-stage4-zlib maybe-all-stage4-zlib
-.PHONY: clean-stage4-zlib maybe-clean-stage4-zlib
-
-maybe-configure-stage4-zlib:
-maybe-all-stage4-zlib:
-maybe-clean-stage4-zlib:
-
-@if zlib-bootstrap
-maybe-configure-stage4-zlib: configure-stage4-zlib
-configure-stage4-zlib:
-       @$(MAKE) stage4-start
-       @[ -f zlib/Makefile ] && exit 0 || : ; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-       $(STAGE_HOST_EXPORTS)  \
-       echo Configuring stage 4 in zlib ; \
-       cd $(HOST_SUBDIR)/zlib || exit 1; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/zlib/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       srcdiroption="--srcdir=$${topdir}/zlib"; \
-       libsrcdir="$$s/zlib"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
-         @stage2_werror_flag@ 
-
-maybe-all-stage4-zlib: all-stage4-zlib
-all-stage4-zlib: configure-stage4-zlib
-       @$(MAKE) stage4-start
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-       $(STAGE_HOST_EXPORTS)  \
-       cd $(HOST_SUBDIR)/zlib && \
-       $(MAKE) $(FLAGS_TO_PASS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                
-
-maybe-clean-stage4-zlib: clean-stage4-zlib
-clean-stage4-zlib:
-       @[ -f zlib/Makefile ] || [ -f stage4-zlib/Makefile ] \
-         || exit 0 ; \
-       [ -f zlib/Makefile ] || $(MAKE) stage4-start ; \
-       cd $(HOST_SUBDIR)/zlib && \
-       $(MAKE) $(FLAGS_TO_PASS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                 clean
-@endif zlib-bootstrap
+       set prev-zlib stage3-zlib ; \
+       @UNDO_LINK_TO_DIR@ 
+@endif zlib
  
+# Bubble a bugfix through all the stages up to stage 4.  They
+# are remade, but not reconfigured.  The next stage (if any) will not
+# be reconfigured as well.
+.PHONY: stage4-bubble
+stage4-bubble:: stage3-bubble
+       @bootstrap_lean@-rm -rf stage2-* ; $(STAMP) stage2-lean
+       @if test -f stage4-lean || test -f stage3-lean  ; then \
+         echo Skipping rebuild of stage4 ; \
+       else \
+         $(MAKE) $(RECURSE_FLAGS_TO_PASS) NOTPARALLEL= all-stage4; \
+       fi
  
+.PHONY: all-stage4 clean-stage4
+do-clean: clean-stage4
  
  # FIXME: Will not need to be conditional when toplevel bootstrap is the
  # only possibility, but now it conflicts with no-bootstrap rules
@@ -33399,7 +34174,7 @@ stageprofile-start::
         @[ -f stage_current ] && $(MAKE) `cat stage_current`-end || : ; \
         echo stageprofile > stage_current ; \
         echo stageprofile > stage_last; \
-       $(mkinstalldirs) $(HOST_SUBDIR)
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)
  @if bfd
         @cd $(HOST_SUBDIR); [ -d stageprofile-bfd ] || \
           mkdir stageprofile-bfd; \
@@ -33473,635 +34248,90 @@ stageprofile-start::
         @CREATE_LINK_TO_DIR@ 
  @endif libiberty
  @if zlib
-       @cd $(HOST_SUBDIR); [ -d stageprofile-zlib ] || \
-         mkdir stageprofile-zlib; \
-       set stageprofile-zlib zlib ; \
-       @CREATE_LINK_TO_DIR@  ; \
-       set stage1-zlib prev-zlib ; \
-       @CREATE_LINK_TO_DIR@ 
-@endif zlib
-
-stageprofile-end::
-       @rm -f stage_current
-@if bfd
-       @cd $(HOST_SUBDIR); set bfd stageprofile-bfd ; \
-       @UNDO_LINK_TO_DIR@  ; \
-       set prev-bfd stage1-bfd ; \
-       @UNDO_LINK_TO_DIR@ 
-@endif bfd
-@if opcodes
-       @cd $(HOST_SUBDIR); set opcodes stageprofile-opcodes ; \
-       @UNDO_LINK_TO_DIR@  ; \
-       set prev-opcodes stage1-opcodes ; \
-       @UNDO_LINK_TO_DIR@ 
-@endif opcodes
-@if binutils
-       @cd $(HOST_SUBDIR); set binutils stageprofile-binutils ; \
-       @UNDO_LINK_TO_DIR@  ; \
-       set prev-binutils stage1-binutils ; \
-       @UNDO_LINK_TO_DIR@ 
-@endif binutils
-@if gas
-       @cd $(HOST_SUBDIR); set gas stageprofile-gas ; \
-       @UNDO_LINK_TO_DIR@  ; \
-       set prev-gas stage1-gas ; \
-       @UNDO_LINK_TO_DIR@ 
-@endif gas
-@if gcc
-       @cd $(HOST_SUBDIR); set gcc stageprofile-gcc ; \
-       @UNDO_LINK_TO_DIR@  ; \
-       set prev-gcc stage1-gcc ; \
-       @UNDO_LINK_TO_DIR@ 
-@endif gcc
-@if intl
-       @cd $(HOST_SUBDIR); set intl stageprofile-intl ; \
-       @UNDO_LINK_TO_DIR@  ; \
-       set prev-intl stage1-intl ; \
-       @UNDO_LINK_TO_DIR@ 
-@endif intl
-@if ld
-       @cd $(HOST_SUBDIR); set ld stageprofile-ld ; \
-       @UNDO_LINK_TO_DIR@  ; \
-       set prev-ld stage1-ld ; \
-       @UNDO_LINK_TO_DIR@ 
-@endif ld
-@if libcpp
-       @cd $(HOST_SUBDIR); set libcpp stageprofile-libcpp ; \
-       @UNDO_LINK_TO_DIR@  ; \
-       set prev-libcpp stage1-libcpp ; \
-       @UNDO_LINK_TO_DIR@ 
-@endif libcpp
-@if libiberty
-       @cd $(HOST_SUBDIR); set libiberty stageprofile-libiberty ; \
-       @UNDO_LINK_TO_DIR@  ; \
-       set prev-libiberty stage1-libiberty ; \
-       @UNDO_LINK_TO_DIR@ 
-@endif libiberty
-@if zlib
-       @cd $(HOST_SUBDIR); set zlib stageprofile-zlib ; \
-       @UNDO_LINK_TO_DIR@  ; \
-       set prev-zlib stage1-zlib ; \
-       @UNDO_LINK_TO_DIR@ 
-@endif zlib
-
-# Bubble a bugfix through all the stages up to stage profile.  They
-# are remade, but not reconfigured.  The next stage (if any) will not
-# be reconfigured as well.
-.PHONY: stageprofile-bubble
-stageprofile-bubble:: stage1-bubble
-       @if test -f stageprofile-lean || test -f stage1-lean  ; then \
-         echo Skipping rebuild of stageprofile ; \
-       else \
-         $(MAKE) $(RECURSE_FLAGS_TO_PASS) NOTPARALLEL= all-stageprofile; \
-       fi
-
-.PHONY: all-stageprofile clean-stageprofile
-all-stageprofile:     \
-  maybe-all-stageprofile-bfd \
-  maybe-all-stageprofile-opcodes \
-  maybe-all-stageprofile-binutils              \
-  maybe-all-stageprofile-gas \
-  maybe-all-stageprofile-gcc        \
-  maybe-all-stageprofile-intl   \
-  maybe-all-stageprofile-ld \
-  maybe-all-stageprofile-libcpp  \
-  maybe-all-stageprofile-libiberty                        \
-  maybe-all-stageprofile-zlib        
-
-do-clean: clean-stageprofile
-clean-stageprofile:     \
-  maybe-clean-stageprofile-bfd \
-  maybe-clean-stageprofile-opcodes \
-  maybe-clean-stageprofile-binutils              \
-  maybe-clean-stageprofile-gas \
-  maybe-clean-stageprofile-gcc        \
-  maybe-clean-stageprofile-intl   \
-  maybe-clean-stageprofile-ld \
-  maybe-clean-stageprofile-libcpp  \
-  maybe-clean-stageprofile-libiberty                        \
-  maybe-clean-stageprofile-zlib        
-
-
-.PHONY: configure-stageprofile-bfd maybe-configure-stageprofile-bfd
-.PHONY: all-stageprofile-bfd maybe-all-stageprofile-bfd
-.PHONY: clean-stageprofile-bfd maybe-clean-stageprofile-bfd
-
-maybe-configure-stageprofile-bfd:
-maybe-all-stageprofile-bfd:
-maybe-clean-stageprofile-bfd:
-
-@if bfd-bootstrap
-maybe-configure-stageprofile-bfd: configure-stageprofile-bfd
-configure-stageprofile-bfd:
-       @$(MAKE) stageprofile-start
-       @[ -f bfd/Makefile ] && exit 0 || : ; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-       $(STAGE_HOST_EXPORTS)  \
-       echo Configuring stage profile in bfd ; \
-       cd $(HOST_SUBDIR)/bfd || exit 1; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/bfd/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       srcdiroption="--srcdir=$${topdir}/bfd"; \
-       libsrcdir="$$s/bfd"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
-         @stage2_werror_flag@ 
-
-maybe-all-stageprofile-bfd: all-stageprofile-bfd
-all-stageprofile-bfd: configure-stageprofile-bfd
-       @$(MAKE) stageprofile-start
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-       $(STAGE_HOST_EXPORTS)  \
-       cd $(HOST_SUBDIR)/bfd && \
-       $(MAKE) $(FLAGS_TO_PASS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" 
-
-maybe-clean-stageprofile-bfd: clean-stageprofile-bfd
-clean-stageprofile-bfd:
-       @[ -f bfd/Makefile ] || [ -f stageprofile-bfd/Makefile ] \
-         || exit 0 ; \
-       [ -f bfd/Makefile ] || $(MAKE) stageprofile-start ; \
-       cd $(HOST_SUBDIR)/bfd && \
-       $(MAKE) $(FLAGS_TO_PASS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               CFLAGS="$(BOOT_CFLAGS) -fprofile-generate"  clean
-@endif bfd-bootstrap
-
-
-.PHONY: configure-stageprofile-opcodes maybe-configure-stageprofile-opcodes
-.PHONY: all-stageprofile-opcodes maybe-all-stageprofile-opcodes
-.PHONY: clean-stageprofile-opcodes maybe-clean-stageprofile-opcodes
-
-maybe-configure-stageprofile-opcodes:
-maybe-all-stageprofile-opcodes:
-maybe-clean-stageprofile-opcodes:
-
-@if opcodes-bootstrap
-maybe-configure-stageprofile-opcodes: configure-stageprofile-opcodes
-configure-stageprofile-opcodes:
-       @$(MAKE) stageprofile-start
-       @[ -f opcodes/Makefile ] && exit 0 || : ; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-       $(STAGE_HOST_EXPORTS)  \
-       echo Configuring stage profile in opcodes ; \
-       cd $(HOST_SUBDIR)/opcodes || exit 1; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/opcodes/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       srcdiroption="--srcdir=$${topdir}/opcodes"; \
-       libsrcdir="$$s/opcodes"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
-         @stage2_werror_flag@ 
-
-maybe-all-stageprofile-opcodes: all-stageprofile-opcodes
-all-stageprofile-opcodes: configure-stageprofile-opcodes
-       @$(MAKE) stageprofile-start
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-       $(STAGE_HOST_EXPORTS)  \
-       cd $(HOST_SUBDIR)/opcodes && \
-       $(MAKE) $(FLAGS_TO_PASS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" 
-
-maybe-clean-stageprofile-opcodes: clean-stageprofile-opcodes
-clean-stageprofile-opcodes:
-       @[ -f opcodes/Makefile ] || [ -f stageprofile-opcodes/Makefile ] \
-         || exit 0 ; \
-       [ -f opcodes/Makefile ] || $(MAKE) stageprofile-start ; \
-       cd $(HOST_SUBDIR)/opcodes && \
-       $(MAKE) $(FLAGS_TO_PASS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               CFLAGS="$(BOOT_CFLAGS) -fprofile-generate"  clean
-@endif opcodes-bootstrap
-
-
-.PHONY: configure-stageprofile-binutils maybe-configure-stageprofile-binutils
-.PHONY: all-stageprofile-binutils maybe-all-stageprofile-binutils
-.PHONY: clean-stageprofile-binutils maybe-clean-stageprofile-binutils
-
-maybe-configure-stageprofile-binutils:
-maybe-all-stageprofile-binutils:
-maybe-clean-stageprofile-binutils:
-
-@if binutils-bootstrap
-maybe-configure-stageprofile-binutils: configure-stageprofile-binutils
-configure-stageprofile-binutils:
-       @$(MAKE) stageprofile-start
-       @[ -f binutils/Makefile ] && exit 0 || : ; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-       $(STAGE_HOST_EXPORTS)  \
-       echo Configuring stage profile in binutils ; \
-       cd $(HOST_SUBDIR)/binutils || exit 1; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/binutils/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       srcdiroption="--srcdir=$${topdir}/binutils"; \
-       libsrcdir="$$s/binutils"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
-         @stage2_werror_flag@ 
-
-maybe-all-stageprofile-binutils: all-stageprofile-binutils
-all-stageprofile-binutils: configure-stageprofile-binutils
-       @$(MAKE) stageprofile-start
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-       $(STAGE_HOST_EXPORTS)  \
-       cd $(HOST_SUBDIR)/binutils && \
-       $(MAKE) $(FLAGS_TO_PASS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" 
-
-maybe-clean-stageprofile-binutils: clean-stageprofile-binutils
-clean-stageprofile-binutils:
-       @[ -f binutils/Makefile ] || [ -f stageprofile-binutils/Makefile ] \
-         || exit 0 ; \
-       [ -f binutils/Makefile ] || $(MAKE) stageprofile-start ; \
-       cd $(HOST_SUBDIR)/binutils && \
-       $(MAKE) $(FLAGS_TO_PASS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               CFLAGS="$(BOOT_CFLAGS) -fprofile-generate"  clean
-@endif binutils-bootstrap
-
-
-.PHONY: configure-stageprofile-gas maybe-configure-stageprofile-gas
-.PHONY: all-stageprofile-gas maybe-all-stageprofile-gas
-.PHONY: clean-stageprofile-gas maybe-clean-stageprofile-gas
-
-maybe-configure-stageprofile-gas:
-maybe-all-stageprofile-gas:
-maybe-clean-stageprofile-gas:
-
-@if gas-bootstrap
-maybe-configure-stageprofile-gas: configure-stageprofile-gas
-configure-stageprofile-gas:
-       @$(MAKE) stageprofile-start
-       @[ -f gas/Makefile ] && exit 0 || : ; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-       $(STAGE_HOST_EXPORTS)  \
-       echo Configuring stage profile in gas ; \
-       cd $(HOST_SUBDIR)/gas || exit 1; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/gas/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       srcdiroption="--srcdir=$${topdir}/gas"; \
-       libsrcdir="$$s/gas"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
-         @stage2_werror_flag@ 
-
-maybe-all-stageprofile-gas: all-stageprofile-gas
-all-stageprofile-gas: configure-stageprofile-gas
-       @$(MAKE) stageprofile-start
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-       $(STAGE_HOST_EXPORTS)  \
-       cd $(HOST_SUBDIR)/gas && \
-       $(MAKE) $(FLAGS_TO_PASS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" 
-
-maybe-clean-stageprofile-gas: clean-stageprofile-gas
-clean-stageprofile-gas:
-       @[ -f gas/Makefile ] || [ -f stageprofile-gas/Makefile ] \
-         || exit 0 ; \
-       [ -f gas/Makefile ] || $(MAKE) stageprofile-start ; \
-       cd $(HOST_SUBDIR)/gas && \
-       $(MAKE) $(FLAGS_TO_PASS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               CFLAGS="$(BOOT_CFLAGS) -fprofile-generate"  clean
-@endif gas-bootstrap
-
-
-.PHONY: configure-stageprofile-gcc maybe-configure-stageprofile-gcc
-.PHONY: all-stageprofile-gcc maybe-all-stageprofile-gcc
-.PHONY: clean-stageprofile-gcc maybe-clean-stageprofile-gcc
-
-maybe-configure-stageprofile-gcc:
-maybe-all-stageprofile-gcc:
-maybe-clean-stageprofile-gcc:
-
-@if gcc-bootstrap
-maybe-configure-stageprofile-gcc: configure-stageprofile-gcc
-configure-stageprofile-gcc:
-       @$(MAKE) stageprofile-start
-       @[ -f gcc/Makefile ] && exit 0 || : ; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-       $(STAGE_HOST_EXPORTS)  \
-       echo Configuring stage profile in gcc ; \
-       cd $(HOST_SUBDIR)/gcc || exit 1; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/gcc/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       srcdiroption="--srcdir=$${topdir}/gcc"; \
-       libsrcdir="$$s/gcc"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
-         @stage2_werror_flag@ 
-
-maybe-all-stageprofile-gcc: all-stageprofile-gcc
-all-stageprofile-gcc: configure-stageprofile-gcc
-       @$(MAKE) stageprofile-start
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-       $(STAGE_HOST_EXPORTS)  \
-       cd $(HOST_SUBDIR)/gcc && \
-       $(MAKE) $(FLAGS_TO_PASS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" $(EXTRA_GCC_FLAGS)
-
-maybe-clean-stageprofile-gcc: clean-stageprofile-gcc
-clean-stageprofile-gcc:
-       @[ -f gcc/Makefile ] || [ -f stageprofile-gcc/Makefile ] \
-         || exit 0 ; \
-       [ -f gcc/Makefile ] || $(MAKE) stageprofile-start ; \
-       cd $(HOST_SUBDIR)/gcc && \
-       $(MAKE) $(FLAGS_TO_PASS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" $(EXTRA_GCC_FLAGS) clean
-@endif gcc-bootstrap
-
-
-.PHONY: configure-stageprofile-intl maybe-configure-stageprofile-intl
-.PHONY: all-stageprofile-intl maybe-all-stageprofile-intl
-.PHONY: clean-stageprofile-intl maybe-clean-stageprofile-intl
-
-maybe-configure-stageprofile-intl:
-maybe-all-stageprofile-intl:
-maybe-clean-stageprofile-intl:
-
-@if intl-bootstrap
-maybe-configure-stageprofile-intl: configure-stageprofile-intl
-configure-stageprofile-intl:
-       @$(MAKE) stageprofile-start
-       @[ -f intl/Makefile ] && exit 0 || : ; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-       $(STAGE_HOST_EXPORTS)  \
-       echo Configuring stage profile in intl ; \
-       cd $(HOST_SUBDIR)/intl || exit 1; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/intl/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       srcdiroption="--srcdir=$${topdir}/intl"; \
-       libsrcdir="$$s/intl"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
-         @stage2_werror_flag@ 
-
-maybe-all-stageprofile-intl: all-stageprofile-intl
-all-stageprofile-intl: configure-stageprofile-intl
-       @$(MAKE) stageprofile-start
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-       $(STAGE_HOST_EXPORTS)  \
-       cd $(HOST_SUBDIR)/intl && \
-       $(MAKE) $(FLAGS_TO_PASS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" 
-
-maybe-clean-stageprofile-intl: clean-stageprofile-intl
-clean-stageprofile-intl:
-       @[ -f intl/Makefile ] || [ -f stageprofile-intl/Makefile ] \
-         || exit 0 ; \
-       [ -f intl/Makefile ] || $(MAKE) stageprofile-start ; \
-       cd $(HOST_SUBDIR)/intl && \
-       $(MAKE) $(FLAGS_TO_PASS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               CFLAGS="$(BOOT_CFLAGS) -fprofile-generate"  clean
-@endif intl-bootstrap
-
-
-.PHONY: configure-stageprofile-ld maybe-configure-stageprofile-ld
-.PHONY: all-stageprofile-ld maybe-all-stageprofile-ld
-.PHONY: clean-stageprofile-ld maybe-clean-stageprofile-ld
-
-maybe-configure-stageprofile-ld:
-maybe-all-stageprofile-ld:
-maybe-clean-stageprofile-ld:
-
-@if ld-bootstrap
-maybe-configure-stageprofile-ld: configure-stageprofile-ld
-configure-stageprofile-ld:
-       @$(MAKE) stageprofile-start
-       @[ -f ld/Makefile ] && exit 0 || : ; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-       $(STAGE_HOST_EXPORTS)  \
-       echo Configuring stage profile in ld ; \
-       cd $(HOST_SUBDIR)/ld || exit 1; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/ld/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       srcdiroption="--srcdir=$${topdir}/ld"; \
-       libsrcdir="$$s/ld"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
-         @stage2_werror_flag@ 
-
-maybe-all-stageprofile-ld: all-stageprofile-ld
-all-stageprofile-ld: configure-stageprofile-ld
-       @$(MAKE) stageprofile-start
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-       $(STAGE_HOST_EXPORTS)  \
-       cd $(HOST_SUBDIR)/ld && \
-       $(MAKE) $(FLAGS_TO_PASS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" 
-
-maybe-clean-stageprofile-ld: clean-stageprofile-ld
-clean-stageprofile-ld:
-       @[ -f ld/Makefile ] || [ -f stageprofile-ld/Makefile ] \
-         || exit 0 ; \
-       [ -f ld/Makefile ] || $(MAKE) stageprofile-start ; \
-       cd $(HOST_SUBDIR)/ld && \
-       $(MAKE) $(FLAGS_TO_PASS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               CFLAGS="$(BOOT_CFLAGS) -fprofile-generate"  clean
-@endif ld-bootstrap
-
-
-.PHONY: configure-stageprofile-libcpp maybe-configure-stageprofile-libcpp
-.PHONY: all-stageprofile-libcpp maybe-all-stageprofile-libcpp
-.PHONY: clean-stageprofile-libcpp maybe-clean-stageprofile-libcpp
-
-maybe-configure-stageprofile-libcpp:
-maybe-all-stageprofile-libcpp:
-maybe-clean-stageprofile-libcpp:
-
-@if libcpp-bootstrap
-maybe-configure-stageprofile-libcpp: configure-stageprofile-libcpp
-configure-stageprofile-libcpp:
-       @$(MAKE) stageprofile-start
-       @[ -f libcpp/Makefile ] && exit 0 || : ; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-       $(STAGE_HOST_EXPORTS)  \
-       echo Configuring stage profile in libcpp ; \
-       cd $(HOST_SUBDIR)/libcpp || exit 1; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/libcpp/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       srcdiroption="--srcdir=$${topdir}/libcpp"; \
-       libsrcdir="$$s/libcpp"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
-         @stage2_werror_flag@ 
-
-maybe-all-stageprofile-libcpp: all-stageprofile-libcpp
-all-stageprofile-libcpp: configure-stageprofile-libcpp
-       @$(MAKE) stageprofile-start
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-       $(STAGE_HOST_EXPORTS)  \
-       cd $(HOST_SUBDIR)/libcpp && \
-       $(MAKE) $(FLAGS_TO_PASS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" 
-
-maybe-clean-stageprofile-libcpp: clean-stageprofile-libcpp
-clean-stageprofile-libcpp:
-       @[ -f libcpp/Makefile ] || [ -f stageprofile-libcpp/Makefile ] \
-         || exit 0 ; \
-       [ -f libcpp/Makefile ] || $(MAKE) stageprofile-start ; \
-       cd $(HOST_SUBDIR)/libcpp && \
-       $(MAKE) $(FLAGS_TO_PASS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               CFLAGS="$(BOOT_CFLAGS) -fprofile-generate"  clean
-@endif libcpp-bootstrap
-
-
-.PHONY: configure-stageprofile-libiberty maybe-configure-stageprofile-libiberty
-.PHONY: all-stageprofile-libiberty maybe-all-stageprofile-libiberty
-.PHONY: clean-stageprofile-libiberty maybe-clean-stageprofile-libiberty
-
-maybe-configure-stageprofile-libiberty:
-maybe-all-stageprofile-libiberty:
-maybe-clean-stageprofile-libiberty:
-
-@if libiberty-bootstrap
-maybe-configure-stageprofile-libiberty: configure-stageprofile-libiberty
-configure-stageprofile-libiberty:
-       @$(MAKE) stageprofile-start
-       @[ -f libiberty/Makefile ] && exit 0 || : ; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-       $(STAGE_HOST_EXPORTS)  \
-       echo Configuring stage profile in libiberty ; \
-       cd $(HOST_SUBDIR)/libiberty || exit 1; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/libiberty/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       srcdiroption="--srcdir=$${topdir}/libiberty"; \
-       libsrcdir="$$s/libiberty"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
-         @stage2_werror_flag@ 
-
-maybe-all-stageprofile-libiberty: all-stageprofile-libiberty
-all-stageprofile-libiberty: configure-stageprofile-libiberty
-       @$(MAKE) stageprofile-start
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-       $(STAGE_HOST_EXPORTS)  \
-       cd $(HOST_SUBDIR)/libiberty && \
-       $(MAKE) $(FLAGS_TO_PASS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" 
-
-maybe-clean-stageprofile-libiberty: clean-stageprofile-libiberty
-clean-stageprofile-libiberty:
-       @[ -f libiberty/Makefile ] || [ -f stageprofile-libiberty/Makefile ] \
-         || exit 0 ; \
-       [ -f libiberty/Makefile ] || $(MAKE) stageprofile-start ; \
-       cd $(HOST_SUBDIR)/libiberty && \
-       $(MAKE) $(FLAGS_TO_PASS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               CFLAGS="$(BOOT_CFLAGS) -fprofile-generate"  clean
-@endif libiberty-bootstrap
-
-
-.PHONY: configure-stageprofile-zlib maybe-configure-stageprofile-zlib
-.PHONY: all-stageprofile-zlib maybe-all-stageprofile-zlib
-.PHONY: clean-stageprofile-zlib maybe-clean-stageprofile-zlib
-
-maybe-configure-stageprofile-zlib:
-maybe-all-stageprofile-zlib:
-maybe-clean-stageprofile-zlib:
-
-@if zlib-bootstrap
-maybe-configure-stageprofile-zlib: configure-stageprofile-zlib
-configure-stageprofile-zlib:
-       @$(MAKE) stageprofile-start
-       @[ -f zlib/Makefile ] && exit 0 || : ; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-       $(STAGE_HOST_EXPORTS)  \
-       echo Configuring stage profile in zlib ; \
-       cd $(HOST_SUBDIR)/zlib || exit 1; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/zlib/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       srcdiroption="--srcdir=$${topdir}/zlib"; \
-       libsrcdir="$$s/zlib"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
-         @stage2_werror_flag@ 
-
-maybe-all-stageprofile-zlib: all-stageprofile-zlib
-all-stageprofile-zlib: configure-stageprofile-zlib
-       @$(MAKE) stageprofile-start
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-       $(STAGE_HOST_EXPORTS)  \
-       cd $(HOST_SUBDIR)/zlib && \
-       $(MAKE) $(FLAGS_TO_PASS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" 
+       @cd $(HOST_SUBDIR); [ -d stageprofile-zlib ] || \
+         mkdir stageprofile-zlib; \
+       set stageprofile-zlib zlib ; \
+       @CREATE_LINK_TO_DIR@  ; \
+       set stage1-zlib prev-zlib ; \
+       @CREATE_LINK_TO_DIR@ 
+@endif zlib
  
-maybe-clean-stageprofile-zlib: clean-stageprofile-zlib
-clean-stageprofile-zlib:
-       @[ -f zlib/Makefile ] || [ -f stageprofile-zlib/Makefile ] \
-         || exit 0 ; \
-       [ -f zlib/Makefile ] || $(MAKE) stageprofile-start ; \
-       cd $(HOST_SUBDIR)/zlib && \
-       $(MAKE) $(FLAGS_TO_PASS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               CFLAGS="$(BOOT_CFLAGS) -fprofile-generate"  clean
-@endif zlib-bootstrap
+stageprofile-end::
+       @rm -f stage_current
+@if bfd
+       @cd $(HOST_SUBDIR); set bfd stageprofile-bfd ; \
+       @UNDO_LINK_TO_DIR@  ; \
+       set prev-bfd stage1-bfd ; \
+       @UNDO_LINK_TO_DIR@ 
+@endif bfd
+@if opcodes
+       @cd $(HOST_SUBDIR); set opcodes stageprofile-opcodes ; \
+       @UNDO_LINK_TO_DIR@  ; \
+       set prev-opcodes stage1-opcodes ; \
+       @UNDO_LINK_TO_DIR@ 
+@endif opcodes
+@if binutils
+       @cd $(HOST_SUBDIR); set binutils stageprofile-binutils ; \
+       @UNDO_LINK_TO_DIR@  ; \
+       set prev-binutils stage1-binutils ; \
+       @UNDO_LINK_TO_DIR@ 
+@endif binutils
+@if gas
+       @cd $(HOST_SUBDIR); set gas stageprofile-gas ; \
+       @UNDO_LINK_TO_DIR@  ; \
+       set prev-gas stage1-gas ; \
+       @UNDO_LINK_TO_DIR@ 
+@endif gas
+@if gcc
+       @cd $(HOST_SUBDIR); set gcc stageprofile-gcc ; \
+       @UNDO_LINK_TO_DIR@  ; \
+       set prev-gcc stage1-gcc ; \
+       @UNDO_LINK_TO_DIR@ 
+@endif gcc
+@if intl
+       @cd $(HOST_SUBDIR); set intl stageprofile-intl ; \
+       @UNDO_LINK_TO_DIR@  ; \
+       set prev-intl stage1-intl ; \
+       @UNDO_LINK_TO_DIR@ 
+@endif intl
+@if ld
+       @cd $(HOST_SUBDIR); set ld stageprofile-ld ; \
+       @UNDO_LINK_TO_DIR@  ; \
+       set prev-ld stage1-ld ; \
+       @UNDO_LINK_TO_DIR@ 
+@endif ld
+@if libcpp
+       @cd $(HOST_SUBDIR); set libcpp stageprofile-libcpp ; \
+       @UNDO_LINK_TO_DIR@  ; \
+       set prev-libcpp stage1-libcpp ; \
+       @UNDO_LINK_TO_DIR@ 
+@endif libcpp
+@if libiberty
+       @cd $(HOST_SUBDIR); set libiberty stageprofile-libiberty ; \
+       @UNDO_LINK_TO_DIR@  ; \
+       set prev-libiberty stage1-libiberty ; \
+       @UNDO_LINK_TO_DIR@ 
+@endif libiberty
+@if zlib
+       @cd $(HOST_SUBDIR); set zlib stageprofile-zlib ; \
+       @UNDO_LINK_TO_DIR@  ; \
+       set prev-zlib stage1-zlib ; \
+       @UNDO_LINK_TO_DIR@ 
+@endif zlib
  
+# Bubble a bugfix through all the stages up to stage profile.  They
+# are remade, but not reconfigured.  The next stage (if any) will not
+# be reconfigured as well.
+.PHONY: stageprofile-bubble
+stageprofile-bubble:: stage1-bubble
+       @if test -f stageprofile-lean || test -f stage1-lean  ; then \
+         echo Skipping rebuild of stageprofile ; \
+       else \
+         $(MAKE) $(RECURSE_FLAGS_TO_PASS) NOTPARALLEL= all-stageprofile; \
+       fi
  
+.PHONY: all-stageprofile clean-stageprofile
+do-clean: clean-stageprofile
  
  # FIXME: Will not need to be conditional when toplevel bootstrap is the
  # only possibility, but now it conflicts with no-bootstrap rules
@@ -34127,7 +34357,7 @@ stagefeedback-start::
         @[ -f stage_current ] && $(MAKE) `cat stage_current`-end || : ; \
         echo stagefeedback > stage_current ; \
         echo stagefeedback > stage_last; \
-       $(mkinstalldirs) $(HOST_SUBDIR)
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)
  @if bfd
         @cd $(HOST_SUBDIR); [ -d stagefeedback-bfd ] || \
           mkdir stagefeedback-bfd; \
@@ -34284,552 +34514,7 @@ stagefeedback-bubble:: stage1-bubble
         fi
  
  .PHONY: all-stagefeedback clean-stagefeedback
-all-stagefeedback:     \
-  maybe-all-stagefeedback-bfd \
-  maybe-all-stagefeedback-opcodes \
-  maybe-all-stagefeedback-binutils              \
-  maybe-all-stagefeedback-gas \
-  maybe-all-stagefeedback-gcc        \
-  maybe-all-stagefeedback-intl   \
-  maybe-all-stagefeedback-ld \
-  maybe-all-stagefeedback-libcpp  \
-  maybe-all-stagefeedback-libiberty                        \
-  maybe-all-stagefeedback-zlib        
-
  do-clean: clean-stagefeedback
-clean-stagefeedback:     \
-  maybe-clean-stagefeedback-bfd \
-  maybe-clean-stagefeedback-opcodes \
-  maybe-clean-stagefeedback-binutils              \
-  maybe-clean-stagefeedback-gas \
-  maybe-clean-stagefeedback-gcc        \
-  maybe-clean-stagefeedback-intl   \
-  maybe-clean-stagefeedback-ld \
-  maybe-clean-stagefeedback-libcpp  \
-  maybe-clean-stagefeedback-libiberty                        \
-  maybe-clean-stagefeedback-zlib        
-
-
-.PHONY: configure-stagefeedback-bfd maybe-configure-stagefeedback-bfd
-.PHONY: all-stagefeedback-bfd maybe-all-stagefeedback-bfd
-.PHONY: clean-stagefeedback-bfd maybe-clean-stagefeedback-bfd
-
-maybe-configure-stagefeedback-bfd:
-maybe-all-stagefeedback-bfd:
-maybe-clean-stagefeedback-bfd:
-
-@if bfd-bootstrap
-maybe-configure-stagefeedback-bfd: configure-stagefeedback-bfd
-configure-stagefeedback-bfd:
-       @$(MAKE) stagefeedback-start
-       @[ -f bfd/Makefile ] && exit 0 || : ; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-       $(STAGE_HOST_EXPORTS)  \
-       echo Configuring stage feedback in bfd ; \
-       cd $(HOST_SUBDIR)/bfd || exit 1; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/bfd/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       srcdiroption="--srcdir=$${topdir}/bfd"; \
-       libsrcdir="$$s/bfd"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
-         @stage2_werror_flag@ 
-
-maybe-all-stagefeedback-bfd: all-stagefeedback-bfd
-all-stagefeedback-bfd: configure-stagefeedback-bfd
-       @$(MAKE) stagefeedback-start
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-       $(STAGE_HOST_EXPORTS)  \
-       cd $(HOST_SUBDIR)/bfd && \
-       $(MAKE) $(FLAGS_TO_PASS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               CFLAGS="$(BOOT_CFLAGS) -fprofile-use" 
-
-maybe-clean-stagefeedback-bfd: clean-stagefeedback-bfd
-clean-stagefeedback-bfd:
-       @[ -f bfd/Makefile ] || [ -f stagefeedback-bfd/Makefile ] \
-         || exit 0 ; \
-       [ -f bfd/Makefile ] || $(MAKE) stagefeedback-start ; \
-       cd $(HOST_SUBDIR)/bfd && \
-       $(MAKE) $(FLAGS_TO_PASS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               CFLAGS="$(BOOT_CFLAGS) -fprofile-use"  clean
-@endif bfd-bootstrap
-
-
-.PHONY: configure-stagefeedback-opcodes maybe-configure-stagefeedback-opcodes
-.PHONY: all-stagefeedback-opcodes maybe-all-stagefeedback-opcodes
-.PHONY: clean-stagefeedback-opcodes maybe-clean-stagefeedback-opcodes
-
-maybe-configure-stagefeedback-opcodes:
-maybe-all-stagefeedback-opcodes:
-maybe-clean-stagefeedback-opcodes:
-
-@if opcodes-bootstrap
-maybe-configure-stagefeedback-opcodes: configure-stagefeedback-opcodes
-configure-stagefeedback-opcodes:
-       @$(MAKE) stagefeedback-start
-       @[ -f opcodes/Makefile ] && exit 0 || : ; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-       $(STAGE_HOST_EXPORTS)  \
-       echo Configuring stage feedback in opcodes ; \
-       cd $(HOST_SUBDIR)/opcodes || exit 1; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/opcodes/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       srcdiroption="--srcdir=$${topdir}/opcodes"; \
-       libsrcdir="$$s/opcodes"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
-         @stage2_werror_flag@ 
-
-maybe-all-stagefeedback-opcodes: all-stagefeedback-opcodes
-all-stagefeedback-opcodes: configure-stagefeedback-opcodes
-       @$(MAKE) stagefeedback-start
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-       $(STAGE_HOST_EXPORTS)  \
-       cd $(HOST_SUBDIR)/opcodes && \
-       $(MAKE) $(FLAGS_TO_PASS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               CFLAGS="$(BOOT_CFLAGS) -fprofile-use" 
-
-maybe-clean-stagefeedback-opcodes: clean-stagefeedback-opcodes
-clean-stagefeedback-opcodes:
-       @[ -f opcodes/Makefile ] || [ -f stagefeedback-opcodes/Makefile ] \
-         || exit 0 ; \
-       [ -f opcodes/Makefile ] || $(MAKE) stagefeedback-start ; \
-       cd $(HOST_SUBDIR)/opcodes && \
-       $(MAKE) $(FLAGS_TO_PASS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               CFLAGS="$(BOOT_CFLAGS) -fprofile-use"  clean
-@endif opcodes-bootstrap
-
-
-.PHONY: configure-stagefeedback-binutils maybe-configure-stagefeedback-binutils
-.PHONY: all-stagefeedback-binutils maybe-all-stagefeedback-binutils
-.PHONY: clean-stagefeedback-binutils maybe-clean-stagefeedback-binutils
-
-maybe-configure-stagefeedback-binutils:
-maybe-all-stagefeedback-binutils:
-maybe-clean-stagefeedback-binutils:
-
-@if binutils-bootstrap
-maybe-configure-stagefeedback-binutils: configure-stagefeedback-binutils
-configure-stagefeedback-binutils:
-       @$(MAKE) stagefeedback-start
-       @[ -f binutils/Makefile ] && exit 0 || : ; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-       $(STAGE_HOST_EXPORTS)  \
-       echo Configuring stage feedback in binutils ; \
-       cd $(HOST_SUBDIR)/binutils || exit 1; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/binutils/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       srcdiroption="--srcdir=$${topdir}/binutils"; \
-       libsrcdir="$$s/binutils"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
-         @stage2_werror_flag@ 
-
-maybe-all-stagefeedback-binutils: all-stagefeedback-binutils
-all-stagefeedback-binutils: configure-stagefeedback-binutils
-       @$(MAKE) stagefeedback-start
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-       $(STAGE_HOST_EXPORTS)  \
-       cd $(HOST_SUBDIR)/binutils && \
-       $(MAKE) $(FLAGS_TO_PASS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               CFLAGS="$(BOOT_CFLAGS) -fprofile-use" 
-
-maybe-clean-stagefeedback-binutils: clean-stagefeedback-binutils
-clean-stagefeedback-binutils:
-       @[ -f binutils/Makefile ] || [ -f stagefeedback-binutils/Makefile ] \
-         || exit 0 ; \
-       [ -f binutils/Makefile ] || $(MAKE) stagefeedback-start ; \
-       cd $(HOST_SUBDIR)/binutils && \
-       $(MAKE) $(FLAGS_TO_PASS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               CFLAGS="$(BOOT_CFLAGS) -fprofile-use"  clean
-@endif binutils-bootstrap
-
-
-.PHONY: configure-stagefeedback-gas maybe-configure-stagefeedback-gas
-.PHONY: all-stagefeedback-gas maybe-all-stagefeedback-gas
-.PHONY: clean-stagefeedback-gas maybe-clean-stagefeedback-gas
-
-maybe-configure-stagefeedback-gas:
-maybe-all-stagefeedback-gas:
-maybe-clean-stagefeedback-gas:
-
-@if gas-bootstrap
-maybe-configure-stagefeedback-gas: configure-stagefeedback-gas
-configure-stagefeedback-gas:
-       @$(MAKE) stagefeedback-start
-       @[ -f gas/Makefile ] && exit 0 || : ; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-       $(STAGE_HOST_EXPORTS)  \
-       echo Configuring stage feedback in gas ; \
-       cd $(HOST_SUBDIR)/gas || exit 1; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/gas/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       srcdiroption="--srcdir=$${topdir}/gas"; \
-       libsrcdir="$$s/gas"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
-         @stage2_werror_flag@ 
-
-maybe-all-stagefeedback-gas: all-stagefeedback-gas
-all-stagefeedback-gas: configure-stagefeedback-gas
-       @$(MAKE) stagefeedback-start
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-       $(STAGE_HOST_EXPORTS)  \
-       cd $(HOST_SUBDIR)/gas && \
-       $(MAKE) $(FLAGS_TO_PASS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               CFLAGS="$(BOOT_CFLAGS) -fprofile-use" 
-
-maybe-clean-stagefeedback-gas: clean-stagefeedback-gas
-clean-stagefeedback-gas:
-       @[ -f gas/Makefile ] || [ -f stagefeedback-gas/Makefile ] \
-         || exit 0 ; \
-       [ -f gas/Makefile ] || $(MAKE) stagefeedback-start ; \
-       cd $(HOST_SUBDIR)/gas && \
-       $(MAKE) $(FLAGS_TO_PASS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               CFLAGS="$(BOOT_CFLAGS) -fprofile-use"  clean
-@endif gas-bootstrap
-
-
-.PHONY: configure-stagefeedback-gcc maybe-configure-stagefeedback-gcc
-.PHONY: all-stagefeedback-gcc maybe-all-stagefeedback-gcc
-.PHONY: clean-stagefeedback-gcc maybe-clean-stagefeedback-gcc
-
-maybe-configure-stagefeedback-gcc:
-maybe-all-stagefeedback-gcc:
-maybe-clean-stagefeedback-gcc:
-
-@if gcc-bootstrap
-maybe-configure-stagefeedback-gcc: configure-stagefeedback-gcc
-configure-stagefeedback-gcc:
-       @$(MAKE) stagefeedback-start
-       @[ -f gcc/Makefile ] && exit 0 || : ; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-       $(STAGE_HOST_EXPORTS)  \
-       echo Configuring stage feedback in gcc ; \
-       cd $(HOST_SUBDIR)/gcc || exit 1; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/gcc/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       srcdiroption="--srcdir=$${topdir}/gcc"; \
-       libsrcdir="$$s/gcc"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
-         @stage2_werror_flag@ 
-
-maybe-all-stagefeedback-gcc: all-stagefeedback-gcc
-all-stagefeedback-gcc: configure-stagefeedback-gcc
-       @$(MAKE) stagefeedback-start
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-       $(STAGE_HOST_EXPORTS)  \
-       cd $(HOST_SUBDIR)/gcc && \
-       $(MAKE) $(FLAGS_TO_PASS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               CFLAGS="$(BOOT_CFLAGS) -fprofile-use" $(EXTRA_GCC_FLAGS)
-
-maybe-clean-stagefeedback-gcc: clean-stagefeedback-gcc
-clean-stagefeedback-gcc:
-       @[ -f gcc/Makefile ] || [ -f stagefeedback-gcc/Makefile ] \
-         || exit 0 ; \
-       [ -f gcc/Makefile ] || $(MAKE) stagefeedback-start ; \
-       cd $(HOST_SUBDIR)/gcc && \
-       $(MAKE) $(FLAGS_TO_PASS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               CFLAGS="$(BOOT_CFLAGS) -fprofile-use" $(EXTRA_GCC_FLAGS) clean
-@endif gcc-bootstrap
-
-
-.PHONY: configure-stagefeedback-intl maybe-configure-stagefeedback-intl
-.PHONY: all-stagefeedback-intl maybe-all-stagefeedback-intl
-.PHONY: clean-stagefeedback-intl maybe-clean-stagefeedback-intl
-
-maybe-configure-stagefeedback-intl:
-maybe-all-stagefeedback-intl:
-maybe-clean-stagefeedback-intl:
-
-@if intl-bootstrap
-maybe-configure-stagefeedback-intl: configure-stagefeedback-intl
-configure-stagefeedback-intl:
-       @$(MAKE) stagefeedback-start
-       @[ -f intl/Makefile ] && exit 0 || : ; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-       $(STAGE_HOST_EXPORTS)  \
-       echo Configuring stage feedback in intl ; \
-       cd $(HOST_SUBDIR)/intl || exit 1; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/intl/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       srcdiroption="--srcdir=$${topdir}/intl"; \
-       libsrcdir="$$s/intl"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
-         @stage2_werror_flag@ 
-
-maybe-all-stagefeedback-intl: all-stagefeedback-intl
-all-stagefeedback-intl: configure-stagefeedback-intl
-       @$(MAKE) stagefeedback-start
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-       $(STAGE_HOST_EXPORTS)  \
-       cd $(HOST_SUBDIR)/intl && \
-       $(MAKE) $(FLAGS_TO_PASS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               CFLAGS="$(BOOT_CFLAGS) -fprofile-use" 
-
-maybe-clean-stagefeedback-intl: clean-stagefeedback-intl
-clean-stagefeedback-intl:
-       @[ -f intl/Makefile ] || [ -f stagefeedback-intl/Makefile ] \
-         || exit 0 ; \
-       [ -f intl/Makefile ] || $(MAKE) stagefeedback-start ; \
-       cd $(HOST_SUBDIR)/intl && \
-       $(MAKE) $(FLAGS_TO_PASS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               CFLAGS="$(BOOT_CFLAGS) -fprofile-use"  clean
-@endif intl-bootstrap
-
-
-.PHONY: configure-stagefeedback-ld maybe-configure-stagefeedback-ld
-.PHONY: all-stagefeedback-ld maybe-all-stagefeedback-ld
-.PHONY: clean-stagefeedback-ld maybe-clean-stagefeedback-ld
-
-maybe-configure-stagefeedback-ld:
-maybe-all-stagefeedback-ld:
-maybe-clean-stagefeedback-ld:
-
-@if ld-bootstrap
-maybe-configure-stagefeedback-ld: configure-stagefeedback-ld
-configure-stagefeedback-ld:
-       @$(MAKE) stagefeedback-start
-       @[ -f ld/Makefile ] && exit 0 || : ; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-       $(STAGE_HOST_EXPORTS)  \
-       echo Configuring stage feedback in ld ; \
-       cd $(HOST_SUBDIR)/ld || exit 1; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/ld/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       srcdiroption="--srcdir=$${topdir}/ld"; \
-       libsrcdir="$$s/ld"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
-         @stage2_werror_flag@ 
-
-maybe-all-stagefeedback-ld: all-stagefeedback-ld
-all-stagefeedback-ld: configure-stagefeedback-ld
-       @$(MAKE) stagefeedback-start
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-       $(STAGE_HOST_EXPORTS)  \
-       cd $(HOST_SUBDIR)/ld && \
-       $(MAKE) $(FLAGS_TO_PASS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               CFLAGS="$(BOOT_CFLAGS) -fprofile-use" 
-
-maybe-clean-stagefeedback-ld: clean-stagefeedback-ld
-clean-stagefeedback-ld:
-       @[ -f ld/Makefile ] || [ -f stagefeedback-ld/Makefile ] \
-         || exit 0 ; \
-       [ -f ld/Makefile ] || $(MAKE) stagefeedback-start ; \
-       cd $(HOST_SUBDIR)/ld && \
-       $(MAKE) $(FLAGS_TO_PASS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               CFLAGS="$(BOOT_CFLAGS) -fprofile-use"  clean
-@endif ld-bootstrap
-
-
-.PHONY: configure-stagefeedback-libcpp maybe-configure-stagefeedback-libcpp
-.PHONY: all-stagefeedback-libcpp maybe-all-stagefeedback-libcpp
-.PHONY: clean-stagefeedback-libcpp maybe-clean-stagefeedback-libcpp
-
-maybe-configure-stagefeedback-libcpp:
-maybe-all-stagefeedback-libcpp:
-maybe-clean-stagefeedback-libcpp:
-
-@if libcpp-bootstrap
-maybe-configure-stagefeedback-libcpp: configure-stagefeedback-libcpp
-configure-stagefeedback-libcpp:
-       @$(MAKE) stagefeedback-start
-       @[ -f libcpp/Makefile ] && exit 0 || : ; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-       $(STAGE_HOST_EXPORTS)  \
-       echo Configuring stage feedback in libcpp ; \
-       cd $(HOST_SUBDIR)/libcpp || exit 1; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/libcpp/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       srcdiroption="--srcdir=$${topdir}/libcpp"; \
-       libsrcdir="$$s/libcpp"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
-         @stage2_werror_flag@ 
-
-maybe-all-stagefeedback-libcpp: all-stagefeedback-libcpp
-all-stagefeedback-libcpp: configure-stagefeedback-libcpp
-       @$(MAKE) stagefeedback-start
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-       $(STAGE_HOST_EXPORTS)  \
-       cd $(HOST_SUBDIR)/libcpp && \
-       $(MAKE) $(FLAGS_TO_PASS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               CFLAGS="$(BOOT_CFLAGS) -fprofile-use" 
-
-maybe-clean-stagefeedback-libcpp: clean-stagefeedback-libcpp
-clean-stagefeedback-libcpp:
-       @[ -f libcpp/Makefile ] || [ -f stagefeedback-libcpp/Makefile ] \
-         || exit 0 ; \
-       [ -f libcpp/Makefile ] || $(MAKE) stagefeedback-start ; \
-       cd $(HOST_SUBDIR)/libcpp && \
-       $(MAKE) $(FLAGS_TO_PASS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               CFLAGS="$(BOOT_CFLAGS) -fprofile-use"  clean
-@endif libcpp-bootstrap
-
-
-.PHONY: configure-stagefeedback-libiberty maybe-configure-stagefeedback-libiberty
-.PHONY: all-stagefeedback-libiberty maybe-all-stagefeedback-libiberty
-.PHONY: clean-stagefeedback-libiberty maybe-clean-stagefeedback-libiberty
-
-maybe-configure-stagefeedback-libiberty:
-maybe-all-stagefeedback-libiberty:
-maybe-clean-stagefeedback-libiberty:
-
-@if libiberty-bootstrap
-maybe-configure-stagefeedback-libiberty: configure-stagefeedback-libiberty
-configure-stagefeedback-libiberty:
-       @$(MAKE) stagefeedback-start
-       @[ -f libiberty/Makefile ] && exit 0 || : ; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-       $(STAGE_HOST_EXPORTS)  \
-       echo Configuring stage feedback in libiberty ; \
-       cd $(HOST_SUBDIR)/libiberty || exit 1; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/libiberty/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       srcdiroption="--srcdir=$${topdir}/libiberty"; \
-       libsrcdir="$$s/libiberty"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
-         @stage2_werror_flag@ 
-
-maybe-all-stagefeedback-libiberty: all-stagefeedback-libiberty
-all-stagefeedback-libiberty: configure-stagefeedback-libiberty
-       @$(MAKE) stagefeedback-start
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-       $(STAGE_HOST_EXPORTS)  \
-       cd $(HOST_SUBDIR)/libiberty && \
-       $(MAKE) $(FLAGS_TO_PASS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               CFLAGS="$(BOOT_CFLAGS) -fprofile-use" 
-
-maybe-clean-stagefeedback-libiberty: clean-stagefeedback-libiberty
-clean-stagefeedback-libiberty:
-       @[ -f libiberty/Makefile ] || [ -f stagefeedback-libiberty/Makefile ] \
-         || exit 0 ; \
-       [ -f libiberty/Makefile ] || $(MAKE) stagefeedback-start ; \
-       cd $(HOST_SUBDIR)/libiberty && \
-       $(MAKE) $(FLAGS_TO_PASS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               CFLAGS="$(BOOT_CFLAGS) -fprofile-use"  clean
-@endif libiberty-bootstrap
-
-
-.PHONY: configure-stagefeedback-zlib maybe-configure-stagefeedback-zlib
-.PHONY: all-stagefeedback-zlib maybe-all-stagefeedback-zlib
-.PHONY: clean-stagefeedback-zlib maybe-clean-stagefeedback-zlib
-
-maybe-configure-stagefeedback-zlib:
-maybe-all-stagefeedback-zlib:
-maybe-clean-stagefeedback-zlib:
-
-@if zlib-bootstrap
-maybe-configure-stagefeedback-zlib: configure-stagefeedback-zlib
-configure-stagefeedback-zlib:
-       @$(MAKE) stagefeedback-start
-       @[ -f zlib/Makefile ] && exit 0 || : ; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-       $(STAGE_HOST_EXPORTS)  \
-       echo Configuring stage feedback in zlib ; \
-       cd $(HOST_SUBDIR)/zlib || exit 1; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/zlib/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       srcdiroption="--srcdir=$${topdir}/zlib"; \
-       libsrcdir="$$s/zlib"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
-         @stage2_werror_flag@ 
-
-maybe-all-stagefeedback-zlib: all-stagefeedback-zlib
-all-stagefeedback-zlib: configure-stagefeedback-zlib
-       @$(MAKE) stagefeedback-start
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-       $(STAGE_HOST_EXPORTS)  \
-       cd $(HOST_SUBDIR)/zlib && \
-       $(MAKE) $(FLAGS_TO_PASS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               CFLAGS="$(BOOT_CFLAGS) -fprofile-use" 
-
-maybe-clean-stagefeedback-zlib: clean-stagefeedback-zlib
-clean-stagefeedback-zlib:
-       @[ -f zlib/Makefile ] || [ -f stagefeedback-zlib/Makefile ] \
-         || exit 0 ; \
-       [ -f zlib/Makefile ] || $(MAKE) stagefeedback-start ; \
-       cd $(HOST_SUBDIR)/zlib && \
-       $(MAKE) $(FLAGS_TO_PASS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               CFLAGS="$(BOOT_CFLAGS) -fprofile-use"  clean
-@endif zlib-bootstrap
-
-
  
  # FIXME: Will not need to be conditional when toplevel bootstrap is the
  # only possibility, but now it conflicts with no-bootstrap rules
@@ -34863,18 +34548,15 @@ stagefeedback-start::
  profiledbootstrap:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         echo "Bootstrapping the compiler"; \
         $(MAKE) stageprofile-bubble distclean-stagefeedback
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}` ; export s; \
-       $(SET_LIB_PATH) \
         echo "Building runtime libraries and training compiler"; \
         $(MAKE) $(BASE_FLAGS_TO_PASS) $(RECURSE_FLAGS) all
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
         echo "Building feedback based compiler"; \
         $(MAKE) stagefeedback-bubble stagefeedback-end
@@ -34994,30 +34676,30 @@ configure-stage3-gcc: maybe-configure-stage3-intl
  configure-stage4-gcc: maybe-configure-stage4-intl
  configure-stageprofile-gcc: maybe-configure-stageprofile-intl
  configure-stagefeedback-gcc: maybe-configure-stagefeedback-intl
-configure-gcc: maybe-configure-binutils
-
-configure-stage1-gcc: maybe-configure-stage1-binutils
-configure-stage2-gcc: maybe-configure-stage2-binutils
-configure-stage3-gcc: maybe-configure-stage3-binutils
-configure-stage4-gcc: maybe-configure-stage4-binutils
-configure-stageprofile-gcc: maybe-configure-stageprofile-binutils
-configure-stagefeedback-gcc: maybe-configure-stagefeedback-binutils
-configure-gcc: maybe-configure-gas
-
-configure-stage1-gcc: maybe-configure-stage1-gas
-configure-stage2-gcc: maybe-configure-stage2-gas
-configure-stage3-gcc: maybe-configure-stage3-gas
-configure-stage4-gcc: maybe-configure-stage4-gas
-configure-stageprofile-gcc: maybe-configure-stageprofile-gas
-configure-stagefeedback-gcc: maybe-configure-stagefeedback-gas
-configure-gcc: maybe-configure-ld
-
-configure-stage1-gcc: maybe-configure-stage1-ld
-configure-stage2-gcc: maybe-configure-stage2-ld
-configure-stage3-gcc: maybe-configure-stage3-ld
-configure-stage4-gcc: maybe-configure-stage4-ld
-configure-stageprofile-gcc: maybe-configure-stageprofile-ld
-configure-stagefeedback-gcc: maybe-configure-stagefeedback-ld
+configure-gcc: maybe-all-binutils
+
+configure-stage1-gcc: maybe-all-stage1-binutils
+configure-stage2-gcc: maybe-all-stage2-binutils
+configure-stage3-gcc: maybe-all-stage3-binutils
+configure-stage4-gcc: maybe-all-stage4-binutils
+configure-stageprofile-gcc: maybe-all-stageprofile-binutils
+configure-stagefeedback-gcc: maybe-all-stagefeedback-binutils
+configure-gcc: maybe-all-gas
+
+configure-stage1-gcc: maybe-all-stage1-gas
+configure-stage2-gcc: maybe-all-stage2-gas
+configure-stage3-gcc: maybe-all-stage3-gas
+configure-stage4-gcc: maybe-all-stage4-gas
+configure-stageprofile-gcc: maybe-all-stageprofile-gas
+configure-stagefeedback-gcc: maybe-all-stagefeedback-gas
+configure-gcc: maybe-all-ld
+
+configure-stage1-gcc: maybe-all-stage1-ld
+configure-stage2-gcc: maybe-all-stage2-ld
+configure-stage3-gcc: maybe-all-stage3-ld
+configure-stage4-gcc: maybe-all-stage4-ld
+configure-stageprofile-gcc: maybe-all-stageprofile-ld
+configure-stagefeedback-gcc: maybe-all-stagefeedback-ld
  all-gcc: all-libiberty
  
  all-stage1-gcc: all-stage1-libiberty
@@ -35088,30 +34770,6 @@ all-stage4-gcc: maybe-all-build-fixincludes
  all-stageprofile-gcc: maybe-all-build-fixincludes
  all-stagefeedback-gcc: maybe-all-build-fixincludes
  all-prebootstrap: maybe-all-build-fixincludes
-all-gcc: maybe-all-binutils
-
-all-stage1-gcc: maybe-all-stage1-binutils
-all-stage2-gcc: maybe-all-stage2-binutils
-all-stage3-gcc: maybe-all-stage3-binutils
-all-stage4-gcc: maybe-all-stage4-binutils
-all-stageprofile-gcc: maybe-all-stageprofile-binutils
-all-stagefeedback-gcc: maybe-all-stagefeedback-binutils
-all-gcc: maybe-all-gas
-
-all-stage1-gcc: maybe-all-stage1-gas
-all-stage2-gcc: maybe-all-stage2-gas
-all-stage3-gcc: maybe-all-stage3-gas
-all-stage4-gcc: maybe-all-stage4-gas
-all-stageprofile-gcc: maybe-all-stageprofile-gas
-all-stagefeedback-gcc: maybe-all-stagefeedback-gas
-all-gcc: maybe-all-ld
-
-all-stage1-gcc: maybe-all-stage1-ld
-all-stage2-gcc: maybe-all-stage2-ld
-all-stage3-gcc: maybe-all-stage3-ld
-all-stage4-gcc: maybe-all-stage4-ld
-all-stageprofile-gcc: maybe-all-stageprofile-ld
-all-stagefeedback-gcc: maybe-all-stagefeedback-ld
  all-gcc: maybe-all-zlib
  
  all-stage1-gcc: maybe-all-stage1-zlib
@@ -35517,7 +35175,7 @@ $(srcdir)/Makefile.in: @MAINT@ $(srcdir)/Makefile.tpl $(srcdir)/Makefile.def
  Makefile: $(srcdir)/Makefile.in config.status
         CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
  
-config.status: configure $(gcc_version_trigger)
+config.status: configure
         CONFIG_SHELL="$(SHELL)" $(SHELL) ./config.status --recheck
  
  # Rebuilding configure.