PR fortran/16861

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

index a6d28ac..1c3917d 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 = \
+       $(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,12 @@ 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 +2235,16 @@ 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 +2261,12 @@ 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 +2277,16 @@ 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 +2303,12 @@ 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 +2319,16 @@ 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 +2345,12 @@ 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 +2361,16 @@ 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 +2387,12 @@ 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 +2403,16 @@ 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 +2429,12 @@ 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 +2445,16 @@ 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 +2471,12 @@ 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 +2487,28 @@ 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 +2521,8 @@ configure-ash:
           || exit 1
  @endif ash
  
+
+
  .PHONY: all-ash maybe-all-ash
  maybe-all-ash:
  @if ash
@@ -2499,12 +2531,12 @@ 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 +2545,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,7 +2559,6 @@ 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)  install)
@@ -2547,7 +2577,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 +2602,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 +2627,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 +2652,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 +2678,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 +2703,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 +2727,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 +2751,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 +2775,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 +2799,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 +2815,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 +2840,8 @@ configure-autoconf:
           || exit 1
  @endif autoconf
  
+
+
  .PHONY: all-autoconf maybe-all-autoconf
  maybe-all-autoconf:
  @if autoconf
@@ -2827,12 +2850,12 @@ 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 +2864,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,7 +2878,6 @@ 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)  install)
@@ -2875,7 +2896,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 +2921,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 +2946,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 +2971,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 +2997,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 +3022,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 +3046,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 +3070,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 +3094,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 +3118,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 +3134,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 +3159,8 @@ configure-automake:
           || exit 1
  @endif automake
  
+
+
  .PHONY: all-automake maybe-all-automake
  maybe-all-automake:
  @if automake
@@ -3155,12 +3169,12 @@ 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 +3183,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,7 +3197,6 @@ 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)  install)
@@ -3203,7 +3215,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 +3240,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 +3265,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 +3290,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 +3316,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 +3341,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 +3365,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 +3389,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 +3413,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 +3437,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 +3453,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 +3478,8 @@ configure-bash:
           || exit 1
  @endif bash
  
+
+
  .PHONY: all-bash maybe-all-bash
  maybe-all-bash:
  @if bash
@@ -3483,12 +3488,12 @@ 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 +3502,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,7 +3516,6 @@ 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)  install)
@@ -3531,7 +3534,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 +3559,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 +3584,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 +3609,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 +3635,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 +3660,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 +3684,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 +3708,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 +3732,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 +3756,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 +3772,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 +3798,8 @@ configure-bfd:
           || exit 1
  @endif bfd
  
+
+
  .PHONY: all-bfd maybe-all-bfd
  maybe-all-bfd:
  @if bfd
@@ -3813,12 +3809,12 @@ 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: check-bfd maybe-check-bfd
  maybe-check-bfd:
  @if bfd
@@ -3827,7 +3823,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,7 +3837,6 @@ 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)  install)
@@ -3861,7 +3855,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 +3880,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 +3905,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 +3930,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 +3956,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 +3981,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 +4005,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 +4029,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 +4053,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 +4077,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 +4093,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 +4119,8 @@ configure-opcodes:
           || exit 1
  @endif opcodes
  
+
+
  .PHONY: all-opcodes maybe-all-opcodes
  maybe-all-opcodes:
  @if opcodes
@@ -4143,12 +4130,12 @@ 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: check-opcodes maybe-check-opcodes
  maybe-check-opcodes:
  @if opcodes
@@ -4157,7 +4144,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,7 +4158,6 @@ 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)  install)
@@ -4191,7 +4176,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 +4201,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 +4226,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 +4251,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 +4277,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 +4302,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 +4326,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 +4350,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 +4374,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 +4398,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 +4414,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 +4440,8 @@ configure-binutils:
           || exit 1
  @endif binutils
  
+
+
  .PHONY: all-binutils maybe-all-binutils
  maybe-all-binutils:
  @if binutils
@@ -4473,12 +4451,12 @@ 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: check-binutils maybe-check-binutils
  maybe-check-binutils:
  @if binutils
@@ -4487,7 +4465,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,7 +4479,6 @@ 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)  install)
@@ -4521,7 +4497,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 +4522,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 +4547,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 +4572,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 +4598,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 +4623,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 +4647,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 +4671,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 +4695,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 +4719,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 +4735,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 +4760,8 @@ configure-bison:
           || exit 1
  @endif bison
  
+
+
  .PHONY: all-bison maybe-all-bison
  maybe-all-bison:
  @if bison
@@ -4801,12 +4770,12 @@ 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 +4786,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,7 +4801,6 @@ 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)  install)
@@ -4852,7 +4819,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 +4844,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 +4869,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 +4894,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 +4920,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 +4945,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 +4969,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 +4993,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 +5017,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 +5041,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 +5057,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 +5082,8 @@ configure-byacc:
           || exit 1
  @endif byacc
  
+
+
  .PHONY: all-byacc maybe-all-byacc
  maybe-all-byacc:
  @if byacc
@@ -5132,12 +5092,12 @@ 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 +5108,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,7 +5123,6 @@ 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)  install)
@@ -5183,7 +5141,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 +5166,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 +5191,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 +5216,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 +5242,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 +5267,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 +5291,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 +5315,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 +5339,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 +5363,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 +5379,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 +5404,8 @@ configure-bzip2:
           || exit 1
  @endif bzip2
  
+
+
  .PHONY: all-bzip2 maybe-all-bzip2
  maybe-all-bzip2:
  @if bzip2
@@ -5463,12 +5414,12 @@ 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 +5428,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,7 +5442,6 @@ 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)  install)
@@ -5511,7 +5460,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 +5485,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 +5510,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 +5535,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 +5561,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 +5586,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 +5610,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 +5634,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 +5658,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 +5682,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 +5698,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 +5723,8 @@ configure-dejagnu:
           || exit 1
  @endif dejagnu
  
+
+
  .PHONY: all-dejagnu maybe-all-dejagnu
  maybe-all-dejagnu:
  @if dejagnu
@@ -5791,12 +5733,12 @@ 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 +5747,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,7 +5761,6 @@ 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)  install)
@@ -5839,7 +5779,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 +5804,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 +5829,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 +5854,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 +5880,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 +5905,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 +5929,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 +5953,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 +5977,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 +6001,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 +6017,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 +6042,8 @@ configure-diff:
           || exit 1
  @endif diff
  
+
+
  .PHONY: all-diff maybe-all-diff
  maybe-all-diff:
  @if diff
@@ -6119,12 +6052,12 @@ 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 +6066,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,7 +6080,6 @@ 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)  install)
@@ -6167,7 +6098,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 +6123,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 +6148,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 +6173,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 +6199,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 +6224,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 +6248,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 +6272,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 +6296,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 +6320,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 +6336,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 +6361,8 @@ configure-dosutils:
           || exit 1
  @endif dosutils
  
+
+
  .PHONY: all-dosutils maybe-all-dosutils
  maybe-all-dosutils:
  @if dosutils
@@ -6447,12 +6371,12 @@ 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,7 +6394,6 @@ 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)  install)
@@ -6489,7 +6412,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 +6437,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 +6462,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 +6487,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 +6513,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 +6538,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 +6562,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 +6586,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 +6610,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 +6634,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 +6650,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 +6675,8 @@ configure-etc:
           || exit 1
  @endif etc
  
+
+
  .PHONY: all-etc maybe-all-etc
  maybe-all-etc:
  @if etc
@@ -6769,12 +6685,12 @@ 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 +6699,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,7 +6713,6 @@ 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)  install)
@@ -6817,7 +6731,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 +6756,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 +6781,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 +6806,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 +6832,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 +6857,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 +6881,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 +6905,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 +6929,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 +6953,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 +6969,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 +6994,8 @@ configure-fastjar:
           || exit 1
  @endif fastjar
  
+
+
  .PHONY: all-fastjar maybe-all-fastjar
  maybe-all-fastjar:
  @if fastjar
@@ -7097,12 +7004,12 @@ 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 +7020,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,7 +7035,6 @@ 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)  install)
@@ -7148,7 +7053,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 +7078,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 +7103,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 +7128,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 +7154,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 +7179,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 +7203,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 +7227,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 +7251,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 +7275,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 +7291,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 +7316,8 @@ configure-fileutils:
           || exit 1
  @endif fileutils
  
+
+
  .PHONY: all-fileutils maybe-all-fileutils
  maybe-all-fileutils:
  @if fileutils
@@ -7428,12 +7326,12 @@ 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 +7340,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,7 +7354,6 @@ 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)  install)
@@ -7476,7 +7372,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 +7397,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 +7422,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 +7447,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 +7473,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 +7498,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 +7522,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 +7546,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 +7570,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 +7594,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 +7610,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 +7635,8 @@ configure-findutils:
           || exit 1
  @endif findutils
  
+
+
  .PHONY: all-findutils maybe-all-findutils
  maybe-all-findutils:
  @if findutils
@@ -7756,12 +7645,12 @@ 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 +7659,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,7 +7673,6 @@ 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)  install)
@@ -7804,7 +7691,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 +7716,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 +7741,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 +7766,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 +7792,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 +7817,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 +7841,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 +7865,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 +7889,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 +7913,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 +7929,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 +7954,8 @@ configure-find:
           || exit 1
  @endif find
  
+
+
  .PHONY: all-find maybe-all-find
  maybe-all-find:
  @if find
@@ -8084,12 +7964,12 @@ 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 +7978,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,7 +7992,6 @@ 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)  install)
@@ -8132,7 +8010,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 +8035,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 +8060,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 +8085,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 +8111,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 +8136,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 +8160,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 +8184,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 +8208,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 +8232,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 +8248,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 +8273,8 @@ configure-fixincludes:
           || exit 1
  @endif fixincludes
  
+
+
  .PHONY: all-fixincludes maybe-all-fixincludes
  maybe-all-fixincludes:
  @if fixincludes
@@ -8412,12 +8283,12 @@ 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 +8297,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,7 +8311,6 @@ 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)  install)
@@ -8480,7 +8349,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 +8403,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 +8427,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 +8451,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 +8475,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 +8491,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 +8516,8 @@ configure-flex:
           || exit 1
  @endif flex
  
+
+
  .PHONY: all-flex maybe-all-flex
  maybe-all-flex:
  @if flex
@@ -8659,12 +8526,12 @@ 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 +8542,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,7 +8557,6 @@ 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)  install)
@@ -8710,7 +8575,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 +8600,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 +8625,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 +8650,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 +8676,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 +8701,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 +8725,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 +8749,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 +8773,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 +8797,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 +8813,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 +8839,8 @@ configure-gas:
           || exit 1
  @endif gas
  
+
+
  .PHONY: all-gas maybe-all-gas
  maybe-all-gas:
  @if gas
@@ -8992,12 +8850,12 @@ 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: check-gas maybe-check-gas
  maybe-check-gas:
  @if gas
@@ -9006,7 +8864,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,7 +8878,6 @@ 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)  install)
@@ -9040,7 +8896,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 +8921,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 +8946,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 +8971,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 +8997,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 +9022,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 +9046,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 +9070,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 +9094,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 +9118,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 +9134,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 +9160,8 @@ configure-gcc:
           || exit 1
  @endif gcc
  
+
+
  .PHONY: all-gcc maybe-all-gcc
  maybe-all-gcc:
  @if gcc
@@ -9322,12 +9171,12 @@ 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: check-gcc maybe-check-gcc
  maybe-check-gcc:
  @if gcc
@@ -9336,7 +9185,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,7 +9199,6 @@ 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) install)
@@ -9370,7 +9217,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 +9242,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 +9267,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 +9292,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 +9318,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 +9343,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 +9367,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 +9391,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 +9415,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 +9439,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 +9455,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 +9480,8 @@ configure-gawk:
           || exit 1
  @endif gawk
  
+
+
  .PHONY: all-gawk maybe-all-gawk
  maybe-all-gawk:
  @if gawk
@@ -9650,12 +9490,12 @@ 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 +9504,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,7 +9518,6 @@ 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)  install)
@@ -9698,7 +9536,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 +9561,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 +9586,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 +9611,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 +9637,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 +9662,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 +9686,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 +9710,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 +9734,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 +9758,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 +9774,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 +9799,8 @@ configure-gettext:
           || exit 1
  @endif gettext
  
+
+
  .PHONY: all-gettext maybe-all-gettext
  maybe-all-gettext:
  @if gettext
@@ -9978,12 +9809,12 @@ 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 +9823,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,7 +9837,6 @@ 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)  install)
@@ -10026,7 +9855,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 +9880,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 +9905,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 +9930,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 +9956,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 +9981,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 +10005,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 +10029,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 +10053,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 +10077,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 +10093,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 +10118,8 @@ configure-gnuserv:
           || exit 1
  @endif gnuserv
  
+
+
  .PHONY: all-gnuserv maybe-all-gnuserv
  maybe-all-gnuserv:
  @if gnuserv
@@ -10306,12 +10128,12 @@ 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 +10142,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,7 +10156,6 @@ 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)  install)
@@ -10354,7 +10174,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 +10199,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 +10224,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 +10249,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 +10275,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 +10300,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 +10324,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 +10348,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 +10372,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 +10396,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 +10412,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 +10437,8 @@ configure-gprof:
           || exit 1
  @endif gprof
  
+
+
  .PHONY: all-gprof maybe-all-gprof
  maybe-all-gprof:
  @if gprof
@@ -10634,12 +10447,12 @@ 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 +10461,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,7 +10475,6 @@ 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)  install)
@@ -10682,7 +10493,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 +10518,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 +10543,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 +10568,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 +10594,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 +10619,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 +10643,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 +10667,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 +10691,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 +10715,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 +10731,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 +10756,8 @@ configure-gzip:
           || exit 1
  @endif gzip
  
+
+
  .PHONY: all-gzip maybe-all-gzip
  maybe-all-gzip:
  @if gzip
@@ -10962,12 +10766,12 @@ 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 +10780,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,7 +10794,6 @@ 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)  install)
@@ -11010,7 +10812,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 +10837,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 +10862,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 +10887,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 +10913,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 +10938,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 +10962,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 +10986,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 +11010,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 +11034,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 +11050,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 +11075,8 @@ configure-hello:
           || exit 1
  @endif hello
  
+
+
  .PHONY: all-hello maybe-all-hello
  maybe-all-hello:
  @if hello
@@ -11290,12 +11085,12 @@ 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 +11099,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,7 +11113,6 @@ 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)  install)
@@ -11338,7 +11131,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 +11156,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 +11181,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 +11206,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 +11232,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 +11257,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 +11281,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 +11305,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 +11329,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 +11353,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 +11369,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 +11394,8 @@ configure-indent:
           || exit 1
  @endif indent
  
+
+
  .PHONY: all-indent maybe-all-indent
  maybe-all-indent:
  @if indent
@@ -11618,12 +11404,12 @@ 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 +11418,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,7 +11432,6 @@ 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)  install)
@@ -11666,7 +11450,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 +11475,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 +11500,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 +11525,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 +11551,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 +11576,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 +11600,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 +11624,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 +11648,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 +11672,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 +11688,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 +11714,8 @@ configure-intl:
           || exit 1
  @endif intl
  
+
+
  .PHONY: all-intl maybe-all-intl
  maybe-all-intl:
  @if intl
@@ -11948,12 +11725,12 @@ 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: check-intl maybe-check-intl
  maybe-check-intl:
  @if intl
@@ -11962,7 +11739,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,7 +11753,6 @@ 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)  install)
@@ -11996,7 +11771,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 +11796,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 +11821,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 +11846,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 +11872,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 +11897,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 +11921,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 +11945,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 +11969,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 +11993,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 +12009,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 +12034,8 @@ configure-tcl:
           || exit 1
  @endif tcl
  
+
+
  .PHONY: all-tcl maybe-all-tcl
  maybe-all-tcl:
  @if tcl
@@ -12276,12 +12044,12 @@ 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 +12058,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,7 +12072,6 @@ 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)  install)
@@ -12324,7 +12090,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 +12115,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 +12140,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 +12165,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 +12191,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 +12216,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 +12250,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 +12274,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 +12298,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 +12314,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 +12339,8 @@ configure-itcl:
           || exit 1
  @endif itcl
  
+
+
  .PHONY: all-itcl maybe-all-itcl
  maybe-all-itcl:
  @if itcl
@@ -12589,12 +12349,12 @@ 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 +12363,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,7 +12377,6 @@ 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)  install)
@@ -12637,7 +12395,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 +12420,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 +12445,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 +12470,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 +12496,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 +12521,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 +12545,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 +12569,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 +12593,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 +12617,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 +12633,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 +12659,8 @@ configure-ld:
           || exit 1
  @endif ld
  
+
+
  .PHONY: all-ld maybe-all-ld
  maybe-all-ld:
  @if ld
@@ -12919,12 +12670,12 @@ 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: check-ld maybe-check-ld
  maybe-check-ld:
  @if ld
@@ -12933,7 +12684,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,7 +12698,6 @@ 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)  install)
@@ -12967,7 +12716,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 +12741,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 +12766,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 +12791,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 +12817,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 +12842,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 +12866,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 +12890,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 +12914,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 +12938,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 +12954,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 +12980,8 @@ configure-libcpp:
           || exit 1
  @endif libcpp
  
+
+
  .PHONY: all-libcpp maybe-all-libcpp
  maybe-all-libcpp:
  @if libcpp
@@ -13249,12 +12991,12 @@ 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: check-libcpp maybe-check-libcpp
  maybe-check-libcpp:
  @if libcpp
@@ -13263,7 +13005,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,7 +13019,6 @@ 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)  install)
@@ -13297,7 +13037,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 +13062,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 +13087,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 +13112,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 +13138,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 +13163,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 +13187,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 +13211,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 +13235,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 +13259,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 +13275,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 +13300,8 @@ configure-libgui:
           || exit 1
  @endif libgui
  
+
+
  .PHONY: all-libgui maybe-all-libgui
  maybe-all-libgui:
  @if libgui
@@ -13577,12 +13310,12 @@ 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 +13324,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,7 +13338,6 @@ 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)  install)
@@ -13625,7 +13356,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 +13381,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 +13406,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 +13431,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 +13457,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 +13482,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 +13506,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 +13530,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 +13554,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 +13578,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 +13594,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 +13620,8 @@ configure-libiberty:
           || exit 1
  @endif libiberty
  
+
+
  .PHONY: all-libiberty maybe-all-libiberty
  maybe-all-libiberty:
  @if libiberty
@@ -13907,12 +13631,12 @@ 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: check-libiberty maybe-check-libiberty
  maybe-check-libiberty:
  @if libiberty
@@ -13921,7 +13645,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,7 +13659,6 @@ 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)  install)
@@ -13955,7 +13677,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 +13702,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 +13727,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 +13752,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 +13778,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 +13803,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 +13827,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 +13851,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 +13875,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 +13899,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 +13915,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 +13940,8 @@ configure-libtool:
           || exit 1
  @endif libtool
  
+
+
  .PHONY: all-libtool maybe-all-libtool
  maybe-all-libtool:
  @if libtool
@@ -14235,12 +13950,12 @@ 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 +13964,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,7 +13978,6 @@ 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)  install)
@@ -14283,7 +13996,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 +14021,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 +14046,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 +14071,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 +14097,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 +14122,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 +14146,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 +14170,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 +14194,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 +14218,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 +14234,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 +14259,8 @@ configure-m4:
           || exit 1
  @endif m4
  
+
+
  .PHONY: all-m4 maybe-all-m4
  maybe-all-m4:
  @if m4
@@ -14563,12 +14269,12 @@ 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 +14283,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,7 +14297,6 @@ 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)  install)
@@ -14611,7 +14315,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 +14340,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 +14365,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 +14390,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 +14416,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 +14441,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 +14465,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 +14489,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 +14513,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 +14537,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 +14553,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 +14578,8 @@ configure-make:
           || exit 1
  @endif make
  
+
+
  .PHONY: all-make maybe-all-make
  maybe-all-make:
  @if make
@@ -14891,12 +14588,12 @@ 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 +14602,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,7 +14616,6 @@ 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)  install)
@@ -14939,7 +14634,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 +14659,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 +14684,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 +14709,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 +14735,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 +14760,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 +14784,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 +14808,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 +14832,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 +14856,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 +14872,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 +14897,8 @@ configure-mmalloc:
           || exit 1
  @endif mmalloc
  
+
+
  .PHONY: all-mmalloc maybe-all-mmalloc
  maybe-all-mmalloc:
  @if mmalloc
@@ -15219,12 +14907,12 @@ 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,7 +14930,6 @@ 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)  install)
@@ -15261,7 +14948,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 +14973,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 +14998,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 +15023,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 +15049,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 +15074,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 +15098,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 +15122,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 +15146,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 +15170,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 +15186,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 +15211,8 @@ configure-patch:
           || exit 1
  @endif patch
  
+
+
  .PHONY: all-patch maybe-all-patch
  maybe-all-patch:
  @if patch
@@ -15541,12 +15221,12 @@ 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 +15235,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,7 +15249,6 @@ 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)  install)
@@ -15589,7 +15267,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 +15292,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 +15317,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 +15342,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 +15368,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 +15393,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 +15417,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 +15441,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 +15465,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 +15489,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 +15505,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 +15530,8 @@ configure-perl:
           || exit 1
  @endif perl
  
+
+
  .PHONY: all-perl maybe-all-perl
  maybe-all-perl:
  @if perl
@@ -15869,12 +15540,12 @@ 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 +15554,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,7 +15568,6 @@ 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)  install)
@@ -15917,7 +15586,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 +15611,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 +15636,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 +15661,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 +15687,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 +15712,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 +15736,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 +15760,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 +15784,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 +15808,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 +15824,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 +15849,8 @@ configure-prms:
           || exit 1
  @endif prms
  
+
+
  .PHONY: all-prms maybe-all-prms
  maybe-all-prms:
  @if prms
@@ -16197,12 +15859,12 @@ 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 +15873,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,7 +15887,6 @@ 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)  install)
@@ -16245,7 +15905,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 +15930,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 +15955,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 +15980,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 +16006,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 +16031,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 +16055,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 +16079,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 +16103,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 +16127,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 +16143,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 +16168,8 @@ configure-rcs:
           || exit 1
  @endif rcs
  
+
+
  .PHONY: all-rcs maybe-all-rcs
  maybe-all-rcs:
  @if rcs
@@ -16525,12 +16178,12 @@ 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 +16192,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,7 +16206,6 @@ 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)  install)
@@ -16573,7 +16224,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 +16249,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 +16274,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 +16299,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 +16325,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 +16350,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 +16374,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 +16398,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 +16422,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 +16446,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 +16462,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 +16487,8 @@ configure-readline:
           || exit 1
  @endif readline
  
+
+
  .PHONY: all-readline maybe-all-readline
  maybe-all-readline:
  @if readline
@@ -16853,12 +16497,12 @@ 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 +16511,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,7 +16525,6 @@ 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)  install)
@@ -16901,7 +16543,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 +16568,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 +16593,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 +16618,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 +16644,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 +16669,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 +16693,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 +16717,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 +16741,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 +16765,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 +16781,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 +16806,8 @@ configure-release:
           || exit 1
  @endif release
  
+
+
  .PHONY: all-release maybe-all-release
  maybe-all-release:
  @if release
@@ -17181,12 +16816,12 @@ 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 +16852,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 +16877,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 +16902,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 +16927,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 +16953,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 +16978,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 +17002,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 +17026,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 +17050,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 +17074,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 +17090,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 +17115,8 @@ configure-recode:
           || exit 1
  @endif recode
  
+
+
  .PHONY: all-recode maybe-all-recode
  maybe-all-recode:
  @if recode
@@ -17497,12 +17125,12 @@ 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 +17139,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,7 +17153,6 @@ 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)  install)
@@ -17545,7 +17171,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 +17196,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 +17221,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 +17246,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 +17272,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 +17297,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 +17321,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 +17345,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 +17369,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 +17393,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 +17409,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 +17434,8 @@ configure-sed:
           || exit 1
  @endif sed
  
+
+
  .PHONY: all-sed maybe-all-sed
  maybe-all-sed:
  @if sed
@@ -17825,12 +17444,12 @@ 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 +17458,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,7 +17472,6 @@ 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)  install)
@@ -17873,7 +17490,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 +17515,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 +17540,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 +17565,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 +17591,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 +17616,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 +17640,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 +17664,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 +17688,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 +17712,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 +17728,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 +17753,8 @@ 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 +17763,12 @@ 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 +17777,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,7 +17791,6 @@ 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)  install)
@@ -18201,7 +17809,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 +17834,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 +17859,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 +17884,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 +17910,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 +17935,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 +17959,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 +17983,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 +18007,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 +18031,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 +18047,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 +18072,8 @@ configure-shellutils:
           || exit 1
  @endif shellutils
  
+
+
  .PHONY: all-shellutils maybe-all-shellutils
  maybe-all-shellutils:
  @if shellutils
@@ -18481,12 +18082,12 @@ 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 +18096,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,7 +18110,6 @@ 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)  install)
@@ -18529,7 +18128,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 +18153,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 +18178,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 +18203,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 +18229,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 +18254,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 +18278,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 +18302,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 +18326,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 +18350,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 +18366,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 +18391,8 @@ configure-sid:
           || exit 1
  @endif sid
  
+
+
  .PHONY: all-sid maybe-all-sid
  maybe-all-sid:
  @if sid
@@ -18809,12 +18401,12 @@ 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 +18415,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,7 +18429,6 @@ 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)  install)
@@ -18857,7 +18447,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 +18472,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 +18497,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 +18522,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 +18548,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 +18573,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 +18597,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 +18621,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 +18645,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 +18669,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 +18685,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 +18710,8 @@ configure-sim:
           || exit 1
  @endif sim
  
+
+
  .PHONY: all-sim maybe-all-sim
  maybe-all-sim:
  @if sim
@@ -19137,12 +18720,12 @@ 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 +18734,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,7 +18748,6 @@ 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)  install)
@@ -19185,7 +18766,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 +18791,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 +18816,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 +18841,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 +18867,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 +18892,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 +18916,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 +18940,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 +18964,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 +18988,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 +19004,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 +19029,8 @@ configure-tar:
           || exit 1
  @endif tar
  
+
+
  .PHONY: all-tar maybe-all-tar
  maybe-all-tar:
  @if tar
@@ -19465,12 +19039,12 @@ 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 +19053,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,7 +19067,6 @@ 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)  install)
@@ -19513,7 +19085,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 +19110,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 +19135,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 +19160,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 +19186,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 +19211,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 +19235,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 +19259,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 +19283,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 +19307,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 +19323,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 +19348,8 @@ configure-texinfo:
           || exit 1
  @endif texinfo
  
+
+
  .PHONY: all-texinfo maybe-all-texinfo
  maybe-all-texinfo:
  @if texinfo
@@ -19793,12 +19358,12 @@ 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 +19372,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 +19399,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 +19424,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 +19449,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 +19474,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 +19500,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 +19525,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 +19549,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 +19573,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 +19597,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 +19621,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 +19637,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 +19662,8 @@ configure-textutils:
           || exit 1
  @endif textutils
  
+
+
  .PHONY: all-textutils maybe-all-textutils
  maybe-all-textutils:
  @if textutils
@@ -20115,12 +19672,12 @@ 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 +19686,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,7 +19700,6 @@ 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)  install)
@@ -20163,7 +19718,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 +19743,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 +19768,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 +19793,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 +19819,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 +19844,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 +19868,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 +19892,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 +19916,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 +19940,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 +19956,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 +19981,8 @@ configure-time:
           || exit 1
  @endif time
  
+
+
  .PHONY: all-time maybe-all-time
  maybe-all-time:
  @if time
@@ -20443,12 +19991,12 @@ 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 +20005,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,7 +20019,6 @@ 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)  install)
@@ -20491,7 +20037,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 +20062,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 +20087,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 +20112,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 +20138,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 +20163,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 +20187,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 +20211,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 +20235,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 +20259,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 +20275,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 +20300,8 @@ configure-uudecode:
           || exit 1
  @endif uudecode
  
+
+
  .PHONY: all-uudecode maybe-all-uudecode
  maybe-all-uudecode:
  @if uudecode
@@ -20771,12 +20310,12 @@ 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 +20324,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,7 +20338,6 @@ 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)  install)
@@ -20819,7 +20356,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 +20381,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 +20406,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 +20431,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 +20457,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 +20482,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 +20506,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 +20530,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 +20554,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 +20578,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 +20594,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 +20619,8 @@ configure-wdiff:
           || exit 1
  @endif wdiff
  
+
+
  .PHONY: all-wdiff maybe-all-wdiff
  maybe-all-wdiff:
  @if wdiff
@@ -21099,12 +20629,12 @@ 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 +20643,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,7 +20657,6 @@ 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)  install)
@@ -21147,7 +20675,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 +20700,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 +20725,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 +20750,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 +20776,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 +20801,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 +20825,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 +20849,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 +20873,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 +20897,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 +20913,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 +20938,8 @@ configure-zip:
           || exit 1
  @endif zip
  
+
+
  .PHONY: all-zip maybe-all-zip
  maybe-all-zip:
  @if zip
@@ -21427,12 +20948,12 @@ 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 +20964,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,7 +20979,6 @@ 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)  install)
@@ -21478,7 +20997,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 +21022,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 +21047,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 +21072,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 +21098,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 +21123,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 +21147,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 +21171,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 +21195,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 +21219,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 +21235,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 +21261,8 @@ configure-zlib:
           || exit 1
  @endif zlib
  
+
+
  .PHONY: all-zlib maybe-all-zlib
  maybe-all-zlib:
  @if zlib
@@ -21760,12 +21272,12 @@ 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: check-zlib maybe-check-zlib
  maybe-check-zlib:
  @if zlib
@@ -21796,7 +21308,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 +21333,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 +21358,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 +21383,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 +21409,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 +21434,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 +21458,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 +21482,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 +21506,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 +21530,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 +21546,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 +21571,8 @@ configure-gdb:
           || exit 1
  @endif gdb
  
+
+
  .PHONY: all-gdb maybe-all-gdb
  maybe-all-gdb:
  @if gdb
@@ -22076,12 +21581,12 @@ 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 +21595,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,7 +21609,6 @@ 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) install)
@@ -22124,7 +21627,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 +21652,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 +21677,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 +21702,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 +21728,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 +21753,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 +21777,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 +21801,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 +21825,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 +21849,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 +21865,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 +21890,8 @@ configure-expect:
           || exit 1
  @endif expect
  
+
+
  .PHONY: all-expect maybe-all-expect
  maybe-all-expect:
  @if expect
@@ -22404,12 +21900,12 @@ 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 +21914,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,7 +21928,6 @@ 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) install)
@@ -22452,7 +21946,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 +21971,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 +21996,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 +22021,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 +22047,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 +22072,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 +22096,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 +22120,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 +22144,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 +22168,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 +22184,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 +22209,8 @@ configure-guile:
           || exit 1
  @endif guile
  
+
+
  .PHONY: all-guile maybe-all-guile
  maybe-all-guile:
  @if guile
@@ -22732,12 +22219,12 @@ 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 +22233,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,7 +22247,6 @@ 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) install)
@@ -22780,7 +22265,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 +22290,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 +22315,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 +22340,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 +22366,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 +22391,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 +22415,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 +22439,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 +22463,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 +22487,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 +22503,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 +22528,8 @@ configure-tk:
           || exit 1
  @endif tk
  
+
+
  .PHONY: all-tk maybe-all-tk
  maybe-all-tk:
  @if tk
@@ -23060,12 +22538,12 @@ 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 +22552,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,7 +22566,6 @@ 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) install)
@@ -23108,7 +22584,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 +22609,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 +22634,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 +22659,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 +22685,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 +22710,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 +22734,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 +22758,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 +22782,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 +22806,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 +22822,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 +22847,8 @@ configure-libtermcap:
           || exit 1
  @endif libtermcap
  
+
+
  .PHONY: all-libtermcap maybe-all-libtermcap
  maybe-all-libtermcap:
  @if libtermcap
@@ -23388,12 +22857,12 @@ 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,7 +22880,6 @@ 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)  install)
@@ -23430,7 +22898,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 +22923,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 +22948,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 +22973,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 +22999,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 +23024,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 +23080,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 +23105,8 @@ configure-utils:
           || exit 1
  @endif utils
  
+
+
  .PHONY: all-utils maybe-all-utils
  maybe-all-utils:
  @if utils
@@ -23650,12 +23115,12 @@ 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,7 +23138,6 @@ 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)  install)
@@ -23692,7 +23156,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 +23181,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 +23206,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 +23231,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 +23257,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 +23282,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 +23306,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 +23330,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 +23354,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 +23378,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,18 +23394,19 @@ maintainer-clean-utils:
  @endif utils
  
  
+
  .PHONY: configure-gnattools maybe-configure-gnattools
  maybe-configure-gnattools:
  @if gnattools
  maybe-configure-gnattools: configure-gnattools
-configure-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 $(HOST_SUBDIR)/gnattools || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/gnattools; \
+       cd "$(HOST_SUBDIR)/gnattools" || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/gnattools/ | \
@@ -23964,6 +23419,8 @@ configure-gnattools:
           || exit 1
  @endif gnattools
  
+
+
  .PHONY: all-gnattools maybe-all-gnattools
  maybe-all-gnattools:
  @if gnattools
@@ -23972,12 +23429,12 @@ 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 $(HOST_SUBDIR)/gnattools && \
           $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-gnattools))
  @endif gnattools
  
+
  .PHONY: check-gnattools maybe-check-gnattools
  maybe-check-gnattools:
  @if gnattools
@@ -23986,7 +23443,6 @@ 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 $(HOST_SUBDIR)/gnattools && \
           $(MAKE) $(FLAGS_TO_PASS)  check)
@@ -24001,7 +23457,6 @@ 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 $(HOST_SUBDIR)/gnattools && \
           $(MAKE) $(FLAGS_TO_PASS)  install)
@@ -24020,7 +23475,6 @@ 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|"`; \
@@ -24046,7 +23500,6 @@ 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|"`; \
@@ -24072,7 +23525,6 @@ 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|"`; \
@@ -24098,7 +23550,6 @@ 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|"`; \
@@ -24125,7 +23576,6 @@ 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|"`; \
@@ -24151,7 +23601,6 @@ 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|"`; \
@@ -24176,7 +23625,6 @@ 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|"`; \
@@ -24201,7 +23649,6 @@ 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|"`; \
@@ -24226,7 +23673,6 @@ 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|"`; \
@@ -24251,7 +23697,6 @@ 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|"`; \
@@ -24273,23 +23718,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; \
@@ -24302,11 +23750,12 @@ 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
@@ -24315,12 +23764,13 @@ 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
@@ -24329,7 +23779,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)
@@ -24344,7 +23793,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)
@@ -24363,7 +23811,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 \
@@ -24389,7 +23836,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 \
@@ -24415,7 +23861,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 \
@@ -24441,7 +23886,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 \
@@ -24468,7 +23912,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 \
@@ -24494,7 +23937,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 \
@@ -24519,7 +23961,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 \
@@ -24544,7 +23985,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 \
@@ -24569,7 +24009,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 \
@@ -24594,7 +24033,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 \
@@ -24611,23 +24049,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; \
@@ -24640,11 +24081,12 @@ 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
@@ -24653,12 +24095,13 @@ 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
@@ -24667,7 +24110,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)
@@ -24682,7 +24124,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)
@@ -24701,7 +24142,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 \
@@ -24727,7 +24167,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 \
@@ -24753,7 +24192,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 \
@@ -24779,7 +24217,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 \
@@ -24806,7 +24243,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 \
@@ -24832,7 +24268,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 \
@@ -24857,7 +24292,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 \
@@ -24882,7 +24316,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 \
@@ -24907,7 +24340,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 \
@@ -24932,7 +24364,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 \
@@ -24949,23 +24380,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; \
@@ -24978,11 +24412,12 @@ 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
@@ -24991,12 +24426,13 @@ 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
@@ -25005,7 +24441,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)
@@ -25020,7 +24455,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)
@@ -25039,7 +24473,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 \
@@ -25065,7 +24498,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 \
@@ -25091,7 +24523,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 \
@@ -25117,7 +24548,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 \
@@ -25144,7 +24574,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 \
@@ -25170,7 +24599,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 \
@@ -25195,7 +24623,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 \
@@ -25220,7 +24647,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 \
@@ -25245,7 +24671,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 \
@@ -25270,7 +24695,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 \
@@ -25287,23 +24711,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; \
@@ -25316,11 +24743,12 @@ 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
@@ -25329,12 +24757,13 @@ 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
@@ -25343,7 +24772,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)
@@ -25358,7 +24786,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)
@@ -25377,7 +24804,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 \
@@ -25403,7 +24829,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 \
@@ -25429,7 +24854,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 \
@@ -25455,7 +24879,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 \
@@ -25482,7 +24905,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 \
@@ -25508,7 +24930,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 \
@@ -25533,7 +24954,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 \
@@ -25558,7 +24978,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 \
@@ -25583,7 +25002,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 \
@@ -25608,7 +25026,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 \
@@ -25625,23 +25042,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; \
@@ -25654,11 +25074,12 @@ 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
@@ -25667,12 +25088,13 @@ 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
@@ -25681,7 +25103,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)
@@ -25696,7 +25117,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)
@@ -25715,7 +25135,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 \
@@ -25741,7 +25160,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 \
@@ -25767,7 +25185,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 \
@@ -25793,7 +25210,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 \
@@ -25820,7 +25236,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 \
@@ -25846,7 +25261,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 \
@@ -25871,7 +25285,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 \
@@ -25896,7 +25309,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 \
@@ -25921,7 +25333,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 \
@@ -25946,7 +25357,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 \
@@ -25963,23 +25373,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; \
@@ -25992,11 +25405,12 @@ 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
@@ -26005,12 +25419,13 @@ 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
@@ -26029,7 +25444,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)
@@ -26048,7 +25462,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 \
@@ -26074,7 +25487,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 \
@@ -26100,7 +25512,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 \
@@ -26126,7 +25537,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 \
@@ -26153,7 +25563,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 \
@@ -26179,7 +25588,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 \
@@ -26236,23 +25644,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; \
@@ -26265,11 +25676,12 @@ 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
@@ -26278,12 +25690,13 @@ 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
@@ -26292,7 +25705,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)
@@ -26307,7 +25719,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)
@@ -26326,7 +25737,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 \
@@ -26352,7 +25762,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 \
@@ -26378,7 +25787,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 \
@@ -26404,7 +25812,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 \
@@ -26431,7 +25838,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 \
@@ -26457,7 +25863,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 \
@@ -26482,7 +25887,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 \
@@ -26507,7 +25911,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 \
@@ -26532,7 +25935,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 \
@@ -26557,7 +25959,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 \
@@ -26574,23 +25975,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; \
@@ -26603,11 +26007,12 @@ 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
@@ -26616,12 +26021,13 @@ 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
@@ -26640,7 +26046,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)
@@ -26659,7 +26064,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 \
@@ -26685,7 +26089,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 \
@@ -26711,7 +26114,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 \
@@ -26737,7 +26139,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 \
@@ -26764,7 +26165,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 \
@@ -26790,7 +26190,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 \
@@ -26815,7 +26214,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 \
@@ -26840,7 +26238,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 \
@@ -26865,7 +26262,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 \
@@ -26890,7 +26286,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 \
@@ -26907,23 +26302,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; \
@@ -26936,11 +26334,12 @@ 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
@@ -26949,12 +26348,13 @@ 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
@@ -26963,7 +26363,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)
@@ -26978,7 +26377,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)
@@ -26997,7 +26395,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 \
@@ -27023,7 +26420,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 \
@@ -27049,7 +26445,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 \
@@ -27075,7 +26470,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 \
@@ -27102,7 +26496,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 \
@@ -27128,7 +26521,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 \
@@ -27153,7 +26545,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 \
@@ -27178,7 +26569,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 \
@@ -27203,7 +26593,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 \
@@ -27228,7 +26617,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 \
@@ -27245,23 +26633,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; \
@@ -27274,11 +26665,12 @@ 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
@@ -27287,12 +26679,13 @@ 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
@@ -27301,7 +26694,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)
@@ -27316,7 +26708,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)
@@ -27335,7 +26726,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 \
@@ -27361,7 +26751,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 \
@@ -27387,7 +26776,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 \
@@ -27413,7 +26801,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 \
@@ -27440,7 +26827,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 \
@@ -27466,7 +26852,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 \
@@ -27491,7 +26876,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 \
@@ -27516,7 +26900,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 \
@@ -27541,7 +26924,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 \
@@ -27566,7 +26948,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 \
@@ -27583,23 +26964,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; \
@@ -27612,11 +26996,12 @@ 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
@@ -27625,12 +27010,13 @@ 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
@@ -27663,7 +27049,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 \
@@ -27689,7 +27074,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 \
@@ -27715,7 +27099,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 \
@@ -27741,7 +27124,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 \
@@ -27768,7 +27150,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 \
@@ -27794,7 +27175,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 \
@@ -27819,7 +27199,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 \
@@ -27844,7 +27223,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 \
@@ -27869,7 +27247,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 \
@@ -27894,7 +27271,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 \
@@ -27911,23 +27287,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; \
@@ -27940,11 +27319,12 @@ 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
@@ -27953,12 +27333,13 @@ 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
@@ -27967,7 +27348,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)
@@ -27982,7 +27362,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)
@@ -28001,7 +27380,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 \
@@ -28027,7 +27405,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 \
@@ -28053,7 +27430,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 \
@@ -28079,7 +27455,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 \
@@ -28106,7 +27481,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 \
@@ -28132,7 +27506,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 \
@@ -28157,7 +27530,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 \
@@ -28182,7 +27554,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 \
@@ -28207,7 +27578,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 \
@@ -28232,7 +27602,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 \
@@ -28249,23 +27618,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; \
@@ -28278,11 +27650,12 @@ 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
@@ -28291,12 +27664,13 @@ 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
@@ -28305,7 +27679,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)
@@ -28320,7 +27693,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)
@@ -28339,7 +27711,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 \
@@ -28365,7 +27736,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 \
@@ -28391,7 +27761,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 \
@@ -28417,7 +27786,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 \
@@ -28444,7 +27812,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 \
@@ -28470,7 +27837,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 \
@@ -28495,7 +27861,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 \
@@ -28520,7 +27885,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 \
@@ -28545,7 +27909,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 \
@@ -28570,7 +27933,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 \
@@ -28587,23 +27949,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; \
@@ -28616,11 +27981,12 @@ 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
@@ -28629,12 +27995,13 @@ 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
@@ -28643,7 +28010,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)
@@ -28658,7 +28024,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)
@@ -28677,7 +28042,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 \
@@ -28703,7 +28067,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 \
@@ -28729,7 +28092,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 \
@@ -28755,7 +28117,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 \
@@ -28782,7 +28143,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 \
@@ -28808,7 +28168,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 \
@@ -28833,7 +28192,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 \
@@ -28858,7 +28216,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 \
@@ -28883,7 +28240,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 \
@@ -28908,7 +28264,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 \
@@ -28925,23 +28280,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; \
@@ -28954,11 +28312,12 @@ 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
@@ -28967,12 +28326,13 @@ 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
@@ -28981,7 +28341,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)
@@ -28996,7 +28355,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)
@@ -29015,7 +28373,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 \
@@ -29041,7 +28398,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 \
@@ -29067,7 +28423,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 \
@@ -29093,7 +28448,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 \
@@ -29120,7 +28474,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 \
@@ -29146,7 +28499,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 \
@@ -29171,7 +28523,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 \
@@ -29196,7 +28547,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 \
@@ -29221,7 +28571,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 \
@@ -29246,7 +28595,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 \
@@ -29263,23 +28611,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; \
@@ -29292,11 +28643,12 @@ 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
@@ -29305,12 +28657,13 @@ 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
@@ -29319,7 +28672,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)
@@ -29334,7 +28686,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)
@@ -29353,7 +28704,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 \
@@ -29379,7 +28729,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 \
@@ -29405,7 +28754,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 \
@@ -29431,7 +28779,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 \
@@ -29458,7 +28805,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 \
@@ -29484,7 +28830,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 \
@@ -29509,7 +28854,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 \
@@ -29534,7 +28878,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 \
@@ -29559,7 +28902,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 \
@@ -29584,7 +28926,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 \
@@ -29601,23 +28942,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; \
@@ -29630,11 +28974,12 @@ 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
@@ -29643,12 +28988,13 @@ 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
@@ -29657,7 +29003,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)
@@ -29672,7 +29017,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)
@@ -29691,7 +29035,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 \
@@ -29717,7 +29060,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 \
@@ -29743,7 +29085,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 \
@@ -29769,7 +29110,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 \
@@ -29796,7 +29136,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 \
@@ -29822,7 +29161,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 \
@@ -29847,7 +29185,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 \
@@ -29872,7 +29209,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 \
@@ -29897,7 +29233,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 \
@@ -29922,7 +29257,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 \
@@ -29939,23 +29273,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; \
@@ -29968,11 +29305,12 @@ 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
@@ -29981,12 +29319,13 @@ 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
@@ -29995,7 +29334,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)
@@ -30010,7 +29348,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)
@@ -30029,7 +29366,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 \
@@ -30055,7 +29391,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 \
@@ -30081,7 +29416,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 \
@@ -30107,7 +29441,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 \
@@ -30134,7 +29467,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 \
@@ -30160,7 +29492,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 \
@@ -30185,7 +29516,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 \
@@ -30210,7 +29540,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 \
@@ -30235,7 +29564,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 \
@@ -30260,7 +29588,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 \
@@ -30292,9 +29619,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; \
@@ -30312,32 +29639,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
  
@@ -30345,13 +29668,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
@@ -30362,7 +29683,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 \
@@ -30386,7 +29706,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); \
@@ -34861,18 +34180,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
@@ -35515,7 +34831,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.