2005-04-12 Frank Ch. Eigler <fche@redhat.com>

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

index b7b0831..1c3917d 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -65,54 +65,49 @@ INSTALL = @INSTALL@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_DATA = @INSTALL_DATA@
+LN = @LN@
+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 = \
-  $(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 libbanshee
+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
+# recursing into a build directory in case that directory's Makefile
+# re-runs configure.
+BASE_EXPORTS = \
+       FLEX="$(FLEX)"; export FLEX; \
+       LEX="$(LEX)"; export LEX; \
+       BISON="$(BISON)"; export BISON; \
+       YACC="$(YACC)"; export YACC; \
+       M4="$(M4)"; export M4; \
+       MAKEINFO="$(MAKEINFO)"; export MAKEINFO;
+
  # This is the list of variables to export in the environment when
-# configuring subdirectories for the build system.  It must also be
-# exported whenever recursing into a build directory in case that
-# directory's Makefile re-runs configure.
+# configuring subdirectories for the build system.
  BUILD_EXPORTS = \
+       $(BASE_EXPORTS) \
         AR="$(AR_FOR_BUILD)"; export AR; \
         AS="$(AS_FOR_BUILD)"; export AS; \
         CC="$(CC_FOR_BUILD)"; export CC; \
@@ -134,11 +129,13 @@ SUBDIRS = @configdirs@
  # This is set by the configure script to the arguments to use when configuring
  # directories built for the host system.
  HOST_CONFIGARGS = @host_configargs@
+# Host programs are put under this directory, which is . except if building
+# with srcdir=..
+HOST_SUBDIR = @host_subdir@
  # This is the list of variables to export in the environment when
-# configuring subdirectories for the host system.  It must also be
-# exported whenever recursing into a host directory in case that
-# directory's Makefile re-runs configure.
+# configuring subdirectories for the host system.
  HOST_EXPORTS = \
+       $(BASE_EXPORTS) \
         CC="$(CC)"; export CC; \
         CFLAGS="$(CFLAGS)"; export CFLAGS; \
         CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
@@ -154,20 +151,22 @@ HOST_EXPORTS = \
         RANLIB="$(RANLIB)"; export RANLIB; \
         WINDRES="$(WINDRES)"; export WINDRES; \
         OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
-       OBJDUMP="$(OBJDUMP)"; export OBJDUMP;
-
-# Similar, for the gcc directory.
-GCC_HOST_EXPORTS = \
-       $(HOST_EXPORTS) \
+       OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
         TOPLEVEL_CONFIGURE_ARGUMENTS="$(TOPLEVEL_CONFIGURE_ARGUMENTS)"; export TOPLEVEL_CONFIGURE_ARGUMENTS; \
         GMPLIBS="$(HOST_GMPLIBS)"; export GMPLIBS; \
-       GMPINC="$(HOST_GMPINC)"; export GMPINC;
+       GMPINC="$(HOST_GMPINC)"; export GMPINC; \
+       $(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR);
  
  # Similar, for later GCC stages.
  STAGE_HOST_EXPORTS = \
-       $(GCC_HOST_EXPORTS) \
-       CC="$(STAGE_CC_WRAPPER) $$r/prev-gcc/xgcc$(exeext) -B$$r/prev-gcc/ -B$(build_tooldir)/bin/"; export CC; \
-       CC_FOR_BUILD="$(STAGE_CC_WRAPPER) $$r/prev-gcc/xgcc$(exeext) -B$$r/prev-gcc/ -B$(build_tooldir)/bin/"; export CC_FOR_BUILD;
+       $(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; \
+       CC_FOR_BUILD="$(STAGE_CC_WRAPPER) \
+         $$r/$(HOST_SUBDIR)/prev-gcc/xgcc$(exeext) \
+         -B$$r/$(HOST_SUBDIR)/prev-gcc/ \
+         -B$(build_tooldir)/bin/"; export CC_FOR_BUILD;
  
  # This is set by the configure script to the list of directories which
  # should be built using the target tools.
@@ -176,18 +175,17 @@ 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.  It must also be
-# exported whenever recursing into a host directory in case that
-# directory's Makefile re-runs configure.
+# configuring subdirectories for the host system.
  BASE_TARGET_EXPORTS = \
+       $(BASE_EXPORTS) \
         AR="$(AR_FOR_TARGET)"; export AR; \
         AS="$(AS_FOR_TARGET)"; export AS; \
         CC="$(CC_FOR_TARGET)"; export CC; \
         CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
         CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
-       CPPFLAGS="$(CFLAGS_FOR_TARGET)"; export CPPFLAGS; \
+       CPPFLAGS="$(CPPFLAGS_FOR_TARGET)"; export CPPFLAGS; \
         CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
         GCJ="$(GCJ_FOR_TARGET)"; export GCJ; \
         GFORTRAN="$(GFORTRAN_FOR_TARGET)"; export GFORTRAN; \
@@ -196,7 +194,8 @@ BASE_TARGET_EXPORTS = \
         LDFLAGS="$(LDFLAGS_FOR_TARGET)"; export LDFLAGS; \
         NM="$(NM_FOR_TARGET)"; export NM; \
         RANLIB="$(RANLIB_FOR_TARGET)"; export RANLIB; \
-       WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES;
+       WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES; \
+       $(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) \
@@ -237,42 +236,51 @@ CXX_FOR_BUILD = $(CXX)
  BUILD_PREFIX = @BUILD_PREFIX@
  BUILD_PREFIX_1 = @BUILD_PREFIX_1@
  
-BISON=@BISON@
-USUAL_BISON = `if [ -f $$r/bison/bison ] ; then \
-           echo $$r/bison/bison -L $$s/bison/ ; \
+# Flags to pass to stage2 and later makes.  They are defined
+# here so that they can be overridden by Makefile fragments.
+BOOT_CFLAGS= -g -O2
+
+CONFIGURED_BISON = @CONFIGURED_BISON@
+BISON = `if [ -f $$r/$(BUILD_SUBDIR)/bison/tests/bison ] ; then \
+           echo $$r/$(BUILD_SUBDIR)/bison/tests/bison ; \
          else \
-           echo bison ; \
+           echo ${CONFIGURED_BISON} ; \
          fi`
  
-DEFAULT_YACC = @DEFAULT_YACC@
-YACC=@YACC@
-USUAL_YACC = `if [ -f $$r/bison/bison ] ; then \
-           echo $$r/bison/bison -y -L $$s/bison/ ; \
-       elif [ -f $$r/byacc/byacc ] ; then \
-           echo $$r/byacc/byacc ; \
+CONFIGURED_YACC = @CONFIGURED_YACC@
+YACC = `if [ -f $$r/$(BUILD_SUBDIR)/bison/tests/bison ] ; then \
+           echo $$r/$(BUILD_SUBDIR)/bison/tests/bison -y ; \
+       elif [ -f $$r/$(BUILD_SUBDIR)/byacc/byacc ] ; then \
+           echo $$r/$(BUILD_SUBDIR)/byacc/byacc ; \
         else \
-           echo ${DEFAULT_YACC} ; \
+           echo ${CONFIGURED_YACC} ; \
         fi`
  
-DEFAULT_LEX = @DEFAULT_LEX@
-LEX=@LEX@
-USUAL_LEX = `if [ -f $$r/flex/flex ] ; \
-       then echo $$r/flex/flex ; \
-       else echo ${DEFAULT_LEX} ; fi`
+CONFIGURED_FLEX = @CONFIGURED_FLEX@
+FLEX = `if [ -f $$r/$(BUILD_SUBDIR)/flex/flex ] ; \
+       then echo $$r/$(BUILD_SUBDIR)/flex/flex ; \
+       else echo ${CONFIGURED_FLEX} ; fi`
+
+CONFIGURED_LEX = @CONFIGURED_LEX@
+LEX = `if [ -f $$r/$(BUILD_SUBDIR)/flex/flex ] ; \
+       then echo $$r/$(BUILD_SUBDIR)/flex/flex ; \
+       else echo ${CONFIGURED_LEX} ; fi`
  
-DEFAULT_M4 = @DEFAULT_M4@
-M4 = `if [ -f $$r/m4/m4 ] ; \
-       then echo $$r/m4/m4 ; \
-       else echo ${DEFAULT_M4} ; fi`
+CONFIGURED_M4 = @CONFIGURED_M4@
+M4 = `if [ -f $$r/$(BUILD_SUBDIR)/m4/m4 ] ; \
+       then echo $$r/$(BUILD_SUBDIR)/m4/m4 ; \
+       else echo ${CONFIGURED_M4} ; fi`
  
  # For an installed makeinfo, we require it to be from texinfo 4.2 or
-# higher, else we use the "missing" dummy.
-MAKEINFO=@MAKEINFO@
-USUAL_MAKEINFO = `if [ -f $$r/texinfo/makeinfo/makeinfo ] ; \
-       then echo $$r/texinfo/makeinfo/makeinfo ; \
-       else if (makeinfo --version \
+# higher, else we use the "missing" dummy.  We also pass the subdirectory
+# makeinfo even if only the Makefile is there, because Texinfo builds its
+# manual when made, and it requires its own version.
+CONFIGURED_MAKEINFO = @CONFIGURED_MAKEINFO@
+MAKEINFO = `if [ -f $$r/$(BUILD_SUBDIR)/texinfo/makeinfo/Makefile ] ; \
+       then echo $$r/$(BUILD_SUBDIR)/texinfo/makeinfo/makeinfo ; \
+       else if (${CONFIGURED_MAKEINFO} --version \
           | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[2-9]|[5-9])') >/dev/null 2>&1; \
-        then echo makeinfo; else echo $$s/missing makeinfo; fi; fi`
+        then echo ${CONFIGURED_MAKEINFO}; else echo $$s/missing makeinfo; fi; fi`
  
  # This just becomes part of the MAKEINFO definition passed down to
  # sub-makes.  It lets flags be given on the command line while still
@@ -280,8 +288,9 @@ USUAL_MAKEINFO = `if [ -f $$r/texinfo/makeinfo/makeinfo ] ; \
  # (Default to avoid splitting info files by setting the threshold high.)
  MAKEINFOFLAGS = --split-size=5000000
  
-EXPECT = `if [ -f $$r/expect/expect ] ; \
-       then echo $$r/expect/expect ; \
+# FIXME: expect may become a build tool?
+EXPECT = `if [ -f $$r/$(HOST_SUBDIR)/expect/expect ] ; \
+       then echo $$r/$(HOST_SUBDIR)/expect/expect ; \
         else echo expect ; fi`
  
  RUNTEST = `if [ -f $$s/dejagnu/runtest ] ; \
@@ -292,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/bfd:$$r/opcodes
-
  AS = @AS@
  
  AR = @AR@
@@ -326,17 +331,13 @@ 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@
  CONFIGURED_AR_FOR_TARGET=@CONFIGURED_AR_FOR_TARGET@
  USUAL_AR_FOR_TARGET = ` \
-  if [ -f $$r/binutils/ar ] ; then \
-    echo $$r/binutils/ar ; \
+  if [ -f $$r/$(HOST_SUBDIR)/binutils/ar ] ; then \
+    echo $$r/$(HOST_SUBDIR)/binutils/ar ; \
    else \
      if [ '$(host)' = '$(target)' ] ; then \
        echo $(AR); \
@@ -348,9 +349,9 @@ USUAL_AR_FOR_TARGET = ` \
  AS_FOR_TARGET=@AS_FOR_TARGET@
  CONFIGURED_AS_FOR_TARGET=@CONFIGURED_AS_FOR_TARGET@
  USUAL_AS_FOR_TARGET = ` \
-  if [ -f $$r/gas/as-new ] ; then \
-    echo $$r/gas/as-new ; \
-  elif [ -f $$r/gcc/xgcc ]; then \
+  if [ -f $$r/$(HOST_SUBDIR)/gas/as-new ] ; then \
+    echo $$r/$(HOST_SUBDIR)/gas/as-new ; \
+  elif [ -f $$r/$(HOST_SUBDIR)/gcc/xgcc ]; then \
      $(CC_FOR_TARGET) -print-prog-name=as ; \
    else \
      if [ '$(host)' = '$(target)' ] ; then \
@@ -371,7 +372,8 @@ CFLAGS_FOR_TARGET = -O2 $(CFLAGS)
  # build libgcc2.a.  We define it here so that it can itself be
  # overridden on the command line.
  GCC_FOR_TARGET=@GCC_FOR_TARGET@
-USUAL_GCC_FOR_TARGET = $(STAGE_CC_WRAPPER) $$r/gcc/xgcc -B$$r/gcc/ $(FLAGS_FOR_TARGET)
+USUAL_GCC_FOR_TARGET = $(STAGE_CC_WRAPPER) \
+  $$r/$(HOST_SUBDIR)/gcc/xgcc -B$$r/$(HOST_SUBDIR)/gcc/ $(FLAGS_FOR_TARGET)
  LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET)
  
  CXX_FOR_TARGET = @CXX_FOR_TARGET@
@@ -384,8 +386,8 @@ LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates
  DLLTOOL_FOR_TARGET=@DLLTOOL_FOR_TARGET@
  CONFIGURED_DLLTOOL_FOR_TARGET=@CONFIGURED_DLLTOOL_FOR_TARGET@
  USUAL_DLLTOOL_FOR_TARGET = ` \
-  if [ -f $$r/binutils/dlltool ] ; then \
-    echo $$r/binutils/dlltool ; \
+  if [ -f $$r/$(HOST_SUBDIR)/binutils/dlltool ] ; then \
+    echo $$r/$(HOST_SUBDIR)/binutils/dlltool ; \
    else \
      if [ '$(host)' = '$(target)' ] ; then \
        echo $(DLLTOOL); \
@@ -400,9 +402,9 @@ GFORTRAN_FOR_TARGET = @GFORTRAN_FOR_TARGET@
  LD_FOR_TARGET=@LD_FOR_TARGET@
  CONFIGURED_LD_FOR_TARGET=@CONFIGURED_LD_FOR_TARGET@
  USUAL_LD_FOR_TARGET = ` \
-  if [ -f $$r/ld/ld-new ] ; then \
-    echo $$r/ld/ld-new ; \
-  elif [ -f $$r/gcc/xgcc ]; then \
+  if [ -f $$r/$(HOST_SUBDIR)/ld/ld-new ] ; then \
+    echo $$r/$(HOST_SUBDIR)/ld/ld-new ; \
+  elif [ -f $$r/$(HOST_SUBDIR)/gcc/xgcc ]; then \
      $(CC_FOR_TARGET) -print-prog-name=ld ; \
    else \
      if [ '$(host)' = '$(target)' ] ; then \
@@ -417,9 +419,9 @@ LDFLAGS_FOR_TARGET =
  NM_FOR_TARGET=@NM_FOR_TARGET@
  CONFIGURED_NM_FOR_TARGET=@CONFIGURED_NM_FOR_TARGET@
  USUAL_NM_FOR_TARGET = ` \
-  if [ -f $$r/binutils/nm-new ] ; then \
-    echo $$r/binutils/nm-new ; \
-  elif [ -f $$r/gcc/xgcc ]; then \
+  if [ -f $$r/$(HOST_SUBDIR)/binutils/nm-new ] ; then \
+    echo $$r/$(HOST_SUBDIR)/binutils/nm-new ; \
+  elif [ -f $$r/$(HOST_SUBDIR)/gcc/xgcc ]; then \
      $(CC_FOR_TARGET) -print-prog-name=nm ; \
    else \
      if [ '$(host)' = '$(target)' ] ; then \
@@ -432,8 +434,8 @@ USUAL_NM_FOR_TARGET = ` \
  RANLIB_FOR_TARGET=@RANLIB_FOR_TARGET@
  CONFIGURED_RANLIB_FOR_TARGET=@CONFIGURED_RANLIB_FOR_TARGET@
  USUAL_RANLIB_FOR_TARGET = ` \
-  if [ -f $$r/binutils/ranlib ] ; then \
-    echo $$r/binutils/ranlib ; \
+  if [ -f $$r/$(HOST_SUBDIR)/binutils/ranlib ] ; then \
+    echo $$r/$(HOST_SUBDIR)/binutils/ranlib ; \
    else \
      if [ '$(host)' = '$(target)' ] ; then \
        if [ x'$(RANLIB)' != x ]; then \
@@ -449,8 +451,8 @@ USUAL_RANLIB_FOR_TARGET = ` \
  WINDRES_FOR_TARGET=@WINDRES_FOR_TARGET@
  CONFIGURED_WINDRES_FOR_TARGET=@CONFIGURED_WINDRES_FOR_TARGET@
  USUAL_WINDRES_FOR_TARGET = ` \
-  if [ -f $$r/binutils/windres ] ; then \
-    echo $$r/binutils/windres ; \
+  if [ -f $$r/$(HOST_SUBDIR)/binutils/windres ] ; then \
+    echo $$r/$(HOST_SUBDIR)/binutils/windres ; \
    else \
      if [ '$(host)' = '$(target)' ] ; then \
        echo $(WINDRES); \
@@ -467,8 +469,7 @@ PICFLAG_FOR_TARGET =
  
  # The first rule in the file had better be this one.  Don't put any above it.
  # This lives here to allow makefile fragments to contain dependencies.
-all: all.normal
-.PHONY: all
+@default_target@:
  
  #### host and target specific makefile fragments come in here.
  @target_makefile_frag@
@@ -477,6 +478,41 @@ all: all.normal
  @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)" \
@@ -490,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)" \
@@ -501,14 +535,12 @@ 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)" \
         "CXX_FOR_BUILD=$(CXX_FOR_BUILD)" \
         "EXPECT=$(EXPECT)" \
+       "FLEX=$(FLEX)" \
         "INSTALL=$(INSTALL)" \
         "INSTALL_DATA=$(INSTALL_DATA)" \
         "INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \
@@ -530,6 +562,7 @@ BASE_FLAGS_TO_PASS = \
         "AS_FOR_TARGET=$(AS_FOR_TARGET)" \
         "CC_FOR_TARGET=$(CC_FOR_TARGET)" \
         "CFLAGS_FOR_TARGET=$(CFLAGS_FOR_TARGET)" \
+       "CPPFLAGS_FOR_TARGET=$(CPPFLAGS_FOR_TARGET)" \
         "CXX_FOR_TARGET=$(CXX_FOR_TARGET)" \
         "CXXFLAGS_FOR_TARGET=$(CXXFLAGS_FOR_TARGET)" \
         "DLLTOOL_FOR_TARGET=$(DLLTOOL_FOR_TARGET)" \
@@ -553,6 +586,8 @@ RECURSE_FLAGS = \
         CXX_FOR_TARGET='$(CXX_FOR_TARGET_FOR_RECURSIVE_MAKE)' \
         RAW_CXX_FOR_TARGET='$(RAW_CXX_FOR_TARGET_FOR_RECURSIVE_MAKE)' \
  
+RECURSE_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(RECURSE_FLAGS)
+
  # Flags to pass down to most sub-makes, in which we're building with
  # the host environment.
  EXTRA_HOST_FLAGS = \
@@ -624,7 +659,7 @@ EXTRA_GCC_FLAGS = \
  GCC_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS)
  
  .PHONY: configure-host
-configure-host: maybe-configure-gcc  \
+configure-host:  \
      maybe-configure-ash \
      maybe-configure-autoconf \
      maybe-configure-automake \
@@ -643,8 +678,10 @@ configure-host: maybe-configure-gcc  \
      maybe-configure-fileutils \
      maybe-configure-findutils \
      maybe-configure-find \
+    maybe-configure-fixincludes \
      maybe-configure-flex \
      maybe-configure-gas \
+    maybe-configure-gcc \
      maybe-configure-gawk \
      maybe-configure-gettext \
      maybe-configure-gnuserv \
@@ -658,7 +695,6 @@ configure-host: maybe-configure-gcc  \
      maybe-configure-ld \
      maybe-configure-libcpp \
      maybe-configure-libgui \
-    maybe-configure-libbanshee \
      maybe-configure-libiberty \
      maybe-configure-libtool \
      maybe-configure-m4 \
@@ -688,9 +724,9 @@ configure-host: maybe-configure-gcc  \
      maybe-configure-expect \
      maybe-configure-guile \
      maybe-configure-tk \
-    maybe-configure-tix \
      maybe-configure-libtermcap \
-    maybe-configure-utils
+    maybe-configure-utils \
+    maybe-configure-gnattools
  .PHONY: configure-target
  configure-target:  \
      maybe-configure-target-libstdc++-v3 \
@@ -712,12 +748,21 @@ configure-target:  \
      maybe-configure-target-rda \
      maybe-configure-target-libada
  
-# The target built for a native build.
-.PHONY: all.normal
-all.normal: @all_build_modules@ all-host all-target
-
+# The target built for a native non-bootstrap build.
+.PHONY: all
+all: unstage all-host all-target stage
+
+.PHONY: all-build
+all-build:  \
+    maybe-all-build-libiberty \
+    maybe-all-build-bison \
+    maybe-all-build-byacc \
+    maybe-all-build-flex \
+    maybe-all-build-m4 \
+    maybe-all-build-texinfo \
+    maybe-all-build-fixincludes
  .PHONY: all-host
-all-host: maybe-all-gcc  \
+all-host:  \
      maybe-all-ash \
      maybe-all-autoconf \
      maybe-all-automake \
@@ -736,8 +781,10 @@ all-host: maybe-all-gcc  \
      maybe-all-fileutils \
      maybe-all-findutils \
      maybe-all-find \
+    maybe-all-fixincludes \
      maybe-all-flex \
      maybe-all-gas \
+    maybe-all-gcc \
      maybe-all-gawk \
      maybe-all-gettext \
      maybe-all-gnuserv \
@@ -751,7 +798,6 @@ all-host: maybe-all-gcc  \
      maybe-all-ld \
      maybe-all-libcpp \
      maybe-all-libgui \
-    maybe-all-libbanshee \
      maybe-all-libiberty \
      maybe-all-libtool \
      maybe-all-m4 \
@@ -781,9 +827,9 @@ all-host: maybe-all-gcc  \
      maybe-all-expect \
      maybe-all-guile \
      maybe-all-tk \
-    maybe-all-tix \
      maybe-all-libtermcap \
-    maybe-all-utils
+    maybe-all-utils \
+    maybe-all-gnattools
  .PHONY: all-target
  all-target:  \
      maybe-all-target-libstdc++-v3 \
@@ -811,10 +857,10 @@ all-target:  \
  # but it may do additional work as well).
  
  .PHONY: do-info
-do-info: info-host info-target
+do-info: unstage info-host info-target stage
  
  .PHONY: info-host
-info-host: maybe-info-gcc  \
+info-host:  \
      maybe-info-ash \
      maybe-info-autoconf \
      maybe-info-automake \
@@ -833,8 +879,10 @@ info-host: maybe-info-gcc  \
      maybe-info-fileutils \
      maybe-info-findutils \
      maybe-info-find \
+    maybe-info-fixincludes \
      maybe-info-flex \
      maybe-info-gas \
+    maybe-info-gcc \
      maybe-info-gawk \
      maybe-info-gettext \
      maybe-info-gnuserv \
@@ -848,7 +896,6 @@ info-host: maybe-info-gcc  \
      maybe-info-ld \
      maybe-info-libcpp \
      maybe-info-libgui \
-    maybe-info-libbanshee \
      maybe-info-libiberty \
      maybe-info-libtool \
      maybe-info-m4 \
@@ -878,9 +925,9 @@ info-host: maybe-info-gcc  \
      maybe-info-expect \
      maybe-info-guile \
      maybe-info-tk \
-    maybe-info-tix \
      maybe-info-libtermcap \
-    maybe-info-utils
+    maybe-info-utils \
+    maybe-info-gnattools
  
  .PHONY: info-target
  info-target:  \
@@ -904,10 +951,10 @@ info-target:  \
      maybe-info-target-libada
  
  .PHONY: do-dvi
-do-dvi: dvi-host dvi-target
+do-dvi: unstage dvi-host dvi-target stage
  
  .PHONY: dvi-host
-dvi-host: maybe-dvi-gcc  \
+dvi-host:  \
      maybe-dvi-ash \
      maybe-dvi-autoconf \
      maybe-dvi-automake \
@@ -926,8 +973,10 @@ dvi-host: maybe-dvi-gcc  \
      maybe-dvi-fileutils \
      maybe-dvi-findutils \
      maybe-dvi-find \
+    maybe-dvi-fixincludes \
      maybe-dvi-flex \
      maybe-dvi-gas \
+    maybe-dvi-gcc \
      maybe-dvi-gawk \
      maybe-dvi-gettext \
      maybe-dvi-gnuserv \
@@ -941,7 +990,6 @@ dvi-host: maybe-dvi-gcc  \
      maybe-dvi-ld \
      maybe-dvi-libcpp \
      maybe-dvi-libgui \
-    maybe-dvi-libbanshee \
      maybe-dvi-libiberty \
      maybe-dvi-libtool \
      maybe-dvi-m4 \
@@ -971,9 +1019,9 @@ dvi-host: maybe-dvi-gcc  \
      maybe-dvi-expect \
      maybe-dvi-guile \
      maybe-dvi-tk \
-    maybe-dvi-tix \
      maybe-dvi-libtermcap \
-    maybe-dvi-utils
+    maybe-dvi-utils \
+    maybe-dvi-gnattools
  
  .PHONY: dvi-target
  dvi-target:  \
@@ -996,11 +1044,105 @@ dvi-target:  \
      maybe-dvi-target-rda \
      maybe-dvi-target-libada
  
+.PHONY: do-html
+do-html: unstage html-host html-target stage
+
+.PHONY: html-host
+html-host:  \
+    maybe-html-ash \
+    maybe-html-autoconf \
+    maybe-html-automake \
+    maybe-html-bash \
+    maybe-html-bfd \
+    maybe-html-opcodes \
+    maybe-html-binutils \
+    maybe-html-bison \
+    maybe-html-byacc \
+    maybe-html-bzip2 \
+    maybe-html-dejagnu \
+    maybe-html-diff \
+    maybe-html-dosutils \
+    maybe-html-etc \
+    maybe-html-fastjar \
+    maybe-html-fileutils \
+    maybe-html-findutils \
+    maybe-html-find \
+    maybe-html-fixincludes \
+    maybe-html-flex \
+    maybe-html-gas \
+    maybe-html-gcc \
+    maybe-html-gawk \
+    maybe-html-gettext \
+    maybe-html-gnuserv \
+    maybe-html-gprof \
+    maybe-html-gzip \
+    maybe-html-hello \
+    maybe-html-indent \
+    maybe-html-intl \
+    maybe-html-tcl \
+    maybe-html-itcl \
+    maybe-html-ld \
+    maybe-html-libcpp \
+    maybe-html-libgui \
+    maybe-html-libiberty \
+    maybe-html-libtool \
+    maybe-html-m4 \
+    maybe-html-make \
+    maybe-html-mmalloc \
+    maybe-html-patch \
+    maybe-html-perl \
+    maybe-html-prms \
+    maybe-html-rcs \
+    maybe-html-readline \
+    maybe-html-release \
+    maybe-html-recode \
+    maybe-html-sed \
+    maybe-html-send-pr \
+    maybe-html-shellutils \
+    maybe-html-sid \
+    maybe-html-sim \
+    maybe-html-tar \
+    maybe-html-texinfo \
+    maybe-html-textutils \
+    maybe-html-time \
+    maybe-html-uudecode \
+    maybe-html-wdiff \
+    maybe-html-zip \
+    maybe-html-zlib \
+    maybe-html-gdb \
+    maybe-html-expect \
+    maybe-html-guile \
+    maybe-html-tk \
+    maybe-html-libtermcap \
+    maybe-html-utils \
+    maybe-html-gnattools
+
+.PHONY: html-target
+html-target:  \
+    maybe-html-target-libstdc++-v3 \
+    maybe-html-target-libmudflap \
+    maybe-html-target-newlib \
+    maybe-html-target-libgfortran \
+    maybe-html-target-libobjc \
+    maybe-html-target-libtermcap \
+    maybe-html-target-winsup \
+    maybe-html-target-libgloss \
+    maybe-html-target-libiberty \
+    maybe-html-target-gperf \
+    maybe-html-target-examples \
+    maybe-html-target-libffi \
+    maybe-html-target-libjava \
+    maybe-html-target-zlib \
+    maybe-html-target-boehm-gc \
+    maybe-html-target-qthreads \
+    maybe-html-target-rda \
+    maybe-html-target-libada
+
  .PHONY: do-TAGS
-do-TAGS: TAGS-host TAGS-target
+do-TAGS: unstage TAGS-host TAGS-target stage
  
  .PHONY: TAGS-host
-TAGS-host: maybe-TAGS-gcc  \
+TAGS-host:  \
      maybe-TAGS-ash \
      maybe-TAGS-autoconf \
      maybe-TAGS-automake \
@@ -1019,8 +1161,10 @@ TAGS-host: maybe-TAGS-gcc  \
      maybe-TAGS-fileutils \
      maybe-TAGS-findutils \
      maybe-TAGS-find \
+    maybe-TAGS-fixincludes \
      maybe-TAGS-flex \
      maybe-TAGS-gas \
+    maybe-TAGS-gcc \
      maybe-TAGS-gawk \
      maybe-TAGS-gettext \
      maybe-TAGS-gnuserv \
@@ -1034,7 +1178,6 @@ TAGS-host: maybe-TAGS-gcc  \
      maybe-TAGS-ld \
      maybe-TAGS-libcpp \
      maybe-TAGS-libgui \
-    maybe-TAGS-libbanshee \
      maybe-TAGS-libiberty \
      maybe-TAGS-libtool \
      maybe-TAGS-m4 \
@@ -1064,9 +1207,9 @@ TAGS-host: maybe-TAGS-gcc  \
      maybe-TAGS-expect \
      maybe-TAGS-guile \
      maybe-TAGS-tk \
-    maybe-TAGS-tix \
      maybe-TAGS-libtermcap \
-    maybe-TAGS-utils
+    maybe-TAGS-utils \
+    maybe-TAGS-gnattools
  
  .PHONY: TAGS-target
  TAGS-target:  \
@@ -1090,10 +1233,10 @@ TAGS-target:  \
      maybe-TAGS-target-libada
  
  .PHONY: do-install-info
-do-install-info: install-info-host install-info-target
+do-install-info: unstage install-info-host install-info-target stage
  
  .PHONY: install-info-host
-install-info-host: maybe-install-info-gcc  \
+install-info-host:  \
      maybe-install-info-ash \
      maybe-install-info-autoconf \
      maybe-install-info-automake \
@@ -1112,8 +1255,10 @@ install-info-host: maybe-install-info-gcc  \
      maybe-install-info-fileutils \
      maybe-install-info-findutils \
      maybe-install-info-find \
+    maybe-install-info-fixincludes \
      maybe-install-info-flex \
      maybe-install-info-gas \
+    maybe-install-info-gcc \
      maybe-install-info-gawk \
      maybe-install-info-gettext \
      maybe-install-info-gnuserv \
@@ -1127,7 +1272,6 @@ install-info-host: maybe-install-info-gcc  \
      maybe-install-info-ld \
      maybe-install-info-libcpp \
      maybe-install-info-libgui \
-    maybe-install-info-libbanshee \
      maybe-install-info-libiberty \
      maybe-install-info-libtool \
      maybe-install-info-m4 \
@@ -1157,9 +1301,9 @@ install-info-host: maybe-install-info-gcc  \
      maybe-install-info-expect \
      maybe-install-info-guile \
      maybe-install-info-tk \
-    maybe-install-info-tix \
      maybe-install-info-libtermcap \
-    maybe-install-info-utils
+    maybe-install-info-utils \
+    maybe-install-info-gnattools
  
  .PHONY: install-info-target
  install-info-target:  \
@@ -1183,10 +1327,10 @@ install-info-target:  \
      maybe-install-info-target-libada
  
  .PHONY: do-installcheck
-do-installcheck: installcheck-host installcheck-target
+do-installcheck: unstage installcheck-host installcheck-target stage
  
  .PHONY: installcheck-host
-installcheck-host: maybe-installcheck-gcc  \
+installcheck-host:  \
      maybe-installcheck-ash \
      maybe-installcheck-autoconf \
      maybe-installcheck-automake \
@@ -1205,8 +1349,10 @@ installcheck-host: maybe-installcheck-gcc  \
      maybe-installcheck-fileutils \
      maybe-installcheck-findutils \
      maybe-installcheck-find \
+    maybe-installcheck-fixincludes \
      maybe-installcheck-flex \
      maybe-installcheck-gas \
+    maybe-installcheck-gcc \
      maybe-installcheck-gawk \
      maybe-installcheck-gettext \
      maybe-installcheck-gnuserv \
@@ -1220,7 +1366,6 @@ installcheck-host: maybe-installcheck-gcc  \
      maybe-installcheck-ld \
      maybe-installcheck-libcpp \
      maybe-installcheck-libgui \
-    maybe-installcheck-libbanshee \
      maybe-installcheck-libiberty \
      maybe-installcheck-libtool \
      maybe-installcheck-m4 \
@@ -1250,9 +1395,9 @@ installcheck-host: maybe-installcheck-gcc  \
      maybe-installcheck-expect \
      maybe-installcheck-guile \
      maybe-installcheck-tk \
-    maybe-installcheck-tix \
      maybe-installcheck-libtermcap \
-    maybe-installcheck-utils
+    maybe-installcheck-utils \
+    maybe-installcheck-gnattools
  
  .PHONY: installcheck-target
  installcheck-target:  \
@@ -1276,10 +1421,10 @@ installcheck-target:  \
      maybe-installcheck-target-libada
  
  .PHONY: do-mostlyclean
-do-mostlyclean: mostlyclean-host mostlyclean-target
+do-mostlyclean: unstage mostlyclean-host mostlyclean-target stage
  
  .PHONY: mostlyclean-host
-mostlyclean-host: maybe-mostlyclean-gcc  \
+mostlyclean-host:  \
      maybe-mostlyclean-ash \
      maybe-mostlyclean-autoconf \
      maybe-mostlyclean-automake \
@@ -1298,8 +1443,10 @@ mostlyclean-host: maybe-mostlyclean-gcc  \
      maybe-mostlyclean-fileutils \
      maybe-mostlyclean-findutils \
      maybe-mostlyclean-find \
+    maybe-mostlyclean-fixincludes \
      maybe-mostlyclean-flex \
      maybe-mostlyclean-gas \
+    maybe-mostlyclean-gcc \
      maybe-mostlyclean-gawk \
      maybe-mostlyclean-gettext \
      maybe-mostlyclean-gnuserv \
@@ -1313,7 +1460,6 @@ mostlyclean-host: maybe-mostlyclean-gcc  \
      maybe-mostlyclean-ld \
      maybe-mostlyclean-libcpp \
      maybe-mostlyclean-libgui \
-    maybe-mostlyclean-libbanshee \
      maybe-mostlyclean-libiberty \
      maybe-mostlyclean-libtool \
      maybe-mostlyclean-m4 \
@@ -1343,9 +1489,9 @@ mostlyclean-host: maybe-mostlyclean-gcc  \
      maybe-mostlyclean-expect \
      maybe-mostlyclean-guile \
      maybe-mostlyclean-tk \
-    maybe-mostlyclean-tix \
      maybe-mostlyclean-libtermcap \
-    maybe-mostlyclean-utils
+    maybe-mostlyclean-utils \
+    maybe-mostlyclean-gnattools
  
  .PHONY: mostlyclean-target
  mostlyclean-target:  \
@@ -1369,10 +1515,10 @@ mostlyclean-target:  \
      maybe-mostlyclean-target-libada
  
  .PHONY: do-clean
-do-clean: clean-host clean-target
+do-clean: unstage clean-host clean-target stage
  
  .PHONY: clean-host
-clean-host: maybe-clean-gcc  \
+clean-host:  \
      maybe-clean-ash \
      maybe-clean-autoconf \
      maybe-clean-automake \
@@ -1391,8 +1537,10 @@ clean-host: maybe-clean-gcc  \
      maybe-clean-fileutils \
      maybe-clean-findutils \
      maybe-clean-find \
+    maybe-clean-fixincludes \
      maybe-clean-flex \
      maybe-clean-gas \
+    maybe-clean-gcc \
      maybe-clean-gawk \
      maybe-clean-gettext \
      maybe-clean-gnuserv \
@@ -1406,7 +1554,6 @@ clean-host: maybe-clean-gcc  \
      maybe-clean-ld \
      maybe-clean-libcpp \
      maybe-clean-libgui \
-    maybe-clean-libbanshee \
      maybe-clean-libiberty \
      maybe-clean-libtool \
      maybe-clean-m4 \
@@ -1436,9 +1583,9 @@ clean-host: maybe-clean-gcc  \
      maybe-clean-expect \
      maybe-clean-guile \
      maybe-clean-tk \
-    maybe-clean-tix \
      maybe-clean-libtermcap \
-    maybe-clean-utils
+    maybe-clean-utils \
+    maybe-clean-gnattools
  
  .PHONY: clean-target
  clean-target:  \
@@ -1462,10 +1609,10 @@ clean-target:  \
      maybe-clean-target-libada
  
  .PHONY: do-distclean
-do-distclean: distclean-host distclean-target
+do-distclean: unstage distclean-host distclean-target stage
  
  .PHONY: distclean-host
-distclean-host: maybe-distclean-gcc  \
+distclean-host:  \
      maybe-distclean-ash \
      maybe-distclean-autoconf \
      maybe-distclean-automake \
@@ -1484,8 +1631,10 @@ distclean-host: maybe-distclean-gcc  \
      maybe-distclean-fileutils \
      maybe-distclean-findutils \
      maybe-distclean-find \
+    maybe-distclean-fixincludes \
      maybe-distclean-flex \
      maybe-distclean-gas \
+    maybe-distclean-gcc \
      maybe-distclean-gawk \
      maybe-distclean-gettext \
      maybe-distclean-gnuserv \
@@ -1499,7 +1648,6 @@ distclean-host: maybe-distclean-gcc  \
      maybe-distclean-ld \
      maybe-distclean-libcpp \
      maybe-distclean-libgui \
-    maybe-distclean-libbanshee \
      maybe-distclean-libiberty \
      maybe-distclean-libtool \
      maybe-distclean-m4 \
@@ -1529,9 +1677,9 @@ distclean-host: maybe-distclean-gcc  \
      maybe-distclean-expect \
      maybe-distclean-guile \
      maybe-distclean-tk \
-    maybe-distclean-tix \
      maybe-distclean-libtermcap \
-    maybe-distclean-utils
+    maybe-distclean-utils \
+    maybe-distclean-gnattools
  
  .PHONY: distclean-target
  distclean-target:  \
@@ -1555,10 +1703,10 @@ distclean-target:  \
      maybe-distclean-target-libada
  
  .PHONY: do-maintainer-clean
-do-maintainer-clean: maintainer-clean-host maintainer-clean-target
+do-maintainer-clean: unstage maintainer-clean-host maintainer-clean-target stage
  
  .PHONY: maintainer-clean-host
-maintainer-clean-host: maybe-maintainer-clean-gcc  \
+maintainer-clean-host:  \
      maybe-maintainer-clean-ash \
      maybe-maintainer-clean-autoconf \
      maybe-maintainer-clean-automake \
@@ -1577,8 +1725,10 @@ maintainer-clean-host: maybe-maintainer-clean-gcc  \
      maybe-maintainer-clean-fileutils \
      maybe-maintainer-clean-findutils \
      maybe-maintainer-clean-find \
+    maybe-maintainer-clean-fixincludes \
      maybe-maintainer-clean-flex \
      maybe-maintainer-clean-gas \
+    maybe-maintainer-clean-gcc \
      maybe-maintainer-clean-gawk \
      maybe-maintainer-clean-gettext \
      maybe-maintainer-clean-gnuserv \
@@ -1592,7 +1742,6 @@ maintainer-clean-host: maybe-maintainer-clean-gcc  \
      maybe-maintainer-clean-ld \
      maybe-maintainer-clean-libcpp \
      maybe-maintainer-clean-libgui \
-    maybe-maintainer-clean-libbanshee \
      maybe-maintainer-clean-libiberty \
      maybe-maintainer-clean-libtool \
      maybe-maintainer-clean-m4 \
@@ -1622,9 +1771,9 @@ maintainer-clean-host: maybe-maintainer-clean-gcc  \
      maybe-maintainer-clean-expect \
      maybe-maintainer-clean-guile \
      maybe-maintainer-clean-tk \
-    maybe-maintainer-clean-tix \
      maybe-maintainer-clean-libtermcap \
-    maybe-maintainer-clean-utils
+    maybe-maintainer-clean-utils \
+    maybe-maintainer-clean-gnattools
  
  .PHONY: maintainer-clean-target
  maintainer-clean-target:  \
@@ -1650,12 +1799,13 @@ maintainer-clean-target:  \
  
  # Here are the targets which correspond to the do-X targets.
  
-.PHONY: info installcheck dvi install-info
+.PHONY: info installcheck dvi html install-info
  .PHONY: clean distclean mostlyclean maintainer-clean realclean
  .PHONY: local-clean local-distclean local-maintainer-clean
  info: do-info
  installcheck: do-installcheck
  dvi: do-dvi
+html: do-html
  
  # Make sure makeinfo is built before we do a `make info', if we're
  # in fact building texinfo.
@@ -1677,6 +1827,9 @@ local-distclean:
           rm -rf $(TARGET_SUBDIR); \
         else true; fi
         -rm -rf $(BUILD_SUBDIR)
+       -if [ "$(HOST_SUBDIR)" != "." ]; then \
+         rm -rf $(HOST_SUBDIR); \
+       else true; fi
         -rm -f texinfo/po/Makefile texinfo/po/Makefile.in texinfo/info/Makefile
         -rm -f texinfo/doc/Makefile texinfo/po/POTFILES
         -rmdir texinfo/doc texinfo/info texinfo/intl texinfo/lib 2>/dev/null
@@ -1701,6 +1854,7 @@ clean-target-libgcc:
         (cd gcc/libgcc && find . -type d -print) | \
         while read d; do rm -f gcc/$$d/libgcc.a || : ; done
         -rm -rf gcc/libgcc
+       -rm -f gcc/stmp-dirs
  
  # Check target.
  
@@ -1708,7 +1862,7 @@ clean-target-libgcc:
  check: do-check
  
  # Only include modules actually being configured and built.
-do-check: maybe-check-gcc  \
+do-check: unstage  \
      maybe-check-ash \
      maybe-check-autoconf \
      maybe-check-automake \
@@ -1727,8 +1881,10 @@ do-check: maybe-check-gcc  \
      maybe-check-fileutils \
      maybe-check-findutils \
      maybe-check-find \
+    maybe-check-fixincludes \
      maybe-check-flex \
      maybe-check-gas \
+    maybe-check-gcc \
      maybe-check-gawk \
      maybe-check-gettext \
      maybe-check-gnuserv \
@@ -1742,7 +1898,6 @@ do-check: maybe-check-gcc  \
      maybe-check-ld \
      maybe-check-libcpp \
      maybe-check-libgui \
-    maybe-check-libbanshee \
      maybe-check-libiberty \
      maybe-check-libtool \
      maybe-check-m4 \
@@ -1772,9 +1927,9 @@ do-check: maybe-check-gcc  \
      maybe-check-expect \
      maybe-check-guile \
      maybe-check-tk \
-    maybe-check-tix \
      maybe-check-libtermcap \
      maybe-check-utils \
+    maybe-check-gnattools \
      maybe-check-target-libstdc++-v3 \
      maybe-check-target-libmudflap \
      maybe-check-target-newlib \
@@ -1792,7 +1947,7 @@ do-check: maybe-check-gcc  \
      maybe-check-target-boehm-gc \
      maybe-check-target-qthreads \
      maybe-check-target-rda \
-    maybe-check-target-libada
+    maybe-check-target-libada stage
  
  # Automated reporting of test results.
  
@@ -1840,6 +1995,7 @@ install-host-nogcc:  \
      maybe-install-fileutils \
      maybe-install-findutils \
      maybe-install-find \
+    maybe-install-fixincludes \
      maybe-install-flex \
      maybe-install-gas \
      maybe-install-gawk \
@@ -1855,7 +2011,6 @@ install-host-nogcc:  \
      maybe-install-ld \
      maybe-install-libcpp \
      maybe-install-libgui \
-    maybe-install-libbanshee \
      maybe-install-libiberty \
      maybe-install-libtool \
      maybe-install-m4 \
@@ -1885,12 +2040,12 @@ install-host-nogcc:  \
      maybe-install-expect \
      maybe-install-guile \
      maybe-install-tk \
-    maybe-install-tix \
      maybe-install-libtermcap \
-    maybe-install-utils
+    maybe-install-utils \
+    maybe-install-gnattools
  
  .PHONY: install-host
-install-host: maybe-install-gcc  \
+install-host:  \
      maybe-install-ash \
      maybe-install-autoconf \
      maybe-install-automake \
@@ -1909,8 +2064,10 @@ install-host: maybe-install-gcc  \
      maybe-install-fileutils \
      maybe-install-findutils \
      maybe-install-find \
+    maybe-install-fixincludes \
      maybe-install-flex \
      maybe-install-gas \
+    maybe-install-gcc \
      maybe-install-gawk \
      maybe-install-gettext \
      maybe-install-gnuserv \
@@ -1924,7 +2081,6 @@ install-host: maybe-install-gcc  \
      maybe-install-ld \
      maybe-install-libcpp \
      maybe-install-libgui \
-    maybe-install-libbanshee \
      maybe-install-libiberty \
      maybe-install-libtool \
      maybe-install-m4 \
@@ -1954,9 +2110,9 @@ install-host: maybe-install-gcc  \
      maybe-install-expect \
      maybe-install-guile \
      maybe-install-tk \
-    maybe-install-tix \
      maybe-install-libtermcap \
-    maybe-install-utils
+    maybe-install-utils \
+    maybe-install-gnattools
  
  .PHONY: install-target
  install-target:  \
@@ -1986,8 +2142,7 @@ uninstall:
  install.all: install-no-fixedincludes
         @if [ -f ./gcc/Makefile ] ; then \
                 r=`${PWD_COMMAND}` ; export r ; \
-               $(SET_LIB_PATH) \
-               $(GCC_HOST_EXPORTS) \
+               $(HOST_EXPORTS) \
                 (cd ./gcc && \
                 $(MAKE) $(FLAGS_TO_PASS) install-headers) ; \
         else \
@@ -2030,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; \
@@ -2047,164 +2211,332 @@ configure-build-libiberty:
         echo Configuring in $(BUILD_SUBDIR)/libiberty; \
         cd "$(BUILD_SUBDIR)/libiberty" || exit 1; \
         case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) \
-           topdir=$(srcdir) ;; \
-         *) \
-           case "$(BUILD_SUBDIR)" in \
-             .) topdir="../$(srcdir)" ;; \
-             *) topdir="../../$(srcdir)" ;; \
-           esac ;; \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(BUILD_SUBDIR)/libiberty/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       if [ "$(srcdir)" = "." ] ; then \
-         if [ "$(BUILD_SUBDIR)" != "." ] ; then \
-           if $(SHELL) $$s/symlink-tree $${topdir}/libiberty "no-such-file" ; then \
-             if [ -f Makefile ]; then \
-               if $(MAKE) distclean; then \
-                 true; \
-               else \
-                 exit 1; \
-               fi; \
-             else \
-               true; \
-             fi; \
-           else \
-             exit 1; \
-           fi; \
-         else \
-           true; \
-         fi; \
-         srcdiroption="--srcdir=."; \
-         libsrcdir="."; \
-       else \
-         srcdiroption="--srcdir=$${topdir}/libiberty"; \
-         libsrcdir="$$s/libiberty"; \
-       fi; \
+       srcdiroption="--srcdir=$${topdir}/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
+TARGET-build-libiberty=all
  maybe-all-build-libiberty: all-build-libiberty
  all-build-libiberty: configure-build-libiberty
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(BUILD_EXPORTS) \
-       (cd $(BUILD_SUBDIR)/libiberty && $(MAKE) all)
+       (cd $(BUILD_SUBDIR)/libiberty && \
+         $(MAKE)   $(TARGET-build-libiberty))
  @endif build-libiberty
  
-.PHONY: configure-build-libbanshee maybe-configure-build-libbanshee
-maybe-configure-build-libbanshee:
-@if build-libbanshee
-maybe-configure-build-libbanshee: configure-build-libbanshee
-configure-build-libbanshee:
-       @test ! -f $(BUILD_SUBDIR)/libbanshee/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/libbanshee ; \
+
+
+.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: 
+       @test ! -f $(BUILD_SUBDIR)/bison/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/bison ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(BUILD_EXPORTS) \
-       echo Configuring in $(BUILD_SUBDIR)/libbanshee; \
-       cd "$(BUILD_SUBDIR)/libbanshee" || exit 1; \
+       echo Configuring in $(BUILD_SUBDIR)/bison; \
+       cd "$(BUILD_SUBDIR)/bison" || exit 1; \
         case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) \
-           topdir=$(srcdir) ;; \
-         *) \
-           case "$(BUILD_SUBDIR)" in \
-             .) topdir="../$(srcdir)" ;; \
-             *) topdir="../../$(srcdir)" ;; \
-           esac ;; \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(BUILD_SUBDIR)/bison/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       if [ "$(srcdir)" = "." ] ; then \
-         if [ "$(BUILD_SUBDIR)" != "." ] ; then \
-           if $(SHELL) $$s/symlink-tree $${topdir}/libbanshee "no-such-file" ; then \
-             if [ -f Makefile ]; then \
-               if $(MAKE) distclean; then \
-                 true; \
-               else \
-                 exit 1; \
-               fi; \
-             else \
-               true; \
-             fi; \
-           else \
-             exit 1; \
-           fi; \
-         else \
-           true; \
-         fi; \
-         srcdiroption="--srcdir=."; \
-         libsrcdir="."; \
-       else \
-         srcdiroption="--srcdir=$${topdir}/libbanshee"; \
-         libsrcdir="$$s/libbanshee"; \
-       fi; \
+       srcdiroption="--srcdir=$${topdir}/bison"; \
+       libsrcdir="$$s/bison"; \
+       rm -f no-such-file || : ; \
+       CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+         $(BUILD_CONFIGARGS) $${srcdiroption}  \
+         || exit 1
+@endif build-bison
+
+
+
+.PHONY: all-build-bison maybe-all-build-bison
+maybe-all-build-bison:
+@if build-bison
+TARGET-build-bison=all
+maybe-all-build-bison: all-build-bison
+all-build-bison: configure-build-bison
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(BUILD_EXPORTS) \
+       (cd $(BUILD_SUBDIR)/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: 
+       @test ! -f $(BUILD_SUBDIR)/byacc/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/byacc ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(BUILD_EXPORTS) \
+       echo Configuring in $(BUILD_SUBDIR)/byacc; \
+       cd "$(BUILD_SUBDIR)/byacc" || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(BUILD_SUBDIR)/byacc/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/byacc"; \
+       libsrcdir="$$s/byacc"; \
+       rm -f no-such-file || : ; \
+       CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+         $(BUILD_CONFIGARGS) $${srcdiroption}  \
+         || exit 1
+@endif build-byacc
+
+
+
+.PHONY: all-build-byacc maybe-all-build-byacc
+maybe-all-build-byacc:
+@if build-byacc
+TARGET-build-byacc=all
+maybe-all-build-byacc: all-build-byacc
+all-build-byacc: configure-build-byacc
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(BUILD_EXPORTS) \
+       (cd $(BUILD_SUBDIR)/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: 
+       @test ! -f $(BUILD_SUBDIR)/flex/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/flex ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(BUILD_EXPORTS) \
+       echo Configuring in $(BUILD_SUBDIR)/flex; \
+       cd "$(BUILD_SUBDIR)/flex" || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(BUILD_SUBDIR)/flex/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/flex"; \
+       libsrcdir="$$s/flex"; \
+       rm -f no-such-file || : ; \
+       CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+         $(BUILD_CONFIGARGS) $${srcdiroption}  \
+         || exit 1
+@endif build-flex
+
+
+
+.PHONY: all-build-flex maybe-all-build-flex
+maybe-all-build-flex:
+@if build-flex
+TARGET-build-flex=all
+maybe-all-build-flex: all-build-flex
+all-build-flex: configure-build-flex
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(BUILD_EXPORTS) \
+       (cd $(BUILD_SUBDIR)/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: 
+       @test ! -f $(BUILD_SUBDIR)/m4/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/m4 ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(BUILD_EXPORTS) \
+       echo Configuring in $(BUILD_SUBDIR)/m4; \
+       cd "$(BUILD_SUBDIR)/m4" || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(BUILD_SUBDIR)/m4/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/m4"; \
+       libsrcdir="$$s/m4"; \
+       rm -f no-such-file || : ; \
+       CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+         $(BUILD_CONFIGARGS) $${srcdiroption}  \
+         || exit 1
+@endif build-m4
+
+
+
+.PHONY: all-build-m4 maybe-all-build-m4
+maybe-all-build-m4:
+@if build-m4
+TARGET-build-m4=all
+maybe-all-build-m4: all-build-m4
+all-build-m4: configure-build-m4
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(BUILD_EXPORTS) \
+       (cd $(BUILD_SUBDIR)/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: 
+       @test ! -f $(BUILD_SUBDIR)/texinfo/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/texinfo ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(BUILD_EXPORTS) \
+       echo Configuring in $(BUILD_SUBDIR)/texinfo; \
+       cd "$(BUILD_SUBDIR)/texinfo" || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(BUILD_SUBDIR)/texinfo/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/texinfo"; \
+       libsrcdir="$$s/texinfo"; \
+       rm -f no-such-file || : ; \
+       CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+         $(BUILD_CONFIGARGS) $${srcdiroption}  \
+         || exit 1
+@endif build-texinfo
+
+
+
+.PHONY: all-build-texinfo maybe-all-build-texinfo
+maybe-all-build-texinfo:
+@if build-texinfo
+TARGET-build-texinfo=all
+maybe-all-build-texinfo: all-build-texinfo
+all-build-texinfo: configure-build-texinfo
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(BUILD_EXPORTS) \
+       (cd $(BUILD_SUBDIR)/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: 
+       @test ! -f $(BUILD_SUBDIR)/fixincludes/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/fixincludes ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(BUILD_EXPORTS) \
+       echo Configuring in $(BUILD_SUBDIR)/fixincludes; \
+       cd "$(BUILD_SUBDIR)/fixincludes" || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(BUILD_SUBDIR)/fixincludes/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/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-libbanshee
+@endif build-fixincludes
  
-.PHONY: all-build-libbanshee maybe-all-build-libbanshee
-maybe-all-build-libbanshee:
-@if build-libbanshee
-maybe-all-build-libbanshee: all-build-libbanshee
-all-build-libbanshee: configure-build-libbanshee
+
+
+.PHONY: all-build-fixincludes maybe-all-build-fixincludes
+maybe-all-build-fixincludes:
+@if build-fixincludes
+TARGET-build-fixincludes=all
+maybe-all-build-fixincludes: all-build-fixincludes
+all-build-fixincludes: configure-build-fixincludes
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(BUILD_EXPORTS) \
-       (cd $(BUILD_SUBDIR)/libbanshee && $(MAKE) all)
-@endif build-libbanshee
+       (cd $(BUILD_SUBDIR)/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:
-       @test ! -f ash/Makefile || exit 0; \
-       [ -d ash ] || mkdir 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 ash || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/ash; \
+       cd "$(HOST_SUBDIR)/ash" || exit 1; \
         case $(srcdir) in \
-         \.) \
-           srcdiroption="--srcdir=."; \
-           libsrcdir=".";; \
-         /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/ash"; \
-           libsrcdir="$$s/ash";; \
-         *) \
-           srcdiroption="--srcdir=../$(srcdir)/ash"; \
-           libsrcdir="$$s/ash";; \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/ash/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
+       srcdiroption="--srcdir=$${topdir}/ash"; \
+       libsrcdir="$$s/ash"; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
  @endif ash
  
+
+
  .PHONY: all-ash maybe-all-ash
  maybe-all-ash:
  @if ash
+TARGET-ash=all
  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 ash && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd $(HOST_SUBDIR)/ash && \
+         $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-ash))
  @endif ash
  
+
  .PHONY: check-ash maybe-check-ash
  maybe-check-ash:
  @if ash
@@ -2213,9 +2545,9 @@ 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 ash && $(MAKE) $(FLAGS_TO_PASS) check)
+       (cd $(HOST_SUBDIR)/ash && \
+         $(MAKE) $(FLAGS_TO_PASS)  check)
  
  @endif ash
  
@@ -2227,9 +2559,9 @@ maybe-install-ash: install-ash
  install-ash: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
-       (cd ash && $(MAKE) $(FLAGS_TO_PASS) install)
+       (cd $(HOST_SUBDIR)/ash && \
+         $(MAKE) $(FLAGS_TO_PASS)  install)
  
  @endif ash
  
@@ -2245,13 +2577,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing info in ash" ; \
-       (cd ash && \
+       (cd $(HOST_SUBDIR)/ash && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -2271,13 +2602,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing dvi in ash" ; \
-       (cd ash && \
+       (cd $(HOST_SUBDIR)/ash && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -2287,6 +2617,31 @@ dvi-ash: \
  
  @endif ash
  
+.PHONY: maybe-html-ash html-ash
+maybe-html-ash:
+@if ash
+maybe-html-ash: html-ash
+
+html-ash: \
+    configure-ash 
+       @[ -f ./ash/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing html in ash" ; \
+       (cd $(HOST_SUBDIR)/ash && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 html) \
+         || exit 1
+
+@endif ash
+
  .PHONY: maybe-TAGS-ash TAGS-ash
  maybe-TAGS-ash:
  @if ash
@@ -2297,13 +2652,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing TAGS in ash" ; \
-       (cd ash && \
+       (cd $(HOST_SUBDIR)/ash && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -2324,13 +2678,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing install-info in ash" ; \
-       (cd ash && \
+       (cd $(HOST_SUBDIR)/ash && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -2350,13 +2703,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing installcheck in ash" ; \
-       (cd ash && \
+       (cd $(HOST_SUBDIR)/ash && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -2375,13 +2727,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing mostlyclean in ash" ; \
-       (cd ash && \
+       (cd $(HOST_SUBDIR)/ash && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -2400,13 +2751,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing clean in ash" ; \
-       (cd ash && \
+       (cd $(HOST_SUBDIR)/ash && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -2425,13 +2775,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing distclean in ash" ; \
-       (cd ash && \
+       (cd $(HOST_SUBDIR)/ash && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -2450,13 +2799,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing maintainer-clean in ash" ; \
-       (cd ash && \
+       (cd $(HOST_SUBDIR)/ash && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -2467,46 +2815,47 @@ maintainer-clean-ash:
  @endif ash
  
  
+
  .PHONY: configure-autoconf maybe-configure-autoconf
  maybe-configure-autoconf:
  @if autoconf
  maybe-configure-autoconf: configure-autoconf
-configure-autoconf:
-       @test ! -f autoconf/Makefile || exit 0; \
-       [ -d autoconf ] || mkdir 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 autoconf || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/autoconf; \
+       cd "$(HOST_SUBDIR)/autoconf" || exit 1; \
         case $(srcdir) in \
-         \.) \
-           srcdiroption="--srcdir=."; \
-           libsrcdir=".";; \
-         /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/autoconf"; \
-           libsrcdir="$$s/autoconf";; \
-         *) \
-           srcdiroption="--srcdir=../$(srcdir)/autoconf"; \
-           libsrcdir="$$s/autoconf";; \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/autoconf/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
+       srcdiroption="--srcdir=$${topdir}/autoconf"; \
+       libsrcdir="$$s/autoconf"; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
  @endif autoconf
  
+
+
  .PHONY: all-autoconf maybe-all-autoconf
  maybe-all-autoconf:
  @if autoconf
+TARGET-autoconf=all
  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 autoconf && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd $(HOST_SUBDIR)/autoconf && \
+         $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-autoconf))
  @endif autoconf
  
+
  .PHONY: check-autoconf maybe-check-autoconf
  maybe-check-autoconf:
  @if autoconf
@@ -2515,9 +2864,9 @@ 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 autoconf && $(MAKE) $(FLAGS_TO_PASS) check)
+       (cd $(HOST_SUBDIR)/autoconf && \
+         $(MAKE) $(FLAGS_TO_PASS)  check)
  
  @endif autoconf
  
@@ -2529,9 +2878,9 @@ maybe-install-autoconf: install-autoconf
  install-autoconf: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
-       (cd autoconf && $(MAKE) $(FLAGS_TO_PASS) install)
+       (cd $(HOST_SUBDIR)/autoconf && \
+         $(MAKE) $(FLAGS_TO_PASS)  install)
  
  @endif autoconf
  
@@ -2547,13 +2896,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing info in autoconf" ; \
-       (cd autoconf && \
+       (cd $(HOST_SUBDIR)/autoconf && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -2573,13 +2921,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing dvi in autoconf" ; \
-       (cd autoconf && \
+       (cd $(HOST_SUBDIR)/autoconf && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -2589,6 +2936,31 @@ dvi-autoconf: \
  
  @endif autoconf
  
+.PHONY: maybe-html-autoconf html-autoconf
+maybe-html-autoconf:
+@if autoconf
+maybe-html-autoconf: html-autoconf
+
+html-autoconf: \
+    configure-autoconf 
+       @[ -f ./autoconf/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing html in autoconf" ; \
+       (cd $(HOST_SUBDIR)/autoconf && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 html) \
+         || exit 1
+
+@endif autoconf
+
  .PHONY: maybe-TAGS-autoconf TAGS-autoconf
  maybe-TAGS-autoconf:
  @if autoconf
@@ -2599,13 +2971,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing TAGS in autoconf" ; \
-       (cd autoconf && \
+       (cd $(HOST_SUBDIR)/autoconf && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -2626,13 +2997,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing install-info in autoconf" ; \
-       (cd autoconf && \
+       (cd $(HOST_SUBDIR)/autoconf && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -2652,13 +3022,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing installcheck in autoconf" ; \
-       (cd autoconf && \
+       (cd $(HOST_SUBDIR)/autoconf && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -2677,13 +3046,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing mostlyclean in autoconf" ; \
-       (cd autoconf && \
+       (cd $(HOST_SUBDIR)/autoconf && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -2702,13 +3070,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing clean in autoconf" ; \
-       (cd autoconf && \
+       (cd $(HOST_SUBDIR)/autoconf && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -2727,13 +3094,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing distclean in autoconf" ; \
-       (cd autoconf && \
+       (cd $(HOST_SUBDIR)/autoconf && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -2752,13 +3118,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing maintainer-clean in autoconf" ; \
-       (cd autoconf && \
+       (cd $(HOST_SUBDIR)/autoconf && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -2769,46 +3134,47 @@ maintainer-clean-autoconf:
  @endif autoconf
  
  
+
  .PHONY: configure-automake maybe-configure-automake
  maybe-configure-automake:
  @if automake
  maybe-configure-automake: configure-automake
-configure-automake:
-       @test ! -f automake/Makefile || exit 0; \
-       [ -d automake ] || mkdir 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 automake || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/automake; \
+       cd "$(HOST_SUBDIR)/automake" || exit 1; \
         case $(srcdir) in \
-         \.) \
-           srcdiroption="--srcdir=."; \
-           libsrcdir=".";; \
-         /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/automake"; \
-           libsrcdir="$$s/automake";; \
-         *) \
-           srcdiroption="--srcdir=../$(srcdir)/automake"; \
-           libsrcdir="$$s/automake";; \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/automake/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
+       srcdiroption="--srcdir=$${topdir}/automake"; \
+       libsrcdir="$$s/automake"; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
  @endif automake
  
+
+
  .PHONY: all-automake maybe-all-automake
  maybe-all-automake:
  @if automake
+TARGET-automake=all
  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 automake && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd $(HOST_SUBDIR)/automake && \
+         $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-automake))
  @endif automake
  
+
  .PHONY: check-automake maybe-check-automake
  maybe-check-automake:
  @if automake
@@ -2817,9 +3183,9 @@ 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 automake && $(MAKE) $(FLAGS_TO_PASS) check)
+       (cd $(HOST_SUBDIR)/automake && \
+         $(MAKE) $(FLAGS_TO_PASS)  check)
  
  @endif automake
  
@@ -2831,9 +3197,9 @@ maybe-install-automake: install-automake
  install-automake: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
-       (cd automake && $(MAKE) $(FLAGS_TO_PASS) install)
+       (cd $(HOST_SUBDIR)/automake && \
+         $(MAKE) $(FLAGS_TO_PASS)  install)
  
  @endif automake
  
@@ -2849,13 +3215,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing info in automake" ; \
-       (cd automake && \
+       (cd $(HOST_SUBDIR)/automake && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -2875,13 +3240,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing dvi in automake" ; \
-       (cd automake && \
+       (cd $(HOST_SUBDIR)/automake && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -2891,6 +3255,31 @@ dvi-automake: \
  
  @endif automake
  
+.PHONY: maybe-html-automake html-automake
+maybe-html-automake:
+@if automake
+maybe-html-automake: html-automake
+
+html-automake: \
+    configure-automake 
+       @[ -f ./automake/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing html in automake" ; \
+       (cd $(HOST_SUBDIR)/automake && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 html) \
+         || exit 1
+
+@endif automake
+
  .PHONY: maybe-TAGS-automake TAGS-automake
  maybe-TAGS-automake:
  @if automake
@@ -2901,13 +3290,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing TAGS in automake" ; \
-       (cd automake && \
+       (cd $(HOST_SUBDIR)/automake && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -2928,13 +3316,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing install-info in automake" ; \
-       (cd automake && \
+       (cd $(HOST_SUBDIR)/automake && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -2954,13 +3341,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing installcheck in automake" ; \
-       (cd automake && \
+       (cd $(HOST_SUBDIR)/automake && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -2979,13 +3365,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing mostlyclean in automake" ; \
-       (cd automake && \
+       (cd $(HOST_SUBDIR)/automake && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -3004,13 +3389,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing clean in automake" ; \
-       (cd automake && \
+       (cd $(HOST_SUBDIR)/automake && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -3029,13 +3413,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing distclean in automake" ; \
-       (cd automake && \
+       (cd $(HOST_SUBDIR)/automake && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -3054,13 +3437,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing maintainer-clean in automake" ; \
-       (cd automake && \
+       (cd $(HOST_SUBDIR)/automake && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -3071,46 +3453,47 @@ maintainer-clean-automake:
  @endif automake
  
  
+
  .PHONY: configure-bash maybe-configure-bash
  maybe-configure-bash:
  @if bash
  maybe-configure-bash: configure-bash
-configure-bash:
-       @test ! -f bash/Makefile || exit 0; \
-       [ -d bash ] || mkdir 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 bash || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/bash; \
+       cd "$(HOST_SUBDIR)/bash" || exit 1; \
         case $(srcdir) in \
-         \.) \
-           srcdiroption="--srcdir=."; \
-           libsrcdir=".";; \
-         /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/bash"; \
-           libsrcdir="$$s/bash";; \
-         *) \
-           srcdiroption="--srcdir=../$(srcdir)/bash"; \
-           libsrcdir="$$s/bash";; \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/bash/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
+       srcdiroption="--srcdir=$${topdir}/bash"; \
+       libsrcdir="$$s/bash"; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
  @endif bash
  
+
+
  .PHONY: all-bash maybe-all-bash
  maybe-all-bash:
  @if bash
+TARGET-bash=all
  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 bash && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd $(HOST_SUBDIR)/bash && \
+         $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-bash))
  @endif bash
  
+
  .PHONY: check-bash maybe-check-bash
  maybe-check-bash:
  @if bash
@@ -3119,9 +3502,9 @@ 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 bash && $(MAKE) $(FLAGS_TO_PASS) check)
+       (cd $(HOST_SUBDIR)/bash && \
+         $(MAKE) $(FLAGS_TO_PASS)  check)
  
  @endif bash
  
@@ -3133,9 +3516,9 @@ maybe-install-bash: install-bash
  install-bash: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
-       (cd bash && $(MAKE) $(FLAGS_TO_PASS) install)
+       (cd $(HOST_SUBDIR)/bash && \
+         $(MAKE) $(FLAGS_TO_PASS)  install)
  
  @endif bash
  
@@ -3151,13 +3534,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing info in bash" ; \
-       (cd bash && \
+       (cd $(HOST_SUBDIR)/bash && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -3177,13 +3559,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing dvi in bash" ; \
-       (cd bash && \
+       (cd $(HOST_SUBDIR)/bash && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -3193,6 +3574,31 @@ dvi-bash: \
  
  @endif bash
  
+.PHONY: maybe-html-bash html-bash
+maybe-html-bash:
+@if bash
+maybe-html-bash: html-bash
+
+html-bash: \
+    configure-bash 
+       @[ -f ./bash/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing html in bash" ; \
+       (cd $(HOST_SUBDIR)/bash && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 html) \
+         || exit 1
+
+@endif bash
+
  .PHONY: maybe-TAGS-bash TAGS-bash
  maybe-TAGS-bash:
  @if bash
@@ -3203,13 +3609,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing TAGS in bash" ; \
-       (cd bash && \
+       (cd $(HOST_SUBDIR)/bash && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -3230,13 +3635,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing install-info in bash" ; \
-       (cd bash && \
+       (cd $(HOST_SUBDIR)/bash && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -3256,13 +3660,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing installcheck in bash" ; \
-       (cd bash && \
+       (cd $(HOST_SUBDIR)/bash && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -3281,13 +3684,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing mostlyclean in bash" ; \
-       (cd bash && \
+       (cd $(HOST_SUBDIR)/bash && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -3306,13 +3708,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing clean in bash" ; \
-       (cd bash && \
+       (cd $(HOST_SUBDIR)/bash && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -3331,13 +3732,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing distclean in bash" ; \
-       (cd bash && \
+       (cd $(HOST_SUBDIR)/bash && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -3356,13 +3756,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing maintainer-clean in bash" ; \
-       (cd bash && \
+       (cd $(HOST_SUBDIR)/bash && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -3373,46 +3772,49 @@ maintainer-clean-bash:
  @endif bash
  
  
+
  .PHONY: configure-bfd maybe-configure-bfd
  maybe-configure-bfd:
  @if bfd
  maybe-configure-bfd: configure-bfd
-configure-bfd:
-       @test ! -f bfd/Makefile || exit 0; \
-       [ -d bfd ] || mkdir 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 bfd || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/bfd; \
+       cd "$(HOST_SUBDIR)/bfd" || exit 1; \
         case $(srcdir) in \
-         \.) \
-           srcdiroption="--srcdir=."; \
-           libsrcdir=".";; \
-         /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/bfd"; \
-           libsrcdir="$$s/bfd";; \
-         *) \
-           srcdiroption="--srcdir=../$(srcdir)/bfd"; \
-           libsrcdir="$$s/bfd";; \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/bfd/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
+       srcdiroption="--srcdir=$${topdir}/bfd"; \
+       libsrcdir="$$s/bfd"; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
  @endif bfd
  
+
+
  .PHONY: all-bfd maybe-all-bfd
  maybe-all-bfd:
  @if bfd
+TARGET-bfd=all
  maybe-all-bfd: all-bfd
  all-bfd: configure-bfd
-       @r=`${PWD_COMMAND}`; export r; \
+       @test -f stage_last && exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
-       (cd bfd && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd $(HOST_SUBDIR)/bfd && \
+         $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-bfd))
  @endif bfd
  
+
  .PHONY: check-bfd maybe-check-bfd
  maybe-check-bfd:
  @if bfd
@@ -3421,9 +3823,9 @@ 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 bfd && $(MAKE) $(FLAGS_TO_PASS) check)
+       (cd $(HOST_SUBDIR)/bfd && \
+         $(MAKE) $(FLAGS_TO_PASS)  check)
  
  @endif bfd
  
@@ -3435,9 +3837,9 @@ maybe-install-bfd: install-bfd
  install-bfd: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
-       (cd bfd && $(MAKE) $(FLAGS_TO_PASS) install)
+       (cd $(HOST_SUBDIR)/bfd && \
+         $(MAKE) $(FLAGS_TO_PASS)  install)
  
  @endif bfd
  
@@ -3453,13 +3855,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing info in bfd" ; \
-       (cd bfd && \
+       (cd $(HOST_SUBDIR)/bfd && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -3479,13 +3880,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing dvi in bfd" ; \
-       (cd bfd && \
+       (cd $(HOST_SUBDIR)/bfd && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -3495,28 +3895,52 @@ dvi-bfd: \
  
  @endif bfd
  
-.PHONY: maybe-TAGS-bfd TAGS-bfd
-maybe-TAGS-bfd:
+.PHONY: maybe-html-bfd html-bfd
+maybe-html-bfd:
  @if bfd
-maybe-TAGS-bfd: TAGS-bfd
+maybe-html-bfd: html-bfd
  
-TAGS-bfd: \
+html-bfd: \
      configure-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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing TAGS in bfd" ; \
-       (cd bfd && \
+       echo "Doing html in bfd" ; \
+       (cd $(HOST_SUBDIR)/bfd && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                 html) \
+         || exit 1
+
+@endif bfd
+
+.PHONY: maybe-TAGS-bfd TAGS-bfd
+maybe-TAGS-bfd:
+@if bfd
+maybe-TAGS-bfd: TAGS-bfd
+
+TAGS-bfd: \
+    configure-bfd 
+       @[ -f ./bfd/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing TAGS in bfd" ; \
+       (cd $(HOST_SUBDIR)/bfd && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 TAGS) \
           || exit 1
  
  @endif bfd
@@ -3532,13 +3956,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing install-info in bfd" ; \
-       (cd bfd && \
+       (cd $(HOST_SUBDIR)/bfd && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -3558,13 +3981,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing installcheck in bfd" ; \
-       (cd bfd && \
+       (cd $(HOST_SUBDIR)/bfd && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -3583,13 +4005,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing mostlyclean in bfd" ; \
-       (cd bfd && \
+       (cd $(HOST_SUBDIR)/bfd && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -3608,13 +4029,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing clean in bfd" ; \
-       (cd bfd && \
+       (cd $(HOST_SUBDIR)/bfd && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -3633,13 +4053,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing distclean in bfd" ; \
-       (cd bfd && \
+       (cd $(HOST_SUBDIR)/bfd && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -3658,13 +4077,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing maintainer-clean in bfd" ; \
-       (cd bfd && \
+       (cd $(HOST_SUBDIR)/bfd && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -3675,46 +4093,49 @@ maintainer-clean-bfd:
  @endif bfd
  
  
+
  .PHONY: configure-opcodes maybe-configure-opcodes
  maybe-configure-opcodes:
  @if opcodes
  maybe-configure-opcodes: configure-opcodes
-configure-opcodes:
-       @test ! -f opcodes/Makefile || exit 0; \
-       [ -d opcodes ] || mkdir 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 opcodes || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/opcodes; \
+       cd "$(HOST_SUBDIR)/opcodes" || exit 1; \
         case $(srcdir) in \
-         \.) \
-           srcdiroption="--srcdir=."; \
-           libsrcdir=".";; \
-         /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/opcodes"; \
-           libsrcdir="$$s/opcodes";; \
-         *) \
-           srcdiroption="--srcdir=../$(srcdir)/opcodes"; \
-           libsrcdir="$$s/opcodes";; \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/opcodes/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
+       srcdiroption="--srcdir=$${topdir}/opcodes"; \
+       libsrcdir="$$s/opcodes"; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
  @endif opcodes
  
+
+
  .PHONY: all-opcodes maybe-all-opcodes
  maybe-all-opcodes:
  @if opcodes
+TARGET-opcodes=all
  maybe-all-opcodes: all-opcodes
  all-opcodes: configure-opcodes
-       @r=`${PWD_COMMAND}`; export r; \
+       @test -f stage_last && exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
-       (cd opcodes && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd $(HOST_SUBDIR)/opcodes && \
+         $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-opcodes))
  @endif opcodes
  
+
  .PHONY: check-opcodes maybe-check-opcodes
  maybe-check-opcodes:
  @if opcodes
@@ -3723,9 +4144,9 @@ 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 opcodes && $(MAKE) $(FLAGS_TO_PASS) check)
+       (cd $(HOST_SUBDIR)/opcodes && \
+         $(MAKE) $(FLAGS_TO_PASS)  check)
  
  @endif opcodes
  
@@ -3737,9 +4158,9 @@ maybe-install-opcodes: install-opcodes
  install-opcodes: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
-       (cd opcodes && $(MAKE) $(FLAGS_TO_PASS) install)
+       (cd $(HOST_SUBDIR)/opcodes && \
+         $(MAKE) $(FLAGS_TO_PASS)  install)
  
  @endif opcodes
  
@@ -3755,13 +4176,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing info in opcodes" ; \
-       (cd opcodes && \
+       (cd $(HOST_SUBDIR)/opcodes && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -3781,13 +4201,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing dvi in opcodes" ; \
-       (cd opcodes && \
+       (cd $(HOST_SUBDIR)/opcodes && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -3797,6 +4216,31 @@ dvi-opcodes: \
  
  @endif opcodes
  
+.PHONY: maybe-html-opcodes html-opcodes
+maybe-html-opcodes:
+@if opcodes
+maybe-html-opcodes: html-opcodes
+
+html-opcodes: \
+    configure-opcodes 
+       @[ -f ./opcodes/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing html in opcodes" ; \
+       (cd $(HOST_SUBDIR)/opcodes && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 html) \
+         || exit 1
+
+@endif opcodes
+
  .PHONY: maybe-TAGS-opcodes TAGS-opcodes
  maybe-TAGS-opcodes:
  @if opcodes
@@ -3807,13 +4251,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing TAGS in opcodes" ; \
-       (cd opcodes && \
+       (cd $(HOST_SUBDIR)/opcodes && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -3834,13 +4277,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing install-info in opcodes" ; \
-       (cd opcodes && \
+       (cd $(HOST_SUBDIR)/opcodes && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -3860,13 +4302,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing installcheck in opcodes" ; \
-       (cd opcodes && \
+       (cd $(HOST_SUBDIR)/opcodes && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -3885,13 +4326,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing mostlyclean in opcodes" ; \
-       (cd opcodes && \
+       (cd $(HOST_SUBDIR)/opcodes && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -3910,13 +4350,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing clean in opcodes" ; \
-       (cd opcodes && \
+       (cd $(HOST_SUBDIR)/opcodes && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -3935,13 +4374,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing distclean in opcodes" ; \
-       (cd opcodes && \
+       (cd $(HOST_SUBDIR)/opcodes && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -3960,13 +4398,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing maintainer-clean in opcodes" ; \
-       (cd opcodes && \
+       (cd $(HOST_SUBDIR)/opcodes && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -3977,46 +4414,49 @@ maintainer-clean-opcodes:
  @endif opcodes
  
  
+
  .PHONY: configure-binutils maybe-configure-binutils
  maybe-configure-binutils:
  @if binutils
  maybe-configure-binutils: configure-binutils
-configure-binutils:
-       @test ! -f binutils/Makefile || exit 0; \
-       [ -d binutils ] || mkdir 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 binutils || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/binutils; \
+       cd "$(HOST_SUBDIR)/binutils" || exit 1; \
         case $(srcdir) in \
-         \.) \
-           srcdiroption="--srcdir=."; \
-           libsrcdir=".";; \
-         /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/binutils"; \
-           libsrcdir="$$s/binutils";; \
-         *) \
-           srcdiroption="--srcdir=../$(srcdir)/binutils"; \
-           libsrcdir="$$s/binutils";; \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/binutils/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
+       srcdiroption="--srcdir=$${topdir}/binutils"; \
+       libsrcdir="$$s/binutils"; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
  @endif binutils
  
+
+
  .PHONY: all-binutils maybe-all-binutils
  maybe-all-binutils:
  @if binutils
+TARGET-binutils=all
  maybe-all-binutils: all-binutils
  all-binutils: configure-binutils
-       @r=`${PWD_COMMAND}`; export r; \
+       @test -f stage_last && exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
-       (cd binutils && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd $(HOST_SUBDIR)/binutils && \
+         $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-binutils))
  @endif binutils
  
+
  .PHONY: check-binutils maybe-check-binutils
  maybe-check-binutils:
  @if binutils
@@ -4025,9 +4465,9 @@ 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 binutils && $(MAKE) $(FLAGS_TO_PASS) check)
+       (cd $(HOST_SUBDIR)/binutils && \
+         $(MAKE) $(FLAGS_TO_PASS)  check)
  
  @endif binutils
  
@@ -4039,9 +4479,9 @@ maybe-install-binutils: install-binutils
  install-binutils: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
-       (cd binutils && $(MAKE) $(FLAGS_TO_PASS) install)
+       (cd $(HOST_SUBDIR)/binutils && \
+         $(MAKE) $(FLAGS_TO_PASS)  install)
  
  @endif binutils
  
@@ -4057,13 +4497,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing info in binutils" ; \
-       (cd binutils && \
+       (cd $(HOST_SUBDIR)/binutils && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -4083,13 +4522,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing dvi in binutils" ; \
-       (cd binutils && \
+       (cd $(HOST_SUBDIR)/binutils && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -4099,6 +4537,31 @@ dvi-binutils: \
  
  @endif binutils
  
+.PHONY: maybe-html-binutils html-binutils
+maybe-html-binutils:
+@if binutils
+maybe-html-binutils: html-binutils
+
+html-binutils: \
+    configure-binutils 
+       @[ -f ./binutils/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing html in binutils" ; \
+       (cd $(HOST_SUBDIR)/binutils && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 html) \
+         || exit 1
+
+@endif binutils
+
  .PHONY: maybe-TAGS-binutils TAGS-binutils
  maybe-TAGS-binutils:
  @if binutils
@@ -4109,13 +4572,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing TAGS in binutils" ; \
-       (cd binutils && \
+       (cd $(HOST_SUBDIR)/binutils && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -4136,13 +4598,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing install-info in binutils" ; \
-       (cd binutils && \
+       (cd $(HOST_SUBDIR)/binutils && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -4162,13 +4623,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing installcheck in binutils" ; \
-       (cd binutils && \
+       (cd $(HOST_SUBDIR)/binutils && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -4187,13 +4647,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing mostlyclean in binutils" ; \
-       (cd binutils && \
+       (cd $(HOST_SUBDIR)/binutils && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -4212,13 +4671,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing clean in binutils" ; \
-       (cd binutils && \
+       (cd $(HOST_SUBDIR)/binutils && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -4237,13 +4695,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing distclean in binutils" ; \
-       (cd binutils && \
+       (cd $(HOST_SUBDIR)/binutils && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -4262,13 +4719,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing maintainer-clean in binutils" ; \
-       (cd binutils && \
+       (cd $(HOST_SUBDIR)/binutils && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -4279,46 +4735,47 @@ maintainer-clean-binutils:
  @endif binutils
  
  
+
  .PHONY: configure-bison maybe-configure-bison
  maybe-configure-bison:
  @if bison
  maybe-configure-bison: configure-bison
-configure-bison:
-       @test ! -f bison/Makefile || exit 0; \
-       [ -d bison ] || mkdir 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 bison || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/bison; \
+       cd "$(HOST_SUBDIR)/bison" || exit 1; \
         case $(srcdir) in \
-         \.) \
-           srcdiroption="--srcdir=."; \
-           libsrcdir=".";; \
-         /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/bison"; \
-           libsrcdir="$$s/bison";; \
-         *) \
-           srcdiroption="--srcdir=../$(srcdir)/bison"; \
-           libsrcdir="$$s/bison";; \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/bison/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
+       srcdiroption="--srcdir=$${topdir}/bison"; \
+       libsrcdir="$$s/bison"; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
  @endif bison
  
+
+
  .PHONY: all-bison maybe-all-bison
  maybe-all-bison:
  @if bison
+TARGET-bison=all
  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 bison && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd $(HOST_SUBDIR)/bison && \
+         $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-bison))
  @endif bison
  
+
  .PHONY: check-bison maybe-check-bison
  maybe-check-bison:
  @if bison
@@ -4329,9 +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 bison && $(MAKE) $(FLAGS_TO_PASS) check); \
+         (cd $(HOST_SUBDIR)/bison && \
+           $(MAKE) $(FLAGS_TO_PASS)  check); \
         fi
  
  @endif bison
@@ -4344,9 +4801,9 @@ maybe-install-bison: install-bison
  install-bison: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
-       (cd bison && $(MAKE) $(FLAGS_TO_PASS) install)
+       (cd $(HOST_SUBDIR)/bison && \
+         $(MAKE) $(FLAGS_TO_PASS)  install)
  
  @endif bison
  
@@ -4362,13 +4819,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing info in bison" ; \
-       (cd bison && \
+       (cd $(HOST_SUBDIR)/bison && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -4388,13 +4844,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing dvi in bison" ; \
-       (cd bison && \
+       (cd $(HOST_SUBDIR)/bison && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -4404,6 +4859,31 @@ dvi-bison: \
  
  @endif bison
  
+.PHONY: maybe-html-bison html-bison
+maybe-html-bison:
+@if bison
+maybe-html-bison: html-bison
+
+html-bison: \
+    configure-bison 
+       @[ -f ./bison/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing html in bison" ; \
+       (cd $(HOST_SUBDIR)/bison && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 html) \
+         || exit 1
+
+@endif bison
+
  .PHONY: maybe-TAGS-bison TAGS-bison
  maybe-TAGS-bison:
  @if bison
@@ -4414,13 +4894,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing TAGS in bison" ; \
-       (cd bison && \
+       (cd $(HOST_SUBDIR)/bison && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -4441,13 +4920,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing install-info in bison" ; \
-       (cd bison && \
+       (cd $(HOST_SUBDIR)/bison && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -4467,13 +4945,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing installcheck in bison" ; \
-       (cd bison && \
+       (cd $(HOST_SUBDIR)/bison && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -4492,13 +4969,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing mostlyclean in bison" ; \
-       (cd bison && \
+       (cd $(HOST_SUBDIR)/bison && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -4517,13 +4993,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing clean in bison" ; \
-       (cd bison && \
+       (cd $(HOST_SUBDIR)/bison && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -4542,13 +5017,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing distclean in bison" ; \
-       (cd bison && \
+       (cd $(HOST_SUBDIR)/bison && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -4567,13 +5041,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing maintainer-clean in bison" ; \
-       (cd bison && \
+       (cd $(HOST_SUBDIR)/bison && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -4584,46 +5057,47 @@ maintainer-clean-bison:
  @endif bison
  
  
+
  .PHONY: configure-byacc maybe-configure-byacc
  maybe-configure-byacc:
  @if byacc
  maybe-configure-byacc: configure-byacc
-configure-byacc:
-       @test ! -f byacc/Makefile || exit 0; \
-       [ -d byacc ] || mkdir 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 byacc || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/byacc; \
+       cd "$(HOST_SUBDIR)/byacc" || exit 1; \
         case $(srcdir) in \
-         \.) \
-           srcdiroption="--srcdir=."; \
-           libsrcdir=".";; \
-         /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/byacc"; \
-           libsrcdir="$$s/byacc";; \
-         *) \
-           srcdiroption="--srcdir=../$(srcdir)/byacc"; \
-           libsrcdir="$$s/byacc";; \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/byacc/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
+       srcdiroption="--srcdir=$${topdir}/byacc"; \
+       libsrcdir="$$s/byacc"; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
  @endif byacc
  
+
+
  .PHONY: all-byacc maybe-all-byacc
  maybe-all-byacc:
  @if byacc
+TARGET-byacc=all
  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 byacc && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd $(HOST_SUBDIR)/byacc && \
+         $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-byacc))
  @endif byacc
  
+
  .PHONY: check-byacc maybe-check-byacc
  maybe-check-byacc:
  @if byacc
@@ -4634,9 +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 byacc && $(MAKE) $(FLAGS_TO_PASS) check); \
+         (cd $(HOST_SUBDIR)/byacc && \
+           $(MAKE) $(FLAGS_TO_PASS)  check); \
         fi
  
  @endif byacc
@@ -4649,9 +5123,9 @@ maybe-install-byacc: install-byacc
  install-byacc: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
-       (cd byacc && $(MAKE) $(FLAGS_TO_PASS) install)
+       (cd $(HOST_SUBDIR)/byacc && \
+         $(MAKE) $(FLAGS_TO_PASS)  install)
  
  @endif byacc
  
@@ -4667,13 +5141,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing info in byacc" ; \
-       (cd byacc && \
+       (cd $(HOST_SUBDIR)/byacc && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -4693,13 +5166,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing dvi in byacc" ; \
-       (cd byacc && \
+       (cd $(HOST_SUBDIR)/byacc && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -4709,6 +5181,31 @@ dvi-byacc: \
  
  @endif byacc
  
+.PHONY: maybe-html-byacc html-byacc
+maybe-html-byacc:
+@if byacc
+maybe-html-byacc: html-byacc
+
+html-byacc: \
+    configure-byacc 
+       @[ -f ./byacc/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing html in byacc" ; \
+       (cd $(HOST_SUBDIR)/byacc && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 html) \
+         || exit 1
+
+@endif byacc
+
  .PHONY: maybe-TAGS-byacc TAGS-byacc
  maybe-TAGS-byacc:
  @if byacc
@@ -4719,13 +5216,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing TAGS in byacc" ; \
-       (cd byacc && \
+       (cd $(HOST_SUBDIR)/byacc && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -4746,13 +5242,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing install-info in byacc" ; \
-       (cd byacc && \
+       (cd $(HOST_SUBDIR)/byacc && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -4772,13 +5267,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing installcheck in byacc" ; \
-       (cd byacc && \
+       (cd $(HOST_SUBDIR)/byacc && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -4797,13 +5291,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing mostlyclean in byacc" ; \
-       (cd byacc && \
+       (cd $(HOST_SUBDIR)/byacc && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -4822,13 +5315,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing clean in byacc" ; \
-       (cd byacc && \
+       (cd $(HOST_SUBDIR)/byacc && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -4847,13 +5339,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing distclean in byacc" ; \
-       (cd byacc && \
+       (cd $(HOST_SUBDIR)/byacc && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -4872,13 +5363,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing maintainer-clean in byacc" ; \
-       (cd byacc && \
+       (cd $(HOST_SUBDIR)/byacc && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -4889,46 +5379,47 @@ maintainer-clean-byacc:
  @endif byacc
  
  
+
  .PHONY: configure-bzip2 maybe-configure-bzip2
  maybe-configure-bzip2:
  @if bzip2
  maybe-configure-bzip2: configure-bzip2
-configure-bzip2:
-       @test ! -f bzip2/Makefile || exit 0; \
-       [ -d bzip2 ] || mkdir 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 bzip2 || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/bzip2; \
+       cd "$(HOST_SUBDIR)/bzip2" || exit 1; \
         case $(srcdir) in \
-         \.) \
-           srcdiroption="--srcdir=."; \
-           libsrcdir=".";; \
-         /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/bzip2"; \
-           libsrcdir="$$s/bzip2";; \
-         *) \
-           srcdiroption="--srcdir=../$(srcdir)/bzip2"; \
-           libsrcdir="$$s/bzip2";; \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/bzip2/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
+       srcdiroption="--srcdir=$${topdir}/bzip2"; \
+       libsrcdir="$$s/bzip2"; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
  @endif bzip2
  
+
+
  .PHONY: all-bzip2 maybe-all-bzip2
  maybe-all-bzip2:
  @if bzip2
+TARGET-bzip2=all
  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 bzip2 && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd $(HOST_SUBDIR)/bzip2 && \
+         $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-bzip2))
  @endif bzip2
  
+
  .PHONY: check-bzip2 maybe-check-bzip2
  maybe-check-bzip2:
  @if bzip2
@@ -4937,9 +5428,9 @@ 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 bzip2 && $(MAKE) $(FLAGS_TO_PASS) check)
+       (cd $(HOST_SUBDIR)/bzip2 && \
+         $(MAKE) $(FLAGS_TO_PASS)  check)
  
  @endif bzip2
  
@@ -4951,9 +5442,9 @@ maybe-install-bzip2: install-bzip2
  install-bzip2: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
-       (cd bzip2 && $(MAKE) $(FLAGS_TO_PASS) install)
+       (cd $(HOST_SUBDIR)/bzip2 && \
+         $(MAKE) $(FLAGS_TO_PASS)  install)
  
  @endif bzip2
  
@@ -4969,13 +5460,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing info in bzip2" ; \
-       (cd bzip2 && \
+       (cd $(HOST_SUBDIR)/bzip2 && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -4995,13 +5485,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing dvi in bzip2" ; \
-       (cd bzip2 && \
+       (cd $(HOST_SUBDIR)/bzip2 && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -5011,6 +5500,31 @@ dvi-bzip2: \
  
  @endif bzip2
  
+.PHONY: maybe-html-bzip2 html-bzip2
+maybe-html-bzip2:
+@if bzip2
+maybe-html-bzip2: html-bzip2
+
+html-bzip2: \
+    configure-bzip2 
+       @[ -f ./bzip2/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing html in bzip2" ; \
+       (cd $(HOST_SUBDIR)/bzip2 && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 html) \
+         || exit 1
+
+@endif bzip2
+
  .PHONY: maybe-TAGS-bzip2 TAGS-bzip2
  maybe-TAGS-bzip2:
  @if bzip2
@@ -5021,13 +5535,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing TAGS in bzip2" ; \
-       (cd bzip2 && \
+       (cd $(HOST_SUBDIR)/bzip2 && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -5048,13 +5561,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing install-info in bzip2" ; \
-       (cd bzip2 && \
+       (cd $(HOST_SUBDIR)/bzip2 && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -5074,13 +5586,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing installcheck in bzip2" ; \
-       (cd bzip2 && \
+       (cd $(HOST_SUBDIR)/bzip2 && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -5099,13 +5610,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing mostlyclean in bzip2" ; \
-       (cd bzip2 && \
+       (cd $(HOST_SUBDIR)/bzip2 && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -5124,13 +5634,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing clean in bzip2" ; \
-       (cd bzip2 && \
+       (cd $(HOST_SUBDIR)/bzip2 && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -5149,13 +5658,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing distclean in bzip2" ; \
-       (cd bzip2 && \
+       (cd $(HOST_SUBDIR)/bzip2 && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -5174,13 +5682,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing maintainer-clean in bzip2" ; \
-       (cd bzip2 && \
+       (cd $(HOST_SUBDIR)/bzip2 && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -5191,46 +5698,47 @@ maintainer-clean-bzip2:
  @endif bzip2
  
  
+
  .PHONY: configure-dejagnu maybe-configure-dejagnu
  maybe-configure-dejagnu:
  @if dejagnu
  maybe-configure-dejagnu: configure-dejagnu
-configure-dejagnu:
-       @test ! -f dejagnu/Makefile || exit 0; \
-       [ -d dejagnu ] || mkdir 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 dejagnu || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/dejagnu; \
+       cd "$(HOST_SUBDIR)/dejagnu" || exit 1; \
         case $(srcdir) in \
-         \.) \
-           srcdiroption="--srcdir=."; \
-           libsrcdir=".";; \
-         /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/dejagnu"; \
-           libsrcdir="$$s/dejagnu";; \
-         *) \
-           srcdiroption="--srcdir=../$(srcdir)/dejagnu"; \
-           libsrcdir="$$s/dejagnu";; \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/dejagnu/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
+       srcdiroption="--srcdir=$${topdir}/dejagnu"; \
+       libsrcdir="$$s/dejagnu"; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
  @endif dejagnu
  
+
+
  .PHONY: all-dejagnu maybe-all-dejagnu
  maybe-all-dejagnu:
  @if dejagnu
+TARGET-dejagnu=all
  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 dejagnu && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd $(HOST_SUBDIR)/dejagnu && \
+         $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-dejagnu))
  @endif dejagnu
  
+
  .PHONY: check-dejagnu maybe-check-dejagnu
  maybe-check-dejagnu:
  @if dejagnu
@@ -5239,9 +5747,9 @@ 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 dejagnu && $(MAKE) $(FLAGS_TO_PASS) check)
+       (cd $(HOST_SUBDIR)/dejagnu && \
+         $(MAKE) $(FLAGS_TO_PASS)  check)
  
  @endif dejagnu
  
@@ -5253,9 +5761,9 @@ maybe-install-dejagnu: install-dejagnu
  install-dejagnu: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
-       (cd dejagnu && $(MAKE) $(FLAGS_TO_PASS) install)
+       (cd $(HOST_SUBDIR)/dejagnu && \
+         $(MAKE) $(FLAGS_TO_PASS)  install)
  
  @endif dejagnu
  
@@ -5271,13 +5779,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing info in dejagnu" ; \
-       (cd dejagnu && \
+       (cd $(HOST_SUBDIR)/dejagnu && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -5297,13 +5804,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing dvi in dejagnu" ; \
-       (cd dejagnu && \
+       (cd $(HOST_SUBDIR)/dejagnu && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -5313,6 +5819,31 @@ dvi-dejagnu: \
  
  @endif dejagnu
  
+.PHONY: maybe-html-dejagnu html-dejagnu
+maybe-html-dejagnu:
+@if dejagnu
+maybe-html-dejagnu: html-dejagnu
+
+html-dejagnu: \
+    configure-dejagnu 
+       @[ -f ./dejagnu/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing html in dejagnu" ; \
+       (cd $(HOST_SUBDIR)/dejagnu && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 html) \
+         || exit 1
+
+@endif dejagnu
+
  .PHONY: maybe-TAGS-dejagnu TAGS-dejagnu
  maybe-TAGS-dejagnu:
  @if dejagnu
@@ -5323,13 +5854,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing TAGS in dejagnu" ; \
-       (cd dejagnu && \
+       (cd $(HOST_SUBDIR)/dejagnu && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -5350,13 +5880,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing install-info in dejagnu" ; \
-       (cd dejagnu && \
+       (cd $(HOST_SUBDIR)/dejagnu && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -5376,13 +5905,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing installcheck in dejagnu" ; \
-       (cd dejagnu && \
+       (cd $(HOST_SUBDIR)/dejagnu && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -5401,13 +5929,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing mostlyclean in dejagnu" ; \
-       (cd dejagnu && \
+       (cd $(HOST_SUBDIR)/dejagnu && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -5426,13 +5953,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing clean in dejagnu" ; \
-       (cd dejagnu && \
+       (cd $(HOST_SUBDIR)/dejagnu && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -5451,13 +5977,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing distclean in dejagnu" ; \
-       (cd dejagnu && \
+       (cd $(HOST_SUBDIR)/dejagnu && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -5476,13 +6001,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing maintainer-clean in dejagnu" ; \
-       (cd dejagnu && \
+       (cd $(HOST_SUBDIR)/dejagnu && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -5493,46 +6017,47 @@ maintainer-clean-dejagnu:
  @endif dejagnu
  
  
+
  .PHONY: configure-diff maybe-configure-diff
  maybe-configure-diff:
  @if diff
  maybe-configure-diff: configure-diff
-configure-diff:
-       @test ! -f diff/Makefile || exit 0; \
-       [ -d diff ] || mkdir 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 diff || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/diff; \
+       cd "$(HOST_SUBDIR)/diff" || exit 1; \
         case $(srcdir) in \
-         \.) \
-           srcdiroption="--srcdir=."; \
-           libsrcdir=".";; \
-         /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/diff"; \
-           libsrcdir="$$s/diff";; \
-         *) \
-           srcdiroption="--srcdir=../$(srcdir)/diff"; \
-           libsrcdir="$$s/diff";; \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/diff/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
+       srcdiroption="--srcdir=$${topdir}/diff"; \
+       libsrcdir="$$s/diff"; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
  @endif diff
  
+
+
  .PHONY: all-diff maybe-all-diff
  maybe-all-diff:
  @if diff
+TARGET-diff=all
  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 diff && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd $(HOST_SUBDIR)/diff && \
+         $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-diff))
  @endif diff
  
+
  .PHONY: check-diff maybe-check-diff
  maybe-check-diff:
  @if diff
@@ -5541,9 +6066,9 @@ 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 diff && $(MAKE) $(FLAGS_TO_PASS) check)
+       (cd $(HOST_SUBDIR)/diff && \
+         $(MAKE) $(FLAGS_TO_PASS)  check)
  
  @endif diff
  
@@ -5555,9 +6080,9 @@ maybe-install-diff: install-diff
  install-diff: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
-       (cd diff && $(MAKE) $(FLAGS_TO_PASS) install)
+       (cd $(HOST_SUBDIR)/diff && \
+         $(MAKE) $(FLAGS_TO_PASS)  install)
  
  @endif diff
  
@@ -5573,13 +6098,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing info in diff" ; \
-       (cd diff && \
+       (cd $(HOST_SUBDIR)/diff && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -5599,13 +6123,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing dvi in diff" ; \
-       (cd diff && \
+       (cd $(HOST_SUBDIR)/diff && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -5615,6 +6138,31 @@ dvi-diff: \
  
  @endif diff
  
+.PHONY: maybe-html-diff html-diff
+maybe-html-diff:
+@if diff
+maybe-html-diff: html-diff
+
+html-diff: \
+    configure-diff 
+       @[ -f ./diff/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing html in diff" ; \
+       (cd $(HOST_SUBDIR)/diff && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 html) \
+         || exit 1
+
+@endif diff
+
  .PHONY: maybe-TAGS-diff TAGS-diff
  maybe-TAGS-diff:
  @if diff
@@ -5625,13 +6173,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing TAGS in diff" ; \
-       (cd diff && \
+       (cd $(HOST_SUBDIR)/diff && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -5652,13 +6199,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing install-info in diff" ; \
-       (cd diff && \
+       (cd $(HOST_SUBDIR)/diff && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -5678,13 +6224,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing installcheck in diff" ; \
-       (cd diff && \
+       (cd $(HOST_SUBDIR)/diff && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -5703,13 +6248,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing mostlyclean in diff" ; \
-       (cd diff && \
+       (cd $(HOST_SUBDIR)/diff && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -5728,13 +6272,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing clean in diff" ; \
-       (cd diff && \
+       (cd $(HOST_SUBDIR)/diff && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -5753,13 +6296,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing distclean in diff" ; \
-       (cd diff && \
+       (cd $(HOST_SUBDIR)/diff && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -5778,13 +6320,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing maintainer-clean in diff" ; \
-       (cd diff && \
+       (cd $(HOST_SUBDIR)/diff && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -5795,46 +6336,47 @@ maintainer-clean-diff:
  @endif diff
  
  
+
  .PHONY: configure-dosutils maybe-configure-dosutils
  maybe-configure-dosutils:
  @if dosutils
  maybe-configure-dosutils: configure-dosutils
-configure-dosutils:
-       @test ! -f dosutils/Makefile || exit 0; \
-       [ -d dosutils ] || mkdir 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 dosutils || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/dosutils; \
+       cd "$(HOST_SUBDIR)/dosutils" || exit 1; \
         case $(srcdir) in \
-         \.) \
-           srcdiroption="--srcdir=."; \
-           libsrcdir=".";; \
-         /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/dosutils"; \
-           libsrcdir="$$s/dosutils";; \
-         *) \
-           srcdiroption="--srcdir=../$(srcdir)/dosutils"; \
-           libsrcdir="$$s/dosutils";; \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/dosutils/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
+       srcdiroption="--srcdir=$${topdir}/dosutils"; \
+       libsrcdir="$$s/dosutils"; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
  @endif dosutils
  
+
+
  .PHONY: all-dosutils maybe-all-dosutils
  maybe-all-dosutils:
  @if dosutils
+TARGET-dosutils=all
  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 dosutils && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd $(HOST_SUBDIR)/dosutils && \
+         $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-dosutils))
  @endif dosutils
  
+
  .PHONY: check-dosutils maybe-check-dosutils
  maybe-check-dosutils:
  @if dosutils
@@ -5852,9 +6394,9 @@ maybe-install-dosutils: install-dosutils
  install-dosutils: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
-       (cd dosutils && $(MAKE) $(FLAGS_TO_PASS) install)
+       (cd $(HOST_SUBDIR)/dosutils && \
+         $(MAKE) $(FLAGS_TO_PASS)  install)
  
  @endif dosutils
  
@@ -5870,13 +6412,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing info in dosutils" ; \
-       (cd dosutils && \
+       (cd $(HOST_SUBDIR)/dosutils && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -5896,13 +6437,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing dvi in dosutils" ; \
-       (cd dosutils && \
+       (cd $(HOST_SUBDIR)/dosutils && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -5912,6 +6452,31 @@ dvi-dosutils: \
  
  @endif dosutils
  
+.PHONY: maybe-html-dosutils html-dosutils
+maybe-html-dosutils:
+@if dosutils
+maybe-html-dosutils: html-dosutils
+
+html-dosutils: \
+    configure-dosutils 
+       @[ -f ./dosutils/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing html in dosutils" ; \
+       (cd $(HOST_SUBDIR)/dosutils && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 html) \
+         || exit 1
+
+@endif dosutils
+
  .PHONY: maybe-TAGS-dosutils TAGS-dosutils
  maybe-TAGS-dosutils:
  @if dosutils
@@ -5922,13 +6487,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing TAGS in dosutils" ; \
-       (cd dosutils && \
+       (cd $(HOST_SUBDIR)/dosutils && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -5949,13 +6513,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing install-info in dosutils" ; \
-       (cd dosutils && \
+       (cd $(HOST_SUBDIR)/dosutils && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -5975,13 +6538,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing installcheck in dosutils" ; \
-       (cd dosutils && \
+       (cd $(HOST_SUBDIR)/dosutils && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -6000,13 +6562,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing mostlyclean in dosutils" ; \
-       (cd dosutils && \
+       (cd $(HOST_SUBDIR)/dosutils && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -6025,13 +6586,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing clean in dosutils" ; \
-       (cd dosutils && \
+       (cd $(HOST_SUBDIR)/dosutils && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -6050,13 +6610,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing distclean in dosutils" ; \
-       (cd dosutils && \
+       (cd $(HOST_SUBDIR)/dosutils && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -6075,13 +6634,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing maintainer-clean in dosutils" ; \
-       (cd dosutils && \
+       (cd $(HOST_SUBDIR)/dosutils && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -6092,46 +6650,47 @@ maintainer-clean-dosutils:
  @endif dosutils
  
  
+
  .PHONY: configure-etc maybe-configure-etc
  maybe-configure-etc:
  @if etc
  maybe-configure-etc: configure-etc
-configure-etc:
-       @test ! -f etc/Makefile || exit 0; \
-       [ -d etc ] || mkdir 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 etc || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/etc; \
+       cd "$(HOST_SUBDIR)/etc" || exit 1; \
         case $(srcdir) in \
-         \.) \
-           srcdiroption="--srcdir=."; \
-           libsrcdir=".";; \
-         /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/etc"; \
-           libsrcdir="$$s/etc";; \
-         *) \
-           srcdiroption="--srcdir=../$(srcdir)/etc"; \
-           libsrcdir="$$s/etc";; \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/etc/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
+       srcdiroption="--srcdir=$${topdir}/etc"; \
+       libsrcdir="$$s/etc"; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
  @endif etc
  
+
+
  .PHONY: all-etc maybe-all-etc
  maybe-all-etc:
  @if etc
+TARGET-etc=all
  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 etc && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd $(HOST_SUBDIR)/etc && \
+         $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-etc))
  @endif etc
  
+
  .PHONY: check-etc maybe-check-etc
  maybe-check-etc:
  @if etc
@@ -6140,9 +6699,9 @@ 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 etc && $(MAKE) $(FLAGS_TO_PASS) check)
+       (cd $(HOST_SUBDIR)/etc && \
+         $(MAKE) $(FLAGS_TO_PASS)  check)
  
  @endif etc
  
@@ -6154,9 +6713,9 @@ maybe-install-etc: install-etc
  install-etc: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
-       (cd etc && $(MAKE) $(FLAGS_TO_PASS) install)
+       (cd $(HOST_SUBDIR)/etc && \
+         $(MAKE) $(FLAGS_TO_PASS)  install)
  
  @endif etc
  
@@ -6172,13 +6731,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing info in etc" ; \
-       (cd etc && \
+       (cd $(HOST_SUBDIR)/etc && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -6198,13 +6756,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing dvi in etc" ; \
-       (cd etc && \
+       (cd $(HOST_SUBDIR)/etc && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -6214,6 +6771,31 @@ dvi-etc: \
  
  @endif etc
  
+.PHONY: maybe-html-etc html-etc
+maybe-html-etc:
+@if etc
+maybe-html-etc: html-etc
+
+html-etc: \
+    configure-etc 
+       @[ -f ./etc/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing html in etc" ; \
+       (cd $(HOST_SUBDIR)/etc && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 html) \
+         || exit 1
+
+@endif etc
+
  .PHONY: maybe-TAGS-etc TAGS-etc
  maybe-TAGS-etc:
  @if etc
@@ -6224,13 +6806,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing TAGS in etc" ; \
-       (cd etc && \
+       (cd $(HOST_SUBDIR)/etc && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -6251,13 +6832,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing install-info in etc" ; \
-       (cd etc && \
+       (cd $(HOST_SUBDIR)/etc && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -6277,13 +6857,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing installcheck in etc" ; \
-       (cd etc && \
+       (cd $(HOST_SUBDIR)/etc && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -6302,13 +6881,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing mostlyclean in etc" ; \
-       (cd etc && \
+       (cd $(HOST_SUBDIR)/etc && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -6327,13 +6905,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing clean in etc" ; \
-       (cd etc && \
+       (cd $(HOST_SUBDIR)/etc && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -6352,13 +6929,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing distclean in etc" ; \
-       (cd etc && \
+       (cd $(HOST_SUBDIR)/etc && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -6377,13 +6953,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing maintainer-clean in etc" ; \
-       (cd etc && \
+       (cd $(HOST_SUBDIR)/etc && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -6394,46 +6969,47 @@ maintainer-clean-etc:
  @endif etc
  
  
+
  .PHONY: configure-fastjar maybe-configure-fastjar
  maybe-configure-fastjar:
  @if fastjar
  maybe-configure-fastjar: configure-fastjar
-configure-fastjar:
-       @test ! -f fastjar/Makefile || exit 0; \
-       [ -d fastjar ] || mkdir 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 fastjar || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/fastjar; \
+       cd "$(HOST_SUBDIR)/fastjar" || exit 1; \
         case $(srcdir) in \
-         \.) \
-           srcdiroption="--srcdir=."; \
-           libsrcdir=".";; \
-         /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/fastjar"; \
-           libsrcdir="$$s/fastjar";; \
-         *) \
-           srcdiroption="--srcdir=../$(srcdir)/fastjar"; \
-           libsrcdir="$$s/fastjar";; \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/fastjar/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
+       srcdiroption="--srcdir=$${topdir}/fastjar"; \
+       libsrcdir="$$s/fastjar"; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
  @endif fastjar
  
+
+
  .PHONY: all-fastjar maybe-all-fastjar
  maybe-all-fastjar:
  @if fastjar
+TARGET-fastjar=all
  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 fastjar && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd $(HOST_SUBDIR)/fastjar && \
+         $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-fastjar))
  @endif fastjar
  
+
  .PHONY: check-fastjar maybe-check-fastjar
  maybe-check-fastjar:
  @if fastjar
@@ -6444,9 +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 fastjar && $(MAKE) $(FLAGS_TO_PASS) check); \
+         (cd $(HOST_SUBDIR)/fastjar && \
+           $(MAKE) $(FLAGS_TO_PASS)  check); \
         fi
  
  @endif fastjar
@@ -6459,9 +7035,9 @@ maybe-install-fastjar: install-fastjar
  install-fastjar: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
-       (cd fastjar && $(MAKE) $(FLAGS_TO_PASS) install)
+       (cd $(HOST_SUBDIR)/fastjar && \
+         $(MAKE) $(FLAGS_TO_PASS)  install)
  
  @endif fastjar
  
@@ -6477,13 +7053,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing info in fastjar" ; \
-       (cd fastjar && \
+       (cd $(HOST_SUBDIR)/fastjar && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -6503,13 +7078,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing dvi in fastjar" ; \
-       (cd fastjar && \
+       (cd $(HOST_SUBDIR)/fastjar && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -6519,6 +7093,31 @@ dvi-fastjar: \
  
  @endif fastjar
  
+.PHONY: maybe-html-fastjar html-fastjar
+maybe-html-fastjar:
+@if fastjar
+maybe-html-fastjar: html-fastjar
+
+html-fastjar: \
+    configure-fastjar 
+       @[ -f ./fastjar/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing html in fastjar" ; \
+       (cd $(HOST_SUBDIR)/fastjar && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 html) \
+         || exit 1
+
+@endif fastjar
+
  .PHONY: maybe-TAGS-fastjar TAGS-fastjar
  maybe-TAGS-fastjar:
  @if fastjar
@@ -6529,13 +7128,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing TAGS in fastjar" ; \
-       (cd fastjar && \
+       (cd $(HOST_SUBDIR)/fastjar && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -6556,13 +7154,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing install-info in fastjar" ; \
-       (cd fastjar && \
+       (cd $(HOST_SUBDIR)/fastjar && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -6582,13 +7179,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing installcheck in fastjar" ; \
-       (cd fastjar && \
+       (cd $(HOST_SUBDIR)/fastjar && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -6607,13 +7203,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing mostlyclean in fastjar" ; \
-       (cd fastjar && \
+       (cd $(HOST_SUBDIR)/fastjar && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -6632,13 +7227,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing clean in fastjar" ; \
-       (cd fastjar && \
+       (cd $(HOST_SUBDIR)/fastjar && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -6657,13 +7251,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing distclean in fastjar" ; \
-       (cd fastjar && \
+       (cd $(HOST_SUBDIR)/fastjar && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -6682,13 +7275,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing maintainer-clean in fastjar" ; \
-       (cd fastjar && \
+       (cd $(HOST_SUBDIR)/fastjar && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -6699,46 +7291,47 @@ maintainer-clean-fastjar:
  @endif fastjar
  
  
+
  .PHONY: configure-fileutils maybe-configure-fileutils
  maybe-configure-fileutils:
  @if fileutils
  maybe-configure-fileutils: configure-fileutils
-configure-fileutils:
-       @test ! -f fileutils/Makefile || exit 0; \
-       [ -d fileutils ] || mkdir 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 fileutils || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/fileutils; \
+       cd "$(HOST_SUBDIR)/fileutils" || exit 1; \
         case $(srcdir) in \
-         \.) \
-           srcdiroption="--srcdir=."; \
-           libsrcdir=".";; \
-         /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/fileutils"; \
-           libsrcdir="$$s/fileutils";; \
-         *) \
-           srcdiroption="--srcdir=../$(srcdir)/fileutils"; \
-           libsrcdir="$$s/fileutils";; \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/fileutils/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
+       srcdiroption="--srcdir=$${topdir}/fileutils"; \
+       libsrcdir="$$s/fileutils"; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
  @endif fileutils
  
+
+
  .PHONY: all-fileutils maybe-all-fileutils
  maybe-all-fileutils:
  @if fileutils
+TARGET-fileutils=all
  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 fileutils && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd $(HOST_SUBDIR)/fileutils && \
+         $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-fileutils))
  @endif fileutils
  
+
  .PHONY: check-fileutils maybe-check-fileutils
  maybe-check-fileutils:
  @if fileutils
@@ -6747,9 +7340,9 @@ 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 fileutils && $(MAKE) $(FLAGS_TO_PASS) check)
+       (cd $(HOST_SUBDIR)/fileutils && \
+         $(MAKE) $(FLAGS_TO_PASS)  check)
  
  @endif fileutils
  
@@ -6761,9 +7354,9 @@ maybe-install-fileutils: install-fileutils
  install-fileutils: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
-       (cd fileutils && $(MAKE) $(FLAGS_TO_PASS) install)
+       (cd $(HOST_SUBDIR)/fileutils && \
+         $(MAKE) $(FLAGS_TO_PASS)  install)
  
  @endif fileutils
  
@@ -6779,13 +7372,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing info in fileutils" ; \
-       (cd fileutils && \
+       (cd $(HOST_SUBDIR)/fileutils && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -6805,13 +7397,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing dvi in fileutils" ; \
-       (cd fileutils && \
+       (cd $(HOST_SUBDIR)/fileutils && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -6821,23 +7412,47 @@ dvi-fileutils: \
  
  @endif fileutils
  
-.PHONY: maybe-TAGS-fileutils TAGS-fileutils
-maybe-TAGS-fileutils:
+.PHONY: maybe-html-fileutils html-fileutils
+maybe-html-fileutils:
  @if fileutils
-maybe-TAGS-fileutils: TAGS-fileutils
+maybe-html-fileutils: html-fileutils
  
-TAGS-fileutils: \
+html-fileutils: \
      configure-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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing html in fileutils" ; \
+       (cd $(HOST_SUBDIR)/fileutils && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 html) \
+         || exit 1
+
+@endif fileutils
+
+.PHONY: maybe-TAGS-fileutils TAGS-fileutils
+maybe-TAGS-fileutils:
+@if fileutils
+maybe-TAGS-fileutils: TAGS-fileutils
+
+TAGS-fileutils: \
+    configure-fileutils 
+       @[ -f ./fileutils/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing TAGS in fileutils" ; \
-       (cd fileutils && \
+       (cd $(HOST_SUBDIR)/fileutils && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -6858,13 +7473,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing install-info in fileutils" ; \
-       (cd fileutils && \
+       (cd $(HOST_SUBDIR)/fileutils && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -6884,13 +7498,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing installcheck in fileutils" ; \
-       (cd fileutils && \
+       (cd $(HOST_SUBDIR)/fileutils && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -6909,13 +7522,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing mostlyclean in fileutils" ; \
-       (cd fileutils && \
+       (cd $(HOST_SUBDIR)/fileutils && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -6934,13 +7546,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing clean in fileutils" ; \
-       (cd fileutils && \
+       (cd $(HOST_SUBDIR)/fileutils && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -6959,13 +7570,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing distclean in fileutils" ; \
-       (cd fileutils && \
+       (cd $(HOST_SUBDIR)/fileutils && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -6984,13 +7594,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing maintainer-clean in fileutils" ; \
-       (cd fileutils && \
+       (cd $(HOST_SUBDIR)/fileutils && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -7001,46 +7610,47 @@ maintainer-clean-fileutils:
  @endif fileutils
  
  
+
  .PHONY: configure-findutils maybe-configure-findutils
  maybe-configure-findutils:
  @if findutils
  maybe-configure-findutils: configure-findutils
-configure-findutils:
-       @test ! -f findutils/Makefile || exit 0; \
-       [ -d findutils ] || mkdir 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 findutils || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/findutils; \
+       cd "$(HOST_SUBDIR)/findutils" || exit 1; \
         case $(srcdir) in \
-         \.) \
-           srcdiroption="--srcdir=."; \
-           libsrcdir=".";; \
-         /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/findutils"; \
-           libsrcdir="$$s/findutils";; \
-         *) \
-           srcdiroption="--srcdir=../$(srcdir)/findutils"; \
-           libsrcdir="$$s/findutils";; \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/findutils/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
+       srcdiroption="--srcdir=$${topdir}/findutils"; \
+       libsrcdir="$$s/findutils"; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
  @endif findutils
  
+
+
  .PHONY: all-findutils maybe-all-findutils
  maybe-all-findutils:
  @if findutils
+TARGET-findutils=all
  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 findutils && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd $(HOST_SUBDIR)/findutils && \
+         $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-findutils))
  @endif findutils
  
+
  .PHONY: check-findutils maybe-check-findutils
  maybe-check-findutils:
  @if findutils
@@ -7049,9 +7659,9 @@ 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 findutils && $(MAKE) $(FLAGS_TO_PASS) check)
+       (cd $(HOST_SUBDIR)/findutils && \
+         $(MAKE) $(FLAGS_TO_PASS)  check)
  
  @endif findutils
  
@@ -7063,9 +7673,9 @@ maybe-install-findutils: install-findutils
  install-findutils: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
-       (cd findutils && $(MAKE) $(FLAGS_TO_PASS) install)
+       (cd $(HOST_SUBDIR)/findutils && \
+         $(MAKE) $(FLAGS_TO_PASS)  install)
  
  @endif findutils
  
@@ -7081,13 +7691,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing info in findutils" ; \
-       (cd findutils && \
+       (cd $(HOST_SUBDIR)/findutils && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -7107,13 +7716,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing dvi in findutils" ; \
-       (cd findutils && \
+       (cd $(HOST_SUBDIR)/findutils && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -7123,6 +7731,31 @@ dvi-findutils: \
  
  @endif findutils
  
+.PHONY: maybe-html-findutils html-findutils
+maybe-html-findutils:
+@if findutils
+maybe-html-findutils: html-findutils
+
+html-findutils: \
+    configure-findutils 
+       @[ -f ./findutils/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing html in findutils" ; \
+       (cd $(HOST_SUBDIR)/findutils && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 html) \
+         || exit 1
+
+@endif findutils
+
  .PHONY: maybe-TAGS-findutils TAGS-findutils
  maybe-TAGS-findutils:
  @if findutils
@@ -7133,13 +7766,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing TAGS in findutils" ; \
-       (cd findutils && \
+       (cd $(HOST_SUBDIR)/findutils && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -7160,13 +7792,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing install-info in findutils" ; \
-       (cd findutils && \
+       (cd $(HOST_SUBDIR)/findutils && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -7186,13 +7817,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing installcheck in findutils" ; \
-       (cd findutils && \
+       (cd $(HOST_SUBDIR)/findutils && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -7211,13 +7841,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing mostlyclean in findutils" ; \
-       (cd findutils && \
+       (cd $(HOST_SUBDIR)/findutils && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -7236,13 +7865,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing clean in findutils" ; \
-       (cd findutils && \
+       (cd $(HOST_SUBDIR)/findutils && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -7261,13 +7889,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing distclean in findutils" ; \
-       (cd findutils && \
+       (cd $(HOST_SUBDIR)/findutils && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -7286,13 +7913,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing maintainer-clean in findutils" ; \
-       (cd findutils && \
+       (cd $(HOST_SUBDIR)/findutils && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -7303,46 +7929,47 @@ maintainer-clean-findutils:
  @endif findutils
  
  
+
  .PHONY: configure-find maybe-configure-find
  maybe-configure-find:
  @if find
  maybe-configure-find: configure-find
-configure-find:
-       @test ! -f find/Makefile || exit 0; \
-       [ -d find ] || mkdir 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 find || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/find; \
+       cd "$(HOST_SUBDIR)/find" || exit 1; \
         case $(srcdir) in \
-         \.) \
-           srcdiroption="--srcdir=."; \
-           libsrcdir=".";; \
-         /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/find"; \
-           libsrcdir="$$s/find";; \
-         *) \
-           srcdiroption="--srcdir=../$(srcdir)/find"; \
-           libsrcdir="$$s/find";; \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/find/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
+       srcdiroption="--srcdir=$${topdir}/find"; \
+       libsrcdir="$$s/find"; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
  @endif find
  
+
+
  .PHONY: all-find maybe-all-find
  maybe-all-find:
  @if find
+TARGET-find=all
  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 find && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd $(HOST_SUBDIR)/find && \
+         $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-find))
  @endif find
  
+
  .PHONY: check-find maybe-check-find
  maybe-check-find:
  @if find
@@ -7351,9 +7978,9 @@ 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 find && $(MAKE) $(FLAGS_TO_PASS) check)
+       (cd $(HOST_SUBDIR)/find && \
+         $(MAKE) $(FLAGS_TO_PASS)  check)
  
  @endif find
  
@@ -7365,9 +7992,9 @@ maybe-install-find: install-find
  install-find: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
-       (cd find && $(MAKE) $(FLAGS_TO_PASS) install)
+       (cd $(HOST_SUBDIR)/find && \
+         $(MAKE) $(FLAGS_TO_PASS)  install)
  
  @endif find
  
@@ -7383,13 +8010,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing info in find" ; \
-       (cd find && \
+       (cd $(HOST_SUBDIR)/find && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -7409,13 +8035,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing dvi in find" ; \
-       (cd find && \
+       (cd $(HOST_SUBDIR)/find && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -7425,6 +8050,31 @@ dvi-find: \
  
  @endif find
  
+.PHONY: maybe-html-find html-find
+maybe-html-find:
+@if find
+maybe-html-find: html-find
+
+html-find: \
+    configure-find 
+       @[ -f ./find/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing html in find" ; \
+       (cd $(HOST_SUBDIR)/find && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 html) \
+         || exit 1
+
+@endif find
+
  .PHONY: maybe-TAGS-find TAGS-find
  maybe-TAGS-find:
  @if find
@@ -7435,13 +8085,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing TAGS in find" ; \
-       (cd find && \
+       (cd $(HOST_SUBDIR)/find && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -7462,13 +8111,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing install-info in find" ; \
-       (cd find && \
+       (cd $(HOST_SUBDIR)/find && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -7488,13 +8136,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing installcheck in find" ; \
-       (cd find && \
+       (cd $(HOST_SUBDIR)/find && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -7513,13 +8160,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing mostlyclean in find" ; \
-       (cd find && \
+       (cd $(HOST_SUBDIR)/find && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -7538,13 +8184,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing clean in find" ; \
-       (cd find && \
+       (cd $(HOST_SUBDIR)/find && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -7563,13 +8208,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing distclean in find" ; \
-       (cd find && \
+       (cd $(HOST_SUBDIR)/find && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -7588,13 +8232,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing maintainer-clean in find" ; \
-       (cd find && \
+       (cd $(HOST_SUBDIR)/find && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -7605,46 +8248,290 @@ maintainer-clean-find:
  @endif find
  
  
+
+.PHONY: configure-fixincludes maybe-configure-fixincludes
+maybe-configure-fixincludes:
+@if fixincludes
+maybe-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 $(HOST_SUBDIR)/fixincludes; \
+       cd "$(HOST_SUBDIR)/fixincludes" || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/fixincludes/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/fixincludes"; \
+       libsrcdir="$$s/fixincludes"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
+         || exit 1
+@endif fixincludes
+
+
+
+.PHONY: all-fixincludes maybe-all-fixincludes
+maybe-all-fixincludes:
+@if fixincludes
+TARGET-fixincludes=all
+maybe-all-fixincludes: all-fixincludes
+all-fixincludes: configure-fixincludes
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(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
+maybe-check-fixincludes: check-fixincludes
+
+check-fixincludes:
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       (cd $(HOST_SUBDIR)/fixincludes && \
+         $(MAKE) $(FLAGS_TO_PASS)  check)
+
+@endif fixincludes
+
+.PHONY: install-fixincludes maybe-install-fixincludes
+maybe-install-fixincludes:
+@if fixincludes
+maybe-install-fixincludes: install-fixincludes
+
+install-fixincludes: installdirs
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       (cd $(HOST_SUBDIR)/fixincludes && \
+         $(MAKE) $(FLAGS_TO_PASS)  install)
+
+@endif fixincludes
+
+# Other targets (info, dvi, etc.)
+
+.PHONY: maybe-info-fixincludes info-fixincludes
+maybe-info-fixincludes:
+@if fixincludes
+maybe-info-fixincludes: info-fixincludes
+
+# fixincludes doesn't support info.
+info-fixincludes:
+
+@endif fixincludes
+
+.PHONY: maybe-dvi-fixincludes dvi-fixincludes
+maybe-dvi-fixincludes:
+@if fixincludes
+maybe-dvi-fixincludes: dvi-fixincludes
+
+# fixincludes doesn't support dvi.
+dvi-fixincludes:
+
+@endif fixincludes
+
+.PHONY: maybe-html-fixincludes html-fixincludes
+maybe-html-fixincludes:
+@if fixincludes
+maybe-html-fixincludes: html-fixincludes
+
+html-fixincludes: \
+    configure-fixincludes 
+       @[ -f ./fixincludes/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing html in fixincludes" ; \
+       (cd $(HOST_SUBDIR)/fixincludes && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 html) \
+         || exit 1
+
+@endif fixincludes
+
+.PHONY: maybe-TAGS-fixincludes TAGS-fixincludes
+maybe-TAGS-fixincludes:
+@if fixincludes
+maybe-TAGS-fixincludes: TAGS-fixincludes
+
+# fixincludes doesn't support TAGS.
+TAGS-fixincludes:
+
+@endif fixincludes
+
+.PHONY: maybe-install-info-fixincludes install-info-fixincludes
+maybe-install-info-fixincludes:
+@if fixincludes
+maybe-install-info-fixincludes: install-info-fixincludes
+
+# fixincludes doesn't support install-info.
+install-info-fixincludes:
+
+@endif fixincludes
+
+.PHONY: maybe-installcheck-fixincludes installcheck-fixincludes
+maybe-installcheck-fixincludes:
+@if fixincludes
+maybe-installcheck-fixincludes: installcheck-fixincludes
+
+# fixincludes doesn't support installcheck.
+installcheck-fixincludes:
+
+@endif fixincludes
+
+.PHONY: maybe-mostlyclean-fixincludes mostlyclean-fixincludes
+maybe-mostlyclean-fixincludes:
+@if fixincludes
+maybe-mostlyclean-fixincludes: mostlyclean-fixincludes
+
+mostlyclean-fixincludes: 
+       @[ -f ./fixincludes/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing mostlyclean in fixincludes" ; \
+       (cd $(HOST_SUBDIR)/fixincludes && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 mostlyclean) \
+         || exit 1
+
+@endif fixincludes
+
+.PHONY: maybe-clean-fixincludes clean-fixincludes
+maybe-clean-fixincludes:
+@if fixincludes
+maybe-clean-fixincludes: clean-fixincludes
+
+clean-fixincludes: 
+       @[ -f ./fixincludes/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing clean in fixincludes" ; \
+       (cd $(HOST_SUBDIR)/fixincludes && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 clean) \
+         || exit 1
+
+@endif fixincludes
+
+.PHONY: maybe-distclean-fixincludes distclean-fixincludes
+maybe-distclean-fixincludes:
+@if fixincludes
+maybe-distclean-fixincludes: distclean-fixincludes
+
+distclean-fixincludes: 
+       @[ -f ./fixincludes/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing distclean in fixincludes" ; \
+       (cd $(HOST_SUBDIR)/fixincludes && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 distclean) \
+         || exit 1
+
+@endif fixincludes
+
+.PHONY: maybe-maintainer-clean-fixincludes maintainer-clean-fixincludes
+maybe-maintainer-clean-fixincludes:
+@if fixincludes
+maybe-maintainer-clean-fixincludes: maintainer-clean-fixincludes
+
+maintainer-clean-fixincludes: 
+       @[ -f ./fixincludes/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing maintainer-clean in fixincludes" ; \
+       (cd $(HOST_SUBDIR)/fixincludes && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 maintainer-clean) \
+         || exit 1
+
+@endif fixincludes
+
+
+
  .PHONY: configure-flex maybe-configure-flex
  maybe-configure-flex:
  @if flex
  maybe-configure-flex: configure-flex
-configure-flex:
-       @test ! -f flex/Makefile || exit 0; \
-       [ -d flex ] || mkdir 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 flex || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/flex; \
+       cd "$(HOST_SUBDIR)/flex" || exit 1; \
         case $(srcdir) in \
-         \.) \
-           srcdiroption="--srcdir=."; \
-           libsrcdir=".";; \
-         /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/flex"; \
-           libsrcdir="$$s/flex";; \
-         *) \
-           srcdiroption="--srcdir=../$(srcdir)/flex"; \
-           libsrcdir="$$s/flex";; \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/flex/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
+       srcdiroption="--srcdir=$${topdir}/flex"; \
+       libsrcdir="$$s/flex"; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
  @endif flex
  
+
+
  .PHONY: all-flex maybe-all-flex
  maybe-all-flex:
  @if flex
+TARGET-flex=all
  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 flex && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd $(HOST_SUBDIR)/flex && \
+         $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-flex))
  @endif flex
  
+
  .PHONY: check-flex maybe-check-flex
  maybe-check-flex:
  @if flex
@@ -7655,9 +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 flex && $(MAKE) $(FLAGS_TO_PASS) check); \
+         (cd $(HOST_SUBDIR)/flex && \
+           $(MAKE) $(FLAGS_TO_PASS)  check); \
         fi
  
  @endif flex
@@ -7670,9 +8557,9 @@ maybe-install-flex: install-flex
  install-flex: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
-       (cd flex && $(MAKE) $(FLAGS_TO_PASS) install)
+       (cd $(HOST_SUBDIR)/flex && \
+         $(MAKE) $(FLAGS_TO_PASS)  install)
  
  @endif flex
  
@@ -7688,13 +8575,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing info in flex" ; \
-       (cd flex && \
+       (cd $(HOST_SUBDIR)/flex && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -7714,13 +8600,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing dvi in flex" ; \
-       (cd flex && \
+       (cd $(HOST_SUBDIR)/flex && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -7730,6 +8615,31 @@ dvi-flex: \
  
  @endif flex
  
+.PHONY: maybe-html-flex html-flex
+maybe-html-flex:
+@if flex
+maybe-html-flex: html-flex
+
+html-flex: \
+    configure-flex 
+       @[ -f ./flex/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing html in flex" ; \
+       (cd $(HOST_SUBDIR)/flex && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 html) \
+         || exit 1
+
+@endif flex
+
  .PHONY: maybe-TAGS-flex TAGS-flex
  maybe-TAGS-flex:
  @if flex
@@ -7740,13 +8650,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing TAGS in flex" ; \
-       (cd flex && \
+       (cd $(HOST_SUBDIR)/flex && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -7767,13 +8676,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing install-info in flex" ; \
-       (cd flex && \
+       (cd $(HOST_SUBDIR)/flex && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -7793,13 +8701,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing installcheck in flex" ; \
-       (cd flex && \
+       (cd $(HOST_SUBDIR)/flex && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -7818,13 +8725,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing mostlyclean in flex" ; \
-       (cd flex && \
+       (cd $(HOST_SUBDIR)/flex && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -7843,13 +8749,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing clean in flex" ; \
-       (cd flex && \
+       (cd $(HOST_SUBDIR)/flex && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -7868,13 +8773,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing distclean in flex" ; \
-       (cd flex && \
+       (cd $(HOST_SUBDIR)/flex && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -7893,13 +8797,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing maintainer-clean in flex" ; \
-       (cd flex && \
+       (cd $(HOST_SUBDIR)/flex && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -7910,46 +8813,49 @@ maintainer-clean-flex:
  @endif flex
  
  
+
  .PHONY: configure-gas maybe-configure-gas
  maybe-configure-gas:
  @if gas
  maybe-configure-gas: configure-gas
-configure-gas:
-       @test ! -f gas/Makefile || exit 0; \
-       [ -d gas ] || mkdir 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 gas || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/gas; \
+       cd "$(HOST_SUBDIR)/gas" || exit 1; \
         case $(srcdir) in \
-         \.) \
-           srcdiroption="--srcdir=."; \
-           libsrcdir=".";; \
-         /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/gas"; \
-           libsrcdir="$$s/gas";; \
-         *) \
-           srcdiroption="--srcdir=../$(srcdir)/gas"; \
-           libsrcdir="$$s/gas";; \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/gas/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
+       srcdiroption="--srcdir=$${topdir}/gas"; \
+       libsrcdir="$$s/gas"; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
  @endif gas
  
+
+
  .PHONY: all-gas maybe-all-gas
  maybe-all-gas:
  @if gas
+TARGET-gas=all
  maybe-all-gas: all-gas
  all-gas: configure-gas
-       @r=`${PWD_COMMAND}`; export r; \
+       @test -f stage_last && exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
-       (cd gas && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd $(HOST_SUBDIR)/gas && \
+         $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-gas))
  @endif gas
  
+
  .PHONY: check-gas maybe-check-gas
  maybe-check-gas:
  @if gas
@@ -7958,9 +8864,9 @@ 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 gas && $(MAKE) $(FLAGS_TO_PASS) check)
+       (cd $(HOST_SUBDIR)/gas && \
+         $(MAKE) $(FLAGS_TO_PASS)  check)
  
  @endif gas
  
@@ -7972,9 +8878,9 @@ maybe-install-gas: install-gas
  install-gas: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
-       (cd gas && $(MAKE) $(FLAGS_TO_PASS) install)
+       (cd $(HOST_SUBDIR)/gas && \
+         $(MAKE) $(FLAGS_TO_PASS)  install)
  
  @endif gas
  
@@ -7990,13 +8896,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing info in gas" ; \
-       (cd gas && \
+       (cd $(HOST_SUBDIR)/gas && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -8016,13 +8921,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing dvi in gas" ; \
-       (cd gas && \
+       (cd $(HOST_SUBDIR)/gas && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -8032,6 +8936,31 @@ dvi-gas: \
  
  @endif gas
  
+.PHONY: maybe-html-gas html-gas
+maybe-html-gas:
+@if gas
+maybe-html-gas: html-gas
+
+html-gas: \
+    configure-gas 
+       @[ -f ./gas/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing html in gas" ; \
+       (cd $(HOST_SUBDIR)/gas && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 html) \
+         || exit 1
+
+@endif gas
+
  .PHONY: maybe-TAGS-gas TAGS-gas
  maybe-TAGS-gas:
  @if gas
@@ -8042,13 +8971,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing TAGS in gas" ; \
-       (cd gas && \
+       (cd $(HOST_SUBDIR)/gas && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -8069,13 +8997,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing install-info in gas" ; \
-       (cd gas && \
+       (cd $(HOST_SUBDIR)/gas && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -8095,13 +9022,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing installcheck in gas" ; \
-       (cd gas && \
+       (cd $(HOST_SUBDIR)/gas && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -8120,13 +9046,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing mostlyclean in gas" ; \
-       (cd gas && \
+       (cd $(HOST_SUBDIR)/gas && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -8145,13 +9070,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing clean in gas" ; \
-       (cd gas && \
+       (cd $(HOST_SUBDIR)/gas && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -8170,13 +9094,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing distclean in gas" ; \
-       (cd gas && \
+       (cd $(HOST_SUBDIR)/gas && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -8195,13 +9118,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing maintainer-clean in gas" ; \
-       (cd gas && \
+       (cd $(HOST_SUBDIR)/gas && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -8212,93 +9134,95 @@ maintainer-clean-gas:
  @endif gas
  
  
-.PHONY: configure-gawk maybe-configure-gawk
-maybe-configure-gawk:
-@if gawk
-maybe-configure-gawk: configure-gawk
-configure-gawk:
-       @test ! -f gawk/Makefile || exit 0; \
-       [ -d gawk ] || mkdir gawk; \
+
+.PHONY: configure-gcc maybe-configure-gcc
+maybe-configure-gcc:
+@if gcc
+maybe-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 gawk; \
-       cd gawk || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/gcc; \
+       cd "$(HOST_SUBDIR)/gcc" || exit 1; \
         case $(srcdir) in \
-         \.) \
-           srcdiroption="--srcdir=."; \
-           libsrcdir=".";; \
-         /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/gawk"; \
-           libsrcdir="$$s/gawk";; \
-         *) \
-           srcdiroption="--srcdir=../$(srcdir)/gawk"; \
-           libsrcdir="$$s/gawk";; \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/gcc/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
+       srcdiroption="--srcdir=$${topdir}/gcc"; \
+       libsrcdir="$$s/gcc"; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
-@endif gawk
+@endif gcc
  
-.PHONY: all-gawk maybe-all-gawk
-maybe-all-gawk:
-@if gawk
-maybe-all-gawk: all-gawk
-all-gawk: configure-gawk
-       @r=`${PWD_COMMAND}`; export r; \
+
+
+.PHONY: all-gcc maybe-all-gcc
+maybe-all-gcc:
+@if gcc
+TARGET-gcc=`if [ -f gcc/stage_last ]; then echo quickstrap ; else echo all; fi`
+maybe-all-gcc: all-gcc
+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 gawk && $(MAKE) $(FLAGS_TO_PASS) all)
-@endif gawk
+       (cd $(HOST_SUBDIR)/gcc && \
+         $(MAKE) $(FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) $(TARGET-gcc))
+@endif gcc
  
-.PHONY: check-gawk maybe-check-gawk
-maybe-check-gawk:
-@if gawk
-maybe-check-gawk: check-gawk
  
-check-gawk:
+.PHONY: check-gcc maybe-check-gcc
+maybe-check-gcc:
+@if gcc
+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 gawk && $(MAKE) $(FLAGS_TO_PASS) check)
+       (cd $(HOST_SUBDIR)/gcc && \
+         $(MAKE) $(FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) check)
  
-@endif gawk
+@endif gcc
  
-.PHONY: install-gawk maybe-install-gawk
-maybe-install-gawk:
-@if gawk
-maybe-install-gawk: install-gawk
+.PHONY: install-gcc maybe-install-gcc
+maybe-install-gcc:
+@if gcc
+maybe-install-gcc: install-gcc
  
-install-gawk: installdirs
+install-gcc: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
-       (cd gawk && $(MAKE) $(FLAGS_TO_PASS) install)
+       (cd $(HOST_SUBDIR)/gcc && \
+         $(MAKE) $(FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) install)
  
-@endif gawk
+@endif gcc
  
  # Other targets (info, dvi, etc.)
  
-.PHONY: maybe-info-gawk info-gawk
-maybe-info-gawk:
-@if gawk
-maybe-info-gawk: info-gawk
+.PHONY: maybe-info-gcc info-gcc
+maybe-info-gcc:
+@if gcc
+maybe-info-gcc: info-gcc
  
-info-gawk: \
-    configure-gawk 
-       @[ -f ./gawk/Makefile ] || exit 0; \
+info-gcc: \
+    configure-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); do \
+       for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing info in gawk" ; \
-       (cd gawk && \
+       echo "Doing info in gcc" ; \
+       (cd $(HOST_SUBDIR)/gcc && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -8306,25 +9230,24 @@ info-gawk: \
                   info) \
           || exit 1
  
-@endif gawk
+@endif gcc
  
-.PHONY: maybe-dvi-gawk dvi-gawk
-maybe-dvi-gawk:
-@if gawk
-maybe-dvi-gawk: dvi-gawk
+.PHONY: maybe-dvi-gcc dvi-gcc
+maybe-dvi-gcc:
+@if gcc
+maybe-dvi-gcc: dvi-gcc
  
-dvi-gawk: \
-    configure-gawk 
-       @[ -f ./gawk/Makefile ] || exit 0; \
+dvi-gcc: \
+    configure-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); do \
+       for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing dvi in gawk" ; \
-       (cd gawk && \
+       echo "Doing dvi in gcc" ; \
+       (cd $(HOST_SUBDIR)/gcc && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -8332,25 +9255,49 @@ dvi-gawk: \
                   dvi) \
           || exit 1
  
-@endif gawk
+@endif gcc
  
-.PHONY: maybe-TAGS-gawk TAGS-gawk
-maybe-TAGS-gawk:
-@if gawk
-maybe-TAGS-gawk: TAGS-gawk
+.PHONY: maybe-html-gcc html-gcc
+maybe-html-gcc:
+@if gcc
+maybe-html-gcc: html-gcc
  
-TAGS-gawk: \
-    configure-gawk 
-       @[ -f ./gawk/Makefile ] || exit 0; \
+html-gcc: \
+    configure-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); do \
+       for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing TAGS in gawk" ; \
-       (cd gawk && \
+       echo "Doing html in gcc" ; \
+       (cd $(HOST_SUBDIR)/gcc && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 html) \
+         || exit 1
+
+@endif gcc
+
+.PHONY: maybe-TAGS-gcc TAGS-gcc
+maybe-TAGS-gcc:
+@if gcc
+maybe-TAGS-gcc: TAGS-gcc
+
+TAGS-gcc: \
+    configure-gcc 
+       @[ -f ./gcc/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing TAGS in gcc" ; \
+       (cd $(HOST_SUBDIR)/gcc && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -8358,26 +9305,25 @@ TAGS-gawk: \
                   TAGS) \
           || exit 1
  
-@endif gawk
+@endif gcc
  
-.PHONY: maybe-install-info-gawk install-info-gawk
-maybe-install-info-gawk:
-@if gawk
-maybe-install-info-gawk: install-info-gawk
+.PHONY: maybe-install-info-gcc install-info-gcc
+maybe-install-info-gcc:
+@if gcc
+maybe-install-info-gcc: install-info-gcc
  
-install-info-gawk: \
-    configure-gawk \
-    info-gawk 
-       @[ -f ./gawk/Makefile ] || exit 0; \
+install-info-gcc: \
+    configure-gcc \
+    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); do \
+       for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing install-info in gawk" ; \
-       (cd gawk && \
+       echo "Doing install-info in gcc" ; \
+       (cd $(HOST_SUBDIR)/gcc && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -8385,25 +9331,24 @@ install-info-gawk: \
                   install-info) \
           || exit 1
  
-@endif gawk
+@endif gcc
  
-.PHONY: maybe-installcheck-gawk installcheck-gawk
-maybe-installcheck-gawk:
-@if gawk
-maybe-installcheck-gawk: installcheck-gawk
+.PHONY: maybe-installcheck-gcc installcheck-gcc
+maybe-installcheck-gcc:
+@if gcc
+maybe-installcheck-gcc: installcheck-gcc
  
-installcheck-gawk: \
-    configure-gawk 
-       @[ -f ./gawk/Makefile ] || exit 0; \
+installcheck-gcc: \
+    configure-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); do \
+       for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing installcheck in gawk" ; \
-       (cd gawk && \
+       echo "Doing installcheck in gcc" ; \
+       (cd $(HOST_SUBDIR)/gcc && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -8411,24 +9356,23 @@ installcheck-gawk: \
                   installcheck) \
           || exit 1
  
-@endif gawk
+@endif gcc
  
-.PHONY: maybe-mostlyclean-gawk mostlyclean-gawk
-maybe-mostlyclean-gawk:
-@if gawk
-maybe-mostlyclean-gawk: mostlyclean-gawk
+.PHONY: maybe-mostlyclean-gcc mostlyclean-gcc
+maybe-mostlyclean-gcc:
+@if gcc
+maybe-mostlyclean-gcc: mostlyclean-gcc
  
-mostlyclean-gawk: 
-       @[ -f ./gawk/Makefile ] || exit 0; \
+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); do \
+       for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing mostlyclean in gawk" ; \
-       (cd gawk && \
+       echo "Doing mostlyclean in gcc" ; \
+       (cd $(HOST_SUBDIR)/gcc && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -8436,24 +9380,23 @@ mostlyclean-gawk:
                   mostlyclean) \
           || exit 1
  
-@endif gawk
+@endif gcc
  
-.PHONY: maybe-clean-gawk clean-gawk
-maybe-clean-gawk:
-@if gawk
-maybe-clean-gawk: clean-gawk
+.PHONY: maybe-clean-gcc clean-gcc
+maybe-clean-gcc:
+@if gcc
+maybe-clean-gcc: clean-gcc
  
-clean-gawk: 
-       @[ -f ./gawk/Makefile ] || exit 0; \
+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); do \
+       for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing clean in gawk" ; \
-       (cd gawk && \
+       echo "Doing clean in gcc" ; \
+       (cd $(HOST_SUBDIR)/gcc && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -8461,24 +9404,23 @@ clean-gawk:
                   clean) \
           || exit 1
  
-@endif gawk
+@endif gcc
  
-.PHONY: maybe-distclean-gawk distclean-gawk
-maybe-distclean-gawk:
-@if gawk
-maybe-distclean-gawk: distclean-gawk
+.PHONY: maybe-distclean-gcc distclean-gcc
+maybe-distclean-gcc:
+@if gcc
+maybe-distclean-gcc: distclean-gcc
  
-distclean-gawk: 
-       @[ -f ./gawk/Makefile ] || exit 0; \
+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); do \
+       for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing distclean in gawk" ; \
-       (cd gawk && \
+       echo "Doing distclean in gcc" ; \
+       (cd $(HOST_SUBDIR)/gcc && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -8486,24 +9428,23 @@ distclean-gawk:
                   distclean) \
           || exit 1
  
-@endif gawk
+@endif gcc
  
-.PHONY: maybe-maintainer-clean-gawk maintainer-clean-gawk
-maybe-maintainer-clean-gawk:
-@if gawk
-maybe-maintainer-clean-gawk: maintainer-clean-gawk
+.PHONY: maybe-maintainer-clean-gcc maintainer-clean-gcc
+maybe-maintainer-clean-gcc:
+@if gcc
+maybe-maintainer-clean-gcc: maintainer-clean-gcc
  
-maintainer-clean-gawk: 
-       @[ -f ./gawk/Makefile ] || exit 0; \
+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); do \
+       for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing maintainer-clean in gawk" ; \
-       (cd gawk && \
+       echo "Doing maintainer-clean in gcc" ; \
+       (cd $(HOST_SUBDIR)/gcc && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -8511,96 +9452,96 @@ maintainer-clean-gawk:
                   maintainer-clean) \
           || exit 1
  
-@endif gawk
+@endif gcc
  
  
-.PHONY: configure-gettext maybe-configure-gettext
-maybe-configure-gettext:
-@if gettext
-maybe-configure-gettext: configure-gettext
-configure-gettext:
-       @test ! -f gettext/Makefile || exit 0; \
-       [ -d gettext ] || mkdir gettext; \
+
+.PHONY: configure-gawk maybe-configure-gawk
+maybe-configure-gawk:
+@if gawk
+maybe-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 gettext; \
-       cd gettext || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/gawk; \
+       cd "$(HOST_SUBDIR)/gawk" || exit 1; \
         case $(srcdir) in \
-         \.) \
-           srcdiroption="--srcdir=."; \
-           libsrcdir=".";; \
-         /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/gettext"; \
-           libsrcdir="$$s/gettext";; \
-         *) \
-           srcdiroption="--srcdir=../$(srcdir)/gettext"; \
-           libsrcdir="$$s/gettext";; \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/gawk/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
+       srcdiroption="--srcdir=$${topdir}/gawk"; \
+       libsrcdir="$$s/gawk"; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
-@endif gettext
+@endif gawk
  
-.PHONY: all-gettext maybe-all-gettext
-maybe-all-gettext:
-@if gettext
-maybe-all-gettext: all-gettext
-all-gettext: configure-gettext
+
+
+.PHONY: all-gawk maybe-all-gawk
+maybe-all-gawk:
+@if gawk
+TARGET-gawk=all
+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 gettext && $(MAKE) $(FLAGS_TO_PASS) all)
-@endif gettext
+       (cd $(HOST_SUBDIR)/gawk && \
+         $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-gawk))
+@endif gawk
  
-.PHONY: check-gettext maybe-check-gettext
-maybe-check-gettext:
-@if gettext
-maybe-check-gettext: check-gettext
  
-check-gettext:
+.PHONY: check-gawk maybe-check-gawk
+maybe-check-gawk:
+@if gawk
+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 gettext && $(MAKE) $(FLAGS_TO_PASS) check)
+       (cd $(HOST_SUBDIR)/gawk && \
+         $(MAKE) $(FLAGS_TO_PASS)  check)
  
-@endif gettext
+@endif gawk
  
-.PHONY: install-gettext maybe-install-gettext
-maybe-install-gettext:
-@if gettext
-maybe-install-gettext: install-gettext
+.PHONY: install-gawk maybe-install-gawk
+maybe-install-gawk:
+@if gawk
+maybe-install-gawk: install-gawk
  
-install-gettext: installdirs
+install-gawk: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
-       (cd gettext && $(MAKE) $(FLAGS_TO_PASS) install)
+       (cd $(HOST_SUBDIR)/gawk && \
+         $(MAKE) $(FLAGS_TO_PASS)  install)
  
-@endif gettext
+@endif gawk
  
  # Other targets (info, dvi, etc.)
  
-.PHONY: maybe-info-gettext info-gettext
-maybe-info-gettext:
-@if gettext
-maybe-info-gettext: info-gettext
+.PHONY: maybe-info-gawk info-gawk
+maybe-info-gawk:
+@if gawk
+maybe-info-gawk: info-gawk
  
-info-gettext: \
-    configure-gettext 
-       @[ -f ./gettext/Makefile ] || exit 0; \
+info-gawk: \
+    configure-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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing info in gettext" ; \
-       (cd gettext && \
+       echo "Doing info in gawk" ; \
+       (cd $(HOST_SUBDIR)/gawk && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -8608,25 +9549,24 @@ info-gettext: \
                   info) \
           || exit 1
  
-@endif gettext
+@endif gawk
  
-.PHONY: maybe-dvi-gettext dvi-gettext
-maybe-dvi-gettext:
-@if gettext
-maybe-dvi-gettext: dvi-gettext
+.PHONY: maybe-dvi-gawk dvi-gawk
+maybe-dvi-gawk:
+@if gawk
+maybe-dvi-gawk: dvi-gawk
  
-dvi-gettext: \
-    configure-gettext 
-       @[ -f ./gettext/Makefile ] || exit 0; \
+dvi-gawk: \
+    configure-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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing dvi in gettext" ; \
-       (cd gettext && \
+       echo "Doing dvi in gawk" ; \
+       (cd $(HOST_SUBDIR)/gawk && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -8634,25 +9574,49 @@ dvi-gettext: \
                   dvi) \
           || exit 1
  
-@endif gettext
+@endif gawk
  
-.PHONY: maybe-TAGS-gettext TAGS-gettext
-maybe-TAGS-gettext:
-@if gettext
-maybe-TAGS-gettext: TAGS-gettext
+.PHONY: maybe-html-gawk html-gawk
+maybe-html-gawk:
+@if gawk
+maybe-html-gawk: html-gawk
  
-TAGS-gettext: \
-    configure-gettext 
-       @[ -f ./gettext/Makefile ] || exit 0; \
+html-gawk: \
+    configure-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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing TAGS in gettext" ; \
-       (cd gettext && \
+       echo "Doing html in gawk" ; \
+       (cd $(HOST_SUBDIR)/gawk && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 html) \
+         || exit 1
+
+@endif gawk
+
+.PHONY: maybe-TAGS-gawk TAGS-gawk
+maybe-TAGS-gawk:
+@if gawk
+maybe-TAGS-gawk: TAGS-gawk
+
+TAGS-gawk: \
+    configure-gawk 
+       @[ -f ./gawk/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing TAGS in gawk" ; \
+       (cd $(HOST_SUBDIR)/gawk && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -8660,26 +9624,25 @@ TAGS-gettext: \
                   TAGS) \
           || exit 1
  
-@endif gettext
+@endif gawk
  
-.PHONY: maybe-install-info-gettext install-info-gettext
-maybe-install-info-gettext:
-@if gettext
-maybe-install-info-gettext: install-info-gettext
+.PHONY: maybe-install-info-gawk install-info-gawk
+maybe-install-info-gawk:
+@if gawk
+maybe-install-info-gawk: install-info-gawk
  
-install-info-gettext: \
-    configure-gettext \
-    info-gettext 
-       @[ -f ./gettext/Makefile ] || exit 0; \
+install-info-gawk: \
+    configure-gawk \
+    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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing install-info in gettext" ; \
-       (cd gettext && \
+       echo "Doing install-info in gawk" ; \
+       (cd $(HOST_SUBDIR)/gawk && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -8687,25 +9650,24 @@ install-info-gettext: \
                   install-info) \
           || exit 1
  
-@endif gettext
+@endif gawk
  
-.PHONY: maybe-installcheck-gettext installcheck-gettext
-maybe-installcheck-gettext:
-@if gettext
-maybe-installcheck-gettext: installcheck-gettext
+.PHONY: maybe-installcheck-gawk installcheck-gawk
+maybe-installcheck-gawk:
+@if gawk
+maybe-installcheck-gawk: installcheck-gawk
  
-installcheck-gettext: \
-    configure-gettext 
-       @[ -f ./gettext/Makefile ] || exit 0; \
+installcheck-gawk: \
+    configure-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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing installcheck in gettext" ; \
-       (cd gettext && \
+       echo "Doing installcheck in gawk" ; \
+       (cd $(HOST_SUBDIR)/gawk && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -8713,24 +9675,23 @@ installcheck-gettext: \
                   installcheck) \
           || exit 1
  
-@endif gettext
+@endif gawk
  
-.PHONY: maybe-mostlyclean-gettext mostlyclean-gettext
-maybe-mostlyclean-gettext:
-@if gettext
-maybe-mostlyclean-gettext: mostlyclean-gettext
+.PHONY: maybe-mostlyclean-gawk mostlyclean-gawk
+maybe-mostlyclean-gawk:
+@if gawk
+maybe-mostlyclean-gawk: mostlyclean-gawk
  
-mostlyclean-gettext: 
-       @[ -f ./gettext/Makefile ] || exit 0; \
+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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing mostlyclean in gettext" ; \
-       (cd gettext && \
+       echo "Doing mostlyclean in gawk" ; \
+       (cd $(HOST_SUBDIR)/gawk && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -8738,24 +9699,23 @@ mostlyclean-gettext:
                   mostlyclean) \
           || exit 1
  
-@endif gettext
+@endif gawk
  
-.PHONY: maybe-clean-gettext clean-gettext
-maybe-clean-gettext:
-@if gettext
-maybe-clean-gettext: clean-gettext
+.PHONY: maybe-clean-gawk clean-gawk
+maybe-clean-gawk:
+@if gawk
+maybe-clean-gawk: clean-gawk
  
-clean-gettext: 
-       @[ -f ./gettext/Makefile ] || exit 0; \
+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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing clean in gettext" ; \
-       (cd gettext && \
+       echo "Doing clean in gawk" ; \
+       (cd $(HOST_SUBDIR)/gawk && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -8763,24 +9723,23 @@ clean-gettext:
                   clean) \
           || exit 1
  
-@endif gettext
+@endif gawk
  
-.PHONY: maybe-distclean-gettext distclean-gettext
-maybe-distclean-gettext:
-@if gettext
-maybe-distclean-gettext: distclean-gettext
+.PHONY: maybe-distclean-gawk distclean-gawk
+maybe-distclean-gawk:
+@if gawk
+maybe-distclean-gawk: distclean-gawk
  
-distclean-gettext: 
-       @[ -f ./gettext/Makefile ] || exit 0; \
+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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing distclean in gettext" ; \
-       (cd gettext && \
+       echo "Doing distclean in gawk" ; \
+       (cd $(HOST_SUBDIR)/gawk && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -8788,24 +9747,23 @@ distclean-gettext:
                   distclean) \
           || exit 1
  
-@endif gettext
+@endif gawk
  
-.PHONY: maybe-maintainer-clean-gettext maintainer-clean-gettext
-maybe-maintainer-clean-gettext:
-@if gettext
-maybe-maintainer-clean-gettext: maintainer-clean-gettext
+.PHONY: maybe-maintainer-clean-gawk maintainer-clean-gawk
+maybe-maintainer-clean-gawk:
+@if gawk
+maybe-maintainer-clean-gawk: maintainer-clean-gawk
  
-maintainer-clean-gettext: 
-       @[ -f ./gettext/Makefile ] || exit 0; \
+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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing maintainer-clean in gettext" ; \
-       (cd gettext && \
+       echo "Doing maintainer-clean in gawk" ; \
+       (cd $(HOST_SUBDIR)/gawk && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -8813,96 +9771,96 @@ maintainer-clean-gettext:
                   maintainer-clean) \
           || exit 1
  
-@endif gettext
+@endif gawk
  
  
-.PHONY: configure-gnuserv maybe-configure-gnuserv
-maybe-configure-gnuserv:
-@if gnuserv
-maybe-configure-gnuserv: configure-gnuserv
-configure-gnuserv:
-       @test ! -f gnuserv/Makefile || exit 0; \
-       [ -d gnuserv ] || mkdir gnuserv; \
+
+.PHONY: configure-gettext maybe-configure-gettext
+maybe-configure-gettext:
+@if gettext
+maybe-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 gnuserv; \
-       cd gnuserv || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/gettext; \
+       cd "$(HOST_SUBDIR)/gettext" || exit 1; \
         case $(srcdir) in \
-         \.) \
-           srcdiroption="--srcdir=."; \
-           libsrcdir=".";; \
-         /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/gnuserv"; \
-           libsrcdir="$$s/gnuserv";; \
-         *) \
-           srcdiroption="--srcdir=../$(srcdir)/gnuserv"; \
-           libsrcdir="$$s/gnuserv";; \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/gettext/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
+       srcdiroption="--srcdir=$${topdir}/gettext"; \
+       libsrcdir="$$s/gettext"; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
-@endif gnuserv
+@endif gettext
  
-.PHONY: all-gnuserv maybe-all-gnuserv
-maybe-all-gnuserv:
-@if gnuserv
-maybe-all-gnuserv: all-gnuserv
-all-gnuserv: configure-gnuserv
+
+
+.PHONY: all-gettext maybe-all-gettext
+maybe-all-gettext:
+@if gettext
+TARGET-gettext=all
+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 gnuserv && $(MAKE) $(FLAGS_TO_PASS) all)
-@endif gnuserv
+       (cd $(HOST_SUBDIR)/gettext && \
+         $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-gettext))
+@endif gettext
  
-.PHONY: check-gnuserv maybe-check-gnuserv
-maybe-check-gnuserv:
-@if gnuserv
-maybe-check-gnuserv: check-gnuserv
  
-check-gnuserv:
+.PHONY: check-gettext maybe-check-gettext
+maybe-check-gettext:
+@if gettext
+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 gnuserv && $(MAKE) $(FLAGS_TO_PASS) check)
+       (cd $(HOST_SUBDIR)/gettext && \
+         $(MAKE) $(FLAGS_TO_PASS)  check)
  
-@endif gnuserv
+@endif gettext
  
-.PHONY: install-gnuserv maybe-install-gnuserv
-maybe-install-gnuserv:
-@if gnuserv
-maybe-install-gnuserv: install-gnuserv
+.PHONY: install-gettext maybe-install-gettext
+maybe-install-gettext:
+@if gettext
+maybe-install-gettext: install-gettext
  
-install-gnuserv: installdirs
+install-gettext: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
-       (cd gnuserv && $(MAKE) $(FLAGS_TO_PASS) install)
+       (cd $(HOST_SUBDIR)/gettext && \
+         $(MAKE) $(FLAGS_TO_PASS)  install)
  
-@endif gnuserv
+@endif gettext
  
  # Other targets (info, dvi, etc.)
  
-.PHONY: maybe-info-gnuserv info-gnuserv
-maybe-info-gnuserv:
-@if gnuserv
-maybe-info-gnuserv: info-gnuserv
+.PHONY: maybe-info-gettext info-gettext
+maybe-info-gettext:
+@if gettext
+maybe-info-gettext: info-gettext
  
-info-gnuserv: \
-    configure-gnuserv 
-       @[ -f ./gnuserv/Makefile ] || exit 0; \
+info-gettext: \
+    configure-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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing info in gnuserv" ; \
-       (cd gnuserv && \
+       echo "Doing info in gettext" ; \
+       (cd $(HOST_SUBDIR)/gettext && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -8910,25 +9868,24 @@ info-gnuserv: \
                   info) \
           || exit 1
  
-@endif gnuserv
+@endif gettext
  
-.PHONY: maybe-dvi-gnuserv dvi-gnuserv
-maybe-dvi-gnuserv:
-@if gnuserv
-maybe-dvi-gnuserv: dvi-gnuserv
+.PHONY: maybe-dvi-gettext dvi-gettext
+maybe-dvi-gettext:
+@if gettext
+maybe-dvi-gettext: dvi-gettext
  
-dvi-gnuserv: \
-    configure-gnuserv 
-       @[ -f ./gnuserv/Makefile ] || exit 0; \
+dvi-gettext: \
+    configure-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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing dvi in gnuserv" ; \
-       (cd gnuserv && \
+       echo "Doing dvi in gettext" ; \
+       (cd $(HOST_SUBDIR)/gettext && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -8936,25 +9893,49 @@ dvi-gnuserv: \
                   dvi) \
           || exit 1
  
-@endif gnuserv
+@endif gettext
  
-.PHONY: maybe-TAGS-gnuserv TAGS-gnuserv
-maybe-TAGS-gnuserv:
-@if gnuserv
-maybe-TAGS-gnuserv: TAGS-gnuserv
+.PHONY: maybe-html-gettext html-gettext
+maybe-html-gettext:
+@if gettext
+maybe-html-gettext: html-gettext
  
-TAGS-gnuserv: \
-    configure-gnuserv 
-       @[ -f ./gnuserv/Makefile ] || exit 0; \
+html-gettext: \
+    configure-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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing TAGS in gnuserv" ; \
-       (cd gnuserv && \
+       echo "Doing html in gettext" ; \
+       (cd $(HOST_SUBDIR)/gettext && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 html) \
+         || exit 1
+
+@endif gettext
+
+.PHONY: maybe-TAGS-gettext TAGS-gettext
+maybe-TAGS-gettext:
+@if gettext
+maybe-TAGS-gettext: TAGS-gettext
+
+TAGS-gettext: \
+    configure-gettext 
+       @[ -f ./gettext/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing TAGS in gettext" ; \
+       (cd $(HOST_SUBDIR)/gettext && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -8962,26 +9943,25 @@ TAGS-gnuserv: \
                   TAGS) \
           || exit 1
  
-@endif gnuserv
+@endif gettext
  
-.PHONY: maybe-install-info-gnuserv install-info-gnuserv
-maybe-install-info-gnuserv:
-@if gnuserv
-maybe-install-info-gnuserv: install-info-gnuserv
+.PHONY: maybe-install-info-gettext install-info-gettext
+maybe-install-info-gettext:
+@if gettext
+maybe-install-info-gettext: install-info-gettext
  
-install-info-gnuserv: \
-    configure-gnuserv \
-    info-gnuserv 
-       @[ -f ./gnuserv/Makefile ] || exit 0; \
+install-info-gettext: \
+    configure-gettext \
+    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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing install-info in gnuserv" ; \
-       (cd gnuserv && \
+       echo "Doing install-info in gettext" ; \
+       (cd $(HOST_SUBDIR)/gettext && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -8989,25 +9969,24 @@ install-info-gnuserv: \
                   install-info) \
           || exit 1
  
-@endif gnuserv
+@endif gettext
  
-.PHONY: maybe-installcheck-gnuserv installcheck-gnuserv
-maybe-installcheck-gnuserv:
-@if gnuserv
-maybe-installcheck-gnuserv: installcheck-gnuserv
+.PHONY: maybe-installcheck-gettext installcheck-gettext
+maybe-installcheck-gettext:
+@if gettext
+maybe-installcheck-gettext: installcheck-gettext
  
-installcheck-gnuserv: \
-    configure-gnuserv 
-       @[ -f ./gnuserv/Makefile ] || exit 0; \
+installcheck-gettext: \
+    configure-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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing installcheck in gnuserv" ; \
-       (cd gnuserv && \
+       echo "Doing installcheck in gettext" ; \
+       (cd $(HOST_SUBDIR)/gettext && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -9015,24 +9994,23 @@ installcheck-gnuserv: \
                   installcheck) \
           || exit 1
  
-@endif gnuserv
+@endif gettext
  
-.PHONY: maybe-mostlyclean-gnuserv mostlyclean-gnuserv
-maybe-mostlyclean-gnuserv:
-@if gnuserv
-maybe-mostlyclean-gnuserv: mostlyclean-gnuserv
+.PHONY: maybe-mostlyclean-gettext mostlyclean-gettext
+maybe-mostlyclean-gettext:
+@if gettext
+maybe-mostlyclean-gettext: mostlyclean-gettext
  
-mostlyclean-gnuserv: 
-       @[ -f ./gnuserv/Makefile ] || exit 0; \
+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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing mostlyclean in gnuserv" ; \
-       (cd gnuserv && \
+       echo "Doing mostlyclean in gettext" ; \
+       (cd $(HOST_SUBDIR)/gettext && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -9040,24 +10018,23 @@ mostlyclean-gnuserv:
                   mostlyclean) \
           || exit 1
  
-@endif gnuserv
+@endif gettext
  
-.PHONY: maybe-clean-gnuserv clean-gnuserv
-maybe-clean-gnuserv:
-@if gnuserv
-maybe-clean-gnuserv: clean-gnuserv
+.PHONY: maybe-clean-gettext clean-gettext
+maybe-clean-gettext:
+@if gettext
+maybe-clean-gettext: clean-gettext
  
-clean-gnuserv: 
-       @[ -f ./gnuserv/Makefile ] || exit 0; \
+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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing clean in gnuserv" ; \
-       (cd gnuserv && \
+       echo "Doing clean in gettext" ; \
+       (cd $(HOST_SUBDIR)/gettext && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -9065,24 +10042,23 @@ clean-gnuserv:
                   clean) \
           || exit 1
  
-@endif gnuserv
+@endif gettext
  
-.PHONY: maybe-distclean-gnuserv distclean-gnuserv
-maybe-distclean-gnuserv:
-@if gnuserv
-maybe-distclean-gnuserv: distclean-gnuserv
+.PHONY: maybe-distclean-gettext distclean-gettext
+maybe-distclean-gettext:
+@if gettext
+maybe-distclean-gettext: distclean-gettext
  
-distclean-gnuserv: 
-       @[ -f ./gnuserv/Makefile ] || exit 0; \
+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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing distclean in gnuserv" ; \
-       (cd gnuserv && \
+       echo "Doing distclean in gettext" ; \
+       (cd $(HOST_SUBDIR)/gettext && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -9090,24 +10066,23 @@ distclean-gnuserv:
                   distclean) \
           || exit 1
  
-@endif gnuserv
+@endif gettext
  
-.PHONY: maybe-maintainer-clean-gnuserv maintainer-clean-gnuserv
-maybe-maintainer-clean-gnuserv:
-@if gnuserv
-maybe-maintainer-clean-gnuserv: maintainer-clean-gnuserv
+.PHONY: maybe-maintainer-clean-gettext maintainer-clean-gettext
+maybe-maintainer-clean-gettext:
+@if gettext
+maybe-maintainer-clean-gettext: maintainer-clean-gettext
  
-maintainer-clean-gnuserv: 
-       @[ -f ./gnuserv/Makefile ] || exit 0; \
+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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing maintainer-clean in gnuserv" ; \
-       (cd gnuserv && \
+       echo "Doing maintainer-clean in gettext" ; \
+       (cd $(HOST_SUBDIR)/gettext && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -9115,96 +10090,96 @@ maintainer-clean-gnuserv:
                   maintainer-clean) \
           || exit 1
  
-@endif gnuserv
+@endif gettext
  
  
-.PHONY: configure-gprof maybe-configure-gprof
-maybe-configure-gprof:
-@if gprof
-maybe-configure-gprof: configure-gprof
-configure-gprof:
-       @test ! -f gprof/Makefile || exit 0; \
-       [ -d gprof ] || mkdir gprof; \
+
+.PHONY: configure-gnuserv maybe-configure-gnuserv
+maybe-configure-gnuserv:
+@if gnuserv
+maybe-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 gprof; \
-       cd gprof || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/gnuserv; \
+       cd "$(HOST_SUBDIR)/gnuserv" || exit 1; \
         case $(srcdir) in \
-         \.) \
-           srcdiroption="--srcdir=."; \
-           libsrcdir=".";; \
-         /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/gprof"; \
-           libsrcdir="$$s/gprof";; \
-         *) \
-           srcdiroption="--srcdir=../$(srcdir)/gprof"; \
-           libsrcdir="$$s/gprof";; \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/gnuserv/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
+       srcdiroption="--srcdir=$${topdir}/gnuserv"; \
+       libsrcdir="$$s/gnuserv"; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
-@endif gprof
+@endif gnuserv
  
-.PHONY: all-gprof maybe-all-gprof
-maybe-all-gprof:
-@if gprof
-maybe-all-gprof: all-gprof
-all-gprof: configure-gprof
+
+
+.PHONY: all-gnuserv maybe-all-gnuserv
+maybe-all-gnuserv:
+@if gnuserv
+TARGET-gnuserv=all
+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 gprof && $(MAKE) $(FLAGS_TO_PASS) all)
-@endif gprof
+       (cd $(HOST_SUBDIR)/gnuserv && \
+         $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-gnuserv))
+@endif gnuserv
  
-.PHONY: check-gprof maybe-check-gprof
-maybe-check-gprof:
-@if gprof
-maybe-check-gprof: check-gprof
  
-check-gprof:
+.PHONY: check-gnuserv maybe-check-gnuserv
+maybe-check-gnuserv:
+@if gnuserv
+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 gprof && $(MAKE) $(FLAGS_TO_PASS) check)
+       (cd $(HOST_SUBDIR)/gnuserv && \
+         $(MAKE) $(FLAGS_TO_PASS)  check)
  
-@endif gprof
+@endif gnuserv
  
-.PHONY: install-gprof maybe-install-gprof
-maybe-install-gprof:
-@if gprof
-maybe-install-gprof: install-gprof
+.PHONY: install-gnuserv maybe-install-gnuserv
+maybe-install-gnuserv:
+@if gnuserv
+maybe-install-gnuserv: install-gnuserv
  
-install-gprof: installdirs
+install-gnuserv: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
-       (cd gprof && $(MAKE) $(FLAGS_TO_PASS) install)
+       (cd $(HOST_SUBDIR)/gnuserv && \
+         $(MAKE) $(FLAGS_TO_PASS)  install)
  
-@endif gprof
+@endif gnuserv
  
  # Other targets (info, dvi, etc.)
  
-.PHONY: maybe-info-gprof info-gprof
-maybe-info-gprof:
-@if gprof
-maybe-info-gprof: info-gprof
+.PHONY: maybe-info-gnuserv info-gnuserv
+maybe-info-gnuserv:
+@if gnuserv
+maybe-info-gnuserv: info-gnuserv
  
-info-gprof: \
-    configure-gprof 
-       @[ -f ./gprof/Makefile ] || exit 0; \
+info-gnuserv: \
+    configure-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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing info in gprof" ; \
-       (cd gprof && \
+       echo "Doing info in gnuserv" ; \
+       (cd $(HOST_SUBDIR)/gnuserv && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -9212,25 +10187,24 @@ info-gprof: \
                   info) \
           || exit 1
  
-@endif gprof
+@endif gnuserv
  
-.PHONY: maybe-dvi-gprof dvi-gprof
-maybe-dvi-gprof:
-@if gprof
-maybe-dvi-gprof: dvi-gprof
+.PHONY: maybe-dvi-gnuserv dvi-gnuserv
+maybe-dvi-gnuserv:
+@if gnuserv
+maybe-dvi-gnuserv: dvi-gnuserv
  
-dvi-gprof: \
-    configure-gprof 
-       @[ -f ./gprof/Makefile ] || exit 0; \
+dvi-gnuserv: \
+    configure-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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing dvi in gprof" ; \
-       (cd gprof && \
+       echo "Doing dvi in gnuserv" ; \
+       (cd $(HOST_SUBDIR)/gnuserv && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -9238,78 +10212,100 @@ dvi-gprof: \
                   dvi) \
           || exit 1
  
-@endif gprof
+@endif gnuserv
  
-.PHONY: maybe-TAGS-gprof TAGS-gprof
-maybe-TAGS-gprof:
-@if gprof
-maybe-TAGS-gprof: TAGS-gprof
+.PHONY: maybe-html-gnuserv html-gnuserv
+maybe-html-gnuserv:
+@if gnuserv
+maybe-html-gnuserv: html-gnuserv
  
-TAGS-gprof: \
-    configure-gprof 
-       @[ -f ./gprof/Makefile ] || exit 0; \
+html-gnuserv: \
+    configure-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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing TAGS in gprof" ; \
-       (cd gprof && \
+       echo "Doing html in gnuserv" ; \
+       (cd $(HOST_SUBDIR)/gnuserv && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                 html) \
           || exit 1
  
-@endif gprof
+@endif gnuserv
  
-.PHONY: maybe-install-info-gprof install-info-gprof
-maybe-install-info-gprof:
-@if gprof
-maybe-install-info-gprof: install-info-gprof
+.PHONY: maybe-TAGS-gnuserv TAGS-gnuserv
+maybe-TAGS-gnuserv:
+@if gnuserv
+maybe-TAGS-gnuserv: TAGS-gnuserv
  
-install-info-gprof: \
-    configure-gprof \
-    info-gprof 
-       @[ -f ./gprof/Makefile ] || exit 0; \
+TAGS-gnuserv: \
+    configure-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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing install-info in gprof" ; \
-       (cd gprof && \
+       echo "Doing TAGS in gnuserv" ; \
+       (cd $(HOST_SUBDIR)/gnuserv && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                 TAGS) \
           || exit 1
  
-@endif gprof
+@endif gnuserv
  
-.PHONY: maybe-installcheck-gprof installcheck-gprof
-maybe-installcheck-gprof:
-@if gprof
-maybe-installcheck-gprof: installcheck-gprof
+.PHONY: maybe-install-info-gnuserv install-info-gnuserv
+maybe-install-info-gnuserv:
+@if gnuserv
+maybe-install-info-gnuserv: install-info-gnuserv
  
-installcheck-gprof: \
-    configure-gprof 
-       @[ -f ./gprof/Makefile ] || exit 0; \
+install-info-gnuserv: \
+    configure-gnuserv \
+    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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing installcheck in gprof" ; \
-       (cd gprof && \
+       echo "Doing install-info in gnuserv" ; \
+       (cd $(HOST_SUBDIR)/gnuserv && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 install-info) \
+         || exit 1
+
+@endif gnuserv
+
+.PHONY: maybe-installcheck-gnuserv installcheck-gnuserv
+maybe-installcheck-gnuserv:
+@if gnuserv
+maybe-installcheck-gnuserv: installcheck-gnuserv
+
+installcheck-gnuserv: \
+    configure-gnuserv 
+       @[ -f ./gnuserv/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing installcheck in gnuserv" ; \
+       (cd $(HOST_SUBDIR)/gnuserv && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -9317,24 +10313,23 @@ installcheck-gprof: \
                   installcheck) \
           || exit 1
  
-@endif gprof
+@endif gnuserv
  
-.PHONY: maybe-mostlyclean-gprof mostlyclean-gprof
-maybe-mostlyclean-gprof:
-@if gprof
-maybe-mostlyclean-gprof: mostlyclean-gprof
+.PHONY: maybe-mostlyclean-gnuserv mostlyclean-gnuserv
+maybe-mostlyclean-gnuserv:
+@if gnuserv
+maybe-mostlyclean-gnuserv: mostlyclean-gnuserv
  
-mostlyclean-gprof: 
-       @[ -f ./gprof/Makefile ] || exit 0; \
+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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing mostlyclean in gprof" ; \
-       (cd gprof && \
+       echo "Doing mostlyclean in gnuserv" ; \
+       (cd $(HOST_SUBDIR)/gnuserv && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -9342,24 +10337,23 @@ mostlyclean-gprof:
                   mostlyclean) \
           || exit 1
  
-@endif gprof
+@endif gnuserv
  
-.PHONY: maybe-clean-gprof clean-gprof
-maybe-clean-gprof:
-@if gprof
-maybe-clean-gprof: clean-gprof
+.PHONY: maybe-clean-gnuserv clean-gnuserv
+maybe-clean-gnuserv:
+@if gnuserv
+maybe-clean-gnuserv: clean-gnuserv
  
-clean-gprof: 
-       @[ -f ./gprof/Makefile ] || exit 0; \
+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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing clean in gprof" ; \
-       (cd gprof && \
+       echo "Doing clean in gnuserv" ; \
+       (cd $(HOST_SUBDIR)/gnuserv && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -9367,24 +10361,23 @@ clean-gprof:
                   clean) \
           || exit 1
  
-@endif gprof
+@endif gnuserv
  
-.PHONY: maybe-distclean-gprof distclean-gprof
-maybe-distclean-gprof:
-@if gprof
-maybe-distclean-gprof: distclean-gprof
+.PHONY: maybe-distclean-gnuserv distclean-gnuserv
+maybe-distclean-gnuserv:
+@if gnuserv
+maybe-distclean-gnuserv: distclean-gnuserv
  
-distclean-gprof: 
-       @[ -f ./gprof/Makefile ] || exit 0; \
+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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing distclean in gprof" ; \
-       (cd gprof && \
+       echo "Doing distclean in gnuserv" ; \
+       (cd $(HOST_SUBDIR)/gnuserv && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -9392,24 +10385,23 @@ distclean-gprof:
                   distclean) \
           || exit 1
  
-@endif gprof
+@endif gnuserv
  
-.PHONY: maybe-maintainer-clean-gprof maintainer-clean-gprof
-maybe-maintainer-clean-gprof:
-@if gprof
-maybe-maintainer-clean-gprof: maintainer-clean-gprof
+.PHONY: maybe-maintainer-clean-gnuserv maintainer-clean-gnuserv
+maybe-maintainer-clean-gnuserv:
+@if gnuserv
+maybe-maintainer-clean-gnuserv: maintainer-clean-gnuserv
  
-maintainer-clean-gprof: 
-       @[ -f ./gprof/Makefile ] || exit 0; \
+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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing maintainer-clean in gprof" ; \
-       (cd gprof && \
+       echo "Doing maintainer-clean in gnuserv" ; \
+       (cd $(HOST_SUBDIR)/gnuserv && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -9417,96 +10409,96 @@ maintainer-clean-gprof:
                   maintainer-clean) \
           || exit 1
  
-@endif gprof
+@endif gnuserv
  
  
-.PHONY: configure-gzip maybe-configure-gzip
-maybe-configure-gzip:
-@if gzip
-maybe-configure-gzip: configure-gzip
-configure-gzip:
-       @test ! -f gzip/Makefile || exit 0; \
-       [ -d gzip ] || mkdir gzip; \
+
+.PHONY: configure-gprof maybe-configure-gprof
+maybe-configure-gprof:
+@if gprof
+maybe-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 gzip; \
-       cd gzip || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/gprof; \
+       cd "$(HOST_SUBDIR)/gprof" || exit 1; \
         case $(srcdir) in \
-         \.) \
-           srcdiroption="--srcdir=."; \
-           libsrcdir=".";; \
-         /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/gzip"; \
-           libsrcdir="$$s/gzip";; \
-         *) \
-           srcdiroption="--srcdir=../$(srcdir)/gzip"; \
-           libsrcdir="$$s/gzip";; \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/gprof/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
+       srcdiroption="--srcdir=$${topdir}/gprof"; \
+       libsrcdir="$$s/gprof"; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
-@endif gzip
+@endif gprof
  
-.PHONY: all-gzip maybe-all-gzip
-maybe-all-gzip:
-@if gzip
-maybe-all-gzip: all-gzip
-all-gzip: configure-gzip
+
+
+.PHONY: all-gprof maybe-all-gprof
+maybe-all-gprof:
+@if gprof
+TARGET-gprof=all
+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 gzip && $(MAKE) $(FLAGS_TO_PASS) all)
-@endif gzip
+       (cd $(HOST_SUBDIR)/gprof && \
+         $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-gprof))
+@endif gprof
  
-.PHONY: check-gzip maybe-check-gzip
-maybe-check-gzip:
-@if gzip
-maybe-check-gzip: check-gzip
  
-check-gzip:
+.PHONY: check-gprof maybe-check-gprof
+maybe-check-gprof:
+@if gprof
+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 gzip && $(MAKE) $(FLAGS_TO_PASS) check)
+       (cd $(HOST_SUBDIR)/gprof && \
+         $(MAKE) $(FLAGS_TO_PASS)  check)
  
-@endif gzip
+@endif gprof
  
-.PHONY: install-gzip maybe-install-gzip
-maybe-install-gzip:
-@if gzip
-maybe-install-gzip: install-gzip
+.PHONY: install-gprof maybe-install-gprof
+maybe-install-gprof:
+@if gprof
+maybe-install-gprof: install-gprof
  
-install-gzip: installdirs
+install-gprof: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
-       (cd gzip && $(MAKE) $(FLAGS_TO_PASS) install)
+       (cd $(HOST_SUBDIR)/gprof && \
+         $(MAKE) $(FLAGS_TO_PASS)  install)
  
-@endif gzip
+@endif gprof
  
  # Other targets (info, dvi, etc.)
  
-.PHONY: maybe-info-gzip info-gzip
-maybe-info-gzip:
-@if gzip
-maybe-info-gzip: info-gzip
+.PHONY: maybe-info-gprof info-gprof
+maybe-info-gprof:
+@if gprof
+maybe-info-gprof: info-gprof
  
-info-gzip: \
-    configure-gzip 
-       @[ -f ./gzip/Makefile ] || exit 0; \
+info-gprof: \
+    configure-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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing info in gzip" ; \
-       (cd gzip && \
+       echo "Doing info in gprof" ; \
+       (cd $(HOST_SUBDIR)/gprof && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -9514,25 +10506,24 @@ info-gzip: \
                   info) \
           || exit 1
  
-@endif gzip
+@endif gprof
  
-.PHONY: maybe-dvi-gzip dvi-gzip
-maybe-dvi-gzip:
-@if gzip
-maybe-dvi-gzip: dvi-gzip
+.PHONY: maybe-dvi-gprof dvi-gprof
+maybe-dvi-gprof:
+@if gprof
+maybe-dvi-gprof: dvi-gprof
  
-dvi-gzip: \
-    configure-gzip 
-       @[ -f ./gzip/Makefile ] || exit 0; \
+dvi-gprof: \
+    configure-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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing dvi in gzip" ; \
-       (cd gzip && \
+       echo "Doing dvi in gprof" ; \
+       (cd $(HOST_SUBDIR)/gprof && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -9540,103 +10531,124 @@ dvi-gzip: \
                   dvi) \
           || exit 1
  
-@endif gzip
+@endif gprof
  
-.PHONY: maybe-TAGS-gzip TAGS-gzip
-maybe-TAGS-gzip:
-@if gzip
-maybe-TAGS-gzip: TAGS-gzip
+.PHONY: maybe-html-gprof html-gprof
+maybe-html-gprof:
+@if gprof
+maybe-html-gprof: html-gprof
  
-TAGS-gzip: \
-    configure-gzip 
-       @[ -f ./gzip/Makefile ] || exit 0; \
+html-gprof: \
+    configure-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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing TAGS in gzip" ; \
-       (cd gzip && \
+       echo "Doing html in gprof" ; \
+       (cd $(HOST_SUBDIR)/gprof && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                 html) \
           || exit 1
  
-@endif gzip
+@endif gprof
  
-.PHONY: maybe-install-info-gzip install-info-gzip
-maybe-install-info-gzip:
-@if gzip
-maybe-install-info-gzip: install-info-gzip
+.PHONY: maybe-TAGS-gprof TAGS-gprof
+maybe-TAGS-gprof:
+@if gprof
+maybe-TAGS-gprof: TAGS-gprof
  
-install-info-gzip: \
-    configure-gzip \
-    info-gzip 
-       @[ -f ./gzip/Makefile ] || exit 0; \
+TAGS-gprof: \
+    configure-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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing install-info in gzip" ; \
-       (cd gzip && \
+       echo "Doing TAGS in gprof" ; \
+       (cd $(HOST_SUBDIR)/gprof && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                 TAGS) \
           || exit 1
  
-@endif gzip
+@endif gprof
  
-.PHONY: maybe-installcheck-gzip installcheck-gzip
-maybe-installcheck-gzip:
-@if gzip
-maybe-installcheck-gzip: installcheck-gzip
+.PHONY: maybe-install-info-gprof install-info-gprof
+maybe-install-info-gprof:
+@if gprof
+maybe-install-info-gprof: install-info-gprof
  
-installcheck-gzip: \
-    configure-gzip 
-       @[ -f ./gzip/Makefile ] || exit 0; \
+install-info-gprof: \
+    configure-gprof \
+    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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing installcheck in gzip" ; \
-       (cd gzip && \
+       echo "Doing install-info in gprof" ; \
+       (cd $(HOST_SUBDIR)/gprof && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                 install-info) \
           || exit 1
  
-@endif gzip
+@endif gprof
  
-.PHONY: maybe-mostlyclean-gzip mostlyclean-gzip
-maybe-mostlyclean-gzip:
-@if gzip
-maybe-mostlyclean-gzip: mostlyclean-gzip
+.PHONY: maybe-installcheck-gprof installcheck-gprof
+maybe-installcheck-gprof:
+@if gprof
+maybe-installcheck-gprof: installcheck-gprof
  
-mostlyclean-gzip: 
-       @[ -f ./gzip/Makefile ] || exit 0; \
+installcheck-gprof: \
+    configure-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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing mostlyclean in gzip" ; \
-       (cd gzip && \
+       echo "Doing installcheck in gprof" ; \
+       (cd $(HOST_SUBDIR)/gprof && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 installcheck) \
+         || exit 1
+
+@endif gprof
+
+.PHONY: maybe-mostlyclean-gprof mostlyclean-gprof
+maybe-mostlyclean-gprof:
+@if gprof
+maybe-mostlyclean-gprof: mostlyclean-gprof
+
+mostlyclean-gprof: 
+       @[ -f ./gprof/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing mostlyclean in gprof" ; \
+       (cd $(HOST_SUBDIR)/gprof && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -9644,24 +10656,23 @@ mostlyclean-gzip:
                   mostlyclean) \
           || exit 1
  
-@endif gzip
+@endif gprof
  
-.PHONY: maybe-clean-gzip clean-gzip
-maybe-clean-gzip:
-@if gzip
-maybe-clean-gzip: clean-gzip
+.PHONY: maybe-clean-gprof clean-gprof
+maybe-clean-gprof:
+@if gprof
+maybe-clean-gprof: clean-gprof
  
-clean-gzip: 
-       @[ -f ./gzip/Makefile ] || exit 0; \
+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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing clean in gzip" ; \
-       (cd gzip && \
+       echo "Doing clean in gprof" ; \
+       (cd $(HOST_SUBDIR)/gprof && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -9669,24 +10680,23 @@ clean-gzip:
                   clean) \
           || exit 1
  
-@endif gzip
+@endif gprof
  
-.PHONY: maybe-distclean-gzip distclean-gzip
-maybe-distclean-gzip:
-@if gzip
-maybe-distclean-gzip: distclean-gzip
+.PHONY: maybe-distclean-gprof distclean-gprof
+maybe-distclean-gprof:
+@if gprof
+maybe-distclean-gprof: distclean-gprof
  
-distclean-gzip: 
-       @[ -f ./gzip/Makefile ] || exit 0; \
+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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing distclean in gzip" ; \
-       (cd gzip && \
+       echo "Doing distclean in gprof" ; \
+       (cd $(HOST_SUBDIR)/gprof && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -9694,24 +10704,23 @@ distclean-gzip:
                   distclean) \
           || exit 1
  
-@endif gzip
+@endif gprof
  
-.PHONY: maybe-maintainer-clean-gzip maintainer-clean-gzip
-maybe-maintainer-clean-gzip:
-@if gzip
-maybe-maintainer-clean-gzip: maintainer-clean-gzip
+.PHONY: maybe-maintainer-clean-gprof maintainer-clean-gprof
+maybe-maintainer-clean-gprof:
+@if gprof
+maybe-maintainer-clean-gprof: maintainer-clean-gprof
  
-maintainer-clean-gzip: 
-       @[ -f ./gzip/Makefile ] || exit 0; \
+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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing maintainer-clean in gzip" ; \
-       (cd gzip && \
+       echo "Doing maintainer-clean in gprof" ; \
+       (cd $(HOST_SUBDIR)/gprof && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -9719,96 +10728,96 @@ maintainer-clean-gzip:
                   maintainer-clean) \
           || exit 1
  
-@endif gzip
+@endif gprof
  
  
-.PHONY: configure-hello maybe-configure-hello
-maybe-configure-hello:
-@if hello
-maybe-configure-hello: configure-hello
-configure-hello:
-       @test ! -f hello/Makefile || exit 0; \
-       [ -d hello ] || mkdir hello; \
+
+.PHONY: configure-gzip maybe-configure-gzip
+maybe-configure-gzip:
+@if gzip
+maybe-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 hello; \
-       cd hello || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/gzip; \
+       cd "$(HOST_SUBDIR)/gzip" || exit 1; \
         case $(srcdir) in \
-         \.) \
-           srcdiroption="--srcdir=."; \
-           libsrcdir=".";; \
-         /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/hello"; \
-           libsrcdir="$$s/hello";; \
-         *) \
-           srcdiroption="--srcdir=../$(srcdir)/hello"; \
-           libsrcdir="$$s/hello";; \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/gzip/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
+       srcdiroption="--srcdir=$${topdir}/gzip"; \
+       libsrcdir="$$s/gzip"; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
-@endif hello
+@endif gzip
  
-.PHONY: all-hello maybe-all-hello
-maybe-all-hello:
-@if hello
-maybe-all-hello: all-hello
-all-hello: configure-hello
+
+
+.PHONY: all-gzip maybe-all-gzip
+maybe-all-gzip:
+@if gzip
+TARGET-gzip=all
+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 hello && $(MAKE) $(FLAGS_TO_PASS) all)
-@endif hello
+       (cd $(HOST_SUBDIR)/gzip && \
+         $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-gzip))
+@endif gzip
  
-.PHONY: check-hello maybe-check-hello
-maybe-check-hello:
-@if hello
-maybe-check-hello: check-hello
  
-check-hello:
+.PHONY: check-gzip maybe-check-gzip
+maybe-check-gzip:
+@if gzip
+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 hello && $(MAKE) $(FLAGS_TO_PASS) check)
+       (cd $(HOST_SUBDIR)/gzip && \
+         $(MAKE) $(FLAGS_TO_PASS)  check)
  
-@endif hello
+@endif gzip
  
-.PHONY: install-hello maybe-install-hello
-maybe-install-hello:
-@if hello
-maybe-install-hello: install-hello
+.PHONY: install-gzip maybe-install-gzip
+maybe-install-gzip:
+@if gzip
+maybe-install-gzip: install-gzip
  
-install-hello: installdirs
+install-gzip: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
-       (cd hello && $(MAKE) $(FLAGS_TO_PASS) install)
+       (cd $(HOST_SUBDIR)/gzip && \
+         $(MAKE) $(FLAGS_TO_PASS)  install)
  
-@endif hello
+@endif gzip
  
  # Other targets (info, dvi, etc.)
  
-.PHONY: maybe-info-hello info-hello
-maybe-info-hello:
-@if hello
-maybe-info-hello: info-hello
+.PHONY: maybe-info-gzip info-gzip
+maybe-info-gzip:
+@if gzip
+maybe-info-gzip: info-gzip
  
-info-hello: \
-    configure-hello 
-       @[ -f ./hello/Makefile ] || exit 0; \
+info-gzip: \
+    configure-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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing info in hello" ; \
-       (cd hello && \
+       echo "Doing info in gzip" ; \
+       (cd $(HOST_SUBDIR)/gzip && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -9816,25 +10825,24 @@ info-hello: \
                   info) \
           || exit 1
  
-@endif hello
+@endif gzip
  
-.PHONY: maybe-dvi-hello dvi-hello
-maybe-dvi-hello:
-@if hello
-maybe-dvi-hello: dvi-hello
+.PHONY: maybe-dvi-gzip dvi-gzip
+maybe-dvi-gzip:
+@if gzip
+maybe-dvi-gzip: dvi-gzip
  
-dvi-hello: \
-    configure-hello 
-       @[ -f ./hello/Makefile ] || exit 0; \
+dvi-gzip: \
+    configure-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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing dvi in hello" ; \
-       (cd hello && \
+       echo "Doing dvi in gzip" ; \
+       (cd $(HOST_SUBDIR)/gzip && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -9842,153 +10850,172 @@ dvi-hello: \
                   dvi) \
           || exit 1
  
-@endif hello
+@endif gzip
  
-.PHONY: maybe-TAGS-hello TAGS-hello
-maybe-TAGS-hello:
-@if hello
-maybe-TAGS-hello: TAGS-hello
+.PHONY: maybe-html-gzip html-gzip
+maybe-html-gzip:
+@if gzip
+maybe-html-gzip: html-gzip
  
-TAGS-hello: \
-    configure-hello 
-       @[ -f ./hello/Makefile ] || exit 0; \
+html-gzip: \
+    configure-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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing TAGS in hello" ; \
-       (cd hello && \
+       echo "Doing html in gzip" ; \
+       (cd $(HOST_SUBDIR)/gzip && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                 html) \
           || exit 1
  
-@endif hello
+@endif gzip
  
-.PHONY: maybe-install-info-hello install-info-hello
-maybe-install-info-hello:
-@if hello
-maybe-install-info-hello: install-info-hello
+.PHONY: maybe-TAGS-gzip TAGS-gzip
+maybe-TAGS-gzip:
+@if gzip
+maybe-TAGS-gzip: TAGS-gzip
  
-install-info-hello: \
-    configure-hello \
-    info-hello 
-       @[ -f ./hello/Makefile ] || exit 0; \
+TAGS-gzip: \
+    configure-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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing install-info in hello" ; \
-       (cd hello && \
+       echo "Doing TAGS in gzip" ; \
+       (cd $(HOST_SUBDIR)/gzip && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                 TAGS) \
           || exit 1
  
-@endif hello
+@endif gzip
  
-.PHONY: maybe-installcheck-hello installcheck-hello
-maybe-installcheck-hello:
-@if hello
-maybe-installcheck-hello: installcheck-hello
+.PHONY: maybe-install-info-gzip install-info-gzip
+maybe-install-info-gzip:
+@if gzip
+maybe-install-info-gzip: install-info-gzip
  
-installcheck-hello: \
-    configure-hello 
-       @[ -f ./hello/Makefile ] || exit 0; \
+install-info-gzip: \
+    configure-gzip \
+    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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing installcheck in hello" ; \
-       (cd hello && \
+       echo "Doing install-info in gzip" ; \
+       (cd $(HOST_SUBDIR)/gzip && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                 install-info) \
           || exit 1
  
-@endif hello
+@endif gzip
  
-.PHONY: maybe-mostlyclean-hello mostlyclean-hello
-maybe-mostlyclean-hello:
-@if hello
-maybe-mostlyclean-hello: mostlyclean-hello
+.PHONY: maybe-installcheck-gzip installcheck-gzip
+maybe-installcheck-gzip:
+@if gzip
+maybe-installcheck-gzip: installcheck-gzip
  
-mostlyclean-hello: 
-       @[ -f ./hello/Makefile ] || exit 0; \
+installcheck-gzip: \
+    configure-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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing mostlyclean in hello" ; \
-       (cd hello && \
+       echo "Doing installcheck in gzip" ; \
+       (cd $(HOST_SUBDIR)/gzip && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                 installcheck) \
           || exit 1
  
-@endif hello
+@endif gzip
  
-.PHONY: maybe-clean-hello clean-hello
-maybe-clean-hello:
-@if hello
-maybe-clean-hello: clean-hello
+.PHONY: maybe-mostlyclean-gzip mostlyclean-gzip
+maybe-mostlyclean-gzip:
+@if gzip
+maybe-mostlyclean-gzip: mostlyclean-gzip
  
-clean-hello: 
-       @[ -f ./hello/Makefile ] || exit 0; \
+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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing clean in hello" ; \
-       (cd hello && \
+       echo "Doing mostlyclean in gzip" ; \
+       (cd $(HOST_SUBDIR)/gzip && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                 mostlyclean) \
           || exit 1
  
-@endif hello
+@endif gzip
  
-.PHONY: maybe-distclean-hello distclean-hello
-maybe-distclean-hello:
-@if hello
-maybe-distclean-hello: distclean-hello
+.PHONY: maybe-clean-gzip clean-gzip
+maybe-clean-gzip:
+@if gzip
+maybe-clean-gzip: clean-gzip
  
-distclean-hello: 
-       @[ -f ./hello/Makefile ] || exit 0; \
+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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing distclean in hello" ; \
-       (cd hello && \
+       echo "Doing clean in gzip" ; \
+       (cd $(HOST_SUBDIR)/gzip && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 clean) \
+         || exit 1
+
+@endif gzip
+
+.PHONY: maybe-distclean-gzip distclean-gzip
+maybe-distclean-gzip:
+@if gzip
+maybe-distclean-gzip: distclean-gzip
+
+distclean-gzip: 
+       @[ -f ./gzip/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing distclean in gzip" ; \
+       (cd $(HOST_SUBDIR)/gzip && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -9996,24 +11023,23 @@ distclean-hello:
                   distclean) \
           || exit 1
  
-@endif hello
+@endif gzip
  
-.PHONY: maybe-maintainer-clean-hello maintainer-clean-hello
-maybe-maintainer-clean-hello:
-@if hello
-maybe-maintainer-clean-hello: maintainer-clean-hello
+.PHONY: maybe-maintainer-clean-gzip maintainer-clean-gzip
+maybe-maintainer-clean-gzip:
+@if gzip
+maybe-maintainer-clean-gzip: maintainer-clean-gzip
  
-maintainer-clean-hello: 
-       @[ -f ./hello/Makefile ] || exit 0; \
+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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing maintainer-clean in hello" ; \
-       (cd hello && \
+       echo "Doing maintainer-clean in gzip" ; \
+       (cd $(HOST_SUBDIR)/gzip && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -10021,96 +11047,96 @@ maintainer-clean-hello:
                   maintainer-clean) \
           || exit 1
  
-@endif hello
+@endif gzip
  
  
-.PHONY: configure-indent maybe-configure-indent
-maybe-configure-indent:
-@if indent
-maybe-configure-indent: configure-indent
-configure-indent:
-       @test ! -f indent/Makefile || exit 0; \
-       [ -d indent ] || mkdir indent; \
+
+.PHONY: configure-hello maybe-configure-hello
+maybe-configure-hello:
+@if hello
+maybe-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 indent; \
-       cd indent || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/hello; \
+       cd "$(HOST_SUBDIR)/hello" || exit 1; \
         case $(srcdir) in \
-         \.) \
-           srcdiroption="--srcdir=."; \
-           libsrcdir=".";; \
-         /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/indent"; \
-           libsrcdir="$$s/indent";; \
-         *) \
-           srcdiroption="--srcdir=../$(srcdir)/indent"; \
-           libsrcdir="$$s/indent";; \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/hello/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
+       srcdiroption="--srcdir=$${topdir}/hello"; \
+       libsrcdir="$$s/hello"; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
-@endif indent
+@endif hello
  
-.PHONY: all-indent maybe-all-indent
-maybe-all-indent:
-@if indent
-maybe-all-indent: all-indent
-all-indent: configure-indent
+
+
+.PHONY: all-hello maybe-all-hello
+maybe-all-hello:
+@if hello
+TARGET-hello=all
+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 indent && $(MAKE) $(FLAGS_TO_PASS) all)
-@endif indent
+       (cd $(HOST_SUBDIR)/hello && \
+         $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-hello))
+@endif hello
  
-.PHONY: check-indent maybe-check-indent
-maybe-check-indent:
-@if indent
-maybe-check-indent: check-indent
  
-check-indent:
+.PHONY: check-hello maybe-check-hello
+maybe-check-hello:
+@if hello
+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 indent && $(MAKE) $(FLAGS_TO_PASS) check)
+       (cd $(HOST_SUBDIR)/hello && \
+         $(MAKE) $(FLAGS_TO_PASS)  check)
  
-@endif indent
+@endif hello
  
-.PHONY: install-indent maybe-install-indent
-maybe-install-indent:
-@if indent
-maybe-install-indent: install-indent
+.PHONY: install-hello maybe-install-hello
+maybe-install-hello:
+@if hello
+maybe-install-hello: install-hello
  
-install-indent: installdirs
+install-hello: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
-       (cd indent && $(MAKE) $(FLAGS_TO_PASS) install)
+       (cd $(HOST_SUBDIR)/hello && \
+         $(MAKE) $(FLAGS_TO_PASS)  install)
  
-@endif indent
+@endif hello
  
  # Other targets (info, dvi, etc.)
  
-.PHONY: maybe-info-indent info-indent
-maybe-info-indent:
-@if indent
-maybe-info-indent: info-indent
+.PHONY: maybe-info-hello info-hello
+maybe-info-hello:
+@if hello
+maybe-info-hello: info-hello
  
-info-indent: \
-    configure-indent 
-       @[ -f ./indent/Makefile ] || exit 0; \
+info-hello: \
+    configure-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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing info in indent" ; \
-       (cd indent && \
+       echo "Doing info in hello" ; \
+       (cd $(HOST_SUBDIR)/hello && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -10118,25 +11144,24 @@ info-indent: \
                   info) \
           || exit 1
  
-@endif indent
+@endif hello
  
-.PHONY: maybe-dvi-indent dvi-indent
-maybe-dvi-indent:
-@if indent
-maybe-dvi-indent: dvi-indent
+.PHONY: maybe-dvi-hello dvi-hello
+maybe-dvi-hello:
+@if hello
+maybe-dvi-hello: dvi-hello
  
-dvi-indent: \
-    configure-indent 
-       @[ -f ./indent/Makefile ] || exit 0; \
+dvi-hello: \
+    configure-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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing dvi in indent" ; \
-       (cd indent && \
+       echo "Doing dvi in hello" ; \
+       (cd $(HOST_SUBDIR)/hello && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -10144,178 +11169,196 @@ dvi-indent: \
                   dvi) \
           || exit 1
  
-@endif indent
+@endif hello
  
-.PHONY: maybe-TAGS-indent TAGS-indent
-maybe-TAGS-indent:
-@if indent
-maybe-TAGS-indent: TAGS-indent
+.PHONY: maybe-html-hello html-hello
+maybe-html-hello:
+@if hello
+maybe-html-hello: html-hello
  
-TAGS-indent: \
-    configure-indent 
-       @[ -f ./indent/Makefile ] || exit 0; \
+html-hello: \
+    configure-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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing TAGS in indent" ; \
-       (cd indent && \
+       echo "Doing html in hello" ; \
+       (cd $(HOST_SUBDIR)/hello && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                 html) \
           || exit 1
  
-@endif indent
+@endif hello
  
-.PHONY: maybe-install-info-indent install-info-indent
-maybe-install-info-indent:
-@if indent
-maybe-install-info-indent: install-info-indent
+.PHONY: maybe-TAGS-hello TAGS-hello
+maybe-TAGS-hello:
+@if hello
+maybe-TAGS-hello: TAGS-hello
  
-install-info-indent: \
-    configure-indent \
-    info-indent 
-       @[ -f ./indent/Makefile ] || exit 0; \
+TAGS-hello: \
+    configure-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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing install-info in indent" ; \
-       (cd indent && \
+       echo "Doing TAGS in hello" ; \
+       (cd $(HOST_SUBDIR)/hello && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                 TAGS) \
           || exit 1
  
-@endif indent
+@endif hello
  
-.PHONY: maybe-installcheck-indent installcheck-indent
-maybe-installcheck-indent:
-@if indent
-maybe-installcheck-indent: installcheck-indent
+.PHONY: maybe-install-info-hello install-info-hello
+maybe-install-info-hello:
+@if hello
+maybe-install-info-hello: install-info-hello
  
-installcheck-indent: \
-    configure-indent 
-       @[ -f ./indent/Makefile ] || exit 0; \
+install-info-hello: \
+    configure-hello \
+    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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing installcheck in indent" ; \
-       (cd indent && \
+       echo "Doing install-info in hello" ; \
+       (cd $(HOST_SUBDIR)/hello && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                 install-info) \
           || exit 1
  
-@endif indent
+@endif hello
  
-.PHONY: maybe-mostlyclean-indent mostlyclean-indent
-maybe-mostlyclean-indent:
-@if indent
-maybe-mostlyclean-indent: mostlyclean-indent
+.PHONY: maybe-installcheck-hello installcheck-hello
+maybe-installcheck-hello:
+@if hello
+maybe-installcheck-hello: installcheck-hello
  
-mostlyclean-indent: 
-       @[ -f ./indent/Makefile ] || exit 0; \
+installcheck-hello: \
+    configure-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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing mostlyclean in indent" ; \
-       (cd indent && \
+       echo "Doing installcheck in hello" ; \
+       (cd $(HOST_SUBDIR)/hello && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                 installcheck) \
           || exit 1
  
-@endif indent
+@endif hello
  
-.PHONY: maybe-clean-indent clean-indent
-maybe-clean-indent:
-@if indent
-maybe-clean-indent: clean-indent
+.PHONY: maybe-mostlyclean-hello mostlyclean-hello
+maybe-mostlyclean-hello:
+@if hello
+maybe-mostlyclean-hello: mostlyclean-hello
  
-clean-indent: 
-       @[ -f ./indent/Makefile ] || exit 0; \
+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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing clean in indent" ; \
-       (cd indent && \
+       echo "Doing mostlyclean in hello" ; \
+       (cd $(HOST_SUBDIR)/hello && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                 mostlyclean) \
           || exit 1
  
-@endif indent
+@endif hello
  
-.PHONY: maybe-distclean-indent distclean-indent
-maybe-distclean-indent:
-@if indent
-maybe-distclean-indent: distclean-indent
+.PHONY: maybe-clean-hello clean-hello
+maybe-clean-hello:
+@if hello
+maybe-clean-hello: clean-hello
  
-distclean-indent: 
-       @[ -f ./indent/Makefile ] || exit 0; \
+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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing distclean in indent" ; \
-       (cd indent && \
+       echo "Doing clean in hello" ; \
+       (cd $(HOST_SUBDIR)/hello && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                 clean) \
           || exit 1
  
-@endif indent
+@endif hello
  
-.PHONY: maybe-maintainer-clean-indent maintainer-clean-indent
-maybe-maintainer-clean-indent:
-@if indent
-maybe-maintainer-clean-indent: maintainer-clean-indent
+.PHONY: maybe-distclean-hello distclean-hello
+maybe-distclean-hello:
+@if hello
+maybe-distclean-hello: distclean-hello
  
-maintainer-clean-indent: 
-       @[ -f ./indent/Makefile ] || exit 0; \
+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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing maintainer-clean in indent" ; \
-       (cd indent && \
+       echo "Doing distclean in hello" ; \
+       (cd $(HOST_SUBDIR)/hello && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 distclean) \
+         || exit 1
+
+@endif hello
+
+.PHONY: maybe-maintainer-clean-hello maintainer-clean-hello
+maybe-maintainer-clean-hello:
+@if hello
+maybe-maintainer-clean-hello: maintainer-clean-hello
+
+maintainer-clean-hello: 
+       @[ -f ./hello/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing maintainer-clean in hello" ; \
+       (cd $(HOST_SUBDIR)/hello && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -10323,96 +11366,96 @@ maintainer-clean-indent:
                   maintainer-clean) \
           || exit 1
  
-@endif indent
+@endif hello
  
  
-.PHONY: configure-intl maybe-configure-intl
-maybe-configure-intl:
-@if intl
-maybe-configure-intl: configure-intl
-configure-intl:
-       @test ! -f intl/Makefile || exit 0; \
-       [ -d intl ] || mkdir intl; \
+
+.PHONY: configure-indent maybe-configure-indent
+maybe-configure-indent:
+@if indent
+maybe-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 intl; \
-       cd intl || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/indent; \
+       cd "$(HOST_SUBDIR)/indent" || exit 1; \
         case $(srcdir) in \
-         \.) \
-           srcdiroption="--srcdir=."; \
-           libsrcdir=".";; \
-         /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/intl"; \
-           libsrcdir="$$s/intl";; \
-         *) \
-           srcdiroption="--srcdir=../$(srcdir)/intl"; \
-           libsrcdir="$$s/intl";; \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/indent/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
+       srcdiroption="--srcdir=$${topdir}/indent"; \
+       libsrcdir="$$s/indent"; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
-@endif intl
+@endif indent
  
-.PHONY: all-intl maybe-all-intl
-maybe-all-intl:
-@if intl
-maybe-all-intl: all-intl
-all-intl: configure-intl
+
+
+.PHONY: all-indent maybe-all-indent
+maybe-all-indent:
+@if indent
+TARGET-indent=all
+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 intl && $(MAKE) $(FLAGS_TO_PASS) all)
-@endif intl
+       (cd $(HOST_SUBDIR)/indent && \
+         $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-indent))
+@endif indent
  
-.PHONY: check-intl maybe-check-intl
-maybe-check-intl:
-@if intl
-maybe-check-intl: check-intl
  
-check-intl:
+.PHONY: check-indent maybe-check-indent
+maybe-check-indent:
+@if indent
+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 intl && $(MAKE) $(FLAGS_TO_PASS) check)
+       (cd $(HOST_SUBDIR)/indent && \
+         $(MAKE) $(FLAGS_TO_PASS)  check)
  
-@endif intl
+@endif indent
  
-.PHONY: install-intl maybe-install-intl
-maybe-install-intl:
-@if intl
-maybe-install-intl: install-intl
+.PHONY: install-indent maybe-install-indent
+maybe-install-indent:
+@if indent
+maybe-install-indent: install-indent
  
-install-intl: installdirs
+install-indent: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
-       (cd intl && $(MAKE) $(FLAGS_TO_PASS) install)
+       (cd $(HOST_SUBDIR)/indent && \
+         $(MAKE) $(FLAGS_TO_PASS)  install)
  
-@endif intl
+@endif indent
  
  # Other targets (info, dvi, etc.)
  
-.PHONY: maybe-info-intl info-intl
-maybe-info-intl:
-@if intl
-maybe-info-intl: info-intl
+.PHONY: maybe-info-indent info-indent
+maybe-info-indent:
+@if indent
+maybe-info-indent: info-indent
  
-info-intl: \
-    configure-intl 
-       @[ -f ./intl/Makefile ] || exit 0; \
+info-indent: \
+    configure-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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing info in intl" ; \
-       (cd intl && \
+       echo "Doing info in indent" ; \
+       (cd $(HOST_SUBDIR)/indent && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -10420,25 +11463,24 @@ info-intl: \
                   info) \
           || exit 1
  
-@endif intl
+@endif indent
  
-.PHONY: maybe-dvi-intl dvi-intl
-maybe-dvi-intl:
-@if intl
-maybe-dvi-intl: dvi-intl
+.PHONY: maybe-dvi-indent dvi-indent
+maybe-dvi-indent:
+@if indent
+maybe-dvi-indent: dvi-indent
  
-dvi-intl: \
-    configure-intl 
-       @[ -f ./intl/Makefile ] || exit 0; \
+dvi-indent: \
+    configure-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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing dvi in intl" ; \
-       (cd intl && \
+       echo "Doing dvi in indent" ; \
+       (cd $(HOST_SUBDIR)/indent && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -10446,275 +11488,295 @@ dvi-intl: \
                   dvi) \
           || exit 1
  
-@endif intl
+@endif indent
  
-.PHONY: maybe-TAGS-intl TAGS-intl
-maybe-TAGS-intl:
-@if intl
-maybe-TAGS-intl: TAGS-intl
+.PHONY: maybe-html-indent html-indent
+maybe-html-indent:
+@if indent
+maybe-html-indent: html-indent
  
-TAGS-intl: \
-    configure-intl 
-       @[ -f ./intl/Makefile ] || exit 0; \
+html-indent: \
+    configure-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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing TAGS in intl" ; \
-       (cd intl && \
+       echo "Doing html in indent" ; \
+       (cd $(HOST_SUBDIR)/indent && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                 html) \
           || exit 1
  
-@endif intl
+@endif indent
  
-.PHONY: maybe-install-info-intl install-info-intl
-maybe-install-info-intl:
-@if intl
-maybe-install-info-intl: install-info-intl
+.PHONY: maybe-TAGS-indent TAGS-indent
+maybe-TAGS-indent:
+@if indent
+maybe-TAGS-indent: TAGS-indent
  
-install-info-intl: \
-    configure-intl \
-    info-intl 
-       @[ -f ./intl/Makefile ] || exit 0; \
+TAGS-indent: \
+    configure-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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing install-info in intl" ; \
-       (cd intl && \
+       echo "Doing TAGS in indent" ; \
+       (cd $(HOST_SUBDIR)/indent && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                 TAGS) \
           || exit 1
  
-@endif intl
+@endif indent
  
-.PHONY: maybe-installcheck-intl installcheck-intl
-maybe-installcheck-intl:
-@if intl
-maybe-installcheck-intl: installcheck-intl
+.PHONY: maybe-install-info-indent install-info-indent
+maybe-install-info-indent:
+@if indent
+maybe-install-info-indent: install-info-indent
  
-installcheck-intl: \
-    configure-intl 
-       @[ -f ./intl/Makefile ] || exit 0; \
+install-info-indent: \
+    configure-indent \
+    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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing installcheck in intl" ; \
-       (cd intl && \
+       echo "Doing install-info in indent" ; \
+       (cd $(HOST_SUBDIR)/indent && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                 install-info) \
           || exit 1
  
-@endif intl
+@endif indent
  
-.PHONY: maybe-mostlyclean-intl mostlyclean-intl
-maybe-mostlyclean-intl:
-@if intl
-maybe-mostlyclean-intl: mostlyclean-intl
+.PHONY: maybe-installcheck-indent installcheck-indent
+maybe-installcheck-indent:
+@if indent
+maybe-installcheck-indent: installcheck-indent
  
-mostlyclean-intl: 
-       @[ -f ./intl/Makefile ] || exit 0; \
+installcheck-indent: \
+    configure-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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing mostlyclean in intl" ; \
-       (cd intl && \
+       echo "Doing installcheck in indent" ; \
+       (cd $(HOST_SUBDIR)/indent && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                 installcheck) \
           || exit 1
  
-@endif intl
+@endif indent
  
-.PHONY: maybe-clean-intl clean-intl
-maybe-clean-intl:
-@if intl
-maybe-clean-intl: clean-intl
+.PHONY: maybe-mostlyclean-indent mostlyclean-indent
+maybe-mostlyclean-indent:
+@if indent
+maybe-mostlyclean-indent: mostlyclean-indent
  
-clean-intl: 
-       @[ -f ./intl/Makefile ] || exit 0; \
+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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing clean in intl" ; \
-       (cd intl && \
+       echo "Doing mostlyclean in indent" ; \
+       (cd $(HOST_SUBDIR)/indent && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                 mostlyclean) \
           || exit 1
  
-@endif intl
+@endif indent
  
-.PHONY: maybe-distclean-intl distclean-intl
-maybe-distclean-intl:
-@if intl
-maybe-distclean-intl: distclean-intl
+.PHONY: maybe-clean-indent clean-indent
+maybe-clean-indent:
+@if indent
+maybe-clean-indent: clean-indent
  
-distclean-intl: 
-       @[ -f ./intl/Makefile ] || exit 0; \
+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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing distclean in intl" ; \
-       (cd intl && \
+       echo "Doing clean in indent" ; \
+       (cd $(HOST_SUBDIR)/indent && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                 clean) \
           || exit 1
  
-@endif intl
+@endif indent
  
-.PHONY: maybe-maintainer-clean-intl maintainer-clean-intl
-maybe-maintainer-clean-intl:
-@if intl
-maybe-maintainer-clean-intl: maintainer-clean-intl
+.PHONY: maybe-distclean-indent distclean-indent
+maybe-distclean-indent:
+@if indent
+maybe-distclean-indent: distclean-indent
  
-maintainer-clean-intl: 
-       @[ -f ./intl/Makefile ] || exit 0; \
+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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing maintainer-clean in intl" ; \
-       (cd intl && \
+       echo "Doing distclean in indent" ; \
+       (cd $(HOST_SUBDIR)/indent && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                 distclean) \
           || exit 1
  
-@endif intl
+@endif indent
  
+.PHONY: maybe-maintainer-clean-indent maintainer-clean-indent
+maybe-maintainer-clean-indent:
+@if indent
+maybe-maintainer-clean-indent: maintainer-clean-indent
  
-.PHONY: configure-tcl maybe-configure-tcl
-maybe-configure-tcl:
-@if tcl
-maybe-configure-tcl: configure-tcl
-configure-tcl:
-       @test ! -f tcl/Makefile || exit 0; \
-       [ -d tcl ] || mkdir tcl; \
+maintainer-clean-indent: 
+       @[ -f ./indent/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing maintainer-clean in indent" ; \
+       (cd $(HOST_SUBDIR)/indent && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 maintainer-clean) \
+         || exit 1
+
+@endif indent
+
+
+
+.PHONY: configure-intl maybe-configure-intl
+maybe-configure-intl:
+@if intl
+maybe-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 tcl; \
-       cd tcl || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/intl; \
+       cd "$(HOST_SUBDIR)/intl" || exit 1; \
         case $(srcdir) in \
-         \.) \
-           srcdiroption="--srcdir=."; \
-           libsrcdir=".";; \
-         /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/tcl"; \
-           libsrcdir="$$s/tcl";; \
-         *) \
-           srcdiroption="--srcdir=../$(srcdir)/tcl"; \
-           libsrcdir="$$s/tcl";; \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/intl/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
+       srcdiroption="--srcdir=$${topdir}/intl"; \
+       libsrcdir="$$s/intl"; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
-@endif tcl
+@endif intl
  
-.PHONY: all-tcl maybe-all-tcl
-maybe-all-tcl:
-@if tcl
-maybe-all-tcl: all-tcl
-all-tcl: configure-tcl
-       @r=`${PWD_COMMAND}`; export r; \
+
+
+.PHONY: all-intl maybe-all-intl
+maybe-all-intl:
+@if intl
+TARGET-intl=all
+maybe-all-intl: all-intl
+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 tcl && $(MAKE) $(FLAGS_TO_PASS) all)
-@endif tcl
+       (cd $(HOST_SUBDIR)/intl && \
+         $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-intl))
+@endif intl
  
-.PHONY: check-tcl maybe-check-tcl
-maybe-check-tcl:
-@if tcl
-maybe-check-tcl: check-tcl
  
-check-tcl:
+.PHONY: check-intl maybe-check-intl
+maybe-check-intl:
+@if intl
+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 tcl && $(MAKE) $(FLAGS_TO_PASS) check)
+       (cd $(HOST_SUBDIR)/intl && \
+         $(MAKE) $(FLAGS_TO_PASS)  check)
  
-@endif tcl
+@endif intl
  
-.PHONY: install-tcl maybe-install-tcl
-maybe-install-tcl:
-@if tcl
-maybe-install-tcl: install-tcl
+.PHONY: install-intl maybe-install-intl
+maybe-install-intl:
+@if intl
+maybe-install-intl: install-intl
  
-install-tcl: installdirs
+install-intl: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
-       (cd tcl && $(MAKE) $(FLAGS_TO_PASS) install)
+       (cd $(HOST_SUBDIR)/intl && \
+         $(MAKE) $(FLAGS_TO_PASS)  install)
  
-@endif tcl
+@endif intl
  
  # Other targets (info, dvi, etc.)
  
-.PHONY: maybe-info-tcl info-tcl
-maybe-info-tcl:
-@if tcl
-maybe-info-tcl: info-tcl
+.PHONY: maybe-info-intl info-intl
+maybe-info-intl:
+@if intl
+maybe-info-intl: info-intl
  
-info-tcl: \
-    configure-tcl 
-       @[ -f ./tcl/Makefile ] || exit 0; \
+info-intl: \
+    configure-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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing info in tcl" ; \
-       (cd tcl && \
+       echo "Doing info in intl" ; \
+       (cd $(HOST_SUBDIR)/intl && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -10722,25 +11784,24 @@ info-tcl: \
                   info) \
           || exit 1
  
-@endif tcl
+@endif intl
  
-.PHONY: maybe-dvi-tcl dvi-tcl
-maybe-dvi-tcl:
-@if tcl
-maybe-dvi-tcl: dvi-tcl
+.PHONY: maybe-dvi-intl dvi-intl
+maybe-dvi-intl:
+@if intl
+maybe-dvi-intl: dvi-intl
  
-dvi-tcl: \
-    configure-tcl 
-       @[ -f ./tcl/Makefile ] || exit 0; \
+dvi-intl: \
+    configure-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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing dvi in tcl" ; \
-       (cd tcl && \
+       echo "Doing dvi in intl" ; \
+       (cd $(HOST_SUBDIR)/intl && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -10748,25 +11809,49 @@ dvi-tcl: \
                   dvi) \
           || exit 1
  
-@endif tcl
+@endif intl
  
-.PHONY: maybe-TAGS-tcl TAGS-tcl
-maybe-TAGS-tcl:
-@if tcl
-maybe-TAGS-tcl: TAGS-tcl
+.PHONY: maybe-html-intl html-intl
+maybe-html-intl:
+@if intl
+maybe-html-intl: html-intl
  
-TAGS-tcl: \
-    configure-tcl 
-       @[ -f ./tcl/Makefile ] || exit 0; \
+html-intl: \
+    configure-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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing TAGS in tcl" ; \
-       (cd tcl && \
+       echo "Doing html in intl" ; \
+       (cd $(HOST_SUBDIR)/intl && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 html) \
+         || exit 1
+
+@endif intl
+
+.PHONY: maybe-TAGS-intl TAGS-intl
+maybe-TAGS-intl:
+@if intl
+maybe-TAGS-intl: TAGS-intl
+
+TAGS-intl: \
+    configure-intl 
+       @[ -f ./intl/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing TAGS in intl" ; \
+       (cd $(HOST_SUBDIR)/intl && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -10774,26 +11859,25 @@ TAGS-tcl: \
                   TAGS) \
           || exit 1
  
-@endif tcl
+@endif intl
  
-.PHONY: maybe-install-info-tcl install-info-tcl
-maybe-install-info-tcl:
-@if tcl
-maybe-install-info-tcl: install-info-tcl
+.PHONY: maybe-install-info-intl install-info-intl
+maybe-install-info-intl:
+@if intl
+maybe-install-info-intl: install-info-intl
  
-install-info-tcl: \
-    configure-tcl \
-    info-tcl 
-       @[ -f ./tcl/Makefile ] || exit 0; \
+install-info-intl: \
+    configure-intl \
+    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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing install-info in tcl" ; \
-       (cd tcl && \
+       echo "Doing install-info in intl" ; \
+       (cd $(HOST_SUBDIR)/intl && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -10801,25 +11885,24 @@ install-info-tcl: \
                   install-info) \
           || exit 1
  
-@endif tcl
+@endif intl
  
-.PHONY: maybe-installcheck-tcl installcheck-tcl
-maybe-installcheck-tcl:
-@if tcl
-maybe-installcheck-tcl: installcheck-tcl
+.PHONY: maybe-installcheck-intl installcheck-intl
+maybe-installcheck-intl:
+@if intl
+maybe-installcheck-intl: installcheck-intl
  
-installcheck-tcl: \
-    configure-tcl 
-       @[ -f ./tcl/Makefile ] || exit 0; \
+installcheck-intl: \
+    configure-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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing installcheck in tcl" ; \
-       (cd tcl && \
+       echo "Doing installcheck in intl" ; \
+       (cd $(HOST_SUBDIR)/intl && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -10827,34 +11910,47 @@ installcheck-tcl: \
                   installcheck) \
           || exit 1
  
-@endif tcl
+@endif intl
  
-.PHONY: maybe-mostlyclean-tcl mostlyclean-tcl
-maybe-mostlyclean-tcl:
-@if tcl
-maybe-mostlyclean-tcl: mostlyclean-tcl
+.PHONY: maybe-mostlyclean-intl mostlyclean-intl
+maybe-mostlyclean-intl:
+@if intl
+maybe-mostlyclean-intl: mostlyclean-intl
  
-# tcl doesn't support mostlyclean.
-mostlyclean-tcl:
+mostlyclean-intl: 
+       @[ -f ./intl/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing mostlyclean in intl" ; \
+       (cd $(HOST_SUBDIR)/intl && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 mostlyclean) \
+         || exit 1
  
-@endif tcl
+@endif intl
  
-.PHONY: maybe-clean-tcl clean-tcl
-maybe-clean-tcl:
-@if tcl
-maybe-clean-tcl: clean-tcl
+.PHONY: maybe-clean-intl clean-intl
+maybe-clean-intl:
+@if intl
+maybe-clean-intl: clean-intl
  
-clean-tcl: 
-       @[ -f ./tcl/Makefile ] || exit 0; \
+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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing clean in tcl" ; \
-       (cd tcl && \
+       echo "Doing clean in intl" ; \
+       (cd $(HOST_SUBDIR)/intl && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -10862,24 +11958,23 @@ clean-tcl:
                   clean) \
           || exit 1
  
-@endif tcl
+@endif intl
  
-.PHONY: maybe-distclean-tcl distclean-tcl
-maybe-distclean-tcl:
-@if tcl
-maybe-distclean-tcl: distclean-tcl
+.PHONY: maybe-distclean-intl distclean-intl
+maybe-distclean-intl:
+@if intl
+maybe-distclean-intl: distclean-intl
  
-distclean-tcl: 
-       @[ -f ./tcl/Makefile ] || exit 0; \
+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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing distclean in tcl" ; \
-       (cd tcl && \
+       echo "Doing distclean in intl" ; \
+       (cd $(HOST_SUBDIR)/intl && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -10887,24 +11982,23 @@ distclean-tcl:
                   distclean) \
           || exit 1
  
-@endif tcl
+@endif intl
  
-.PHONY: maybe-maintainer-clean-tcl maintainer-clean-tcl
-maybe-maintainer-clean-tcl:
-@if tcl
-maybe-maintainer-clean-tcl: maintainer-clean-tcl
+.PHONY: maybe-maintainer-clean-intl maintainer-clean-intl
+maybe-maintainer-clean-intl:
+@if intl
+maybe-maintainer-clean-intl: maintainer-clean-intl
  
-maintainer-clean-tcl: 
-       @[ -f ./tcl/Makefile ] || exit 0; \
+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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing maintainer-clean in tcl" ; \
-       (cd tcl && \
+       echo "Doing maintainer-clean in intl" ; \
+       (cd $(HOST_SUBDIR)/intl && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -10912,96 +12006,96 @@ maintainer-clean-tcl:
                   maintainer-clean) \
           || exit 1
  
-@endif tcl
+@endif intl
  
  
-.PHONY: configure-itcl maybe-configure-itcl
-maybe-configure-itcl:
-@if itcl
-maybe-configure-itcl: configure-itcl
-configure-itcl:
-       @test ! -f itcl/Makefile || exit 0; \
-       [ -d itcl ] || mkdir itcl; \
+
+.PHONY: configure-tcl maybe-configure-tcl
+maybe-configure-tcl:
+@if tcl
+maybe-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 itcl; \
-       cd itcl || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/tcl; \
+       cd "$(HOST_SUBDIR)/tcl" || exit 1; \
         case $(srcdir) in \
-         \.) \
-           srcdiroption="--srcdir=."; \
-           libsrcdir=".";; \
-         /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/itcl"; \
-           libsrcdir="$$s/itcl";; \
-         *) \
-           srcdiroption="--srcdir=../$(srcdir)/itcl"; \
-           libsrcdir="$$s/itcl";; \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/tcl/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
+       srcdiroption="--srcdir=$${topdir}/tcl"; \
+       libsrcdir="$$s/tcl"; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
-@endif itcl
+@endif tcl
  
-.PHONY: all-itcl maybe-all-itcl
-maybe-all-itcl:
-@if itcl
-maybe-all-itcl: all-itcl
-all-itcl: configure-itcl
+
+
+.PHONY: all-tcl maybe-all-tcl
+maybe-all-tcl:
+@if tcl
+TARGET-tcl=all
+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 itcl && $(MAKE) $(FLAGS_TO_PASS) all)
-@endif itcl
+       (cd $(HOST_SUBDIR)/tcl && \
+         $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-tcl))
+@endif tcl
  
-.PHONY: check-itcl maybe-check-itcl
-maybe-check-itcl:
-@if itcl
-maybe-check-itcl: check-itcl
  
-check-itcl:
+.PHONY: check-tcl maybe-check-tcl
+maybe-check-tcl:
+@if tcl
+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 itcl && $(MAKE) $(FLAGS_TO_PASS) check)
+       (cd $(HOST_SUBDIR)/tcl && \
+         $(MAKE) $(FLAGS_TO_PASS)  check)
  
-@endif itcl
+@endif tcl
  
-.PHONY: install-itcl maybe-install-itcl
-maybe-install-itcl:
-@if itcl
-maybe-install-itcl: install-itcl
+.PHONY: install-tcl maybe-install-tcl
+maybe-install-tcl:
+@if tcl
+maybe-install-tcl: install-tcl
  
-install-itcl: installdirs
+install-tcl: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
-       (cd itcl && $(MAKE) $(FLAGS_TO_PASS) install)
+       (cd $(HOST_SUBDIR)/tcl && \
+         $(MAKE) $(FLAGS_TO_PASS)  install)
  
-@endif itcl
+@endif tcl
  
  # Other targets (info, dvi, etc.)
  
-.PHONY: maybe-info-itcl info-itcl
-maybe-info-itcl:
-@if itcl
-maybe-info-itcl: info-itcl
+.PHONY: maybe-info-tcl info-tcl
+maybe-info-tcl:
+@if tcl
+maybe-info-tcl: info-tcl
  
-info-itcl: \
-    configure-itcl 
-       @[ -f ./itcl/Makefile ] || exit 0; \
+info-tcl: \
+    configure-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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing info in itcl" ; \
-       (cd itcl && \
+       echo "Doing info in tcl" ; \
+       (cd $(HOST_SUBDIR)/tcl && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -11009,25 +12103,24 @@ info-itcl: \
                   info) \
           || exit 1
  
-@endif itcl
+@endif tcl
  
-.PHONY: maybe-dvi-itcl dvi-itcl
-maybe-dvi-itcl:
-@if itcl
-maybe-dvi-itcl: dvi-itcl
+.PHONY: maybe-dvi-tcl dvi-tcl
+maybe-dvi-tcl:
+@if tcl
+maybe-dvi-tcl: dvi-tcl
  
-dvi-itcl: \
-    configure-itcl 
-       @[ -f ./itcl/Makefile ] || exit 0; \
+dvi-tcl: \
+    configure-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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing dvi in itcl" ; \
-       (cd itcl && \
+       echo "Doing dvi in tcl" ; \
+       (cd $(HOST_SUBDIR)/tcl && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -11035,128 +12128,134 @@ dvi-itcl: \
                   dvi) \
           || exit 1
  
-@endif itcl
+@endif tcl
  
-.PHONY: maybe-TAGS-itcl TAGS-itcl
-maybe-TAGS-itcl:
-@if itcl
-maybe-TAGS-itcl: TAGS-itcl
+.PHONY: maybe-html-tcl html-tcl
+maybe-html-tcl:
+@if tcl
+maybe-html-tcl: html-tcl
  
-TAGS-itcl: \
-    configure-itcl 
-       @[ -f ./itcl/Makefile ] || exit 0; \
+html-tcl: \
+    configure-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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing TAGS in itcl" ; \
-       (cd itcl && \
+       echo "Doing html in tcl" ; \
+       (cd $(HOST_SUBDIR)/tcl && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                 html) \
           || exit 1
  
-@endif itcl
+@endif tcl
  
-.PHONY: maybe-install-info-itcl install-info-itcl
-maybe-install-info-itcl:
-@if itcl
-maybe-install-info-itcl: install-info-itcl
+.PHONY: maybe-TAGS-tcl TAGS-tcl
+maybe-TAGS-tcl:
+@if tcl
+maybe-TAGS-tcl: TAGS-tcl
  
-install-info-itcl: \
-    configure-itcl \
-    info-itcl 
-       @[ -f ./itcl/Makefile ] || exit 0; \
+TAGS-tcl: \
+    configure-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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing install-info in itcl" ; \
-       (cd itcl && \
+       echo "Doing TAGS in tcl" ; \
+       (cd $(HOST_SUBDIR)/tcl && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                 TAGS) \
           || exit 1
  
-@endif itcl
+@endif tcl
  
-.PHONY: maybe-installcheck-itcl installcheck-itcl
-maybe-installcheck-itcl:
-@if itcl
-maybe-installcheck-itcl: installcheck-itcl
+.PHONY: maybe-install-info-tcl install-info-tcl
+maybe-install-info-tcl:
+@if tcl
+maybe-install-info-tcl: install-info-tcl
  
-installcheck-itcl: \
-    configure-itcl 
-       @[ -f ./itcl/Makefile ] || exit 0; \
+install-info-tcl: \
+    configure-tcl \
+    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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing installcheck in itcl" ; \
-       (cd itcl && \
+       echo "Doing install-info in tcl" ; \
+       (cd $(HOST_SUBDIR)/tcl && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                 install-info) \
           || exit 1
  
-@endif itcl
+@endif tcl
  
-.PHONY: maybe-mostlyclean-itcl mostlyclean-itcl
-maybe-mostlyclean-itcl:
-@if itcl
-maybe-mostlyclean-itcl: mostlyclean-itcl
+.PHONY: maybe-installcheck-tcl installcheck-tcl
+maybe-installcheck-tcl:
+@if tcl
+maybe-installcheck-tcl: installcheck-tcl
  
-mostlyclean-itcl: 
-       @[ -f ./itcl/Makefile ] || exit 0; \
+installcheck-tcl: \
+    configure-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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing mostlyclean in itcl" ; \
-       (cd itcl && \
+       echo "Doing installcheck in tcl" ; \
+       (cd $(HOST_SUBDIR)/tcl && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                 installcheck) \
           || exit 1
  
-@endif itcl
+@endif tcl
  
-.PHONY: maybe-clean-itcl clean-itcl
-maybe-clean-itcl:
-@if itcl
-maybe-clean-itcl: clean-itcl
+.PHONY: maybe-mostlyclean-tcl mostlyclean-tcl
+maybe-mostlyclean-tcl:
+@if tcl
+maybe-mostlyclean-tcl: mostlyclean-tcl
  
-clean-itcl: 
-       @[ -f ./itcl/Makefile ] || exit 0; \
+# tcl doesn't support mostlyclean.
+mostlyclean-tcl:
+
+@endif tcl
+
+.PHONY: maybe-clean-tcl clean-tcl
+maybe-clean-tcl:
+@if tcl
+maybe-clean-tcl: clean-tcl
+
+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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing clean in itcl" ; \
-       (cd itcl && \
+       echo "Doing clean in tcl" ; \
+       (cd $(HOST_SUBDIR)/tcl && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -11164,24 +12263,23 @@ clean-itcl:
                   clean) \
           || exit 1
  
-@endif itcl
+@endif tcl
  
-.PHONY: maybe-distclean-itcl distclean-itcl
-maybe-distclean-itcl:
-@if itcl
-maybe-distclean-itcl: distclean-itcl
+.PHONY: maybe-distclean-tcl distclean-tcl
+maybe-distclean-tcl:
+@if tcl
+maybe-distclean-tcl: distclean-tcl
  
-distclean-itcl: 
-       @[ -f ./itcl/Makefile ] || exit 0; \
+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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing distclean in itcl" ; \
-       (cd itcl && \
+       echo "Doing distclean in tcl" ; \
+       (cd $(HOST_SUBDIR)/tcl && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -11189,24 +12287,23 @@ distclean-itcl:
                   distclean) \
           || exit 1
  
-@endif itcl
+@endif tcl
  
-.PHONY: maybe-maintainer-clean-itcl maintainer-clean-itcl
-maybe-maintainer-clean-itcl:
-@if itcl
-maybe-maintainer-clean-itcl: maintainer-clean-itcl
+.PHONY: maybe-maintainer-clean-tcl maintainer-clean-tcl
+maybe-maintainer-clean-tcl:
+@if tcl
+maybe-maintainer-clean-tcl: maintainer-clean-tcl
  
-maintainer-clean-itcl: 
-       @[ -f ./itcl/Makefile ] || exit 0; \
+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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing maintainer-clean in itcl" ; \
-       (cd itcl && \
+       echo "Doing maintainer-clean in tcl" ; \
+       (cd $(HOST_SUBDIR)/tcl && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -11214,96 +12311,96 @@ maintainer-clean-itcl:
                   maintainer-clean) \
           || exit 1
  
-@endif itcl
+@endif tcl
  
  
-.PHONY: configure-ld maybe-configure-ld
-maybe-configure-ld:
-@if ld
-maybe-configure-ld: configure-ld
-configure-ld:
-       @test ! -f ld/Makefile || exit 0; \
-       [ -d ld ] || mkdir ld; \
+
+.PHONY: configure-itcl maybe-configure-itcl
+maybe-configure-itcl:
+@if itcl
+maybe-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 ld; \
-       cd ld || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/itcl; \
+       cd "$(HOST_SUBDIR)/itcl" || exit 1; \
         case $(srcdir) in \
-         \.) \
-           srcdiroption="--srcdir=."; \
-           libsrcdir=".";; \
-         /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/ld"; \
-           libsrcdir="$$s/ld";; \
-         *) \
-           srcdiroption="--srcdir=../$(srcdir)/ld"; \
-           libsrcdir="$$s/ld";; \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/itcl/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
+       srcdiroption="--srcdir=$${topdir}/itcl"; \
+       libsrcdir="$$s/itcl"; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
-@endif ld
+@endif itcl
  
-.PHONY: all-ld maybe-all-ld
-maybe-all-ld:
-@if ld
-maybe-all-ld: all-ld
-all-ld: configure-ld
+
+
+.PHONY: all-itcl maybe-all-itcl
+maybe-all-itcl:
+@if itcl
+TARGET-itcl=all
+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 ld && $(MAKE) $(FLAGS_TO_PASS) all)
-@endif ld
+       (cd $(HOST_SUBDIR)/itcl && \
+         $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-itcl))
+@endif itcl
  
-.PHONY: check-ld maybe-check-ld
-maybe-check-ld:
-@if ld
-maybe-check-ld: check-ld
  
-check-ld:
+.PHONY: check-itcl maybe-check-itcl
+maybe-check-itcl:
+@if itcl
+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 ld && $(MAKE) $(FLAGS_TO_PASS) check)
+       (cd $(HOST_SUBDIR)/itcl && \
+         $(MAKE) $(FLAGS_TO_PASS)  check)
  
-@endif ld
+@endif itcl
  
-.PHONY: install-ld maybe-install-ld
-maybe-install-ld:
-@if ld
-maybe-install-ld: install-ld
+.PHONY: install-itcl maybe-install-itcl
+maybe-install-itcl:
+@if itcl
+maybe-install-itcl: install-itcl
  
-install-ld: installdirs
+install-itcl: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
-       (cd ld && $(MAKE) $(FLAGS_TO_PASS) install)
+       (cd $(HOST_SUBDIR)/itcl && \
+         $(MAKE) $(FLAGS_TO_PASS)  install)
  
-@endif ld
+@endif itcl
  
  # Other targets (info, dvi, etc.)
  
-.PHONY: maybe-info-ld info-ld
-maybe-info-ld:
-@if ld
-maybe-info-ld: info-ld
+.PHONY: maybe-info-itcl info-itcl
+maybe-info-itcl:
+@if itcl
+maybe-info-itcl: info-itcl
  
-info-ld: \
-    configure-ld 
-       @[ -f ./ld/Makefile ] || exit 0; \
+info-itcl: \
+    configure-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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing info in ld" ; \
-       (cd ld && \
+       echo "Doing info in itcl" ; \
+       (cd $(HOST_SUBDIR)/itcl && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -11311,25 +12408,24 @@ info-ld: \
                   info) \
           || exit 1
  
-@endif ld
+@endif itcl
  
-.PHONY: maybe-dvi-ld dvi-ld
-maybe-dvi-ld:
-@if ld
-maybe-dvi-ld: dvi-ld
+.PHONY: maybe-dvi-itcl dvi-itcl
+maybe-dvi-itcl:
+@if itcl
+maybe-dvi-itcl: dvi-itcl
  
-dvi-ld: \
-    configure-ld 
-       @[ -f ./ld/Makefile ] || exit 0; \
+dvi-itcl: \
+    configure-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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing dvi in ld" ; \
-       (cd ld && \
+       echo "Doing dvi in itcl" ; \
+       (cd $(HOST_SUBDIR)/itcl && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -11337,25 +12433,49 @@ dvi-ld: \
                   dvi) \
           || exit 1
  
-@endif ld
+@endif itcl
  
-.PHONY: maybe-TAGS-ld TAGS-ld
-maybe-TAGS-ld:
-@if ld
-maybe-TAGS-ld: TAGS-ld
+.PHONY: maybe-html-itcl html-itcl
+maybe-html-itcl:
+@if itcl
+maybe-html-itcl: html-itcl
  
-TAGS-ld: \
-    configure-ld 
-       @[ -f ./ld/Makefile ] || exit 0; \
+html-itcl: \
+    configure-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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing TAGS in ld" ; \
-       (cd ld && \
+       echo "Doing html in itcl" ; \
+       (cd $(HOST_SUBDIR)/itcl && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 html) \
+         || exit 1
+
+@endif itcl
+
+.PHONY: maybe-TAGS-itcl TAGS-itcl
+maybe-TAGS-itcl:
+@if itcl
+maybe-TAGS-itcl: TAGS-itcl
+
+TAGS-itcl: \
+    configure-itcl 
+       @[ -f ./itcl/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing TAGS in itcl" ; \
+       (cd $(HOST_SUBDIR)/itcl && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -11363,26 +12483,25 @@ TAGS-ld: \
                   TAGS) \
           || exit 1
  
-@endif ld
+@endif itcl
  
-.PHONY: maybe-install-info-ld install-info-ld
-maybe-install-info-ld:
-@if ld
-maybe-install-info-ld: install-info-ld
+.PHONY: maybe-install-info-itcl install-info-itcl
+maybe-install-info-itcl:
+@if itcl
+maybe-install-info-itcl: install-info-itcl
  
-install-info-ld: \
-    configure-ld \
-    info-ld 
-       @[ -f ./ld/Makefile ] || exit 0; \
+install-info-itcl: \
+    configure-itcl \
+    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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing install-info in ld" ; \
-       (cd ld && \
+       echo "Doing install-info in itcl" ; \
+       (cd $(HOST_SUBDIR)/itcl && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -11390,25 +12509,24 @@ install-info-ld: \
                   install-info) \
           || exit 1
  
-@endif ld
+@endif itcl
  
-.PHONY: maybe-installcheck-ld installcheck-ld
-maybe-installcheck-ld:
-@if ld
-maybe-installcheck-ld: installcheck-ld
+.PHONY: maybe-installcheck-itcl installcheck-itcl
+maybe-installcheck-itcl:
+@if itcl
+maybe-installcheck-itcl: installcheck-itcl
  
-installcheck-ld: \
-    configure-ld 
-       @[ -f ./ld/Makefile ] || exit 0; \
+installcheck-itcl: \
+    configure-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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing installcheck in ld" ; \
-       (cd ld && \
+       echo "Doing installcheck in itcl" ; \
+       (cd $(HOST_SUBDIR)/itcl && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -11416,24 +12534,23 @@ installcheck-ld: \
                   installcheck) \
           || exit 1
  
-@endif ld
+@endif itcl
  
-.PHONY: maybe-mostlyclean-ld mostlyclean-ld
-maybe-mostlyclean-ld:
-@if ld
-maybe-mostlyclean-ld: mostlyclean-ld
+.PHONY: maybe-mostlyclean-itcl mostlyclean-itcl
+maybe-mostlyclean-itcl:
+@if itcl
+maybe-mostlyclean-itcl: mostlyclean-itcl
  
-mostlyclean-ld: 
-       @[ -f ./ld/Makefile ] || exit 0; \
+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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing mostlyclean in ld" ; \
-       (cd ld && \
+       echo "Doing mostlyclean in itcl" ; \
+       (cd $(HOST_SUBDIR)/itcl && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -11441,24 +12558,23 @@ mostlyclean-ld:
                   mostlyclean) \
           || exit 1
  
-@endif ld
+@endif itcl
  
-.PHONY: maybe-clean-ld clean-ld
-maybe-clean-ld:
-@if ld
-maybe-clean-ld: clean-ld
+.PHONY: maybe-clean-itcl clean-itcl
+maybe-clean-itcl:
+@if itcl
+maybe-clean-itcl: clean-itcl
  
-clean-ld: 
-       @[ -f ./ld/Makefile ] || exit 0; \
+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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing clean in ld" ; \
-       (cd ld && \
+       echo "Doing clean in itcl" ; \
+       (cd $(HOST_SUBDIR)/itcl && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -11466,24 +12582,23 @@ clean-ld:
                   clean) \
           || exit 1
  
-@endif ld
+@endif itcl
  
-.PHONY: maybe-distclean-ld distclean-ld
-maybe-distclean-ld:
-@if ld
-maybe-distclean-ld: distclean-ld
+.PHONY: maybe-distclean-itcl distclean-itcl
+maybe-distclean-itcl:
+@if itcl
+maybe-distclean-itcl: distclean-itcl
  
-distclean-ld: 
-       @[ -f ./ld/Makefile ] || exit 0; \
+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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing distclean in ld" ; \
-       (cd ld && \
+       echo "Doing distclean in itcl" ; \
+       (cd $(HOST_SUBDIR)/itcl && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -11491,24 +12606,23 @@ distclean-ld:
                   distclean) \
           || exit 1
  
-@endif ld
+@endif itcl
  
-.PHONY: maybe-maintainer-clean-ld maintainer-clean-ld
-maybe-maintainer-clean-ld:
-@if ld
-maybe-maintainer-clean-ld: maintainer-clean-ld
+.PHONY: maybe-maintainer-clean-itcl maintainer-clean-itcl
+maybe-maintainer-clean-itcl:
+@if itcl
+maybe-maintainer-clean-itcl: maintainer-clean-itcl
  
-maintainer-clean-ld: 
-       @[ -f ./ld/Makefile ] || exit 0; \
+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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing maintainer-clean in ld" ; \
-       (cd ld && \
+       echo "Doing maintainer-clean in itcl" ; \
+       (cd $(HOST_SUBDIR)/itcl && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -11516,96 +12630,98 @@ maintainer-clean-ld:
                   maintainer-clean) \
           || exit 1
  
-@endif ld
+@endif itcl
  
  
-.PHONY: configure-libcpp maybe-configure-libcpp
-maybe-configure-libcpp:
-@if libcpp
-maybe-configure-libcpp: configure-libcpp
-configure-libcpp:
-       @test ! -f libcpp/Makefile || exit 0; \
-       [ -d libcpp ] || mkdir libcpp; \
+
+.PHONY: configure-ld maybe-configure-ld
+maybe-configure-ld:
+@if ld
+maybe-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 libcpp; \
-       cd libcpp || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/ld; \
+       cd "$(HOST_SUBDIR)/ld" || exit 1; \
         case $(srcdir) in \
-         \.) \
-           srcdiroption="--srcdir=."; \
-           libsrcdir=".";; \
-         /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/libcpp"; \
-           libsrcdir="$$s/libcpp";; \
-         *) \
-           srcdiroption="--srcdir=../$(srcdir)/libcpp"; \
-           libsrcdir="$$s/libcpp";; \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/ld/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
+       srcdiroption="--srcdir=$${topdir}/ld"; \
+       libsrcdir="$$s/ld"; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
-@endif libcpp
+@endif ld
  
-.PHONY: all-libcpp maybe-all-libcpp
-maybe-all-libcpp:
-@if libcpp
-maybe-all-libcpp: all-libcpp
-all-libcpp: configure-libcpp
-       @r=`${PWD_COMMAND}`; export r; \
+
+
+.PHONY: all-ld maybe-all-ld
+maybe-all-ld:
+@if ld
+TARGET-ld=all
+maybe-all-ld: all-ld
+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 libcpp && $(MAKE) $(FLAGS_TO_PASS) all)
-@endif libcpp
+       (cd $(HOST_SUBDIR)/ld && \
+         $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-ld))
+@endif ld
  
-.PHONY: check-libcpp maybe-check-libcpp
-maybe-check-libcpp:
-@if libcpp
-maybe-check-libcpp: check-libcpp
  
-check-libcpp:
+.PHONY: check-ld maybe-check-ld
+maybe-check-ld:
+@if ld
+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 libcpp && $(MAKE) $(FLAGS_TO_PASS) check)
+       (cd $(HOST_SUBDIR)/ld && \
+         $(MAKE) $(FLAGS_TO_PASS)  check)
  
-@endif libcpp
+@endif ld
  
-.PHONY: install-libcpp maybe-install-libcpp
-maybe-install-libcpp:
-@if libcpp
-maybe-install-libcpp: install-libcpp
+.PHONY: install-ld maybe-install-ld
+maybe-install-ld:
+@if ld
+maybe-install-ld: install-ld
  
-install-libcpp: installdirs
+install-ld: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
-       (cd libcpp && $(MAKE) $(FLAGS_TO_PASS) install)
+       (cd $(HOST_SUBDIR)/ld && \
+         $(MAKE) $(FLAGS_TO_PASS)  install)
  
-@endif libcpp
+@endif ld
  
  # Other targets (info, dvi, etc.)
  
-.PHONY: maybe-info-libcpp info-libcpp
-maybe-info-libcpp:
-@if libcpp
-maybe-info-libcpp: info-libcpp
+.PHONY: maybe-info-ld info-ld
+maybe-info-ld:
+@if ld
+maybe-info-ld: info-ld
  
-info-libcpp: \
-    configure-libcpp 
-       @[ -f ./libcpp/Makefile ] || exit 0; \
+info-ld: \
+    configure-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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing info in libcpp" ; \
-       (cd libcpp && \
+       echo "Doing info in ld" ; \
+       (cd $(HOST_SUBDIR)/ld && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -11613,25 +12729,24 @@ info-libcpp: \
                   info) \
           || exit 1
  
-@endif libcpp
+@endif ld
  
-.PHONY: maybe-dvi-libcpp dvi-libcpp
-maybe-dvi-libcpp:
-@if libcpp
-maybe-dvi-libcpp: dvi-libcpp
+.PHONY: maybe-dvi-ld dvi-ld
+maybe-dvi-ld:
+@if ld
+maybe-dvi-ld: dvi-ld
  
-dvi-libcpp: \
-    configure-libcpp 
-       @[ -f ./libcpp/Makefile ] || exit 0; \
+dvi-ld: \
+    configure-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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing dvi in libcpp" ; \
-       (cd libcpp && \
+       echo "Doing dvi in ld" ; \
+       (cd $(HOST_SUBDIR)/ld && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -11639,25 +12754,49 @@ dvi-libcpp: \
                   dvi) \
           || exit 1
  
-@endif libcpp
+@endif ld
  
-.PHONY: maybe-TAGS-libcpp TAGS-libcpp
-maybe-TAGS-libcpp:
-@if libcpp
-maybe-TAGS-libcpp: TAGS-libcpp
+.PHONY: maybe-html-ld html-ld
+maybe-html-ld:
+@if ld
+maybe-html-ld: html-ld
  
-TAGS-libcpp: \
-    configure-libcpp 
-       @[ -f ./libcpp/Makefile ] || exit 0; \
+html-ld: \
+    configure-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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing TAGS in libcpp" ; \
-       (cd libcpp && \
+       echo "Doing html in ld" ; \
+       (cd $(HOST_SUBDIR)/ld && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 html) \
+         || exit 1
+
+@endif ld
+
+.PHONY: maybe-TAGS-ld TAGS-ld
+maybe-TAGS-ld:
+@if ld
+maybe-TAGS-ld: TAGS-ld
+
+TAGS-ld: \
+    configure-ld 
+       @[ -f ./ld/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing TAGS in ld" ; \
+       (cd $(HOST_SUBDIR)/ld && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -11665,26 +12804,25 @@ TAGS-libcpp: \
                   TAGS) \
           || exit 1
  
-@endif libcpp
+@endif ld
  
-.PHONY: maybe-install-info-libcpp install-info-libcpp
-maybe-install-info-libcpp:
-@if libcpp
-maybe-install-info-libcpp: install-info-libcpp
+.PHONY: maybe-install-info-ld install-info-ld
+maybe-install-info-ld:
+@if ld
+maybe-install-info-ld: install-info-ld
  
-install-info-libcpp: \
-    configure-libcpp \
-    info-libcpp 
-       @[ -f ./libcpp/Makefile ] || exit 0; \
+install-info-ld: \
+    configure-ld \
+    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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing install-info in libcpp" ; \
-       (cd libcpp && \
+       echo "Doing install-info in ld" ; \
+       (cd $(HOST_SUBDIR)/ld && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -11692,25 +12830,24 @@ install-info-libcpp: \
                   install-info) \
           || exit 1
  
-@endif libcpp
+@endif ld
  
-.PHONY: maybe-installcheck-libcpp installcheck-libcpp
-maybe-installcheck-libcpp:
-@if libcpp
-maybe-installcheck-libcpp: installcheck-libcpp
+.PHONY: maybe-installcheck-ld installcheck-ld
+maybe-installcheck-ld:
+@if ld
+maybe-installcheck-ld: installcheck-ld
  
-installcheck-libcpp: \
-    configure-libcpp 
-       @[ -f ./libcpp/Makefile ] || exit 0; \
+installcheck-ld: \
+    configure-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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing installcheck in libcpp" ; \
-       (cd libcpp && \
+       echo "Doing installcheck in ld" ; \
+       (cd $(HOST_SUBDIR)/ld && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -11718,24 +12855,23 @@ installcheck-libcpp: \
                   installcheck) \
           || exit 1
  
-@endif libcpp
+@endif ld
  
-.PHONY: maybe-mostlyclean-libcpp mostlyclean-libcpp
-maybe-mostlyclean-libcpp:
-@if libcpp
-maybe-mostlyclean-libcpp: mostlyclean-libcpp
+.PHONY: maybe-mostlyclean-ld mostlyclean-ld
+maybe-mostlyclean-ld:
+@if ld
+maybe-mostlyclean-ld: mostlyclean-ld
  
-mostlyclean-libcpp: 
-       @[ -f ./libcpp/Makefile ] || exit 0; \
+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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing mostlyclean in libcpp" ; \
-       (cd libcpp && \
+       echo "Doing mostlyclean in ld" ; \
+       (cd $(HOST_SUBDIR)/ld && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -11743,24 +12879,23 @@ mostlyclean-libcpp:
                   mostlyclean) \
           || exit 1
  
-@endif libcpp
+@endif ld
  
-.PHONY: maybe-clean-libcpp clean-libcpp
-maybe-clean-libcpp:
-@if libcpp
-maybe-clean-libcpp: clean-libcpp
+.PHONY: maybe-clean-ld clean-ld
+maybe-clean-ld:
+@if ld
+maybe-clean-ld: clean-ld
  
-clean-libcpp: 
-       @[ -f ./libcpp/Makefile ] || exit 0; \
+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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing clean in libcpp" ; \
-       (cd libcpp && \
+       echo "Doing clean in ld" ; \
+       (cd $(HOST_SUBDIR)/ld && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -11768,24 +12903,23 @@ clean-libcpp:
                   clean) \
           || exit 1
  
-@endif libcpp
+@endif ld
  
-.PHONY: maybe-distclean-libcpp distclean-libcpp
-maybe-distclean-libcpp:
-@if libcpp
-maybe-distclean-libcpp: distclean-libcpp
+.PHONY: maybe-distclean-ld distclean-ld
+maybe-distclean-ld:
+@if ld
+maybe-distclean-ld: distclean-ld
  
-distclean-libcpp: 
-       @[ -f ./libcpp/Makefile ] || exit 0; \
+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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing distclean in libcpp" ; \
-       (cd libcpp && \
+       echo "Doing distclean in ld" ; \
+       (cd $(HOST_SUBDIR)/ld && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -11793,24 +12927,23 @@ distclean-libcpp:
                   distclean) \
           || exit 1
  
-@endif libcpp
+@endif ld
  
-.PHONY: maybe-maintainer-clean-libcpp maintainer-clean-libcpp
-maybe-maintainer-clean-libcpp:
-@if libcpp
-maybe-maintainer-clean-libcpp: maintainer-clean-libcpp
+.PHONY: maybe-maintainer-clean-ld maintainer-clean-ld
+maybe-maintainer-clean-ld:
+@if ld
+maybe-maintainer-clean-ld: maintainer-clean-ld
  
-maintainer-clean-libcpp: 
-       @[ -f ./libcpp/Makefile ] || exit 0; \
+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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing maintainer-clean in libcpp" ; \
-       (cd libcpp && \
+       echo "Doing maintainer-clean in ld" ; \
+       (cd $(HOST_SUBDIR)/ld && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -11818,96 +12951,98 @@ maintainer-clean-libcpp:
                   maintainer-clean) \
           || exit 1
  
-@endif libcpp
+@endif ld
  
  
-.PHONY: configure-libgui maybe-configure-libgui
-maybe-configure-libgui:
-@if libgui
-maybe-configure-libgui: configure-libgui
-configure-libgui:
-       @test ! -f libgui/Makefile || exit 0; \
-       [ -d libgui ] || mkdir libgui; \
+
+.PHONY: configure-libcpp maybe-configure-libcpp
+maybe-configure-libcpp:
+@if libcpp
+maybe-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 libgui; \
-       cd libgui || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/libcpp; \
+       cd "$(HOST_SUBDIR)/libcpp" || exit 1; \
         case $(srcdir) in \
-         \.) \
-           srcdiroption="--srcdir=."; \
-           libsrcdir=".";; \
-         /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/libgui"; \
-           libsrcdir="$$s/libgui";; \
-         *) \
-           srcdiroption="--srcdir=../$(srcdir)/libgui"; \
-           libsrcdir="$$s/libgui";; \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/libcpp/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
+       srcdiroption="--srcdir=$${topdir}/libcpp"; \
+       libsrcdir="$$s/libcpp"; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
-@endif libgui
+@endif libcpp
  
-.PHONY: all-libgui maybe-all-libgui
-maybe-all-libgui:
-@if libgui
-maybe-all-libgui: all-libgui
-all-libgui: configure-libgui
-       @r=`${PWD_COMMAND}`; export r; \
+
+
+.PHONY: all-libcpp maybe-all-libcpp
+maybe-all-libcpp:
+@if libcpp
+TARGET-libcpp=all
+maybe-all-libcpp: all-libcpp
+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 libgui && $(MAKE) $(FLAGS_TO_PASS) all)
-@endif libgui
+       (cd $(HOST_SUBDIR)/libcpp && \
+         $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-libcpp))
+@endif libcpp
  
-.PHONY: check-libgui maybe-check-libgui
-maybe-check-libgui:
-@if libgui
-maybe-check-libgui: check-libgui
  
-check-libgui:
+.PHONY: check-libcpp maybe-check-libcpp
+maybe-check-libcpp:
+@if libcpp
+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 libgui && $(MAKE) $(FLAGS_TO_PASS) check)
+       (cd $(HOST_SUBDIR)/libcpp && \
+         $(MAKE) $(FLAGS_TO_PASS)  check)
  
-@endif libgui
+@endif libcpp
  
-.PHONY: install-libgui maybe-install-libgui
-maybe-install-libgui:
-@if libgui
-maybe-install-libgui: install-libgui
+.PHONY: install-libcpp maybe-install-libcpp
+maybe-install-libcpp:
+@if libcpp
+maybe-install-libcpp: install-libcpp
  
-install-libgui: installdirs
+install-libcpp: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
-       (cd libgui && $(MAKE) $(FLAGS_TO_PASS) install)
+       (cd $(HOST_SUBDIR)/libcpp && \
+         $(MAKE) $(FLAGS_TO_PASS)  install)
  
-@endif libgui
+@endif libcpp
  
  # Other targets (info, dvi, etc.)
  
-.PHONY: maybe-info-libgui info-libgui
-maybe-info-libgui:
-@if libgui
-maybe-info-libgui: info-libgui
+.PHONY: maybe-info-libcpp info-libcpp
+maybe-info-libcpp:
+@if libcpp
+maybe-info-libcpp: info-libcpp
  
-info-libgui: \
-    configure-libgui 
-       @[ -f ./libgui/Makefile ] || exit 0; \
+info-libcpp: \
+    configure-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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing info in libgui" ; \
-       (cd libgui && \
+       echo "Doing info in libcpp" ; \
+       (cd $(HOST_SUBDIR)/libcpp && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -11915,25 +13050,24 @@ info-libgui: \
                   info) \
           || exit 1
  
-@endif libgui
+@endif libcpp
  
-.PHONY: maybe-dvi-libgui dvi-libgui
-maybe-dvi-libgui:
-@if libgui
-maybe-dvi-libgui: dvi-libgui
+.PHONY: maybe-dvi-libcpp dvi-libcpp
+maybe-dvi-libcpp:
+@if libcpp
+maybe-dvi-libcpp: dvi-libcpp
  
-dvi-libgui: \
-    configure-libgui 
-       @[ -f ./libgui/Makefile ] || exit 0; \
+dvi-libcpp: \
+    configure-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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing dvi in libgui" ; \
-       (cd libgui && \
+       echo "Doing dvi in libcpp" ; \
+       (cd $(HOST_SUBDIR)/libcpp && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -11941,52 +13075,75 @@ dvi-libgui: \
                   dvi) \
           || exit 1
  
-@endif libgui
+@endif libcpp
  
-.PHONY: maybe-TAGS-libgui TAGS-libgui
-maybe-TAGS-libgui:
-@if libgui
-maybe-TAGS-libgui: TAGS-libgui
+.PHONY: maybe-html-libcpp html-libcpp
+maybe-html-libcpp:
+@if libcpp
+maybe-html-libcpp: html-libcpp
  
-TAGS-libgui: \
-    configure-libgui 
-       @[ -f ./libgui/Makefile ] || exit 0; \
+html-libcpp: \
+    configure-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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing TAGS in libgui" ; \
-       (cd libgui && \
+       echo "Doing html in libcpp" ; \
+       (cd $(HOST_SUBDIR)/libcpp && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                 html) \
           || exit 1
  
-@endif libgui
+@endif libcpp
  
-.PHONY: maybe-install-info-libgui install-info-libgui
-maybe-install-info-libgui:
-@if libgui
-maybe-install-info-libgui: install-info-libgui
+.PHONY: maybe-TAGS-libcpp TAGS-libcpp
+maybe-TAGS-libcpp:
+@if libcpp
+maybe-TAGS-libcpp: TAGS-libcpp
  
-install-info-libgui: \
-    configure-libgui \
-    info-libgui 
-       @[ -f ./libgui/Makefile ] || exit 0; \
+TAGS-libcpp: \
+    configure-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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing install-info in libgui" ; \
-       (cd libgui && \
+       echo "Doing TAGS in libcpp" ; \
+       (cd $(HOST_SUBDIR)/libcpp && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 TAGS) \
+         || exit 1
+
+@endif libcpp
+
+.PHONY: maybe-install-info-libcpp install-info-libcpp
+maybe-install-info-libcpp:
+@if libcpp
+maybe-install-info-libcpp: install-info-libcpp
+
+install-info-libcpp: \
+    configure-libcpp \
+    info-libcpp 
+       @[ -f ./libcpp/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing install-info in libcpp" ; \
+       (cd $(HOST_SUBDIR)/libcpp && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -11994,25 +13151,24 @@ install-info-libgui: \
                   install-info) \
           || exit 1
  
-@endif libgui
+@endif libcpp
  
-.PHONY: maybe-installcheck-libgui installcheck-libgui
-maybe-installcheck-libgui:
-@if libgui
-maybe-installcheck-libgui: installcheck-libgui
+.PHONY: maybe-installcheck-libcpp installcheck-libcpp
+maybe-installcheck-libcpp:
+@if libcpp
+maybe-installcheck-libcpp: installcheck-libcpp
  
-installcheck-libgui: \
-    configure-libgui 
-       @[ -f ./libgui/Makefile ] || exit 0; \
+installcheck-libcpp: \
+    configure-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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing installcheck in libgui" ; \
-       (cd libgui && \
+       echo "Doing installcheck in libcpp" ; \
+       (cd $(HOST_SUBDIR)/libcpp && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -12020,24 +13176,23 @@ installcheck-libgui: \
                   installcheck) \
           || exit 1
  
-@endif libgui
+@endif libcpp
  
-.PHONY: maybe-mostlyclean-libgui mostlyclean-libgui
-maybe-mostlyclean-libgui:
-@if libgui
-maybe-mostlyclean-libgui: mostlyclean-libgui
+.PHONY: maybe-mostlyclean-libcpp mostlyclean-libcpp
+maybe-mostlyclean-libcpp:
+@if libcpp
+maybe-mostlyclean-libcpp: mostlyclean-libcpp
  
-mostlyclean-libgui: 
-       @[ -f ./libgui/Makefile ] || exit 0; \
+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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing mostlyclean in libgui" ; \
-       (cd libgui && \
+       echo "Doing mostlyclean in libcpp" ; \
+       (cd $(HOST_SUBDIR)/libcpp && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -12045,24 +13200,23 @@ mostlyclean-libgui:
                   mostlyclean) \
           || exit 1
  
-@endif libgui
+@endif libcpp
  
-.PHONY: maybe-clean-libgui clean-libgui
-maybe-clean-libgui:
-@if libgui
-maybe-clean-libgui: clean-libgui
+.PHONY: maybe-clean-libcpp clean-libcpp
+maybe-clean-libcpp:
+@if libcpp
+maybe-clean-libcpp: clean-libcpp
  
-clean-libgui: 
-       @[ -f ./libgui/Makefile ] || exit 0; \
+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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing clean in libgui" ; \
-       (cd libgui && \
+       echo "Doing clean in libcpp" ; \
+       (cd $(HOST_SUBDIR)/libcpp && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -12070,24 +13224,23 @@ clean-libgui:
                   clean) \
           || exit 1
  
-@endif libgui
+@endif libcpp
  
-.PHONY: maybe-distclean-libgui distclean-libgui
-maybe-distclean-libgui:
-@if libgui
-maybe-distclean-libgui: distclean-libgui
+.PHONY: maybe-distclean-libcpp distclean-libcpp
+maybe-distclean-libcpp:
+@if libcpp
+maybe-distclean-libcpp: distclean-libcpp
  
-distclean-libgui: 
-       @[ -f ./libgui/Makefile ] || exit 0; \
+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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing distclean in libgui" ; \
-       (cd libgui && \
+       echo "Doing distclean in libcpp" ; \
+       (cd $(HOST_SUBDIR)/libcpp && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -12095,24 +13248,23 @@ distclean-libgui:
                   distclean) \
           || exit 1
  
-@endif libgui
+@endif libcpp
  
-.PHONY: maybe-maintainer-clean-libgui maintainer-clean-libgui
-maybe-maintainer-clean-libgui:
-@if libgui
-maybe-maintainer-clean-libgui: maintainer-clean-libgui
+.PHONY: maybe-maintainer-clean-libcpp maintainer-clean-libcpp
+maybe-maintainer-clean-libcpp:
+@if libcpp
+maybe-maintainer-clean-libcpp: maintainer-clean-libcpp
  
-maintainer-clean-libgui: 
-       @[ -f ./libgui/Makefile ] || exit 0; \
+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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing maintainer-clean in libgui" ; \
-       (cd libgui && \
+       echo "Doing maintainer-clean in libcpp" ; \
+       (cd $(HOST_SUBDIR)/libcpp && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -12120,91 +13272,96 @@ maintainer-clean-libgui:
                   maintainer-clean) \
           || exit 1
  
-@endif libgui
+@endif libcpp
+
  
  
-.PHONY: configure-libbanshee maybe-configure-libbanshee
-maybe-configure-libbanshee:
-@if libbanshee
-maybe-configure-libbanshee: configure-libbanshee
-configure-libbanshee:
-       @test ! -f libbanshee/Makefile || exit 0; \
-       [ -d libbanshee ] || mkdir libbanshee; \
+.PHONY: configure-libgui maybe-configure-libgui
+maybe-configure-libgui:
+@if libgui
+maybe-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 libbanshee; \
-       cd libbanshee || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/libgui; \
+       cd "$(HOST_SUBDIR)/libgui" || exit 1; \
         case $(srcdir) in \
-         \.) \
-           srcdiroption="--srcdir=."; \
-           libsrcdir=".";; \
-         /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/libbanshee"; \
-           libsrcdir="$$s/libbanshee";; \
-         *) \
-           srcdiroption="--srcdir=../$(srcdir)/libbanshee"; \
-           libsrcdir="$$s/libbanshee";; \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/libgui/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
+       srcdiroption="--srcdir=$${topdir}/libgui"; \
+       libsrcdir="$$s/libgui"; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
-@endif libbanshee
+@endif libgui
+
+
  
-.PHONY: all-libbanshee maybe-all-libbanshee
-maybe-all-libbanshee:
-@if libbanshee
-maybe-all-libbanshee: all-libbanshee
-all-libbanshee: configure-libbanshee
+.PHONY: all-libgui maybe-all-libgui
+maybe-all-libgui:
+@if libgui
+TARGET-libgui=all
+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 libbanshee && $(MAKE) $(FLAGS_TO_PASS) all)
-@endif libbanshee
+       (cd $(HOST_SUBDIR)/libgui && \
+         $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-libgui))
+@endif libgui
  
-.PHONY: check-libbanshee maybe-check-libbanshee
-maybe-check-libbanshee:
-@if libbanshee
-maybe-check-libbanshee: check-libbanshee
  
-check-libbanshee:
+.PHONY: check-libgui maybe-check-libgui
+maybe-check-libgui:
+@if libgui
+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 libbanshee && $(MAKE) $(FLAGS_TO_PASS) check)
+       (cd $(HOST_SUBDIR)/libgui && \
+         $(MAKE) $(FLAGS_TO_PASS)  check)
  
-@endif libbanshee
+@endif libgui
  
-.PHONY: install-libbanshee maybe-install-libbanshee
-maybe-install-libbanshee:
-@if libbanshee
-maybe-install-libbanshee: install-libbanshee
+.PHONY: install-libgui maybe-install-libgui
+maybe-install-libgui:
+@if libgui
+maybe-install-libgui: install-libgui
  
-install-libbanshee:
+install-libgui: installdirs
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       (cd $(HOST_SUBDIR)/libgui && \
+         $(MAKE) $(FLAGS_TO_PASS)  install)
  
-@endif libbanshee
+@endif libgui
  
  # Other targets (info, dvi, etc.)
  
-.PHONY: maybe-info-libbanshee info-libbanshee
-maybe-info-libbanshee:
-@if libbanshee
-maybe-info-libbanshee: info-libbanshee
+.PHONY: maybe-info-libgui info-libgui
+maybe-info-libgui:
+@if libgui
+maybe-info-libgui: info-libgui
  
-info-libbanshee: \
-    configure-libbanshee 
-       @[ -f ./libbanshee/Makefile ] || exit 0; \
+info-libgui: \
+    configure-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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing info in libbanshee" ; \
-       (cd libbanshee && \
+       echo "Doing info in libgui" ; \
+       (cd $(HOST_SUBDIR)/libgui && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -12212,25 +13369,24 @@ info-libbanshee: \
                   info) \
           || exit 1
  
-@endif libbanshee
+@endif libgui
  
-.PHONY: maybe-dvi-libbanshee dvi-libbanshee
-maybe-dvi-libbanshee:
-@if libbanshee
-maybe-dvi-libbanshee: dvi-libbanshee
+.PHONY: maybe-dvi-libgui dvi-libgui
+maybe-dvi-libgui:
+@if libgui
+maybe-dvi-libgui: dvi-libgui
  
-dvi-libbanshee: \
-    configure-libbanshee 
-       @[ -f ./libbanshee/Makefile ] || exit 0; \
+dvi-libgui: \
+    configure-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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing dvi in libbanshee" ; \
-       (cd libbanshee && \
+       echo "Doing dvi in libgui" ; \
+       (cd $(HOST_SUBDIR)/libgui && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -12238,25 +13394,49 @@ dvi-libbanshee: \
                   dvi) \
           || exit 1
  
-@endif libbanshee
+@endif libgui
+
+.PHONY: maybe-html-libgui html-libgui
+maybe-html-libgui:
+@if libgui
+maybe-html-libgui: html-libgui
+
+html-libgui: \
+    configure-libgui 
+       @[ -f ./libgui/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing html in libgui" ; \
+       (cd $(HOST_SUBDIR)/libgui && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 html) \
+         || exit 1
+
+@endif libgui
  
-.PHONY: maybe-TAGS-libbanshee TAGS-libbanshee
-maybe-TAGS-libbanshee:
-@if libbanshee
-maybe-TAGS-libbanshee: TAGS-libbanshee
+.PHONY: maybe-TAGS-libgui TAGS-libgui
+maybe-TAGS-libgui:
+@if libgui
+maybe-TAGS-libgui: TAGS-libgui
  
-TAGS-libbanshee: \
-    configure-libbanshee 
-       @[ -f ./libbanshee/Makefile ] || exit 0; \
+TAGS-libgui: \
+    configure-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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing TAGS in libbanshee" ; \
-       (cd libbanshee && \
+       echo "Doing TAGS in libgui" ; \
+       (cd $(HOST_SUBDIR)/libgui && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -12264,26 +13444,25 @@ TAGS-libbanshee: \
                   TAGS) \
           || exit 1
  
-@endif libbanshee
+@endif libgui
  
-.PHONY: maybe-install-info-libbanshee install-info-libbanshee
-maybe-install-info-libbanshee:
-@if libbanshee
-maybe-install-info-libbanshee: install-info-libbanshee
+.PHONY: maybe-install-info-libgui install-info-libgui
+maybe-install-info-libgui:
+@if libgui
+maybe-install-info-libgui: install-info-libgui
  
-install-info-libbanshee: \
-    configure-libbanshee \
-    info-libbanshee 
-       @[ -f ./libbanshee/Makefile ] || exit 0; \
+install-info-libgui: \
+    configure-libgui \
+    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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing install-info in libbanshee" ; \
-       (cd libbanshee && \
+       echo "Doing install-info in libgui" ; \
+       (cd $(HOST_SUBDIR)/libgui && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -12291,25 +13470,24 @@ install-info-libbanshee: \
                   install-info) \
           || exit 1
  
-@endif libbanshee
+@endif libgui
  
-.PHONY: maybe-installcheck-libbanshee installcheck-libbanshee
-maybe-installcheck-libbanshee:
-@if libbanshee
-maybe-installcheck-libbanshee: installcheck-libbanshee
+.PHONY: maybe-installcheck-libgui installcheck-libgui
+maybe-installcheck-libgui:
+@if libgui
+maybe-installcheck-libgui: installcheck-libgui
  
-installcheck-libbanshee: \
-    configure-libbanshee 
-       @[ -f ./libbanshee/Makefile ] || exit 0; \
+installcheck-libgui: \
+    configure-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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing installcheck in libbanshee" ; \
-       (cd libbanshee && \
+       echo "Doing installcheck in libgui" ; \
+       (cd $(HOST_SUBDIR)/libgui && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -12317,24 +13495,23 @@ installcheck-libbanshee: \
                   installcheck) \
           || exit 1
  
-@endif libbanshee
+@endif libgui
  
-.PHONY: maybe-mostlyclean-libbanshee mostlyclean-libbanshee
-maybe-mostlyclean-libbanshee:
-@if libbanshee
-maybe-mostlyclean-libbanshee: mostlyclean-libbanshee
+.PHONY: maybe-mostlyclean-libgui mostlyclean-libgui
+maybe-mostlyclean-libgui:
+@if libgui
+maybe-mostlyclean-libgui: mostlyclean-libgui
  
-mostlyclean-libbanshee: 
-       @[ -f ./libbanshee/Makefile ] || exit 0; \
+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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing mostlyclean in libbanshee" ; \
-       (cd libbanshee && \
+       echo "Doing mostlyclean in libgui" ; \
+       (cd $(HOST_SUBDIR)/libgui && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -12342,24 +13519,23 @@ mostlyclean-libbanshee:
                   mostlyclean) \
           || exit 1
  
-@endif libbanshee
+@endif libgui
  
-.PHONY: maybe-clean-libbanshee clean-libbanshee
-maybe-clean-libbanshee:
-@if libbanshee
-maybe-clean-libbanshee: clean-libbanshee
+.PHONY: maybe-clean-libgui clean-libgui
+maybe-clean-libgui:
+@if libgui
+maybe-clean-libgui: clean-libgui
  
-clean-libbanshee: 
-       @[ -f ./libbanshee/Makefile ] || exit 0; \
+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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing clean in libbanshee" ; \
-       (cd libbanshee && \
+       echo "Doing clean in libgui" ; \
+       (cd $(HOST_SUBDIR)/libgui && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -12367,24 +13543,23 @@ clean-libbanshee:
                   clean) \
           || exit 1
  
-@endif libbanshee
+@endif libgui
  
-.PHONY: maybe-distclean-libbanshee distclean-libbanshee
-maybe-distclean-libbanshee:
-@if libbanshee
-maybe-distclean-libbanshee: distclean-libbanshee
+.PHONY: maybe-distclean-libgui distclean-libgui
+maybe-distclean-libgui:
+@if libgui
+maybe-distclean-libgui: distclean-libgui
  
-distclean-libbanshee: 
-       @[ -f ./libbanshee/Makefile ] || exit 0; \
+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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing distclean in libbanshee" ; \
-       (cd libbanshee && \
+       echo "Doing distclean in libgui" ; \
+       (cd $(HOST_SUBDIR)/libgui && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -12392,24 +13567,23 @@ distclean-libbanshee:
                   distclean) \
           || exit 1
  
-@endif libbanshee
+@endif libgui
  
-.PHONY: maybe-maintainer-clean-libbanshee maintainer-clean-libbanshee
-maybe-maintainer-clean-libbanshee:
-@if libbanshee
-maybe-maintainer-clean-libbanshee: maintainer-clean-libbanshee
+.PHONY: maybe-maintainer-clean-libgui maintainer-clean-libgui
+maybe-maintainer-clean-libgui:
+@if libgui
+maybe-maintainer-clean-libgui: maintainer-clean-libgui
  
-maintainer-clean-libbanshee: 
-       @[ -f ./libbanshee/Makefile ] || exit 0; \
+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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing maintainer-clean in libbanshee" ; \
-       (cd libbanshee && \
+       echo "Doing maintainer-clean in libgui" ; \
+       (cd $(HOST_SUBDIR)/libgui && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -12417,49 +13591,52 @@ maintainer-clean-libbanshee:
                   maintainer-clean) \
           || exit 1
  
-@endif libbanshee
+@endif libgui
+
  
  
  .PHONY: configure-libiberty maybe-configure-libiberty
  maybe-configure-libiberty:
  @if libiberty
  maybe-configure-libiberty: configure-libiberty
-configure-libiberty:
-       @test ! -f libiberty/Makefile || exit 0; \
-       [ -d libiberty ] || mkdir 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 libiberty || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/libiberty; \
+       cd "$(HOST_SUBDIR)/libiberty" || exit 1; \
         case $(srcdir) in \
-         \.) \
-           srcdiroption="--srcdir=."; \
-           libsrcdir=".";; \
-         /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/libiberty"; \
-           libsrcdir="$$s/libiberty";; \
-         *) \
-           srcdiroption="--srcdir=../$(srcdir)/libiberty"; \
-           libsrcdir="$$s/libiberty";; \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/libiberty/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
+       srcdiroption="--srcdir=$${topdir}/libiberty"; \
+       libsrcdir="$$s/libiberty"; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
  @endif libiberty
  
-.PHONY: all-libiberty maybe-all-libiberty
+
+
+.PHONY: all-libiberty maybe-all-libiberty
  maybe-all-libiberty:
  @if libiberty
+TARGET-libiberty=all
  maybe-all-libiberty: all-libiberty
  all-libiberty: configure-libiberty
-       @r=`${PWD_COMMAND}`; export r; \
+       @test -f stage_last && exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
-       (cd libiberty && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd $(HOST_SUBDIR)/libiberty && \
+         $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-libiberty))
  @endif libiberty
  
+
  .PHONY: check-libiberty maybe-check-libiberty
  maybe-check-libiberty:
  @if libiberty
@@ -12468,9 +13645,9 @@ 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 libiberty && $(MAKE) $(FLAGS_TO_PASS) check)
+       (cd $(HOST_SUBDIR)/libiberty && \
+         $(MAKE) $(FLAGS_TO_PASS)  check)
  
  @endif libiberty
  
@@ -12482,9 +13659,9 @@ maybe-install-libiberty: install-libiberty
  install-libiberty: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
-       (cd libiberty && $(MAKE) $(FLAGS_TO_PASS) install)
+       (cd $(HOST_SUBDIR)/libiberty && \
+         $(MAKE) $(FLAGS_TO_PASS)  install)
  
  @endif libiberty
  
@@ -12500,13 +13677,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing info in libiberty" ; \
-       (cd libiberty && \
+       (cd $(HOST_SUBDIR)/libiberty && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -12526,13 +13702,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing dvi in libiberty" ; \
-       (cd libiberty && \
+       (cd $(HOST_SUBDIR)/libiberty && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -12542,6 +13717,31 @@ dvi-libiberty: \
  
  @endif libiberty
  
+.PHONY: maybe-html-libiberty html-libiberty
+maybe-html-libiberty:
+@if libiberty
+maybe-html-libiberty: html-libiberty
+
+html-libiberty: \
+    configure-libiberty 
+       @[ -f ./libiberty/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing html in libiberty" ; \
+       (cd $(HOST_SUBDIR)/libiberty && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 html) \
+         || exit 1
+
+@endif libiberty
+
  .PHONY: maybe-TAGS-libiberty TAGS-libiberty
  maybe-TAGS-libiberty:
  @if libiberty
@@ -12552,13 +13752,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing TAGS in libiberty" ; \
-       (cd libiberty && \
+       (cd $(HOST_SUBDIR)/libiberty && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -12579,13 +13778,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing install-info in libiberty" ; \
-       (cd libiberty && \
+       (cd $(HOST_SUBDIR)/libiberty && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -12605,13 +13803,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing installcheck in libiberty" ; \
-       (cd libiberty && \
+       (cd $(HOST_SUBDIR)/libiberty && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -12630,13 +13827,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing mostlyclean in libiberty" ; \
-       (cd libiberty && \
+       (cd $(HOST_SUBDIR)/libiberty && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -12655,13 +13851,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing clean in libiberty" ; \
-       (cd libiberty && \
+       (cd $(HOST_SUBDIR)/libiberty && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -12680,13 +13875,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing distclean in libiberty" ; \
-       (cd libiberty && \
+       (cd $(HOST_SUBDIR)/libiberty && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -12705,13 +13899,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing maintainer-clean in libiberty" ; \
-       (cd libiberty && \
+       (cd $(HOST_SUBDIR)/libiberty && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -12722,46 +13915,47 @@ maintainer-clean-libiberty:
  @endif libiberty
  
  
+
  .PHONY: configure-libtool maybe-configure-libtool
  maybe-configure-libtool:
  @if libtool
  maybe-configure-libtool: configure-libtool
-configure-libtool:
-       @test ! -f libtool/Makefile || exit 0; \
-       [ -d libtool ] || mkdir 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 libtool || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/libtool; \
+       cd "$(HOST_SUBDIR)/libtool" || exit 1; \
         case $(srcdir) in \
-         \.) \
-           srcdiroption="--srcdir=."; \
-           libsrcdir=".";; \
-         /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/libtool"; \
-           libsrcdir="$$s/libtool";; \
-         *) \
-           srcdiroption="--srcdir=../$(srcdir)/libtool"; \
-           libsrcdir="$$s/libtool";; \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/libtool/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
+       srcdiroption="--srcdir=$${topdir}/libtool"; \
+       libsrcdir="$$s/libtool"; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
  @endif libtool
  
+
+
  .PHONY: all-libtool maybe-all-libtool
  maybe-all-libtool:
  @if libtool
+TARGET-libtool=all
  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 libtool && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd $(HOST_SUBDIR)/libtool && \
+         $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-libtool))
  @endif libtool
  
+
  .PHONY: check-libtool maybe-check-libtool
  maybe-check-libtool:
  @if libtool
@@ -12770,9 +13964,9 @@ 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 libtool && $(MAKE) $(FLAGS_TO_PASS) check)
+       (cd $(HOST_SUBDIR)/libtool && \
+         $(MAKE) $(FLAGS_TO_PASS)  check)
  
  @endif libtool
  
@@ -12784,9 +13978,9 @@ maybe-install-libtool: install-libtool
  install-libtool: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
-       (cd libtool && $(MAKE) $(FLAGS_TO_PASS) install)
+       (cd $(HOST_SUBDIR)/libtool && \
+         $(MAKE) $(FLAGS_TO_PASS)  install)
  
  @endif libtool
  
@@ -12802,13 +13996,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing info in libtool" ; \
-       (cd libtool && \
+       (cd $(HOST_SUBDIR)/libtool && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -12828,13 +14021,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing dvi in libtool" ; \
-       (cd libtool && \
+       (cd $(HOST_SUBDIR)/libtool && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -12844,6 +14036,31 @@ dvi-libtool: \
  
  @endif libtool
  
+.PHONY: maybe-html-libtool html-libtool
+maybe-html-libtool:
+@if libtool
+maybe-html-libtool: html-libtool
+
+html-libtool: \
+    configure-libtool 
+       @[ -f ./libtool/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing html in libtool" ; \
+       (cd $(HOST_SUBDIR)/libtool && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 html) \
+         || exit 1
+
+@endif libtool
+
  .PHONY: maybe-TAGS-libtool TAGS-libtool
  maybe-TAGS-libtool:
  @if libtool
@@ -12854,13 +14071,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing TAGS in libtool" ; \
-       (cd libtool && \
+       (cd $(HOST_SUBDIR)/libtool && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -12881,13 +14097,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing install-info in libtool" ; \
-       (cd libtool && \
+       (cd $(HOST_SUBDIR)/libtool && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -12907,13 +14122,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing installcheck in libtool" ; \
-       (cd libtool && \
+       (cd $(HOST_SUBDIR)/libtool && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -12932,13 +14146,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing mostlyclean in libtool" ; \
-       (cd libtool && \
+       (cd $(HOST_SUBDIR)/libtool && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -12957,13 +14170,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing clean in libtool" ; \
-       (cd libtool && \
+       (cd $(HOST_SUBDIR)/libtool && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -12982,13 +14194,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing distclean in libtool" ; \
-       (cd libtool && \
+       (cd $(HOST_SUBDIR)/libtool && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -13007,13 +14218,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing maintainer-clean in libtool" ; \
-       (cd libtool && \
+       (cd $(HOST_SUBDIR)/libtool && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -13024,46 +14234,47 @@ maintainer-clean-libtool:
  @endif libtool
  
  
+
  .PHONY: configure-m4 maybe-configure-m4
  maybe-configure-m4:
  @if m4
  maybe-configure-m4: configure-m4
-configure-m4:
-       @test ! -f m4/Makefile || exit 0; \
-       [ -d m4 ] || mkdir 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 m4 || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/m4; \
+       cd "$(HOST_SUBDIR)/m4" || exit 1; \
         case $(srcdir) in \
-         \.) \
-           srcdiroption="--srcdir=."; \
-           libsrcdir=".";; \
-         /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/m4"; \
-           libsrcdir="$$s/m4";; \
-         *) \
-           srcdiroption="--srcdir=../$(srcdir)/m4"; \
-           libsrcdir="$$s/m4";; \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/m4/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
+       srcdiroption="--srcdir=$${topdir}/m4"; \
+       libsrcdir="$$s/m4"; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
  @endif m4
  
+
+
  .PHONY: all-m4 maybe-all-m4
  maybe-all-m4:
  @if m4
+TARGET-m4=all
  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 m4 && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd $(HOST_SUBDIR)/m4 && \
+         $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-m4))
  @endif m4
  
+
  .PHONY: check-m4 maybe-check-m4
  maybe-check-m4:
  @if m4
@@ -13072,9 +14283,9 @@ 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 m4 && $(MAKE) $(FLAGS_TO_PASS) check)
+       (cd $(HOST_SUBDIR)/m4 && \
+         $(MAKE) $(FLAGS_TO_PASS)  check)
  
  @endif m4
  
@@ -13086,9 +14297,9 @@ maybe-install-m4: install-m4
  install-m4: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
-       (cd m4 && $(MAKE) $(FLAGS_TO_PASS) install)
+       (cd $(HOST_SUBDIR)/m4 && \
+         $(MAKE) $(FLAGS_TO_PASS)  install)
  
  @endif m4
  
@@ -13104,13 +14315,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing info in m4" ; \
-       (cd m4 && \
+       (cd $(HOST_SUBDIR)/m4 && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -13130,13 +14340,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing dvi in m4" ; \
-       (cd m4 && \
+       (cd $(HOST_SUBDIR)/m4 && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -13146,6 +14355,31 @@ dvi-m4: \
  
  @endif m4
  
+.PHONY: maybe-html-m4 html-m4
+maybe-html-m4:
+@if m4
+maybe-html-m4: html-m4
+
+html-m4: \
+    configure-m4 
+       @[ -f ./m4/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing html in m4" ; \
+       (cd $(HOST_SUBDIR)/m4 && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 html) \
+         || exit 1
+
+@endif m4
+
  .PHONY: maybe-TAGS-m4 TAGS-m4
  maybe-TAGS-m4:
  @if m4
@@ -13156,13 +14390,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing TAGS in m4" ; \
-       (cd m4 && \
+       (cd $(HOST_SUBDIR)/m4 && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -13183,13 +14416,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing install-info in m4" ; \
-       (cd m4 && \
+       (cd $(HOST_SUBDIR)/m4 && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -13209,13 +14441,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing installcheck in m4" ; \
-       (cd m4 && \
+       (cd $(HOST_SUBDIR)/m4 && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -13234,13 +14465,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing mostlyclean in m4" ; \
-       (cd m4 && \
+       (cd $(HOST_SUBDIR)/m4 && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -13259,13 +14489,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing clean in m4" ; \
-       (cd m4 && \
+       (cd $(HOST_SUBDIR)/m4 && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -13284,13 +14513,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing distclean in m4" ; \
-       (cd m4 && \
+       (cd $(HOST_SUBDIR)/m4 && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -13309,13 +14537,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing maintainer-clean in m4" ; \
-       (cd m4 && \
+       (cd $(HOST_SUBDIR)/m4 && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -13326,46 +14553,47 @@ maintainer-clean-m4:
  @endif m4
  
  
+
  .PHONY: configure-make maybe-configure-make
  maybe-configure-make:
  @if make
  maybe-configure-make: configure-make
-configure-make:
-       @test ! -f make/Makefile || exit 0; \
-       [ -d make ] || mkdir 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 make || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/make; \
+       cd "$(HOST_SUBDIR)/make" || exit 1; \
         case $(srcdir) in \
-         \.) \
-           srcdiroption="--srcdir=."; \
-           libsrcdir=".";; \
-         /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/make"; \
-           libsrcdir="$$s/make";; \
-         *) \
-           srcdiroption="--srcdir=../$(srcdir)/make"; \
-           libsrcdir="$$s/make";; \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/make/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
+       srcdiroption="--srcdir=$${topdir}/make"; \
+       libsrcdir="$$s/make"; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
  @endif make
  
+
+
  .PHONY: all-make maybe-all-make
  maybe-all-make:
  @if make
+TARGET-make=all
  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 make && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd $(HOST_SUBDIR)/make && \
+         $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-make))
  @endif make
  
+
  .PHONY: check-make maybe-check-make
  maybe-check-make:
  @if make
@@ -13374,9 +14602,9 @@ 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 make && $(MAKE) $(FLAGS_TO_PASS) check)
+       (cd $(HOST_SUBDIR)/make && \
+         $(MAKE) $(FLAGS_TO_PASS)  check)
  
  @endif make
  
@@ -13388,9 +14616,9 @@ maybe-install-make: install-make
  install-make: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
-       (cd make && $(MAKE) $(FLAGS_TO_PASS) install)
+       (cd $(HOST_SUBDIR)/make && \
+         $(MAKE) $(FLAGS_TO_PASS)  install)
  
  @endif make
  
@@ -13406,13 +14634,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing info in make" ; \
-       (cd make && \
+       (cd $(HOST_SUBDIR)/make && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -13432,13 +14659,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing dvi in make" ; \
-       (cd make && \
+       (cd $(HOST_SUBDIR)/make && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -13448,6 +14674,31 @@ dvi-make: \
  
  @endif make
  
+.PHONY: maybe-html-make html-make
+maybe-html-make:
+@if make
+maybe-html-make: html-make
+
+html-make: \
+    configure-make 
+       @[ -f ./make/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing html in make" ; \
+       (cd $(HOST_SUBDIR)/make && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 html) \
+         || exit 1
+
+@endif make
+
  .PHONY: maybe-TAGS-make TAGS-make
  maybe-TAGS-make:
  @if make
@@ -13458,13 +14709,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing TAGS in make" ; \
-       (cd make && \
+       (cd $(HOST_SUBDIR)/make && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -13485,13 +14735,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing install-info in make" ; \
-       (cd make && \
+       (cd $(HOST_SUBDIR)/make && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -13511,13 +14760,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing installcheck in make" ; \
-       (cd make && \
+       (cd $(HOST_SUBDIR)/make && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -13536,13 +14784,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing mostlyclean in make" ; \
-       (cd make && \
+       (cd $(HOST_SUBDIR)/make && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -13561,13 +14808,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing clean in make" ; \
-       (cd make && \
+       (cd $(HOST_SUBDIR)/make && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -13586,13 +14832,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing distclean in make" ; \
-       (cd make && \
+       (cd $(HOST_SUBDIR)/make && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -13611,13 +14856,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing maintainer-clean in make" ; \
-       (cd make && \
+       (cd $(HOST_SUBDIR)/make && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -13628,46 +14872,47 @@ maintainer-clean-make:
  @endif make
  
  
+
  .PHONY: configure-mmalloc maybe-configure-mmalloc
  maybe-configure-mmalloc:
  @if mmalloc
  maybe-configure-mmalloc: configure-mmalloc
-configure-mmalloc:
-       @test ! -f mmalloc/Makefile || exit 0; \
-       [ -d mmalloc ] || mkdir 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 mmalloc || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/mmalloc; \
+       cd "$(HOST_SUBDIR)/mmalloc" || exit 1; \
         case $(srcdir) in \
-         \.) \
-           srcdiroption="--srcdir=."; \
-           libsrcdir=".";; \
-         /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/mmalloc"; \
-           libsrcdir="$$s/mmalloc";; \
-         *) \
-           srcdiroption="--srcdir=../$(srcdir)/mmalloc"; \
-           libsrcdir="$$s/mmalloc";; \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/mmalloc/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
+       srcdiroption="--srcdir=$${topdir}/mmalloc"; \
+       libsrcdir="$$s/mmalloc"; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
  @endif mmalloc
  
+
+
  .PHONY: all-mmalloc maybe-all-mmalloc
  maybe-all-mmalloc:
  @if mmalloc
+TARGET-mmalloc=all
  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 mmalloc && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd $(HOST_SUBDIR)/mmalloc && \
+         $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-mmalloc))
  @endif mmalloc
  
+
  .PHONY: check-mmalloc maybe-check-mmalloc
  maybe-check-mmalloc:
  @if mmalloc
@@ -13685,9 +14930,9 @@ maybe-install-mmalloc: install-mmalloc
  install-mmalloc: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
-       (cd mmalloc && $(MAKE) $(FLAGS_TO_PASS) install)
+       (cd $(HOST_SUBDIR)/mmalloc && \
+         $(MAKE) $(FLAGS_TO_PASS)  install)
  
  @endif mmalloc
  
@@ -13703,13 +14948,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing info in mmalloc" ; \
-       (cd mmalloc && \
+       (cd $(HOST_SUBDIR)/mmalloc && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -13729,13 +14973,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing dvi in mmalloc" ; \
-       (cd mmalloc && \
+       (cd $(HOST_SUBDIR)/mmalloc && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -13745,6 +14988,31 @@ dvi-mmalloc: \
  
  @endif mmalloc
  
+.PHONY: maybe-html-mmalloc html-mmalloc
+maybe-html-mmalloc:
+@if mmalloc
+maybe-html-mmalloc: html-mmalloc
+
+html-mmalloc: \
+    configure-mmalloc 
+       @[ -f ./mmalloc/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing html in mmalloc" ; \
+       (cd $(HOST_SUBDIR)/mmalloc && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 html) \
+         || exit 1
+
+@endif mmalloc
+
  .PHONY: maybe-TAGS-mmalloc TAGS-mmalloc
  maybe-TAGS-mmalloc:
  @if mmalloc
@@ -13755,13 +15023,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing TAGS in mmalloc" ; \
-       (cd mmalloc && \
+       (cd $(HOST_SUBDIR)/mmalloc && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -13782,13 +15049,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing install-info in mmalloc" ; \
-       (cd mmalloc && \
+       (cd $(HOST_SUBDIR)/mmalloc && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -13808,13 +15074,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing installcheck in mmalloc" ; \
-       (cd mmalloc && \
+       (cd $(HOST_SUBDIR)/mmalloc && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -13833,13 +15098,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing mostlyclean in mmalloc" ; \
-       (cd mmalloc && \
+       (cd $(HOST_SUBDIR)/mmalloc && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -13858,13 +15122,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing clean in mmalloc" ; \
-       (cd mmalloc && \
+       (cd $(HOST_SUBDIR)/mmalloc && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -13883,13 +15146,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing distclean in mmalloc" ; \
-       (cd mmalloc && \
+       (cd $(HOST_SUBDIR)/mmalloc && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -13908,13 +15170,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing maintainer-clean in mmalloc" ; \
-       (cd mmalloc && \
+       (cd $(HOST_SUBDIR)/mmalloc && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -13925,46 +15186,47 @@ maintainer-clean-mmalloc:
  @endif mmalloc
  
  
+
  .PHONY: configure-patch maybe-configure-patch
  maybe-configure-patch:
  @if patch
  maybe-configure-patch: configure-patch
-configure-patch:
-       @test ! -f patch/Makefile || exit 0; \
-       [ -d patch ] || mkdir 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 patch || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/patch; \
+       cd "$(HOST_SUBDIR)/patch" || exit 1; \
         case $(srcdir) in \
-         \.) \
-           srcdiroption="--srcdir=."; \
-           libsrcdir=".";; \
-         /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/patch"; \
-           libsrcdir="$$s/patch";; \
-         *) \
-           srcdiroption="--srcdir=../$(srcdir)/patch"; \
-           libsrcdir="$$s/patch";; \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/patch/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
+       srcdiroption="--srcdir=$${topdir}/patch"; \
+       libsrcdir="$$s/patch"; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
  @endif patch
  
+
+
  .PHONY: all-patch maybe-all-patch
  maybe-all-patch:
  @if patch
+TARGET-patch=all
  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 patch && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd $(HOST_SUBDIR)/patch && \
+         $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-patch))
  @endif patch
  
+
  .PHONY: check-patch maybe-check-patch
  maybe-check-patch:
  @if patch
@@ -13973,9 +15235,9 @@ 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 patch && $(MAKE) $(FLAGS_TO_PASS) check)
+       (cd $(HOST_SUBDIR)/patch && \
+         $(MAKE) $(FLAGS_TO_PASS)  check)
  
  @endif patch
  
@@ -13987,9 +15249,9 @@ maybe-install-patch: install-patch
  install-patch: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
-       (cd patch && $(MAKE) $(FLAGS_TO_PASS) install)
+       (cd $(HOST_SUBDIR)/patch && \
+         $(MAKE) $(FLAGS_TO_PASS)  install)
  
  @endif patch
  
@@ -14005,13 +15267,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing info in patch" ; \
-       (cd patch && \
+       (cd $(HOST_SUBDIR)/patch && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -14031,13 +15292,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing dvi in patch" ; \
-       (cd patch && \
+       (cd $(HOST_SUBDIR)/patch && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -14047,6 +15307,31 @@ dvi-patch: \
  
  @endif patch
  
+.PHONY: maybe-html-patch html-patch
+maybe-html-patch:
+@if patch
+maybe-html-patch: html-patch
+
+html-patch: \
+    configure-patch 
+       @[ -f ./patch/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing html in patch" ; \
+       (cd $(HOST_SUBDIR)/patch && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 html) \
+         || exit 1
+
+@endif patch
+
  .PHONY: maybe-TAGS-patch TAGS-patch
  maybe-TAGS-patch:
  @if patch
@@ -14057,13 +15342,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing TAGS in patch" ; \
-       (cd patch && \
+       (cd $(HOST_SUBDIR)/patch && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -14084,13 +15368,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing install-info in patch" ; \
-       (cd patch && \
+       (cd $(HOST_SUBDIR)/patch && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -14110,13 +15393,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing installcheck in patch" ; \
-       (cd patch && \
+       (cd $(HOST_SUBDIR)/patch && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -14135,13 +15417,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing mostlyclean in patch" ; \
-       (cd patch && \
+       (cd $(HOST_SUBDIR)/patch && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -14160,13 +15441,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing clean in patch" ; \
-       (cd patch && \
+       (cd $(HOST_SUBDIR)/patch && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -14185,13 +15465,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing distclean in patch" ; \
-       (cd patch && \
+       (cd $(HOST_SUBDIR)/patch && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -14210,13 +15489,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing maintainer-clean in patch" ; \
-       (cd patch && \
+       (cd $(HOST_SUBDIR)/patch && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -14227,46 +15505,47 @@ maintainer-clean-patch:
  @endif patch
  
  
+
  .PHONY: configure-perl maybe-configure-perl
  maybe-configure-perl:
  @if perl
  maybe-configure-perl: configure-perl
-configure-perl:
-       @test ! -f perl/Makefile || exit 0; \
-       [ -d perl ] || mkdir 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 perl || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/perl; \
+       cd "$(HOST_SUBDIR)/perl" || exit 1; \
         case $(srcdir) in \
-         \.) \
-           srcdiroption="--srcdir=."; \
-           libsrcdir=".";; \
-         /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/perl"; \
-           libsrcdir="$$s/perl";; \
-         *) \
-           srcdiroption="--srcdir=../$(srcdir)/perl"; \
-           libsrcdir="$$s/perl";; \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/perl/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
+       srcdiroption="--srcdir=$${topdir}/perl"; \
+       libsrcdir="$$s/perl"; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
  @endif perl
  
+
+
  .PHONY: all-perl maybe-all-perl
  maybe-all-perl:
  @if perl
+TARGET-perl=all
  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 perl && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd $(HOST_SUBDIR)/perl && \
+         $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-perl))
  @endif perl
  
+
  .PHONY: check-perl maybe-check-perl
  maybe-check-perl:
  @if perl
@@ -14275,9 +15554,9 @@ 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 perl && $(MAKE) $(FLAGS_TO_PASS) check)
+       (cd $(HOST_SUBDIR)/perl && \
+         $(MAKE) $(FLAGS_TO_PASS)  check)
  
  @endif perl
  
@@ -14289,9 +15568,9 @@ maybe-install-perl: install-perl
  install-perl: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
-       (cd perl && $(MAKE) $(FLAGS_TO_PASS) install)
+       (cd $(HOST_SUBDIR)/perl && \
+         $(MAKE) $(FLAGS_TO_PASS)  install)
  
  @endif perl
  
@@ -14307,13 +15586,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing info in perl" ; \
-       (cd perl && \
+       (cd $(HOST_SUBDIR)/perl && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -14333,13 +15611,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing dvi in perl" ; \
-       (cd perl && \
+       (cd $(HOST_SUBDIR)/perl && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -14349,6 +15626,31 @@ dvi-perl: \
  
  @endif perl
  
+.PHONY: maybe-html-perl html-perl
+maybe-html-perl:
+@if perl
+maybe-html-perl: html-perl
+
+html-perl: \
+    configure-perl 
+       @[ -f ./perl/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing html in perl" ; \
+       (cd $(HOST_SUBDIR)/perl && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 html) \
+         || exit 1
+
+@endif perl
+
  .PHONY: maybe-TAGS-perl TAGS-perl
  maybe-TAGS-perl:
  @if perl
@@ -14359,13 +15661,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing TAGS in perl" ; \
-       (cd perl && \
+       (cd $(HOST_SUBDIR)/perl && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -14386,13 +15687,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing install-info in perl" ; \
-       (cd perl && \
+       (cd $(HOST_SUBDIR)/perl && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -14412,13 +15712,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing installcheck in perl" ; \
-       (cd perl && \
+       (cd $(HOST_SUBDIR)/perl && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -14437,13 +15736,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing mostlyclean in perl" ; \
-       (cd perl && \
+       (cd $(HOST_SUBDIR)/perl && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -14462,13 +15760,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing clean in perl" ; \
-       (cd perl && \
+       (cd $(HOST_SUBDIR)/perl && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -14487,13 +15784,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing distclean in perl" ; \
-       (cd perl && \
+       (cd $(HOST_SUBDIR)/perl && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -14512,13 +15808,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing maintainer-clean in perl" ; \
-       (cd perl && \
+       (cd $(HOST_SUBDIR)/perl && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -14529,46 +15824,47 @@ maintainer-clean-perl:
  @endif perl
  
  
+
  .PHONY: configure-prms maybe-configure-prms
  maybe-configure-prms:
  @if prms
  maybe-configure-prms: configure-prms
-configure-prms:
-       @test ! -f prms/Makefile || exit 0; \
-       [ -d prms ] || mkdir 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 prms || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/prms; \
+       cd "$(HOST_SUBDIR)/prms" || exit 1; \
         case $(srcdir) in \
-         \.) \
-           srcdiroption="--srcdir=."; \
-           libsrcdir=".";; \
-         /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/prms"; \
-           libsrcdir="$$s/prms";; \
-         *) \
-           srcdiroption="--srcdir=../$(srcdir)/prms"; \
-           libsrcdir="$$s/prms";; \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/prms/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
+       srcdiroption="--srcdir=$${topdir}/prms"; \
+       libsrcdir="$$s/prms"; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
  @endif prms
  
+
+
  .PHONY: all-prms maybe-all-prms
  maybe-all-prms:
  @if prms
+TARGET-prms=all
  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 prms && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd $(HOST_SUBDIR)/prms && \
+         $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-prms))
  @endif prms
  
+
  .PHONY: check-prms maybe-check-prms
  maybe-check-prms:
  @if prms
@@ -14577,9 +15873,9 @@ 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 prms && $(MAKE) $(FLAGS_TO_PASS) check)
+       (cd $(HOST_SUBDIR)/prms && \
+         $(MAKE) $(FLAGS_TO_PASS)  check)
  
  @endif prms
  
@@ -14591,9 +15887,9 @@ maybe-install-prms: install-prms
  install-prms: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
-       (cd prms && $(MAKE) $(FLAGS_TO_PASS) install)
+       (cd $(HOST_SUBDIR)/prms && \
+         $(MAKE) $(FLAGS_TO_PASS)  install)
  
  @endif prms
  
@@ -14609,13 +15905,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing info in prms" ; \
-       (cd prms && \
+       (cd $(HOST_SUBDIR)/prms && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -14635,13 +15930,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing dvi in prms" ; \
-       (cd prms && \
+       (cd $(HOST_SUBDIR)/prms && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -14651,6 +15945,31 @@ dvi-prms: \
  
  @endif prms
  
+.PHONY: maybe-html-prms html-prms
+maybe-html-prms:
+@if prms
+maybe-html-prms: html-prms
+
+html-prms: \
+    configure-prms 
+       @[ -f ./prms/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing html in prms" ; \
+       (cd $(HOST_SUBDIR)/prms && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 html) \
+         || exit 1
+
+@endif prms
+
  .PHONY: maybe-TAGS-prms TAGS-prms
  maybe-TAGS-prms:
  @if prms
@@ -14661,13 +15980,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing TAGS in prms" ; \
-       (cd prms && \
+       (cd $(HOST_SUBDIR)/prms && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -14688,13 +16006,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing install-info in prms" ; \
-       (cd prms && \
+       (cd $(HOST_SUBDIR)/prms && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -14714,13 +16031,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing installcheck in prms" ; \
-       (cd prms && \
+       (cd $(HOST_SUBDIR)/prms && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -14739,13 +16055,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing mostlyclean in prms" ; \
-       (cd prms && \
+       (cd $(HOST_SUBDIR)/prms && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -14764,13 +16079,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing clean in prms" ; \
-       (cd prms && \
+       (cd $(HOST_SUBDIR)/prms && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -14789,13 +16103,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing distclean in prms" ; \
-       (cd prms && \
+       (cd $(HOST_SUBDIR)/prms && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -14814,13 +16127,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing maintainer-clean in prms" ; \
-       (cd prms && \
+       (cd $(HOST_SUBDIR)/prms && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -14831,46 +16143,47 @@ maintainer-clean-prms:
  @endif prms
  
  
+
  .PHONY: configure-rcs maybe-configure-rcs
  maybe-configure-rcs:
  @if rcs
  maybe-configure-rcs: configure-rcs
-configure-rcs:
-       @test ! -f rcs/Makefile || exit 0; \
-       [ -d rcs ] || mkdir 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 rcs || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/rcs; \
+       cd "$(HOST_SUBDIR)/rcs" || exit 1; \
         case $(srcdir) in \
-         \.) \
-           srcdiroption="--srcdir=."; \
-           libsrcdir=".";; \
-         /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/rcs"; \
-           libsrcdir="$$s/rcs";; \
-         *) \
-           srcdiroption="--srcdir=../$(srcdir)/rcs"; \
-           libsrcdir="$$s/rcs";; \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/rcs/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
+       srcdiroption="--srcdir=$${topdir}/rcs"; \
+       libsrcdir="$$s/rcs"; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
  @endif rcs
  
+
+
  .PHONY: all-rcs maybe-all-rcs
  maybe-all-rcs:
  @if rcs
+TARGET-rcs=all
  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 rcs && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd $(HOST_SUBDIR)/rcs && \
+         $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-rcs))
  @endif rcs
  
+
  .PHONY: check-rcs maybe-check-rcs
  maybe-check-rcs:
  @if rcs
@@ -14879,9 +16192,9 @@ 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 rcs && $(MAKE) $(FLAGS_TO_PASS) check)
+       (cd $(HOST_SUBDIR)/rcs && \
+         $(MAKE) $(FLAGS_TO_PASS)  check)
  
  @endif rcs
  
@@ -14893,9 +16206,9 @@ maybe-install-rcs: install-rcs
  install-rcs: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
-       (cd rcs && $(MAKE) $(FLAGS_TO_PASS) install)
+       (cd $(HOST_SUBDIR)/rcs && \
+         $(MAKE) $(FLAGS_TO_PASS)  install)
  
  @endif rcs
  
@@ -14911,13 +16224,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing info in rcs" ; \
-       (cd rcs && \
+       (cd $(HOST_SUBDIR)/rcs && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -14937,13 +16249,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing dvi in rcs" ; \
-       (cd rcs && \
+       (cd $(HOST_SUBDIR)/rcs && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -14953,6 +16264,31 @@ dvi-rcs: \
  
  @endif rcs
  
+.PHONY: maybe-html-rcs html-rcs
+maybe-html-rcs:
+@if rcs
+maybe-html-rcs: html-rcs
+
+html-rcs: \
+    configure-rcs 
+       @[ -f ./rcs/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing html in rcs" ; \
+       (cd $(HOST_SUBDIR)/rcs && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 html) \
+         || exit 1
+
+@endif rcs
+
  .PHONY: maybe-TAGS-rcs TAGS-rcs
  maybe-TAGS-rcs:
  @if rcs
@@ -14963,13 +16299,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing TAGS in rcs" ; \
-       (cd rcs && \
+       (cd $(HOST_SUBDIR)/rcs && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -14990,13 +16325,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing install-info in rcs" ; \
-       (cd rcs && \
+       (cd $(HOST_SUBDIR)/rcs && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -15016,13 +16350,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing installcheck in rcs" ; \
-       (cd rcs && \
+       (cd $(HOST_SUBDIR)/rcs && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -15041,13 +16374,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing mostlyclean in rcs" ; \
-       (cd rcs && \
+       (cd $(HOST_SUBDIR)/rcs && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -15066,13 +16398,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing clean in rcs" ; \
-       (cd rcs && \
+       (cd $(HOST_SUBDIR)/rcs && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -15091,13 +16422,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing distclean in rcs" ; \
-       (cd rcs && \
+       (cd $(HOST_SUBDIR)/rcs && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -15116,13 +16446,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing maintainer-clean in rcs" ; \
-       (cd rcs && \
+       (cd $(HOST_SUBDIR)/rcs && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -15133,46 +16462,47 @@ maintainer-clean-rcs:
  @endif rcs
  
  
+
  .PHONY: configure-readline maybe-configure-readline
  maybe-configure-readline:
  @if readline
  maybe-configure-readline: configure-readline
-configure-readline:
-       @test ! -f readline/Makefile || exit 0; \
-       [ -d readline ] || mkdir 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 readline || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/readline; \
+       cd "$(HOST_SUBDIR)/readline" || exit 1; \
         case $(srcdir) in \
-         \.) \
-           srcdiroption="--srcdir=."; \
-           libsrcdir=".";; \
-         /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/readline"; \
-           libsrcdir="$$s/readline";; \
-         *) \
-           srcdiroption="--srcdir=../$(srcdir)/readline"; \
-           libsrcdir="$$s/readline";; \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/readline/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
+       srcdiroption="--srcdir=$${topdir}/readline"; \
+       libsrcdir="$$s/readline"; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
  @endif readline
  
+
+
  .PHONY: all-readline maybe-all-readline
  maybe-all-readline:
  @if readline
+TARGET-readline=all
  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 readline && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd $(HOST_SUBDIR)/readline && \
+         $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-readline))
  @endif readline
  
+
  .PHONY: check-readline maybe-check-readline
  maybe-check-readline:
  @if readline
@@ -15181,9 +16511,9 @@ 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 readline && $(MAKE) $(FLAGS_TO_PASS) check)
+       (cd $(HOST_SUBDIR)/readline && \
+         $(MAKE) $(FLAGS_TO_PASS)  check)
  
  @endif readline
  
@@ -15195,9 +16525,9 @@ maybe-install-readline: install-readline
  install-readline: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
-       (cd readline && $(MAKE) $(FLAGS_TO_PASS) install)
+       (cd $(HOST_SUBDIR)/readline && \
+         $(MAKE) $(FLAGS_TO_PASS)  install)
  
  @endif readline
  
@@ -15213,13 +16543,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing info in readline" ; \
-       (cd readline && \
+       (cd $(HOST_SUBDIR)/readline && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -15239,13 +16568,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing dvi in readline" ; \
-       (cd readline && \
+       (cd $(HOST_SUBDIR)/readline && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -15255,6 +16583,31 @@ dvi-readline: \
  
  @endif readline
  
+.PHONY: maybe-html-readline html-readline
+maybe-html-readline:
+@if readline
+maybe-html-readline: html-readline
+
+html-readline: \
+    configure-readline 
+       @[ -f ./readline/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing html in readline" ; \
+       (cd $(HOST_SUBDIR)/readline && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 html) \
+         || exit 1
+
+@endif readline
+
  .PHONY: maybe-TAGS-readline TAGS-readline
  maybe-TAGS-readline:
  @if readline
@@ -15265,13 +16618,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing TAGS in readline" ; \
-       (cd readline && \
+       (cd $(HOST_SUBDIR)/readline && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -15292,13 +16644,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing install-info in readline" ; \
-       (cd readline && \
+       (cd $(HOST_SUBDIR)/readline && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -15318,13 +16669,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing installcheck in readline" ; \
-       (cd readline && \
+       (cd $(HOST_SUBDIR)/readline && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -15343,13 +16693,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing mostlyclean in readline" ; \
-       (cd readline && \
+       (cd $(HOST_SUBDIR)/readline && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -15368,13 +16717,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing clean in readline" ; \
-       (cd readline && \
+       (cd $(HOST_SUBDIR)/readline && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -15393,13 +16741,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing distclean in readline" ; \
-       (cd readline && \
+       (cd $(HOST_SUBDIR)/readline && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -15418,13 +16765,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing maintainer-clean in readline" ; \
-       (cd readline && \
+       (cd $(HOST_SUBDIR)/readline && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -15435,46 +16781,47 @@ maintainer-clean-readline:
  @endif readline
  
  
+
  .PHONY: configure-release maybe-configure-release
  maybe-configure-release:
  @if release
  maybe-configure-release: configure-release
-configure-release:
-       @test ! -f release/Makefile || exit 0; \
-       [ -d release ] || mkdir 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 release || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/release; \
+       cd "$(HOST_SUBDIR)/release" || exit 1; \
         case $(srcdir) in \
-         \.) \
-           srcdiroption="--srcdir=."; \
-           libsrcdir=".";; \
-         /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/release"; \
-           libsrcdir="$$s/release";; \
-         *) \
-           srcdiroption="--srcdir=../$(srcdir)/release"; \
-           libsrcdir="$$s/release";; \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/release/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
+       srcdiroption="--srcdir=$${topdir}/release"; \
+       libsrcdir="$$s/release"; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
  @endif release
  
+
+
  .PHONY: all-release maybe-all-release
  maybe-all-release:
  @if release
+TARGET-release=all
  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 release && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd $(HOST_SUBDIR)/release && \
+         $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-release))
  @endif release
  
+
  .PHONY: check-release maybe-check-release
  maybe-check-release:
  @if release
@@ -15505,13 +16852,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing info in release" ; \
-       (cd release && \
+       (cd $(HOST_SUBDIR)/release && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -15531,13 +16877,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing dvi in release" ; \
-       (cd release && \
+       (cd $(HOST_SUBDIR)/release && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -15547,6 +16892,31 @@ dvi-release: \
  
  @endif release
  
+.PHONY: maybe-html-release html-release
+maybe-html-release:
+@if release
+maybe-html-release: html-release
+
+html-release: \
+    configure-release 
+       @[ -f ./release/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing html in release" ; \
+       (cd $(HOST_SUBDIR)/release && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 html) \
+         || exit 1
+
+@endif release
+
  .PHONY: maybe-TAGS-release TAGS-release
  maybe-TAGS-release:
  @if release
@@ -15557,13 +16927,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing TAGS in release" ; \
-       (cd release && \
+       (cd $(HOST_SUBDIR)/release && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -15584,13 +16953,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing install-info in release" ; \
-       (cd release && \
+       (cd $(HOST_SUBDIR)/release && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -15610,13 +16978,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing installcheck in release" ; \
-       (cd release && \
+       (cd $(HOST_SUBDIR)/release && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -15635,13 +17002,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing mostlyclean in release" ; \
-       (cd release && \
+       (cd $(HOST_SUBDIR)/release && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -15660,13 +17026,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing clean in release" ; \
-       (cd release && \
+       (cd $(HOST_SUBDIR)/release && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -15685,13 +17050,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing distclean in release" ; \
-       (cd release && \
+       (cd $(HOST_SUBDIR)/release && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -15710,13 +17074,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing maintainer-clean in release" ; \
-       (cd release && \
+       (cd $(HOST_SUBDIR)/release && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -15727,46 +17090,47 @@ maintainer-clean-release:
  @endif release
  
  
+
  .PHONY: configure-recode maybe-configure-recode
  maybe-configure-recode:
  @if recode
  maybe-configure-recode: configure-recode
-configure-recode:
-       @test ! -f recode/Makefile || exit 0; \
-       [ -d recode ] || mkdir 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 recode || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/recode; \
+       cd "$(HOST_SUBDIR)/recode" || exit 1; \
         case $(srcdir) in \
-         \.) \
-           srcdiroption="--srcdir=."; \
-           libsrcdir=".";; \
-         /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/recode"; \
-           libsrcdir="$$s/recode";; \
-         *) \
-           srcdiroption="--srcdir=../$(srcdir)/recode"; \
-           libsrcdir="$$s/recode";; \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/recode/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
+       srcdiroption="--srcdir=$${topdir}/recode"; \
+       libsrcdir="$$s/recode"; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
  @endif recode
  
+
+
  .PHONY: all-recode maybe-all-recode
  maybe-all-recode:
  @if recode
+TARGET-recode=all
  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 recode && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd $(HOST_SUBDIR)/recode && \
+         $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-recode))
  @endif recode
  
+
  .PHONY: check-recode maybe-check-recode
  maybe-check-recode:
  @if recode
@@ -15775,9 +17139,9 @@ 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 recode && $(MAKE) $(FLAGS_TO_PASS) check)
+       (cd $(HOST_SUBDIR)/recode && \
+         $(MAKE) $(FLAGS_TO_PASS)  check)
  
  @endif recode
  
@@ -15789,9 +17153,9 @@ maybe-install-recode: install-recode
  install-recode: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
-       (cd recode && $(MAKE) $(FLAGS_TO_PASS) install)
+       (cd $(HOST_SUBDIR)/recode && \
+         $(MAKE) $(FLAGS_TO_PASS)  install)
  
  @endif recode
  
@@ -15807,13 +17171,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing info in recode" ; \
-       (cd recode && \
+       (cd $(HOST_SUBDIR)/recode && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -15833,13 +17196,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing dvi in recode" ; \
-       (cd recode && \
+       (cd $(HOST_SUBDIR)/recode && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -15849,34 +17211,58 @@ dvi-recode: \
  
  @endif recode
  
-.PHONY: maybe-TAGS-recode TAGS-recode
-maybe-TAGS-recode:
+.PHONY: maybe-html-recode html-recode
+maybe-html-recode:
  @if recode
-maybe-TAGS-recode: TAGS-recode
+maybe-html-recode: html-recode
  
-TAGS-recode: \
+html-recode: \
      configure-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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing TAGS in recode" ; \
-       (cd recode && \
+       echo "Doing html in recode" ; \
+       (cd $(HOST_SUBDIR)/recode && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                 html) \
           || exit 1
  
  @endif recode
  
-.PHONY: maybe-install-info-recode install-info-recode
-maybe-install-info-recode:
+.PHONY: maybe-TAGS-recode TAGS-recode
+maybe-TAGS-recode:
+@if recode
+maybe-TAGS-recode: TAGS-recode
+
+TAGS-recode: \
+    configure-recode 
+       @[ -f ./recode/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing TAGS in recode" ; \
+       (cd $(HOST_SUBDIR)/recode && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 TAGS) \
+         || exit 1
+
+@endif recode
+
+.PHONY: maybe-install-info-recode install-info-recode
+maybe-install-info-recode:
  @if recode
  maybe-install-info-recode: install-info-recode
  
@@ -15886,13 +17272,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing install-info in recode" ; \
-       (cd recode && \
+       (cd $(HOST_SUBDIR)/recode && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -15912,13 +17297,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing installcheck in recode" ; \
-       (cd recode && \
+       (cd $(HOST_SUBDIR)/recode && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -15937,13 +17321,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing mostlyclean in recode" ; \
-       (cd recode && \
+       (cd $(HOST_SUBDIR)/recode && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -15962,13 +17345,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing clean in recode" ; \
-       (cd recode && \
+       (cd $(HOST_SUBDIR)/recode && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -15987,13 +17369,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing distclean in recode" ; \
-       (cd recode && \
+       (cd $(HOST_SUBDIR)/recode && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -16012,13 +17393,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing maintainer-clean in recode" ; \
-       (cd recode && \
+       (cd $(HOST_SUBDIR)/recode && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -16029,46 +17409,47 @@ maintainer-clean-recode:
  @endif recode
  
  
+
  .PHONY: configure-sed maybe-configure-sed
  maybe-configure-sed:
  @if sed
  maybe-configure-sed: configure-sed
-configure-sed:
-       @test ! -f sed/Makefile || exit 0; \
-       [ -d sed ] || mkdir 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 sed || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/sed; \
+       cd "$(HOST_SUBDIR)/sed" || exit 1; \
         case $(srcdir) in \
-         \.) \
-           srcdiroption="--srcdir=."; \
-           libsrcdir=".";; \
-         /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/sed"; \
-           libsrcdir="$$s/sed";; \
-         *) \
-           srcdiroption="--srcdir=../$(srcdir)/sed"; \
-           libsrcdir="$$s/sed";; \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/sed/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
+       srcdiroption="--srcdir=$${topdir}/sed"; \
+       libsrcdir="$$s/sed"; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
  @endif sed
  
+
+
  .PHONY: all-sed maybe-all-sed
  maybe-all-sed:
  @if sed
+TARGET-sed=all
  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 sed && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd $(HOST_SUBDIR)/sed && \
+         $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-sed))
  @endif sed
  
+
  .PHONY: check-sed maybe-check-sed
  maybe-check-sed:
  @if sed
@@ -16077,9 +17458,9 @@ 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 sed && $(MAKE) $(FLAGS_TO_PASS) check)
+       (cd $(HOST_SUBDIR)/sed && \
+         $(MAKE) $(FLAGS_TO_PASS)  check)
  
  @endif sed
  
@@ -16091,9 +17472,9 @@ maybe-install-sed: install-sed
  install-sed: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
-       (cd sed && $(MAKE) $(FLAGS_TO_PASS) install)
+       (cd $(HOST_SUBDIR)/sed && \
+         $(MAKE) $(FLAGS_TO_PASS)  install)
  
  @endif sed
  
@@ -16109,13 +17490,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing info in sed" ; \
-       (cd sed && \
+       (cd $(HOST_SUBDIR)/sed && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -16135,13 +17515,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing dvi in sed" ; \
-       (cd sed && \
+       (cd $(HOST_SUBDIR)/sed && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -16151,6 +17530,31 @@ dvi-sed: \
  
  @endif sed
  
+.PHONY: maybe-html-sed html-sed
+maybe-html-sed:
+@if sed
+maybe-html-sed: html-sed
+
+html-sed: \
+    configure-sed 
+       @[ -f ./sed/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing html in sed" ; \
+       (cd $(HOST_SUBDIR)/sed && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 html) \
+         || exit 1
+
+@endif sed
+
  .PHONY: maybe-TAGS-sed TAGS-sed
  maybe-TAGS-sed:
  @if sed
@@ -16161,13 +17565,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing TAGS in sed" ; \
-       (cd sed && \
+       (cd $(HOST_SUBDIR)/sed && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -16188,13 +17591,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing install-info in sed" ; \
-       (cd sed && \
+       (cd $(HOST_SUBDIR)/sed && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -16214,13 +17616,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing installcheck in sed" ; \
-       (cd sed && \
+       (cd $(HOST_SUBDIR)/sed && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -16239,13 +17640,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing mostlyclean in sed" ; \
-       (cd sed && \
+       (cd $(HOST_SUBDIR)/sed && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -16264,13 +17664,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing clean in sed" ; \
-       (cd sed && \
+       (cd $(HOST_SUBDIR)/sed && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -16289,13 +17688,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing distclean in sed" ; \
-       (cd sed && \
+       (cd $(HOST_SUBDIR)/sed && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -16314,13 +17712,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing maintainer-clean in sed" ; \
-       (cd sed && \
+       (cd $(HOST_SUBDIR)/sed && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -16331,46 +17728,47 @@ 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:
-       @test ! -f send-pr/Makefile || exit 0; \
-       [ -d send-pr ] || mkdir 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 send-pr || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/send-pr; \
+       cd "$(HOST_SUBDIR)/send-pr" || exit 1; \
         case $(srcdir) in \
-         \.) \
-           srcdiroption="--srcdir=."; \
-           libsrcdir=".";; \
-         /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/send-pr"; \
-           libsrcdir="$$s/send-pr";; \
-         *) \
-           srcdiroption="--srcdir=../$(srcdir)/send-pr"; \
-           libsrcdir="$$s/send-pr";; \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/send-pr/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
+       srcdiroption="--srcdir=$${topdir}/send-pr"; \
+       libsrcdir="$$s/send-pr"; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
  @endif send-pr
  
+
+
  .PHONY: all-send-pr maybe-all-send-pr
  maybe-all-send-pr:
  @if send-pr
+TARGET-send-pr=all
  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 send-pr && $(MAKE) $(FLAGS_TO_PASS) all)
+       (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
@@ -16379,9 +17777,9 @@ 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 send-pr && $(MAKE) $(FLAGS_TO_PASS) check)
+       (cd $(HOST_SUBDIR)/send-pr && \
+         $(MAKE) $(FLAGS_TO_PASS)  check)
  
  @endif send-pr
  
@@ -16393,9 +17791,9 @@ maybe-install-send-pr: install-send-pr
  install-send-pr: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
-       (cd send-pr && $(MAKE) $(FLAGS_TO_PASS) install)
+       (cd $(HOST_SUBDIR)/send-pr && \
+         $(MAKE) $(FLAGS_TO_PASS)  install)
  
  @endif send-pr
  
@@ -16411,13 +17809,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing info in send-pr" ; \
-       (cd send-pr && \
+       (cd $(HOST_SUBDIR)/send-pr && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -16437,13 +17834,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing dvi in send-pr" ; \
-       (cd send-pr && \
+       (cd $(HOST_SUBDIR)/send-pr && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -16453,6 +17849,31 @@ dvi-send-pr: \
  
  @endif send-pr
  
+.PHONY: maybe-html-send-pr html-send-pr
+maybe-html-send-pr:
+@if send-pr
+maybe-html-send-pr: html-send-pr
+
+html-send-pr: \
+    configure-send-pr 
+       @[ -f ./send-pr/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing html in send-pr" ; \
+       (cd $(HOST_SUBDIR)/send-pr && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 html) \
+         || exit 1
+
+@endif send-pr
+
  .PHONY: maybe-TAGS-send-pr TAGS-send-pr
  maybe-TAGS-send-pr:
  @if send-pr
@@ -16463,13 +17884,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing TAGS in send-pr" ; \
-       (cd send-pr && \
+       (cd $(HOST_SUBDIR)/send-pr && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -16490,13 +17910,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing install-info in send-pr" ; \
-       (cd send-pr && \
+       (cd $(HOST_SUBDIR)/send-pr && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -16516,13 +17935,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing installcheck in send-pr" ; \
-       (cd send-pr && \
+       (cd $(HOST_SUBDIR)/send-pr && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -16541,13 +17959,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing mostlyclean in send-pr" ; \
-       (cd send-pr && \
+       (cd $(HOST_SUBDIR)/send-pr && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -16566,13 +17983,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing clean in send-pr" ; \
-       (cd send-pr && \
+       (cd $(HOST_SUBDIR)/send-pr && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -16591,13 +18007,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing distclean in send-pr" ; \
-       (cd send-pr && \
+       (cd $(HOST_SUBDIR)/send-pr && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -16616,13 +18031,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing maintainer-clean in send-pr" ; \
-       (cd send-pr && \
+       (cd $(HOST_SUBDIR)/send-pr && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -16633,46 +18047,47 @@ 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:
-       @test ! -f shellutils/Makefile || exit 0; \
-       [ -d shellutils ] || mkdir 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 shellutils || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/shellutils; \
+       cd "$(HOST_SUBDIR)/shellutils" || exit 1; \
         case $(srcdir) in \
-         \.) \
-           srcdiroption="--srcdir=."; \
-           libsrcdir=".";; \
-         /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/shellutils"; \
-           libsrcdir="$$s/shellutils";; \
-         *) \
-           srcdiroption="--srcdir=../$(srcdir)/shellutils"; \
-           libsrcdir="$$s/shellutils";; \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/shellutils/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
+       srcdiroption="--srcdir=$${topdir}/shellutils"; \
+       libsrcdir="$$s/shellutils"; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
  @endif shellutils
  
+
+
  .PHONY: all-shellutils maybe-all-shellutils
  maybe-all-shellutils:
  @if shellutils
+TARGET-shellutils=all
  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 shellutils && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd $(HOST_SUBDIR)/shellutils && \
+         $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-shellutils))
  @endif shellutils
  
+
  .PHONY: check-shellutils maybe-check-shellutils
  maybe-check-shellutils:
  @if shellutils
@@ -16681,9 +18096,9 @@ 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 shellutils && $(MAKE) $(FLAGS_TO_PASS) check)
+       (cd $(HOST_SUBDIR)/shellutils && \
+         $(MAKE) $(FLAGS_TO_PASS)  check)
  
  @endif shellutils
  
@@ -16695,9 +18110,9 @@ maybe-install-shellutils: install-shellutils
  install-shellutils: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
-       (cd shellutils && $(MAKE) $(FLAGS_TO_PASS) install)
+       (cd $(HOST_SUBDIR)/shellutils && \
+         $(MAKE) $(FLAGS_TO_PASS)  install)
  
  @endif shellutils
  
@@ -16713,13 +18128,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing info in shellutils" ; \
-       (cd shellutils && \
+       (cd $(HOST_SUBDIR)/shellutils && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -16739,13 +18153,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing dvi in shellutils" ; \
-       (cd shellutils && \
+       (cd $(HOST_SUBDIR)/shellutils && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -16755,6 +18168,31 @@ dvi-shellutils: \
  
  @endif shellutils
  
+.PHONY: maybe-html-shellutils html-shellutils
+maybe-html-shellutils:
+@if shellutils
+maybe-html-shellutils: html-shellutils
+
+html-shellutils: \
+    configure-shellutils 
+       @[ -f ./shellutils/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing html in shellutils" ; \
+       (cd $(HOST_SUBDIR)/shellutils && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 html) \
+         || exit 1
+
+@endif shellutils
+
  .PHONY: maybe-TAGS-shellutils TAGS-shellutils
  maybe-TAGS-shellutils:
  @if shellutils
@@ -16765,13 +18203,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing TAGS in shellutils" ; \
-       (cd shellutils && \
+       (cd $(HOST_SUBDIR)/shellutils && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -16792,13 +18229,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing install-info in shellutils" ; \
-       (cd shellutils && \
+       (cd $(HOST_SUBDIR)/shellutils && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -16818,13 +18254,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing installcheck in shellutils" ; \
-       (cd shellutils && \
+       (cd $(HOST_SUBDIR)/shellutils && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -16843,13 +18278,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing mostlyclean in shellutils" ; \
-       (cd shellutils && \
+       (cd $(HOST_SUBDIR)/shellutils && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -16868,13 +18302,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing clean in shellutils" ; \
-       (cd shellutils && \
+       (cd $(HOST_SUBDIR)/shellutils && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -16893,13 +18326,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing distclean in shellutils" ; \
-       (cd shellutils && \
+       (cd $(HOST_SUBDIR)/shellutils && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -16918,13 +18350,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing maintainer-clean in shellutils" ; \
-       (cd shellutils && \
+       (cd $(HOST_SUBDIR)/shellutils && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -16935,46 +18366,47 @@ maintainer-clean-shellutils:
  @endif shellutils
  
  
+
  .PHONY: configure-sid maybe-configure-sid
  maybe-configure-sid:
  @if sid
  maybe-configure-sid: configure-sid
-configure-sid:
-       @test ! -f sid/Makefile || exit 0; \
-       [ -d sid ] || mkdir 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 sid || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/sid; \
+       cd "$(HOST_SUBDIR)/sid" || exit 1; \
         case $(srcdir) in \
-         \.) \
-           srcdiroption="--srcdir=."; \
-           libsrcdir=".";; \
-         /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/sid"; \
-           libsrcdir="$$s/sid";; \
-         *) \
-           srcdiroption="--srcdir=../$(srcdir)/sid"; \
-           libsrcdir="$$s/sid";; \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/sid/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
+       srcdiroption="--srcdir=$${topdir}/sid"; \
+       libsrcdir="$$s/sid"; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
  @endif sid
  
+
+
  .PHONY: all-sid maybe-all-sid
  maybe-all-sid:
  @if sid
+TARGET-sid=all
  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 sid && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd $(HOST_SUBDIR)/sid && \
+         $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-sid))
  @endif sid
  
+
  .PHONY: check-sid maybe-check-sid
  maybe-check-sid:
  @if sid
@@ -16983,9 +18415,9 @@ 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 sid && $(MAKE) $(FLAGS_TO_PASS) check)
+       (cd $(HOST_SUBDIR)/sid && \
+         $(MAKE) $(FLAGS_TO_PASS)  check)
  
  @endif sid
  
@@ -16997,9 +18429,9 @@ maybe-install-sid: install-sid
  install-sid: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
-       (cd sid && $(MAKE) $(FLAGS_TO_PASS) install)
+       (cd $(HOST_SUBDIR)/sid && \
+         $(MAKE) $(FLAGS_TO_PASS)  install)
  
  @endif sid
  
@@ -17015,13 +18447,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing info in sid" ; \
-       (cd sid && \
+       (cd $(HOST_SUBDIR)/sid && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -17041,13 +18472,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing dvi in sid" ; \
-       (cd sid && \
+       (cd $(HOST_SUBDIR)/sid && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -17057,6 +18487,31 @@ dvi-sid: \
  
  @endif sid
  
+.PHONY: maybe-html-sid html-sid
+maybe-html-sid:
+@if sid
+maybe-html-sid: html-sid
+
+html-sid: \
+    configure-sid 
+       @[ -f ./sid/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing html in sid" ; \
+       (cd $(HOST_SUBDIR)/sid && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 html) \
+         || exit 1
+
+@endif sid
+
  .PHONY: maybe-TAGS-sid TAGS-sid
  maybe-TAGS-sid:
  @if sid
@@ -17067,13 +18522,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing TAGS in sid" ; \
-       (cd sid && \
+       (cd $(HOST_SUBDIR)/sid && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -17094,13 +18548,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing install-info in sid" ; \
-       (cd sid && \
+       (cd $(HOST_SUBDIR)/sid && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -17120,13 +18573,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing installcheck in sid" ; \
-       (cd sid && \
+       (cd $(HOST_SUBDIR)/sid && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -17145,13 +18597,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing mostlyclean in sid" ; \
-       (cd sid && \
+       (cd $(HOST_SUBDIR)/sid && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -17170,13 +18621,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing clean in sid" ; \
-       (cd sid && \
+       (cd $(HOST_SUBDIR)/sid && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -17195,13 +18645,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing distclean in sid" ; \
-       (cd sid && \
+       (cd $(HOST_SUBDIR)/sid && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -17220,13 +18669,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing maintainer-clean in sid" ; \
-       (cd sid && \
+       (cd $(HOST_SUBDIR)/sid && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -17237,46 +18685,47 @@ maintainer-clean-sid:
  @endif sid
  
  
+
  .PHONY: configure-sim maybe-configure-sim
  maybe-configure-sim:
  @if sim
  maybe-configure-sim: configure-sim
-configure-sim:
-       @test ! -f sim/Makefile || exit 0; \
-       [ -d sim ] || mkdir 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 sim || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/sim; \
+       cd "$(HOST_SUBDIR)/sim" || exit 1; \
         case $(srcdir) in \
-         \.) \
-           srcdiroption="--srcdir=."; \
-           libsrcdir=".";; \
-         /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/sim"; \
-           libsrcdir="$$s/sim";; \
-         *) \
-           srcdiroption="--srcdir=../$(srcdir)/sim"; \
-           libsrcdir="$$s/sim";; \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/sim/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
+       srcdiroption="--srcdir=$${topdir}/sim"; \
+       libsrcdir="$$s/sim"; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
  @endif sim
  
+
+
  .PHONY: all-sim maybe-all-sim
  maybe-all-sim:
  @if sim
+TARGET-sim=all
  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 sim && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd $(HOST_SUBDIR)/sim && \
+         $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-sim))
  @endif sim
  
+
  .PHONY: check-sim maybe-check-sim
  maybe-check-sim:
  @if sim
@@ -17285,9 +18734,9 @@ 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 sim && $(MAKE) $(FLAGS_TO_PASS) check)
+       (cd $(HOST_SUBDIR)/sim && \
+         $(MAKE) $(FLAGS_TO_PASS)  check)
  
  @endif sim
  
@@ -17299,9 +18748,9 @@ maybe-install-sim: install-sim
  install-sim: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
-       (cd sim && $(MAKE) $(FLAGS_TO_PASS) install)
+       (cd $(HOST_SUBDIR)/sim && \
+         $(MAKE) $(FLAGS_TO_PASS)  install)
  
  @endif sim
  
@@ -17317,13 +18766,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing info in sim" ; \
-       (cd sim && \
+       (cd $(HOST_SUBDIR)/sim && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -17343,13 +18791,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing dvi in sim" ; \
-       (cd sim && \
+       (cd $(HOST_SUBDIR)/sim && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -17359,6 +18806,31 @@ dvi-sim: \
  
  @endif sim
  
+.PHONY: maybe-html-sim html-sim
+maybe-html-sim:
+@if sim
+maybe-html-sim: html-sim
+
+html-sim: \
+    configure-sim 
+       @[ -f ./sim/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing html in sim" ; \
+       (cd $(HOST_SUBDIR)/sim && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 html) \
+         || exit 1
+
+@endif sim
+
  .PHONY: maybe-TAGS-sim TAGS-sim
  maybe-TAGS-sim:
  @if sim
@@ -17369,13 +18841,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing TAGS in sim" ; \
-       (cd sim && \
+       (cd $(HOST_SUBDIR)/sim && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -17396,13 +18867,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing install-info in sim" ; \
-       (cd sim && \
+       (cd $(HOST_SUBDIR)/sim && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -17422,13 +18892,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing installcheck in sim" ; \
-       (cd sim && \
+       (cd $(HOST_SUBDIR)/sim && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -17447,13 +18916,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing mostlyclean in sim" ; \
-       (cd sim && \
+       (cd $(HOST_SUBDIR)/sim && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -17472,13 +18940,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing clean in sim" ; \
-       (cd sim && \
+       (cd $(HOST_SUBDIR)/sim && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -17497,13 +18964,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing distclean in sim" ; \
-       (cd sim && \
+       (cd $(HOST_SUBDIR)/sim && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -17522,13 +18988,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing maintainer-clean in sim" ; \
-       (cd sim && \
+       (cd $(HOST_SUBDIR)/sim && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -17539,46 +19004,47 @@ maintainer-clean-sim:
  @endif sim
  
  
+
  .PHONY: configure-tar maybe-configure-tar
  maybe-configure-tar:
  @if tar
  maybe-configure-tar: configure-tar
-configure-tar:
-       @test ! -f tar/Makefile || exit 0; \
-       [ -d tar ] || mkdir 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 tar || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/tar; \
+       cd "$(HOST_SUBDIR)/tar" || exit 1; \
         case $(srcdir) in \
-         \.) \
-           srcdiroption="--srcdir=."; \
-           libsrcdir=".";; \
-         /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/tar"; \
-           libsrcdir="$$s/tar";; \
-         *) \
-           srcdiroption="--srcdir=../$(srcdir)/tar"; \
-           libsrcdir="$$s/tar";; \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/tar/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
+       srcdiroption="--srcdir=$${topdir}/tar"; \
+       libsrcdir="$$s/tar"; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
  @endif tar
  
+
+
  .PHONY: all-tar maybe-all-tar
  maybe-all-tar:
  @if tar
+TARGET-tar=all
  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 tar && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd $(HOST_SUBDIR)/tar && \
+         $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-tar))
  @endif tar
  
+
  .PHONY: check-tar maybe-check-tar
  maybe-check-tar:
  @if tar
@@ -17587,9 +19053,9 @@ 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 tar && $(MAKE) $(FLAGS_TO_PASS) check)
+       (cd $(HOST_SUBDIR)/tar && \
+         $(MAKE) $(FLAGS_TO_PASS)  check)
  
  @endif tar
  
@@ -17601,9 +19067,9 @@ maybe-install-tar: install-tar
  install-tar: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
-       (cd tar && $(MAKE) $(FLAGS_TO_PASS) install)
+       (cd $(HOST_SUBDIR)/tar && \
+         $(MAKE) $(FLAGS_TO_PASS)  install)
  
  @endif tar
  
@@ -17619,13 +19085,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing info in tar" ; \
-       (cd tar && \
+       (cd $(HOST_SUBDIR)/tar && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -17645,13 +19110,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing dvi in tar" ; \
-       (cd tar && \
+       (cd $(HOST_SUBDIR)/tar && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -17661,6 +19125,31 @@ dvi-tar: \
  
  @endif tar
  
+.PHONY: maybe-html-tar html-tar
+maybe-html-tar:
+@if tar
+maybe-html-tar: html-tar
+
+html-tar: \
+    configure-tar 
+       @[ -f ./tar/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing html in tar" ; \
+       (cd $(HOST_SUBDIR)/tar && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 html) \
+         || exit 1
+
+@endif tar
+
  .PHONY: maybe-TAGS-tar TAGS-tar
  maybe-TAGS-tar:
  @if tar
@@ -17671,13 +19160,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing TAGS in tar" ; \
-       (cd tar && \
+       (cd $(HOST_SUBDIR)/tar && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -17698,13 +19186,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing install-info in tar" ; \
-       (cd tar && \
+       (cd $(HOST_SUBDIR)/tar && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -17724,13 +19211,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing installcheck in tar" ; \
-       (cd tar && \
+       (cd $(HOST_SUBDIR)/tar && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -17749,13 +19235,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing mostlyclean in tar" ; \
-       (cd tar && \
+       (cd $(HOST_SUBDIR)/tar && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -17774,13 +19259,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing clean in tar" ; \
-       (cd tar && \
+       (cd $(HOST_SUBDIR)/tar && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -17799,13 +19283,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing distclean in tar" ; \
-       (cd tar && \
+       (cd $(HOST_SUBDIR)/tar && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -17824,13 +19307,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing maintainer-clean in tar" ; \
-       (cd tar && \
+       (cd $(HOST_SUBDIR)/tar && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -17841,46 +19323,47 @@ maintainer-clean-tar:
  @endif tar
  
  
+
  .PHONY: configure-texinfo maybe-configure-texinfo
  maybe-configure-texinfo:
  @if texinfo
  maybe-configure-texinfo: configure-texinfo
-configure-texinfo:
-       @test ! -f texinfo/Makefile || exit 0; \
-       [ -d texinfo ] || mkdir 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 texinfo || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/texinfo; \
+       cd "$(HOST_SUBDIR)/texinfo" || exit 1; \
         case $(srcdir) in \
-         \.) \
-           srcdiroption="--srcdir=."; \
-           libsrcdir=".";; \
-         /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/texinfo"; \
-           libsrcdir="$$s/texinfo";; \
-         *) \
-           srcdiroption="--srcdir=../$(srcdir)/texinfo"; \
-           libsrcdir="$$s/texinfo";; \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/texinfo/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
+       srcdiroption="--srcdir=$${topdir}/texinfo"; \
+       libsrcdir="$$s/texinfo"; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
  @endif texinfo
  
+
+
  .PHONY: all-texinfo maybe-all-texinfo
  maybe-all-texinfo:
  @if texinfo
+TARGET-texinfo=all
  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 texinfo && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd $(HOST_SUBDIR)/texinfo && \
+         $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-texinfo))
  @endif texinfo
  
+
  .PHONY: check-texinfo maybe-check-texinfo
  maybe-check-texinfo:
  @if texinfo
@@ -17889,9 +19372,9 @@ 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 texinfo && $(MAKE) $(FLAGS_TO_PASS) check)
+       (cd $(HOST_SUBDIR)/texinfo && \
+         $(MAKE) $(FLAGS_TO_PASS)  check)
  
  @endif texinfo
  
@@ -17916,13 +19399,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing info in texinfo" ; \
-       (cd texinfo && \
+       (cd $(HOST_SUBDIR)/texinfo && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -17942,13 +19424,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing dvi in texinfo" ; \
-       (cd texinfo && \
+       (cd $(HOST_SUBDIR)/texinfo && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -17958,6 +19439,31 @@ dvi-texinfo: \
  
  @endif texinfo
  
+.PHONY: maybe-html-texinfo html-texinfo
+maybe-html-texinfo:
+@if texinfo
+maybe-html-texinfo: html-texinfo
+
+html-texinfo: \
+    configure-texinfo 
+       @[ -f ./texinfo/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing html in texinfo" ; \
+       (cd $(HOST_SUBDIR)/texinfo && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 html) \
+         || exit 1
+
+@endif texinfo
+
  .PHONY: maybe-TAGS-texinfo TAGS-texinfo
  maybe-TAGS-texinfo:
  @if texinfo
@@ -17968,13 +19474,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing TAGS in texinfo" ; \
-       (cd texinfo && \
+       (cd $(HOST_SUBDIR)/texinfo && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -17995,13 +19500,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing install-info in texinfo" ; \
-       (cd texinfo && \
+       (cd $(HOST_SUBDIR)/texinfo && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -18021,13 +19525,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing installcheck in texinfo" ; \
-       (cd texinfo && \
+       (cd $(HOST_SUBDIR)/texinfo && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -18046,13 +19549,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing mostlyclean in texinfo" ; \
-       (cd texinfo && \
+       (cd $(HOST_SUBDIR)/texinfo && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -18071,13 +19573,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing clean in texinfo" ; \
-       (cd texinfo && \
+       (cd $(HOST_SUBDIR)/texinfo && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -18096,13 +19597,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing distclean in texinfo" ; \
-       (cd texinfo && \
+       (cd $(HOST_SUBDIR)/texinfo && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -18121,13 +19621,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing maintainer-clean in texinfo" ; \
-       (cd texinfo && \
+       (cd $(HOST_SUBDIR)/texinfo && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -18138,46 +19637,47 @@ maintainer-clean-texinfo:
  @endif texinfo
  
  
+
  .PHONY: configure-textutils maybe-configure-textutils
  maybe-configure-textutils:
  @if textutils
  maybe-configure-textutils: configure-textutils
-configure-textutils:
-       @test ! -f textutils/Makefile || exit 0; \
-       [ -d textutils ] || mkdir 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 textutils || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/textutils; \
+       cd "$(HOST_SUBDIR)/textutils" || exit 1; \
         case $(srcdir) in \
-         \.) \
-           srcdiroption="--srcdir=."; \
-           libsrcdir=".";; \
-         /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/textutils"; \
-           libsrcdir="$$s/textutils";; \
-         *) \
-           srcdiroption="--srcdir=../$(srcdir)/textutils"; \
-           libsrcdir="$$s/textutils";; \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/textutils/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
+       srcdiroption="--srcdir=$${topdir}/textutils"; \
+       libsrcdir="$$s/textutils"; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
  @endif textutils
  
+
+
  .PHONY: all-textutils maybe-all-textutils
  maybe-all-textutils:
  @if textutils
+TARGET-textutils=all
  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 textutils && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd $(HOST_SUBDIR)/textutils && \
+         $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-textutils))
  @endif textutils
  
+
  .PHONY: check-textutils maybe-check-textutils
  maybe-check-textutils:
  @if textutils
@@ -18186,9 +19686,9 @@ 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 textutils && $(MAKE) $(FLAGS_TO_PASS) check)
+       (cd $(HOST_SUBDIR)/textutils && \
+         $(MAKE) $(FLAGS_TO_PASS)  check)
  
  @endif textutils
  
@@ -18200,9 +19700,9 @@ maybe-install-textutils: install-textutils
  install-textutils: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
-       (cd textutils && $(MAKE) $(FLAGS_TO_PASS) install)
+       (cd $(HOST_SUBDIR)/textutils && \
+         $(MAKE) $(FLAGS_TO_PASS)  install)
  
  @endif textutils
  
@@ -18218,13 +19718,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing info in textutils" ; \
-       (cd textutils && \
+       (cd $(HOST_SUBDIR)/textutils && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -18244,13 +19743,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing dvi in textutils" ; \
-       (cd textutils && \
+       (cd $(HOST_SUBDIR)/textutils && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -18260,6 +19758,31 @@ dvi-textutils: \
  
  @endif textutils
  
+.PHONY: maybe-html-textutils html-textutils
+maybe-html-textutils:
+@if textutils
+maybe-html-textutils: html-textutils
+
+html-textutils: \
+    configure-textutils 
+       @[ -f ./textutils/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing html in textutils" ; \
+       (cd $(HOST_SUBDIR)/textutils && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 html) \
+         || exit 1
+
+@endif textutils
+
  .PHONY: maybe-TAGS-textutils TAGS-textutils
  maybe-TAGS-textutils:
  @if textutils
@@ -18270,13 +19793,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing TAGS in textutils" ; \
-       (cd textutils && \
+       (cd $(HOST_SUBDIR)/textutils && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -18297,13 +19819,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing install-info in textutils" ; \
-       (cd textutils && \
+       (cd $(HOST_SUBDIR)/textutils && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -18323,13 +19844,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing installcheck in textutils" ; \
-       (cd textutils && \
+       (cd $(HOST_SUBDIR)/textutils && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -18348,13 +19868,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing mostlyclean in textutils" ; \
-       (cd textutils && \
+       (cd $(HOST_SUBDIR)/textutils && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -18373,13 +19892,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing clean in textutils" ; \
-       (cd textutils && \
+       (cd $(HOST_SUBDIR)/textutils && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -18398,13 +19916,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing distclean in textutils" ; \
-       (cd textutils && \
+       (cd $(HOST_SUBDIR)/textutils && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -18423,13 +19940,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing maintainer-clean in textutils" ; \
-       (cd textutils && \
+       (cd $(HOST_SUBDIR)/textutils && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -18440,46 +19956,47 @@ maintainer-clean-textutils:
  @endif textutils
  
  
+
  .PHONY: configure-time maybe-configure-time
  maybe-configure-time:
  @if time
  maybe-configure-time: configure-time
-configure-time:
-       @test ! -f time/Makefile || exit 0; \
-       [ -d time ] || mkdir 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 time || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/time; \
+       cd "$(HOST_SUBDIR)/time" || exit 1; \
         case $(srcdir) in \
-         \.) \
-           srcdiroption="--srcdir=."; \
-           libsrcdir=".";; \
-         /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/time"; \
-           libsrcdir="$$s/time";; \
-         *) \
-           srcdiroption="--srcdir=../$(srcdir)/time"; \
-           libsrcdir="$$s/time";; \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/time/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
+       srcdiroption="--srcdir=$${topdir}/time"; \
+       libsrcdir="$$s/time"; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
  @endif time
  
+
+
  .PHONY: all-time maybe-all-time
  maybe-all-time:
  @if time
+TARGET-time=all
  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 time && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd $(HOST_SUBDIR)/time && \
+         $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-time))
  @endif time
  
+
  .PHONY: check-time maybe-check-time
  maybe-check-time:
  @if time
@@ -18488,9 +20005,9 @@ 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 time && $(MAKE) $(FLAGS_TO_PASS) check)
+       (cd $(HOST_SUBDIR)/time && \
+         $(MAKE) $(FLAGS_TO_PASS)  check)
  
  @endif time
  
@@ -18502,9 +20019,9 @@ maybe-install-time: install-time
  install-time: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
-       (cd time && $(MAKE) $(FLAGS_TO_PASS) install)
+       (cd $(HOST_SUBDIR)/time && \
+         $(MAKE) $(FLAGS_TO_PASS)  install)
  
  @endif time
  
@@ -18520,13 +20037,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing info in time" ; \
-       (cd time && \
+       (cd $(HOST_SUBDIR)/time && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -18546,13 +20062,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing dvi in time" ; \
-       (cd time && \
+       (cd $(HOST_SUBDIR)/time && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -18562,6 +20077,31 @@ dvi-time: \
  
  @endif time
  
+.PHONY: maybe-html-time html-time
+maybe-html-time:
+@if time
+maybe-html-time: html-time
+
+html-time: \
+    configure-time 
+       @[ -f ./time/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing html in time" ; \
+       (cd $(HOST_SUBDIR)/time && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 html) \
+         || exit 1
+
+@endif time
+
  .PHONY: maybe-TAGS-time TAGS-time
  maybe-TAGS-time:
  @if time
@@ -18572,13 +20112,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing TAGS in time" ; \
-       (cd time && \
+       (cd $(HOST_SUBDIR)/time && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -18599,13 +20138,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing install-info in time" ; \
-       (cd time && \
+       (cd $(HOST_SUBDIR)/time && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -18625,13 +20163,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing installcheck in time" ; \
-       (cd time && \
+       (cd $(HOST_SUBDIR)/time && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -18650,13 +20187,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing mostlyclean in time" ; \
-       (cd time && \
+       (cd $(HOST_SUBDIR)/time && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -18675,13 +20211,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing clean in time" ; \
-       (cd time && \
+       (cd $(HOST_SUBDIR)/time && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -18700,13 +20235,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing distclean in time" ; \
-       (cd time && \
+       (cd $(HOST_SUBDIR)/time && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -18725,13 +20259,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing maintainer-clean in time" ; \
-       (cd time && \
+       (cd $(HOST_SUBDIR)/time && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -18742,46 +20275,47 @@ maintainer-clean-time:
  @endif time
  
  
+
  .PHONY: configure-uudecode maybe-configure-uudecode
  maybe-configure-uudecode:
  @if uudecode
  maybe-configure-uudecode: configure-uudecode
-configure-uudecode:
-       @test ! -f uudecode/Makefile || exit 0; \
-       [ -d uudecode ] || mkdir 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 uudecode || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/uudecode; \
+       cd "$(HOST_SUBDIR)/uudecode" || exit 1; \
         case $(srcdir) in \
-         \.) \
-           srcdiroption="--srcdir=."; \
-           libsrcdir=".";; \
-         /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/uudecode"; \
-           libsrcdir="$$s/uudecode";; \
-         *) \
-           srcdiroption="--srcdir=../$(srcdir)/uudecode"; \
-           libsrcdir="$$s/uudecode";; \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/uudecode/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
+       srcdiroption="--srcdir=$${topdir}/uudecode"; \
+       libsrcdir="$$s/uudecode"; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
  @endif uudecode
  
+
+
  .PHONY: all-uudecode maybe-all-uudecode
  maybe-all-uudecode:
  @if uudecode
+TARGET-uudecode=all
  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 uudecode && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd $(HOST_SUBDIR)/uudecode && \
+         $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-uudecode))
  @endif uudecode
  
+
  .PHONY: check-uudecode maybe-check-uudecode
  maybe-check-uudecode:
  @if uudecode
@@ -18790,9 +20324,9 @@ 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 uudecode && $(MAKE) $(FLAGS_TO_PASS) check)
+       (cd $(HOST_SUBDIR)/uudecode && \
+         $(MAKE) $(FLAGS_TO_PASS)  check)
  
  @endif uudecode
  
@@ -18804,9 +20338,9 @@ maybe-install-uudecode: install-uudecode
  install-uudecode: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
-       (cd uudecode && $(MAKE) $(FLAGS_TO_PASS) install)
+       (cd $(HOST_SUBDIR)/uudecode && \
+         $(MAKE) $(FLAGS_TO_PASS)  install)
  
  @endif uudecode
  
@@ -18822,13 +20356,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing info in uudecode" ; \
-       (cd uudecode && \
+       (cd $(HOST_SUBDIR)/uudecode && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -18848,13 +20381,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing dvi in uudecode" ; \
-       (cd uudecode && \
+       (cd $(HOST_SUBDIR)/uudecode && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -18864,6 +20396,31 @@ dvi-uudecode: \
  
  @endif uudecode
  
+.PHONY: maybe-html-uudecode html-uudecode
+maybe-html-uudecode:
+@if uudecode
+maybe-html-uudecode: html-uudecode
+
+html-uudecode: \
+    configure-uudecode 
+       @[ -f ./uudecode/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing html in uudecode" ; \
+       (cd $(HOST_SUBDIR)/uudecode && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 html) \
+         || exit 1
+
+@endif uudecode
+
  .PHONY: maybe-TAGS-uudecode TAGS-uudecode
  maybe-TAGS-uudecode:
  @if uudecode
@@ -18874,13 +20431,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing TAGS in uudecode" ; \
-       (cd uudecode && \
+       (cd $(HOST_SUBDIR)/uudecode && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -18901,13 +20457,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing install-info in uudecode" ; \
-       (cd uudecode && \
+       (cd $(HOST_SUBDIR)/uudecode && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -18927,13 +20482,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing installcheck in uudecode" ; \
-       (cd uudecode && \
+       (cd $(HOST_SUBDIR)/uudecode && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -18952,13 +20506,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing mostlyclean in uudecode" ; \
-       (cd uudecode && \
+       (cd $(HOST_SUBDIR)/uudecode && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -18977,13 +20530,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing clean in uudecode" ; \
-       (cd uudecode && \
+       (cd $(HOST_SUBDIR)/uudecode && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -19002,13 +20554,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing distclean in uudecode" ; \
-       (cd uudecode && \
+       (cd $(HOST_SUBDIR)/uudecode && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -19027,13 +20578,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing maintainer-clean in uudecode" ; \
-       (cd uudecode && \
+       (cd $(HOST_SUBDIR)/uudecode && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -19044,46 +20594,47 @@ maintainer-clean-uudecode:
  @endif uudecode
  
  
+
  .PHONY: configure-wdiff maybe-configure-wdiff
  maybe-configure-wdiff:
  @if wdiff
  maybe-configure-wdiff: configure-wdiff
-configure-wdiff:
-       @test ! -f wdiff/Makefile || exit 0; \
-       [ -d wdiff ] || mkdir 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 wdiff || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/wdiff; \
+       cd "$(HOST_SUBDIR)/wdiff" || exit 1; \
         case $(srcdir) in \
-         \.) \
-           srcdiroption="--srcdir=."; \
-           libsrcdir=".";; \
-         /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/wdiff"; \
-           libsrcdir="$$s/wdiff";; \
-         *) \
-           srcdiroption="--srcdir=../$(srcdir)/wdiff"; \
-           libsrcdir="$$s/wdiff";; \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/wdiff/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
+       srcdiroption="--srcdir=$${topdir}/wdiff"; \
+       libsrcdir="$$s/wdiff"; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
  @endif wdiff
  
+
+
  .PHONY: all-wdiff maybe-all-wdiff
  maybe-all-wdiff:
  @if wdiff
+TARGET-wdiff=all
  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 wdiff && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd $(HOST_SUBDIR)/wdiff && \
+         $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-wdiff))
  @endif wdiff
  
+
  .PHONY: check-wdiff maybe-check-wdiff
  maybe-check-wdiff:
  @if wdiff
@@ -19092,9 +20643,9 @@ 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 wdiff && $(MAKE) $(FLAGS_TO_PASS) check)
+       (cd $(HOST_SUBDIR)/wdiff && \
+         $(MAKE) $(FLAGS_TO_PASS)  check)
  
  @endif wdiff
  
@@ -19106,9 +20657,9 @@ maybe-install-wdiff: install-wdiff
  install-wdiff: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
-       (cd wdiff && $(MAKE) $(FLAGS_TO_PASS) install)
+       (cd $(HOST_SUBDIR)/wdiff && \
+         $(MAKE) $(FLAGS_TO_PASS)  install)
  
  @endif wdiff
  
@@ -19124,13 +20675,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing info in wdiff" ; \
-       (cd wdiff && \
+       (cd $(HOST_SUBDIR)/wdiff && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -19150,13 +20700,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing dvi in wdiff" ; \
-       (cd wdiff && \
+       (cd $(HOST_SUBDIR)/wdiff && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -19166,28 +20715,52 @@ dvi-wdiff: \
  
  @endif wdiff
  
-.PHONY: maybe-TAGS-wdiff TAGS-wdiff
-maybe-TAGS-wdiff:
+.PHONY: maybe-html-wdiff html-wdiff
+maybe-html-wdiff:
  @if wdiff
-maybe-TAGS-wdiff: TAGS-wdiff
+maybe-html-wdiff: html-wdiff
  
-TAGS-wdiff: \
+html-wdiff: \
      configure-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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing TAGS in wdiff" ; \
-       (cd wdiff && \
+       echo "Doing html in wdiff" ; \
+       (cd $(HOST_SUBDIR)/wdiff && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                 html) \
+         || exit 1
+
+@endif wdiff
+
+.PHONY: maybe-TAGS-wdiff TAGS-wdiff
+maybe-TAGS-wdiff:
+@if wdiff
+maybe-TAGS-wdiff: TAGS-wdiff
+
+TAGS-wdiff: \
+    configure-wdiff 
+       @[ -f ./wdiff/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing TAGS in wdiff" ; \
+       (cd $(HOST_SUBDIR)/wdiff && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 TAGS) \
           || exit 1
  
  @endif wdiff
@@ -19203,13 +20776,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing install-info in wdiff" ; \
-       (cd wdiff && \
+       (cd $(HOST_SUBDIR)/wdiff && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -19229,13 +20801,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing installcheck in wdiff" ; \
-       (cd wdiff && \
+       (cd $(HOST_SUBDIR)/wdiff && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -19254,13 +20825,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing mostlyclean in wdiff" ; \
-       (cd wdiff && \
+       (cd $(HOST_SUBDIR)/wdiff && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -19279,13 +20849,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing clean in wdiff" ; \
-       (cd wdiff && \
+       (cd $(HOST_SUBDIR)/wdiff && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -19304,13 +20873,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing distclean in wdiff" ; \
-       (cd wdiff && \
+       (cd $(HOST_SUBDIR)/wdiff && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -19329,13 +20897,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing maintainer-clean in wdiff" ; \
-       (cd wdiff && \
+       (cd $(HOST_SUBDIR)/wdiff && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -19346,46 +20913,47 @@ maintainer-clean-wdiff:
  @endif wdiff
  
  
+
  .PHONY: configure-zip maybe-configure-zip
  maybe-configure-zip:
  @if zip
  maybe-configure-zip: configure-zip
-configure-zip:
-       @test ! -f zip/Makefile || exit 0; \
-       [ -d zip ] || mkdir 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 zip || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/zip; \
+       cd "$(HOST_SUBDIR)/zip" || exit 1; \
         case $(srcdir) in \
-         \.) \
-           srcdiroption="--srcdir=."; \
-           libsrcdir=".";; \
-         /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/zip"; \
-           libsrcdir="$$s/zip";; \
-         *) \
-           srcdiroption="--srcdir=../$(srcdir)/zip"; \
-           libsrcdir="$$s/zip";; \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/zip/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
+       srcdiroption="--srcdir=$${topdir}/zip"; \
+       libsrcdir="$$s/zip"; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
  @endif zip
  
+
+
  .PHONY: all-zip maybe-all-zip
  maybe-all-zip:
  @if zip
+TARGET-zip=all
  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 zip && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd $(HOST_SUBDIR)/zip && \
+         $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-zip))
  @endif zip
  
+
  .PHONY: check-zip maybe-check-zip
  maybe-check-zip:
  @if zip
@@ -19396,9 +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 zip && $(MAKE) $(FLAGS_TO_PASS) check); \
+         (cd $(HOST_SUBDIR)/zip && \
+           $(MAKE) $(FLAGS_TO_PASS)  check); \
         fi
  
  @endif zip
@@ -19411,9 +20979,9 @@ maybe-install-zip: install-zip
  install-zip: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
-       (cd zip && $(MAKE) $(FLAGS_TO_PASS) install)
+       (cd $(HOST_SUBDIR)/zip && \
+         $(MAKE) $(FLAGS_TO_PASS)  install)
  
  @endif zip
  
@@ -19429,13 +20997,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing info in zip" ; \
-       (cd zip && \
+       (cd $(HOST_SUBDIR)/zip && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -19455,13 +21022,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing dvi in zip" ; \
-       (cd zip && \
+       (cd $(HOST_SUBDIR)/zip && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -19471,6 +21037,31 @@ dvi-zip: \
  
  @endif zip
  
+.PHONY: maybe-html-zip html-zip
+maybe-html-zip:
+@if zip
+maybe-html-zip: html-zip
+
+html-zip: \
+    configure-zip 
+       @[ -f ./zip/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing html in zip" ; \
+       (cd $(HOST_SUBDIR)/zip && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 html) \
+         || exit 1
+
+@endif zip
+
  .PHONY: maybe-TAGS-zip TAGS-zip
  maybe-TAGS-zip:
  @if zip
@@ -19481,13 +21072,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing TAGS in zip" ; \
-       (cd zip && \
+       (cd $(HOST_SUBDIR)/zip && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -19508,13 +21098,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing install-info in zip" ; \
-       (cd zip && \
+       (cd $(HOST_SUBDIR)/zip && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -19534,13 +21123,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing installcheck in zip" ; \
-       (cd zip && \
+       (cd $(HOST_SUBDIR)/zip && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -19559,13 +21147,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing mostlyclean in zip" ; \
-       (cd zip && \
+       (cd $(HOST_SUBDIR)/zip && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -19584,13 +21171,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing clean in zip" ; \
-       (cd zip && \
+       (cd $(HOST_SUBDIR)/zip && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -19609,13 +21195,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing distclean in zip" ; \
-       (cd zip && \
+       (cd $(HOST_SUBDIR)/zip && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -19634,13 +21219,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing maintainer-clean in zip" ; \
-       (cd zip && \
+       (cd $(HOST_SUBDIR)/zip && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -19651,46 +21235,49 @@ maintainer-clean-zip:
  @endif zip
  
  
+
  .PHONY: configure-zlib maybe-configure-zlib
  maybe-configure-zlib:
  @if zlib
  maybe-configure-zlib: configure-zlib
-configure-zlib:
-       @test ! -f zlib/Makefile || exit 0; \
-       [ -d zlib ] || mkdir 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 zlib || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/zlib; \
+       cd "$(HOST_SUBDIR)/zlib" || exit 1; \
         case $(srcdir) in \
-         \.) \
-           srcdiroption="--srcdir=."; \
-           libsrcdir=".";; \
-         /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/zlib"; \
-           libsrcdir="$$s/zlib";; \
-         *) \
-           srcdiroption="--srcdir=../$(srcdir)/zlib"; \
-           libsrcdir="$$s/zlib";; \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/zlib/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
+       srcdiroption="--srcdir=$${topdir}/zlib"; \
+       libsrcdir="$$s/zlib"; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
  @endif zlib
  
+
+
  .PHONY: all-zlib maybe-all-zlib
  maybe-all-zlib:
  @if zlib
+TARGET-zlib=all
  maybe-all-zlib: all-zlib
  all-zlib: configure-zlib
-       @r=`${PWD_COMMAND}`; export r; \
+       @test -f stage_last && exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
-       (cd zlib && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd $(HOST_SUBDIR)/zlib && \
+         $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-zlib))
  @endif zlib
  
+
  .PHONY: check-zlib maybe-check-zlib
  maybe-check-zlib:
  @if zlib
@@ -19721,13 +21308,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing info in zlib" ; \
-       (cd zlib && \
+       (cd $(HOST_SUBDIR)/zlib && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -19747,13 +21333,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing dvi in zlib" ; \
-       (cd zlib && \
+       (cd $(HOST_SUBDIR)/zlib && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -19763,6 +21348,31 @@ dvi-zlib: \
  
  @endif zlib
  
+.PHONY: maybe-html-zlib html-zlib
+maybe-html-zlib:
+@if zlib
+maybe-html-zlib: html-zlib
+
+html-zlib: \
+    configure-zlib 
+       @[ -f ./zlib/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing html in zlib" ; \
+       (cd $(HOST_SUBDIR)/zlib && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 html) \
+         || exit 1
+
+@endif zlib
+
  .PHONY: maybe-TAGS-zlib TAGS-zlib
  maybe-TAGS-zlib:
  @if zlib
@@ -19773,13 +21383,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing TAGS in zlib" ; \
-       (cd zlib && \
+       (cd $(HOST_SUBDIR)/zlib && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -19800,13 +21409,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing install-info in zlib" ; \
-       (cd zlib && \
+       (cd $(HOST_SUBDIR)/zlib && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -19826,13 +21434,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing installcheck in zlib" ; \
-       (cd zlib && \
+       (cd $(HOST_SUBDIR)/zlib && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -19851,13 +21458,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing mostlyclean in zlib" ; \
-       (cd zlib && \
+       (cd $(HOST_SUBDIR)/zlib && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -19876,13 +21482,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing clean in zlib" ; \
-       (cd zlib && \
+       (cd $(HOST_SUBDIR)/zlib && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -19901,13 +21506,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing distclean in zlib" ; \
-       (cd zlib && \
+       (cd $(HOST_SUBDIR)/zlib && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -19926,13 +21530,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing maintainer-clean in zlib" ; \
-       (cd zlib && \
+       (cd $(HOST_SUBDIR)/zlib && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -19943,46 +21546,47 @@ maintainer-clean-zlib:
  @endif zlib
  
  
+
  .PHONY: configure-gdb maybe-configure-gdb
  maybe-configure-gdb:
  @if gdb
  maybe-configure-gdb: configure-gdb
-configure-gdb:
-       @test ! -f gdb/Makefile || exit 0; \
-       [ -d gdb ] || mkdir 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 gdb || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/gdb; \
+       cd "$(HOST_SUBDIR)/gdb" || exit 1; \
         case $(srcdir) in \
-         \.) \
-           srcdiroption="--srcdir=."; \
-           libsrcdir=".";; \
-         /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/gdb"; \
-           libsrcdir="$$s/gdb";; \
-         *) \
-           srcdiroption="--srcdir=../$(srcdir)/gdb"; \
-           libsrcdir="$$s/gdb";; \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/gdb/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
+       srcdiroption="--srcdir=$${topdir}/gdb"; \
+       libsrcdir="$$s/gdb"; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
  @endif gdb
  
+
+
  .PHONY: all-gdb maybe-all-gdb
  maybe-all-gdb:
  @if gdb
+TARGET-gdb=all
  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 gdb && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) all)
+       (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
@@ -19991,9 +21595,9 @@ 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 gdb && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) check)
+       (cd $(HOST_SUBDIR)/gdb && \
+         $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) check)
  
  @endif gdb
  
@@ -20005,9 +21609,9 @@ maybe-install-gdb: install-gdb
  install-gdb: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
-       (cd gdb && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) install)
+       (cd $(HOST_SUBDIR)/gdb && \
+         $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) install)
  
  @endif gdb
  
@@ -20023,13 +21627,12 @@ 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); do \
+       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing info in gdb" ; \
-       (cd gdb && \
+       (cd $(HOST_SUBDIR)/gdb && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -20049,13 +21652,12 @@ 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); do \
+       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing dvi in gdb" ; \
-       (cd gdb && \
+       (cd $(HOST_SUBDIR)/gdb && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -20065,6 +21667,31 @@ dvi-gdb: \
  
  @endif gdb
  
+.PHONY: maybe-html-gdb html-gdb
+maybe-html-gdb:
+@if gdb
+maybe-html-gdb: html-gdb
+
+html-gdb: \
+    configure-gdb 
+       @[ -f ./gdb/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing html in gdb" ; \
+       (cd $(HOST_SUBDIR)/gdb && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 html) \
+         || exit 1
+
+@endif gdb
+
  .PHONY: maybe-TAGS-gdb TAGS-gdb
  maybe-TAGS-gdb:
  @if gdb
@@ -20075,13 +21702,12 @@ 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); do \
+       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing TAGS in gdb" ; \
-       (cd gdb && \
+       (cd $(HOST_SUBDIR)/gdb && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -20102,13 +21728,12 @@ 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); do \
+       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing install-info in gdb" ; \
-       (cd gdb && \
+       (cd $(HOST_SUBDIR)/gdb && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -20128,13 +21753,12 @@ 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); do \
+       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing installcheck in gdb" ; \
-       (cd gdb && \
+       (cd $(HOST_SUBDIR)/gdb && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -20153,13 +21777,12 @@ 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); do \
+       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing mostlyclean in gdb" ; \
-       (cd gdb && \
+       (cd $(HOST_SUBDIR)/gdb && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -20178,13 +21801,12 @@ 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); do \
+       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing clean in gdb" ; \
-       (cd gdb && \
+       (cd $(HOST_SUBDIR)/gdb && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -20203,13 +21825,12 @@ 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); do \
+       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing distclean in gdb" ; \
-       (cd gdb && \
+       (cd $(HOST_SUBDIR)/gdb && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -20228,13 +21849,12 @@ 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); do \
+       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing maintainer-clean in gdb" ; \
-       (cd gdb && \
+       (cd $(HOST_SUBDIR)/gdb && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -20245,46 +21865,47 @@ maintainer-clean-gdb:
  @endif gdb
  
  
+
  .PHONY: configure-expect maybe-configure-expect
  maybe-configure-expect:
  @if expect
  maybe-configure-expect: configure-expect
-configure-expect:
-       @test ! -f expect/Makefile || exit 0; \
-       [ -d expect ] || mkdir 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 expect || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/expect; \
+       cd "$(HOST_SUBDIR)/expect" || exit 1; \
         case $(srcdir) in \
-         \.) \
-           srcdiroption="--srcdir=."; \
-           libsrcdir=".";; \
-         /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/expect"; \
-           libsrcdir="$$s/expect";; \
-         *) \
-           srcdiroption="--srcdir=../$(srcdir)/expect"; \
-           libsrcdir="$$s/expect";; \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/expect/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
+       srcdiroption="--srcdir=$${topdir}/expect"; \
+       libsrcdir="$$s/expect"; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
  @endif expect
  
+
+
  .PHONY: all-expect maybe-all-expect
  maybe-all-expect:
  @if expect
+TARGET-expect=all
  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 expect && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) all)
+       (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
@@ -20293,9 +21914,9 @@ 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 expect && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) check)
+       (cd $(HOST_SUBDIR)/expect && \
+         $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) check)
  
  @endif expect
  
@@ -20307,9 +21928,9 @@ maybe-install-expect: install-expect
  install-expect: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
-       (cd expect && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) install)
+       (cd $(HOST_SUBDIR)/expect && \
+         $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) install)
  
  @endif expect
  
@@ -20325,13 +21946,12 @@ 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); do \
+       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing info in expect" ; \
-       (cd expect && \
+       (cd $(HOST_SUBDIR)/expect && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -20351,13 +21971,12 @@ 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); do \
+       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing dvi in expect" ; \
-       (cd expect && \
+       (cd $(HOST_SUBDIR)/expect && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -20367,6 +21986,31 @@ dvi-expect: \
  
  @endif expect
  
+.PHONY: maybe-html-expect html-expect
+maybe-html-expect:
+@if expect
+maybe-html-expect: html-expect
+
+html-expect: \
+    configure-expect 
+       @[ -f ./expect/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing html in expect" ; \
+       (cd $(HOST_SUBDIR)/expect && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 html) \
+         || exit 1
+
+@endif expect
+
  .PHONY: maybe-TAGS-expect TAGS-expect
  maybe-TAGS-expect:
  @if expect
@@ -20377,13 +22021,12 @@ 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); do \
+       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing TAGS in expect" ; \
-       (cd expect && \
+       (cd $(HOST_SUBDIR)/expect && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -20404,13 +22047,12 @@ 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); do \
+       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing install-info in expect" ; \
-       (cd expect && \
+       (cd $(HOST_SUBDIR)/expect && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -20430,13 +22072,12 @@ 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); do \
+       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing installcheck in expect" ; \
-       (cd expect && \
+       (cd $(HOST_SUBDIR)/expect && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -20455,13 +22096,12 @@ 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); do \
+       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing mostlyclean in expect" ; \
-       (cd expect && \
+       (cd $(HOST_SUBDIR)/expect && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -20480,13 +22120,12 @@ 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); do \
+       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing clean in expect" ; \
-       (cd expect && \
+       (cd $(HOST_SUBDIR)/expect && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -20505,13 +22144,12 @@ 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); do \
+       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing distclean in expect" ; \
-       (cd expect && \
+       (cd $(HOST_SUBDIR)/expect && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -20530,13 +22168,12 @@ 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); do \
+       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing maintainer-clean in expect" ; \
-       (cd expect && \
+       (cd $(HOST_SUBDIR)/expect && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -20547,46 +22184,47 @@ maintainer-clean-expect:
  @endif expect
  
  
+
  .PHONY: configure-guile maybe-configure-guile
  maybe-configure-guile:
  @if guile
  maybe-configure-guile: configure-guile
-configure-guile:
-       @test ! -f guile/Makefile || exit 0; \
-       [ -d guile ] || mkdir 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 guile || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/guile; \
+       cd "$(HOST_SUBDIR)/guile" || exit 1; \
         case $(srcdir) in \
-         \.) \
-           srcdiroption="--srcdir=."; \
-           libsrcdir=".";; \
-         /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/guile"; \
-           libsrcdir="$$s/guile";; \
-         *) \
-           srcdiroption="--srcdir=../$(srcdir)/guile"; \
-           libsrcdir="$$s/guile";; \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/guile/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
+       srcdiroption="--srcdir=$${topdir}/guile"; \
+       libsrcdir="$$s/guile"; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
  @endif guile
  
+
+
  .PHONY: all-guile maybe-all-guile
  maybe-all-guile:
  @if guile
+TARGET-guile=all
  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 guile && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) all)
+       (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
@@ -20595,9 +22233,9 @@ 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 guile && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) check)
+       (cd $(HOST_SUBDIR)/guile && \
+         $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) check)
  
  @endif guile
  
@@ -20609,9 +22247,9 @@ maybe-install-guile: install-guile
  install-guile: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
-       (cd guile && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) install)
+       (cd $(HOST_SUBDIR)/guile && \
+         $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) install)
  
  @endif guile
  
@@ -20627,13 +22265,12 @@ 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); do \
+       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing info in guile" ; \
-       (cd guile && \
+       (cd $(HOST_SUBDIR)/guile && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -20653,13 +22290,12 @@ 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); do \
+       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing dvi in guile" ; \
-       (cd guile && \
+       (cd $(HOST_SUBDIR)/guile && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -20669,6 +22305,31 @@ dvi-guile: \
  
  @endif guile
  
+.PHONY: maybe-html-guile html-guile
+maybe-html-guile:
+@if guile
+maybe-html-guile: html-guile
+
+html-guile: \
+    configure-guile 
+       @[ -f ./guile/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing html in guile" ; \
+       (cd $(HOST_SUBDIR)/guile && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 html) \
+         || exit 1
+
+@endif guile
+
  .PHONY: maybe-TAGS-guile TAGS-guile
  maybe-TAGS-guile:
  @if guile
@@ -20679,13 +22340,12 @@ 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); do \
+       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing TAGS in guile" ; \
-       (cd guile && \
+       (cd $(HOST_SUBDIR)/guile && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -20706,13 +22366,12 @@ 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); do \
+       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing install-info in guile" ; \
-       (cd guile && \
+       (cd $(HOST_SUBDIR)/guile && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -20732,13 +22391,12 @@ 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); do \
+       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing installcheck in guile" ; \
-       (cd guile && \
+       (cd $(HOST_SUBDIR)/guile && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -20757,13 +22415,12 @@ 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); do \
+       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing mostlyclean in guile" ; \
-       (cd guile && \
+       (cd $(HOST_SUBDIR)/guile && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -20782,13 +22439,12 @@ 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); do \
+       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing clean in guile" ; \
-       (cd guile && \
+       (cd $(HOST_SUBDIR)/guile && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -20807,13 +22463,12 @@ 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); do \
+       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing distclean in guile" ; \
-       (cd guile && \
+       (cd $(HOST_SUBDIR)/guile && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -20832,13 +22487,12 @@ 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); do \
+       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing maintainer-clean in guile" ; \
-       (cd guile && \
+       (cd $(HOST_SUBDIR)/guile && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -20849,46 +22503,47 @@ maintainer-clean-guile:
  @endif guile
  
  
+
  .PHONY: configure-tk maybe-configure-tk
  maybe-configure-tk:
  @if tk
  maybe-configure-tk: configure-tk
-configure-tk:
-       @test ! -f tk/Makefile || exit 0; \
-       [ -d tk ] || mkdir 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 tk || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/tk; \
+       cd "$(HOST_SUBDIR)/tk" || exit 1; \
         case $(srcdir) in \
-         \.) \
-           srcdiroption="--srcdir=."; \
-           libsrcdir=".";; \
-         /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/tk"; \
-           libsrcdir="$$s/tk";; \
-         *) \
-           srcdiroption="--srcdir=../$(srcdir)/tk"; \
-           libsrcdir="$$s/tk";; \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/tk/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
+       srcdiroption="--srcdir=$${topdir}/tk"; \
+       libsrcdir="$$s/tk"; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
  @endif tk
  
+
+
  .PHONY: all-tk maybe-all-tk
  maybe-all-tk:
  @if tk
+TARGET-tk=all
  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 tk && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) all)
+       (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
@@ -20897,9 +22552,9 @@ 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 tk && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) check)
+       (cd $(HOST_SUBDIR)/tk && \
+         $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) check)
  
  @endif tk
  
@@ -20911,9 +22566,9 @@ maybe-install-tk: install-tk
  install-tk: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
-       (cd tk && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) install)
+       (cd $(HOST_SUBDIR)/tk && \
+         $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) install)
  
  @endif tk
  
@@ -20929,13 +22584,12 @@ 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); do \
+       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing info in tk" ; \
-       (cd tk && \
+       (cd $(HOST_SUBDIR)/tk && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -20955,13 +22609,12 @@ 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); do \
+       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing dvi in tk" ; \
-       (cd tk && \
+       (cd $(HOST_SUBDIR)/tk && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -20971,6 +22624,31 @@ dvi-tk: \
  
  @endif tk
  
+.PHONY: maybe-html-tk html-tk
+maybe-html-tk:
+@if tk
+maybe-html-tk: html-tk
+
+html-tk: \
+    configure-tk 
+       @[ -f ./tk/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing html in tk" ; \
+       (cd $(HOST_SUBDIR)/tk && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 html) \
+         || exit 1
+
+@endif tk
+
  .PHONY: maybe-TAGS-tk TAGS-tk
  maybe-TAGS-tk:
  @if tk
@@ -20981,13 +22659,12 @@ 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); do \
+       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing TAGS in tk" ; \
-       (cd tk && \
+       (cd $(HOST_SUBDIR)/tk && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -21008,13 +22685,12 @@ 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); do \
+       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing install-info in tk" ; \
-       (cd tk && \
+       (cd $(HOST_SUBDIR)/tk && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -21034,13 +22710,12 @@ 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); do \
+       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing installcheck in tk" ; \
-       (cd tk && \
+       (cd $(HOST_SUBDIR)/tk && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -21059,13 +22734,12 @@ 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); do \
+       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing mostlyclean in tk" ; \
-       (cd tk && \
+       (cd $(HOST_SUBDIR)/tk && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -21084,13 +22758,12 @@ 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); do \
+       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing clean in tk" ; \
-       (cd tk && \
+       (cd $(HOST_SUBDIR)/tk && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -21109,13 +22782,12 @@ 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); do \
+       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing distclean in tk" ; \
-       (cd tk && \
+       (cd $(HOST_SUBDIR)/tk && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -21134,13 +22806,12 @@ 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); do \
+       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing maintainer-clean in tk" ; \
-       (cd tk && \
+       (cd $(HOST_SUBDIR)/tk && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -21151,93 +22822,88 @@ maintainer-clean-tk:
  @endif tk
  
  
-.PHONY: configure-tix maybe-configure-tix
-maybe-configure-tix:
-@if tix
-maybe-configure-tix: configure-tix
-configure-tix:
-       @test ! -f tix/Makefile || exit 0; \
-       [ -d tix ] || mkdir tix; \
+
+.PHONY: configure-libtermcap maybe-configure-libtermcap
+maybe-configure-libtermcap:
+@if libtermcap
+maybe-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 tix; \
-       cd tix || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/libtermcap; \
+       cd "$(HOST_SUBDIR)/libtermcap" || exit 1; \
         case $(srcdir) in \
-         \.) \
-           srcdiroption="--srcdir=."; \
-           libsrcdir=".";; \
-         /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/tix"; \
-           libsrcdir="$$s/tix";; \
-         *) \
-           srcdiroption="--srcdir=../$(srcdir)/tix"; \
-           libsrcdir="$$s/tix";; \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/libtermcap/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
+       srcdiroption="--srcdir=$${topdir}/libtermcap"; \
+       libsrcdir="$$s/libtermcap"; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
-@endif tix
+@endif libtermcap
  
-.PHONY: all-tix maybe-all-tix
-maybe-all-tix:
-@if tix
-maybe-all-tix: all-tix
-all-tix: configure-tix
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
-       $(HOST_EXPORTS) \
-       (cd tix && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) all)
-@endif tix
  
-.PHONY: check-tix maybe-check-tix
-maybe-check-tix:
-@if tix
-maybe-check-tix: check-tix
  
-check-tix:
+.PHONY: all-libtermcap maybe-all-libtermcap
+maybe-all-libtermcap:
+@if libtermcap
+TARGET-libtermcap=all
+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 tix && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) check)
+       (cd $(HOST_SUBDIR)/libtermcap && \
+         $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-libtermcap))
+@endif libtermcap
+
+
+.PHONY: check-libtermcap maybe-check-libtermcap
+maybe-check-libtermcap:
+@if libtermcap
+maybe-check-libtermcap: check-libtermcap
+
+check-libtermcap:
  
-@endif tix
+@endif libtermcap
  
-.PHONY: install-tix maybe-install-tix
-maybe-install-tix:
-@if tix
-maybe-install-tix: install-tix
+.PHONY: install-libtermcap maybe-install-libtermcap
+maybe-install-libtermcap:
+@if libtermcap
+maybe-install-libtermcap: install-libtermcap
  
-install-tix: installdirs
+install-libtermcap: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
-       (cd tix && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) install)
+       (cd $(HOST_SUBDIR)/libtermcap && \
+         $(MAKE) $(FLAGS_TO_PASS)  install)
  
-@endif tix
+@endif libtermcap
  
  # Other targets (info, dvi, etc.)
  
-.PHONY: maybe-info-tix info-tix
-maybe-info-tix:
-@if tix
-maybe-info-tix: info-tix
+.PHONY: maybe-info-libtermcap info-libtermcap
+maybe-info-libtermcap:
+@if libtermcap
+maybe-info-libtermcap: info-libtermcap
  
-info-tix: \
-    configure-tix 
-       @[ -f ./tix/Makefile ] || exit 0; \
+info-libtermcap: \
+    configure-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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing info in tix" ; \
-       (cd tix && \
+       echo "Doing info in libtermcap" ; \
+       (cd $(HOST_SUBDIR)/libtermcap && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -21245,25 +22911,24 @@ info-tix: \
                   info) \
           || exit 1
  
-@endif tix
+@endif libtermcap
  
-.PHONY: maybe-dvi-tix dvi-tix
-maybe-dvi-tix:
-@if tix
-maybe-dvi-tix: dvi-tix
+.PHONY: maybe-dvi-libtermcap dvi-libtermcap
+maybe-dvi-libtermcap:
+@if libtermcap
+maybe-dvi-libtermcap: dvi-libtermcap
  
-dvi-tix: \
-    configure-tix 
-       @[ -f ./tix/Makefile ] || exit 0; \
+dvi-libtermcap: \
+    configure-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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing dvi in tix" ; \
-       (cd tix && \
+       echo "Doing dvi in libtermcap" ; \
+       (cd $(HOST_SUBDIR)/libtermcap && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -21271,388 +22936,113 @@ dvi-tix: \
                   dvi) \
           || exit 1
  
-@endif tix
+@endif libtermcap
  
-.PHONY: maybe-TAGS-tix TAGS-tix
-maybe-TAGS-tix:
-@if tix
-maybe-TAGS-tix: TAGS-tix
+.PHONY: maybe-html-libtermcap html-libtermcap
+maybe-html-libtermcap:
+@if libtermcap
+maybe-html-libtermcap: html-libtermcap
  
-TAGS-tix: \
-    configure-tix 
-       @[ -f ./tix/Makefile ] || exit 0; \
+html-libtermcap: \
+    configure-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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing TAGS in tix" ; \
-       (cd tix && \
+       echo "Doing html in libtermcap" ; \
+       (cd $(HOST_SUBDIR)/libtermcap && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                 html) \
           || exit 1
  
-@endif tix
+@endif libtermcap
  
-.PHONY: maybe-install-info-tix install-info-tix
-maybe-install-info-tix:
-@if tix
-maybe-install-info-tix: install-info-tix
+.PHONY: maybe-TAGS-libtermcap TAGS-libtermcap
+maybe-TAGS-libtermcap:
+@if libtermcap
+maybe-TAGS-libtermcap: TAGS-libtermcap
  
-install-info-tix: \
-    configure-tix \
-    info-tix 
-       @[ -f ./tix/Makefile ] || exit 0; \
+TAGS-libtermcap: \
+    configure-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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing install-info in tix" ; \
-       (cd tix && \
+       echo "Doing TAGS in libtermcap" ; \
+       (cd $(HOST_SUBDIR)/libtermcap && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                 TAGS) \
           || exit 1
  
-@endif tix
+@endif libtermcap
  
-.PHONY: maybe-installcheck-tix installcheck-tix
-maybe-installcheck-tix:
-@if tix
-maybe-installcheck-tix: installcheck-tix
+.PHONY: maybe-install-info-libtermcap install-info-libtermcap
+maybe-install-info-libtermcap:
+@if libtermcap
+maybe-install-info-libtermcap: install-info-libtermcap
  
-installcheck-tix: \
-    configure-tix 
-       @[ -f ./tix/Makefile ] || exit 0; \
+install-info-libtermcap: \
+    configure-libtermcap \
+    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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing installcheck in tix" ; \
-       (cd tix && \
+       echo "Doing install-info in libtermcap" ; \
+       (cd $(HOST_SUBDIR)/libtermcap && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                 install-info) \
           || exit 1
  
-@endif tix
+@endif libtermcap
  
-.PHONY: maybe-mostlyclean-tix mostlyclean-tix
-maybe-mostlyclean-tix:
-@if tix
-maybe-mostlyclean-tix: mostlyclean-tix
+.PHONY: maybe-installcheck-libtermcap installcheck-libtermcap
+maybe-installcheck-libtermcap:
+@if libtermcap
+maybe-installcheck-libtermcap: installcheck-libtermcap
  
-mostlyclean-tix: 
-       @[ -f ./tix/Makefile ] || exit 0; \
+installcheck-libtermcap: \
+    configure-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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing mostlyclean in tix" ; \
-       (cd tix && \
+       echo "Doing installcheck in libtermcap" ; \
+       (cd $(HOST_SUBDIR)/libtermcap && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                 installcheck) \
           || exit 1
  
-@endif tix
+@endif libtermcap
  
-.PHONY: maybe-clean-tix clean-tix
-maybe-clean-tix:
-@if tix
-maybe-clean-tix: clean-tix
-
-clean-tix: 
-       @[ -f ./tix/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
-       $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       echo "Doing clean in tix" ; \
-       (cd tix && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-                 "RANLIB=$${RANLIB}" \
-                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
-         || exit 1
-
-@endif tix
-
-.PHONY: maybe-distclean-tix distclean-tix
-maybe-distclean-tix:
-@if tix
-maybe-distclean-tix: distclean-tix
-
-distclean-tix: 
-       @[ -f ./tix/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
-       $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       echo "Doing distclean in tix" ; \
-       (cd tix && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-                 "RANLIB=$${RANLIB}" \
-                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
-         || exit 1
-
-@endif tix
-
-.PHONY: maybe-maintainer-clean-tix maintainer-clean-tix
-maybe-maintainer-clean-tix:
-@if tix
-maybe-maintainer-clean-tix: maintainer-clean-tix
-
-maintainer-clean-tix: 
-       @[ -f ./tix/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
-       $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       echo "Doing maintainer-clean in tix" ; \
-       (cd tix && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-                 "RANLIB=$${RANLIB}" \
-                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
-         || exit 1
-
-@endif tix
-
-
-.PHONY: configure-libtermcap maybe-configure-libtermcap
-maybe-configure-libtermcap:
-@if libtermcap
-maybe-configure-libtermcap: configure-libtermcap
-configure-libtermcap:
-       @test ! -f libtermcap/Makefile || exit 0; \
-       [ -d libtermcap ] || mkdir libtermcap; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       echo Configuring in libtermcap; \
-       cd libtermcap || exit 1; \
-       case $(srcdir) in \
-         \.) \
-           srcdiroption="--srcdir=."; \
-           libsrcdir=".";; \
-         /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/libtermcap"; \
-           libsrcdir="$$s/libtermcap";; \
-         *) \
-           srcdiroption="--srcdir=../$(srcdir)/libtermcap"; \
-           libsrcdir="$$s/libtermcap";; \
-       esac; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
-         || exit 1
-@endif libtermcap
-
-.PHONY: all-libtermcap maybe-all-libtermcap
-maybe-all-libtermcap:
-@if libtermcap
-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 libtermcap && $(MAKE) $(FLAGS_TO_PASS) all)
-@endif libtermcap
-
-.PHONY: check-libtermcap maybe-check-libtermcap
-maybe-check-libtermcap:
-@if libtermcap
-maybe-check-libtermcap: check-libtermcap
-
-check-libtermcap:
-
-@endif libtermcap
-
-.PHONY: install-libtermcap maybe-install-libtermcap
-maybe-install-libtermcap:
-@if libtermcap
-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 libtermcap && $(MAKE) $(FLAGS_TO_PASS) install)
-
-@endif libtermcap
-
-# Other targets (info, dvi, etc.)
-
-.PHONY: maybe-info-libtermcap info-libtermcap
-maybe-info-libtermcap:
-@if libtermcap
-maybe-info-libtermcap: info-libtermcap
-
-info-libtermcap: \
-    configure-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|"`; \
-       done; \
-       echo "Doing info in libtermcap" ; \
-       (cd libtermcap && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-                 "RANLIB=$${RANLIB}" \
-                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
-         || exit 1
-
-@endif libtermcap
-
-.PHONY: maybe-dvi-libtermcap dvi-libtermcap
-maybe-dvi-libtermcap:
-@if libtermcap
-maybe-dvi-libtermcap: dvi-libtermcap
-
-dvi-libtermcap: \
-    configure-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|"`; \
-       done; \
-       echo "Doing dvi in libtermcap" ; \
-       (cd libtermcap && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-                 "RANLIB=$${RANLIB}" \
-                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
-         || exit 1
-
-@endif libtermcap
-
-.PHONY: maybe-TAGS-libtermcap TAGS-libtermcap
-maybe-TAGS-libtermcap:
-@if libtermcap
-maybe-TAGS-libtermcap: TAGS-libtermcap
-
-TAGS-libtermcap: \
-    configure-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|"`; \
-       done; \
-       echo "Doing TAGS in libtermcap" ; \
-       (cd libtermcap && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-                 "RANLIB=$${RANLIB}" \
-                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
-         || exit 1
-
-@endif libtermcap
-
-.PHONY: maybe-install-info-libtermcap install-info-libtermcap
-maybe-install-info-libtermcap:
-@if libtermcap
-maybe-install-info-libtermcap: install-info-libtermcap
-
-install-info-libtermcap: \
-    configure-libtermcap \
-    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|"`; \
-       done; \
-       echo "Doing install-info in libtermcap" ; \
-       (cd libtermcap && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-                 "RANLIB=$${RANLIB}" \
-                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
-         || exit 1
-
-@endif libtermcap
-
-.PHONY: maybe-installcheck-libtermcap installcheck-libtermcap
-maybe-installcheck-libtermcap:
-@if libtermcap
-maybe-installcheck-libtermcap: installcheck-libtermcap
-
-installcheck-libtermcap: \
-    configure-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|"`; \
-       done; \
-       echo "Doing installcheck in libtermcap" ; \
-       (cd libtermcap && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-                 "RANLIB=$${RANLIB}" \
-                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
-         || exit 1
-
-@endif libtermcap
-
-.PHONY: maybe-mostlyclean-libtermcap mostlyclean-libtermcap
-maybe-mostlyclean-libtermcap:
-@if libtermcap
-maybe-mostlyclean-libtermcap: mostlyclean-libtermcap
+.PHONY: maybe-mostlyclean-libtermcap mostlyclean-libtermcap
+maybe-mostlyclean-libtermcap:
+@if libtermcap
+maybe-mostlyclean-libtermcap: mostlyclean-libtermcap
  
  # libtermcap doesn't support mostlyclean.
  mostlyclean-libtermcap:
@@ -21690,46 +23080,47 @@ maintainer-clean-libtermcap:
  @endif libtermcap
  
  
+
  .PHONY: configure-utils maybe-configure-utils
  maybe-configure-utils:
  @if utils
  maybe-configure-utils: configure-utils
-configure-utils:
-       @test ! -f utils/Makefile || exit 0; \
-       [ -d utils ] || mkdir 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 utils || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/utils; \
+       cd "$(HOST_SUBDIR)/utils" || exit 1; \
         case $(srcdir) in \
-         \.) \
-           srcdiroption="--srcdir=."; \
-           libsrcdir=".";; \
-         /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/utils"; \
-           libsrcdir="$$s/utils";; \
-         *) \
-           srcdiroption="--srcdir=../$(srcdir)/utils"; \
-           libsrcdir="$$s/utils";; \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/utils/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
+       srcdiroption="--srcdir=$${topdir}/utils"; \
+       libsrcdir="$$s/utils"; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
  @endif utils
  
+
+
  .PHONY: all-utils maybe-all-utils
  maybe-all-utils:
  @if utils
+TARGET-utils=all
  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 utils && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd $(HOST_SUBDIR)/utils && \
+         $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-utils))
  @endif utils
  
+
  .PHONY: check-utils maybe-check-utils
  maybe-check-utils:
  @if utils
@@ -21747,9 +23138,9 @@ maybe-install-utils: install-utils
  install-utils: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
         $(HOST_EXPORTS) \
-       (cd utils && $(MAKE) $(FLAGS_TO_PASS) install)
+       (cd $(HOST_SUBDIR)/utils && \
+         $(MAKE) $(FLAGS_TO_PASS)  install)
  
  @endif utils
  
@@ -21765,13 +23156,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing info in utils" ; \
-       (cd utils && \
+       (cd $(HOST_SUBDIR)/utils && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -21791,13 +23181,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing dvi in utils" ; \
-       (cd utils && \
+       (cd $(HOST_SUBDIR)/utils && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -21807,6 +23196,31 @@ dvi-utils: \
  
  @endif utils
  
+.PHONY: maybe-html-utils html-utils
+maybe-html-utils:
+@if utils
+maybe-html-utils: html-utils
+
+html-utils: \
+    configure-utils 
+       @[ -f ./utils/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing html in utils" ; \
+       (cd $(HOST_SUBDIR)/utils && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 html) \
+         || exit 1
+
+@endif utils
+
  .PHONY: maybe-TAGS-utils TAGS-utils
  maybe-TAGS-utils:
  @if utils
@@ -21817,13 +23231,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing TAGS in utils" ; \
-       (cd utils && \
+       (cd $(HOST_SUBDIR)/utils && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -21844,13 +23257,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing install-info in utils" ; \
-       (cd utils && \
+       (cd $(HOST_SUBDIR)/utils && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -21870,13 +23282,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing installcheck in utils" ; \
-       (cd utils && \
+       (cd $(HOST_SUBDIR)/utils && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -21895,13 +23306,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing mostlyclean in utils" ; \
-       (cd utils && \
+       (cd $(HOST_SUBDIR)/utils && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -21920,13 +23330,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing clean in utils" ; \
-       (cd utils && \
+       (cd $(HOST_SUBDIR)/utils && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -21945,13 +23354,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing distclean in utils" ; \
-       (cd utils && \
+       (cd $(HOST_SUBDIR)/utils && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -21970,13 +23378,12 @@ 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing maintainer-clean in utils" ; \
-       (cd utils && \
+       (cd $(HOST_SUBDIR)/utils && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -21988,61 +23395,382 @@ maintainer-clean-utils:
  
  
  
-# ---------------------------------------
-# 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.
-$(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
-
-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 ; \
+.PHONY: configure-gnattools maybe-configure-gnattools
+maybe-configure-gnattools:
+@if gnattools
+maybe-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; \
-       $(SET_LIB_PATH) \
-       $(RAW_CXX_TARGET_EXPORTS) \
-       echo Configuring in $(TARGET_SUBDIR)/libstdc++-v3; \
-       cd "$(TARGET_SUBDIR)/libstdc++-v3" || exit 1; \
+       $(HOST_EXPORTS) \
+       echo Configuring in $(HOST_SUBDIR)/gnattools; \
+       cd "$(HOST_SUBDIR)/gnattools" || exit 1; \
         case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) \
-           topdir=$(srcdir) ;; \
-         *) \
-           case "$(TARGET_SUBDIR)" in \
-             .) topdir="../$(srcdir)" ;; \
-             *) topdir="../../$(srcdir)" ;; \
-           esac ;; \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/gnattools/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-         srcdiroption="--srcdir=$${topdir}/libstdc++-v3"; \
-         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)" \
+       srcdiroption="--srcdir=$${topdir}/gnattools"; \
+       libsrcdir="$$s/gnattools"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
-@endif target-libstdc++-v3
+@endif gnattools
  
-.PHONY: all-target-libstdc++-v3 maybe-all-target-libstdc++-v3
-maybe-all-target-libstdc++-v3:
-@if target-libstdc++-v3
-maybe-all-target-libstdc++-v3: all-target-libstdc++-v3
-all-target-libstdc++-v3: configure-target-libstdc++-v3
+
+
+.PHONY: all-gnattools maybe-all-gnattools
+maybe-all-gnattools:
+@if gnattools
+TARGET-gnattools=all
+maybe-all-gnattools: all-gnattools
+all-gnattools: configure-gnattools
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(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
+maybe-check-gnattools: check-gnattools
+
+check-gnattools:
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       (cd $(HOST_SUBDIR)/gnattools && \
+         $(MAKE) $(FLAGS_TO_PASS)  check)
+
+@endif gnattools
+
+.PHONY: install-gnattools maybe-install-gnattools
+maybe-install-gnattools:
+@if gnattools
+maybe-install-gnattools: install-gnattools
+
+install-gnattools: installdirs
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       (cd $(HOST_SUBDIR)/gnattools && \
+         $(MAKE) $(FLAGS_TO_PASS)  install)
+
+@endif gnattools
+
+# Other targets (info, dvi, etc.)
+
+.PHONY: maybe-info-gnattools info-gnattools
+maybe-info-gnattools:
+@if gnattools
+maybe-info-gnattools: info-gnattools
+
+info-gnattools: \
+    configure-gnattools 
+       @[ -f ./gnattools/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing info in gnattools" ; \
+       (cd $(HOST_SUBDIR)/gnattools && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 info) \
+         || exit 1
+
+@endif gnattools
+
+.PHONY: maybe-dvi-gnattools dvi-gnattools
+maybe-dvi-gnattools:
+@if gnattools
+maybe-dvi-gnattools: dvi-gnattools
+
+dvi-gnattools: \
+    configure-gnattools 
+       @[ -f ./gnattools/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing dvi in gnattools" ; \
+       (cd $(HOST_SUBDIR)/gnattools && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 dvi) \
+         || exit 1
+
+@endif gnattools
+
+.PHONY: maybe-html-gnattools html-gnattools
+maybe-html-gnattools:
+@if gnattools
+maybe-html-gnattools: html-gnattools
+
+html-gnattools: \
+    configure-gnattools 
+       @[ -f ./gnattools/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing html in gnattools" ; \
+       (cd $(HOST_SUBDIR)/gnattools && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 html) \
+         || exit 1
+
+@endif gnattools
+
+.PHONY: maybe-TAGS-gnattools TAGS-gnattools
+maybe-TAGS-gnattools:
+@if gnattools
+maybe-TAGS-gnattools: TAGS-gnattools
+
+TAGS-gnattools: \
+    configure-gnattools 
+       @[ -f ./gnattools/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing TAGS in gnattools" ; \
+       (cd $(HOST_SUBDIR)/gnattools && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 TAGS) \
+         || exit 1
+
+@endif gnattools
+
+.PHONY: maybe-install-info-gnattools install-info-gnattools
+maybe-install-info-gnattools:
+@if gnattools
+maybe-install-info-gnattools: install-info-gnattools
+
+install-info-gnattools: \
+    configure-gnattools \
+    info-gnattools 
+       @[ -f ./gnattools/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing install-info in gnattools" ; \
+       (cd $(HOST_SUBDIR)/gnattools && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 install-info) \
+         || exit 1
+
+@endif gnattools
+
+.PHONY: maybe-installcheck-gnattools installcheck-gnattools
+maybe-installcheck-gnattools:
+@if gnattools
+maybe-installcheck-gnattools: installcheck-gnattools
+
+installcheck-gnattools: \
+    configure-gnattools 
+       @[ -f ./gnattools/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing installcheck in gnattools" ; \
+       (cd $(HOST_SUBDIR)/gnattools && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 installcheck) \
+         || exit 1
+
+@endif gnattools
+
+.PHONY: maybe-mostlyclean-gnattools mostlyclean-gnattools
+maybe-mostlyclean-gnattools:
+@if gnattools
+maybe-mostlyclean-gnattools: mostlyclean-gnattools
+
+mostlyclean-gnattools: 
+       @[ -f ./gnattools/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing mostlyclean in gnattools" ; \
+       (cd $(HOST_SUBDIR)/gnattools && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 mostlyclean) \
+         || exit 1
+
+@endif gnattools
+
+.PHONY: maybe-clean-gnattools clean-gnattools
+maybe-clean-gnattools:
+@if gnattools
+maybe-clean-gnattools: clean-gnattools
+
+clean-gnattools: 
+       @[ -f ./gnattools/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing clean in gnattools" ; \
+       (cd $(HOST_SUBDIR)/gnattools && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 clean) \
+         || exit 1
+
+@endif gnattools
+
+.PHONY: maybe-distclean-gnattools distclean-gnattools
+maybe-distclean-gnattools:
+@if gnattools
+maybe-distclean-gnattools: distclean-gnattools
+
+distclean-gnattools: 
+       @[ -f ./gnattools/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing distclean in gnattools" ; \
+       (cd $(HOST_SUBDIR)/gnattools && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 distclean) \
+         || exit 1
+
+@endif gnattools
+
+.PHONY: maybe-maintainer-clean-gnattools maintainer-clean-gnattools
+maybe-maintainer-clean-gnattools:
+@if gnattools
+maybe-maintainer-clean-gnattools: maintainer-clean-gnattools
+
+maintainer-clean-gnattools: 
+       @[ -f ./gnattools/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing maintainer-clean in gnattools" ; \
+       (cd $(HOST_SUBDIR)/gnattools && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 maintainer-clean) \
+         || exit 1
+
+@endif gnattools
+
+
+
+# ---------------------------------------
+# Modules which run on the target machine
+# ---------------------------------------
+
+
+# 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; \
+       $(RAW_CXX_TARGET_EXPORTS) \
+       echo Configuring in $(TARGET_SUBDIR)/libstdc++-v3; \
+       cd "$(TARGET_SUBDIR)/libstdc++-v3" || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(TARGET_SUBDIR)/libstdc++-v3/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/libstdc++-v3"; \
+       libsrcdir="$$s/libstdc++-v3"; \
+       rm -f no-such-file || : ; \
+       CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+         $(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
+TARGET-target-libstdc++-v3=all
+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)'  all)
+         $(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
@@ -22051,10 +23779,9 @@ 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)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   check)
  
  @endif target-libstdc++-v3
  
@@ -22066,10 +23793,9 @@ 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)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
  
  @endif target-libstdc++-v3
  
@@ -22085,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 \
@@ -22096,7 +23821,7 @@ info-target-libstdc++-v3: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
           || exit 1
  
  @endif target-libstdc++-v3
@@ -22111,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 \
@@ -22122,7 +23846,32 @@ dvi-target-libstdc++-v3: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  dvi) \
+         || exit 1
+
+@endif target-libstdc++-v3
+
+.PHONY: maybe-html-target-libstdc++-v3 html-target-libstdc++-v3
+maybe-html-target-libstdc++-v3:
+@if target-libstdc++-v3
+maybe-html-target-libstdc++-v3: html-target-libstdc++-v3
+
+html-target-libstdc++-v3: \
+    configure-target-libstdc++-v3 
+       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(RAW_CXX_TARGET_EXPORTS) \
+       echo "Doing html in $(TARGET_SUBDIR)/libstdc++-v3" ; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                  html) \
           || exit 1
  
  @endif target-libstdc++-v3
@@ -22137,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 \
@@ -22148,7 +23896,7 @@ TAGS-target-libstdc++-v3: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  TAGS) \
           || exit 1
  
  @endif target-libstdc++-v3
@@ -22164,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 \
@@ -22175,7 +23922,7 @@ install-info-target-libstdc++-v3: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  install-info) \
           || exit 1
  
  @endif target-libstdc++-v3
@@ -22190,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 \
@@ -22201,7 +23947,7 @@ installcheck-target-libstdc++-v3: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
           || exit 1
  
  @endif target-libstdc++-v3
@@ -22215,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 \
@@ -22226,7 +23971,7 @@ mostlyclean-target-libstdc++-v3:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  mostlyclean) \
           || exit 1
  
  @endif target-libstdc++-v3
@@ -22240,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 \
@@ -22251,7 +23995,7 @@ clean-target-libstdc++-v3:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  clean) \
           || exit 1
  
  @endif target-libstdc++-v3
@@ -22265,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 \
@@ -22276,7 +24019,7 @@ distclean-target-libstdc++-v3:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  distclean) \
           || exit 1
  
  @endif target-libstdc++-v3
@@ -22290,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 \
@@ -22301,63 +24043,65 @@ maintainer-clean-target-libstdc++-v3:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  maintainer-clean) \
           || exit 1
  
  @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; \
         case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) \
-           topdir=$(srcdir) ;; \
-         *) \
-           case "$(TARGET_SUBDIR)" in \
-             .) topdir="../$(srcdir)" ;; \
-             *) topdir="../../$(srcdir)" ;; \
-           esac ;; \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(TARGET_SUBDIR)/libmudflap/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-         srcdiroption="--srcdir=$${topdir}/libmudflap"; \
-         libsrcdir="$$s/libmudflap"; \
+       srcdiroption="--srcdir=$${topdir}/libmudflap"; \
+       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
+TARGET-target-libmudflap=all
  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)  all)
+         $(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
@@ -22366,10 +24110,9 @@ 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)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
  
  @endif target-libmudflap
  
@@ -22381,10 +24124,9 @@ 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)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
  
  @endif target-libmudflap
  
@@ -22400,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 \
@@ -22411,7 +24152,7 @@ info-target-libmudflap: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
           || exit 1
  
  @endif target-libmudflap
@@ -22426,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 \
@@ -22437,24 +24177,23 @@ dvi-target-libmudflap: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  dvi) \
           || exit 1
  
  @endif target-libmudflap
  
-.PHONY: maybe-TAGS-target-libmudflap TAGS-target-libmudflap
-maybe-TAGS-target-libmudflap:
+.PHONY: maybe-html-target-libmudflap html-target-libmudflap
+maybe-html-target-libmudflap:
  @if target-libmudflap
-maybe-TAGS-target-libmudflap: TAGS-target-libmudflap
+maybe-html-target-libmudflap: html-target-libmudflap
  
-TAGS-target-libmudflap: \
+html-target-libmudflap: \
      configure-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" ; \
+       echo "Doing html in $(TARGET_SUBDIR)/libmudflap" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
@@ -22463,7 +24202,32 @@ TAGS-target-libmudflap: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  html) \
+         || exit 1
+
+@endif target-libmudflap
+
+.PHONY: maybe-TAGS-target-libmudflap TAGS-target-libmudflap
+maybe-TAGS-target-libmudflap:
+@if target-libmudflap
+maybe-TAGS-target-libmudflap: TAGS-target-libmudflap
+
+TAGS-target-libmudflap: \
+    configure-target-libmudflap 
+       @[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(NORMAL_TARGET_EXPORTS) \
+       echo "Doing TAGS in $(TARGET_SUBDIR)/libmudflap" ; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/libmudflap && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                  TAGS) \
           || exit 1
  
  @endif target-libmudflap
@@ -22479,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 \
@@ -22490,7 +24253,7 @@ install-info-target-libmudflap: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  install-info) \
           || exit 1
  
  @endif target-libmudflap
@@ -22505,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 \
@@ -22516,7 +24278,7 @@ installcheck-target-libmudflap: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
           || exit 1
  
  @endif target-libmudflap
@@ -22530,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 \
@@ -22541,7 +24302,7 @@ mostlyclean-target-libmudflap:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  mostlyclean) \
           || exit 1
  
  @endif target-libmudflap
@@ -22555,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 \
@@ -22566,7 +24326,7 @@ clean-target-libmudflap:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  clean) \
           || exit 1
  
  @endif target-libmudflap
@@ -22580,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 \
@@ -22591,7 +24350,7 @@ distclean-target-libmudflap:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  distclean) \
           || exit 1
  
  @endif target-libmudflap
@@ -22605,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 \
@@ -22616,63 +24374,65 @@ maintainer-clean-target-libmudflap:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  maintainer-clean) \
           || exit 1
  
  @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; \
         case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) \
-           topdir=$(srcdir) ;; \
-         *) \
-           case "$(TARGET_SUBDIR)" in \
-             .) topdir="../$(srcdir)" ;; \
-             *) topdir="../../$(srcdir)" ;; \
-           esac ;; \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(TARGET_SUBDIR)/newlib/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-         srcdiroption="--srcdir=$${topdir}/newlib"; \
-         libsrcdir="$$s/newlib"; \
+       srcdiroption="--srcdir=$${topdir}/newlib"; \
+       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
+TARGET-target-newlib=all
  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)  all)
+         $(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
@@ -22681,10 +24441,9 @@ 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)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
  
  @endif target-newlib
  
@@ -22696,10 +24455,9 @@ 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)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
  
  @endif target-newlib
  
@@ -22715,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 \
@@ -22726,7 +24483,7 @@ info-target-newlib: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
           || exit 1
  
  @endif target-newlib
@@ -22741,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 \
@@ -22752,7 +24508,32 @@ dvi-target-newlib: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  dvi) \
+         || exit 1
+
+@endif target-newlib
+
+.PHONY: maybe-html-target-newlib html-target-newlib
+maybe-html-target-newlib:
+@if target-newlib
+maybe-html-target-newlib: html-target-newlib
+
+html-target-newlib: \
+    configure-target-newlib 
+       @[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(NORMAL_TARGET_EXPORTS) \
+       echo "Doing html in $(TARGET_SUBDIR)/newlib" ; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/newlib && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                  html) \
           || exit 1
  
  @endif target-newlib
@@ -22767,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 \
@@ -22778,7 +24558,7 @@ TAGS-target-newlib: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  TAGS) \
           || exit 1
  
  @endif target-newlib
@@ -22794,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 \
@@ -22805,7 +24584,7 @@ install-info-target-newlib: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  install-info) \
           || exit 1
  
  @endif target-newlib
@@ -22820,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 \
@@ -22831,7 +24609,7 @@ installcheck-target-newlib: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
           || exit 1
  
  @endif target-newlib
@@ -22845,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 \
@@ -22856,7 +24633,7 @@ mostlyclean-target-newlib:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  mostlyclean) \
           || exit 1
  
  @endif target-newlib
@@ -22870,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 \
@@ -22881,7 +24657,7 @@ clean-target-newlib:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  clean) \
           || exit 1
  
  @endif target-newlib
@@ -22895,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 \
@@ -22906,7 +24681,7 @@ distclean-target-newlib:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  distclean) \
           || exit 1
  
  @endif target-newlib
@@ -22920,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 \
@@ -22931,63 +24705,65 @@ maintainer-clean-target-newlib:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  maintainer-clean) \
           || exit 1
  
  @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; \
         case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) \
-           topdir=$(srcdir) ;; \
-         *) \
-           case "$(TARGET_SUBDIR)" in \
-             .) topdir="../$(srcdir)" ;; \
-             *) topdir="../../$(srcdir)" ;; \
-           esac ;; \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(TARGET_SUBDIR)/libgfortran/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-         srcdiroption="--srcdir=$${topdir}/libgfortran"; \
-         libsrcdir="$$s/libgfortran"; \
+       srcdiroption="--srcdir=$${topdir}/libgfortran"; \
+       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
+TARGET-target-libgfortran=all
  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)  all)
+         $(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
@@ -22996,10 +24772,9 @@ 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)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
  
  @endif target-libgfortran
  
@@ -23011,10 +24786,9 @@ 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)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
  
  @endif target-libgfortran
  
@@ -23030,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 \
@@ -23041,7 +24814,7 @@ info-target-libgfortran: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
           || exit 1
  
  @endif target-libgfortran
@@ -23056,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 \
@@ -23067,7 +24839,32 @@ dvi-target-libgfortran: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  dvi) \
+         || exit 1
+
+@endif target-libgfortran
+
+.PHONY: maybe-html-target-libgfortran html-target-libgfortran
+maybe-html-target-libgfortran:
+@if target-libgfortran
+maybe-html-target-libgfortran: html-target-libgfortran
+
+html-target-libgfortran: \
+    configure-target-libgfortran 
+       @[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(NORMAL_TARGET_EXPORTS) \
+       echo "Doing html in $(TARGET_SUBDIR)/libgfortran" ; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/libgfortran && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                  html) \
           || exit 1
  
  @endif target-libgfortran
@@ -23082,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 \
@@ -23093,7 +24889,7 @@ TAGS-target-libgfortran: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  TAGS) \
           || exit 1
  
  @endif target-libgfortran
@@ -23109,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 \
@@ -23120,7 +24915,7 @@ install-info-target-libgfortran: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  install-info) \
           || exit 1
  
  @endif target-libgfortran
@@ -23135,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 \
@@ -23146,7 +24940,7 @@ installcheck-target-libgfortran: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
           || exit 1
  
  @endif target-libgfortran
@@ -23160,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 \
@@ -23171,7 +24964,7 @@ mostlyclean-target-libgfortran:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  mostlyclean) \
           || exit 1
  
  @endif target-libgfortran
@@ -23185,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 \
@@ -23196,7 +24988,7 @@ clean-target-libgfortran:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  clean) \
           || exit 1
  
  @endif target-libgfortran
@@ -23210,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 \
@@ -23221,7 +25012,7 @@ distclean-target-libgfortran:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  distclean) \
           || exit 1
  
  @endif target-libgfortran
@@ -23235,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 \
@@ -23246,63 +25036,65 @@ maintainer-clean-target-libgfortran:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  maintainer-clean) \
           || exit 1
  
  @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; \
         case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) \
-           topdir=$(srcdir) ;; \
-         *) \
-           case "$(TARGET_SUBDIR)" in \
-             .) topdir="../$(srcdir)" ;; \
-             *) topdir="../../$(srcdir)" ;; \
-           esac ;; \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(TARGET_SUBDIR)/libobjc/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-         srcdiroption="--srcdir=$${topdir}/libobjc"; \
-         libsrcdir="$$s/libobjc"; \
+       srcdiroption="--srcdir=$${topdir}/libobjc"; \
+       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
+TARGET-target-libobjc=all
  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)  all)
+         $(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
@@ -23311,10 +25103,9 @@ 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)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
  
  @endif target-libobjc
  
@@ -23326,10 +25117,9 @@ 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)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
  
  @endif target-libobjc
  
@@ -23345,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 \
@@ -23356,7 +25145,7 @@ info-target-libobjc: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
           || exit 1
  
  @endif target-libobjc
@@ -23371,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 \
@@ -23382,7 +25170,32 @@ dvi-target-libobjc: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  dvi) \
+         || exit 1
+
+@endif target-libobjc
+
+.PHONY: maybe-html-target-libobjc html-target-libobjc
+maybe-html-target-libobjc:
+@if target-libobjc
+maybe-html-target-libobjc: html-target-libobjc
+
+html-target-libobjc: \
+    configure-target-libobjc 
+       @[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(NORMAL_TARGET_EXPORTS) \
+       echo "Doing html in $(TARGET_SUBDIR)/libobjc" ; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/libobjc && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                  html) \
           || exit 1
  
  @endif target-libobjc
@@ -23397,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 \
@@ -23408,7 +25220,7 @@ TAGS-target-libobjc: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  TAGS) \
           || exit 1
  
  @endif target-libobjc
@@ -23424,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 \
@@ -23435,7 +25246,7 @@ install-info-target-libobjc: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  install-info) \
           || exit 1
  
  @endif target-libobjc
@@ -23450,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 \
@@ -23461,7 +25271,7 @@ installcheck-target-libobjc: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
           || exit 1
  
  @endif target-libobjc
@@ -23475,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 \
@@ -23486,7 +25295,7 @@ mostlyclean-target-libobjc:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  mostlyclean) \
           || exit 1
  
  @endif target-libobjc
@@ -23500,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 \
@@ -23511,7 +25319,7 @@ clean-target-libobjc:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  clean) \
           || exit 1
  
  @endif target-libobjc
@@ -23525,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 \
@@ -23536,7 +25343,7 @@ distclean-target-libobjc:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  distclean) \
           || exit 1
  
  @endif target-libobjc
@@ -23550,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 \
@@ -23561,85 +25367,65 @@ maintainer-clean-target-libobjc:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  maintainer-clean) \
           || exit 1
  
  @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; \
         case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) \
-           topdir=$(srcdir) ;; \
-         *) \
-           case "$(TARGET_SUBDIR)" in \
-             .) topdir="../$(srcdir)" ;; \
-             *) topdir="../../$(srcdir)" ;; \
-           esac ;; \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(TARGET_SUBDIR)/libtermcap/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       if [ "$(srcdir)" = "." ] ; then \
-         if [ "$(TARGET_SUBDIR)" != "." ] ; then \
-           if $(SHELL) $$s/symlink-tree $${topdir}/libtermcap "no-such-file" ; then \
-             if [ -f Makefile ]; then \
-               if $(MAKE) distclean; then \
-                 true; \
-               else \
-                 exit 1; \
-               fi; \
-             else \
-               true; \
-             fi; \
-           else \
-             exit 1; \
-           fi; \
-         else \
-           true; \
-         fi; \
-         srcdiroption="--srcdir=."; \
-         libsrcdir="."; \
-       else \
-         srcdiroption="--srcdir=$${topdir}/libtermcap"; \
-         libsrcdir="$$s/libtermcap"; \
-       fi; \
+       srcdiroption="--srcdir=$${topdir}/libtermcap"; \
+       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
+TARGET-target-libtermcap=all
  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)  all)
+         $(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
@@ -23658,10 +25444,9 @@ 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)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
  
  @endif target-libtermcap
  
@@ -23677,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 \
@@ -23688,7 +25472,7 @@ info-target-libtermcap: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
           || exit 1
  
  @endif target-libtermcap
@@ -23703,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 \
@@ -23714,7 +25497,32 @@ dvi-target-libtermcap: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  dvi) \
+         || exit 1
+
+@endif target-libtermcap
+
+.PHONY: maybe-html-target-libtermcap html-target-libtermcap
+maybe-html-target-libtermcap:
+@if target-libtermcap
+maybe-html-target-libtermcap: html-target-libtermcap
+
+html-target-libtermcap: \
+    configure-target-libtermcap 
+       @[ -f $(TARGET_SUBDIR)/libtermcap/Makefile ] || exit 0 ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(NORMAL_TARGET_EXPORTS) \
+       echo "Doing html in $(TARGET_SUBDIR)/libtermcap" ; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/libtermcap && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                  html) \
           || exit 1
  
  @endif target-libtermcap
@@ -23729,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 \
@@ -23740,7 +25547,7 @@ TAGS-target-libtermcap: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  TAGS) \
           || exit 1
  
  @endif target-libtermcap
@@ -23756,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 \
@@ -23767,7 +25573,7 @@ install-info-target-libtermcap: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  install-info) \
           || exit 1
  
  @endif target-libtermcap
@@ -23782,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 \
@@ -23793,7 +25598,7 @@ installcheck-target-libtermcap: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
           || exit 1
  
  @endif target-libtermcap
@@ -23839,57 +25644,59 @@ 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; \
         case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) \
-           topdir=$(srcdir) ;; \
-         *) \
-           case "$(TARGET_SUBDIR)" in \
-             .) topdir="../$(srcdir)" ;; \
-             *) topdir="../../$(srcdir)" ;; \
-           esac ;; \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(TARGET_SUBDIR)/winsup/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-         srcdiroption="--srcdir=$${topdir}/winsup"; \
-         libsrcdir="$$s/winsup"; \
+       srcdiroption="--srcdir=$${topdir}/winsup"; \
+       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
+TARGET-target-winsup=all
  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)  all)
+         $(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
@@ -23898,10 +25705,9 @@ 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)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
  
  @endif target-winsup
  
@@ -23913,10 +25719,9 @@ 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)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
  
  @endif target-winsup
  
@@ -23932,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 \
@@ -23943,7 +25747,7 @@ info-target-winsup: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
           || exit 1
  
  @endif target-winsup
@@ -23958,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 \
@@ -23969,7 +25772,32 @@ dvi-target-winsup: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  dvi) \
+         || exit 1
+
+@endif target-winsup
+
+.PHONY: maybe-html-target-winsup html-target-winsup
+maybe-html-target-winsup:
+@if target-winsup
+maybe-html-target-winsup: html-target-winsup
+
+html-target-winsup: \
+    configure-target-winsup 
+       @[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(NORMAL_TARGET_EXPORTS) \
+       echo "Doing html in $(TARGET_SUBDIR)/winsup" ; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/winsup && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                  html) \
           || exit 1
  
  @endif target-winsup
@@ -23984,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 \
@@ -23995,7 +25822,7 @@ TAGS-target-winsup: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  TAGS) \
           || exit 1
  
  @endif target-winsup
@@ -24011,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 \
@@ -24022,7 +25848,7 @@ install-info-target-winsup: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  install-info) \
           || exit 1
  
  @endif target-winsup
@@ -24037,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 \
@@ -24048,7 +25873,7 @@ installcheck-target-winsup: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
           || exit 1
  
  @endif target-winsup
@@ -24062,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 \
@@ -24073,7 +25897,7 @@ mostlyclean-target-winsup:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  mostlyclean) \
           || exit 1
  
  @endif target-winsup
@@ -24087,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 \
@@ -24098,7 +25921,7 @@ clean-target-winsup:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  clean) \
           || exit 1
  
  @endif target-winsup
@@ -24112,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 \
@@ -24123,7 +25945,7 @@ distclean-target-winsup:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  distclean) \
           || exit 1
  
  @endif target-winsup
@@ -24137,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 \
@@ -24148,63 +25969,65 @@ maintainer-clean-target-winsup:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  maintainer-clean) \
           || exit 1
  
  @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
  
-configure-target-libgloss: $(TARGET_SUBDIR)/libgloss/multilib.out
+
+
+.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; \
         case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) \
-           topdir=$(srcdir) ;; \
-         *) \
-           case "$(TARGET_SUBDIR)" in \
-             .) topdir="../$(srcdir)" ;; \
-             *) topdir="../../$(srcdir)" ;; \
-           esac ;; \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(TARGET_SUBDIR)/libgloss/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-         srcdiroption="--srcdir=$${topdir}/libgloss"; \
-         libsrcdir="$$s/libgloss"; \
+       srcdiroption="--srcdir=$${topdir}/libgloss"; \
+       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
+TARGET-target-libgloss=all
  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)  all)
+         $(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
@@ -24223,10 +26046,9 @@ 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)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
  
  @endif target-libgloss
  
@@ -24242,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 \
@@ -24253,7 +26074,7 @@ info-target-libgloss: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
           || exit 1
  
  @endif target-libgloss
@@ -24268,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 \
@@ -24279,7 +26099,32 @@ dvi-target-libgloss: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  dvi) \
+         || exit 1
+
+@endif target-libgloss
+
+.PHONY: maybe-html-target-libgloss html-target-libgloss
+maybe-html-target-libgloss:
+@if target-libgloss
+maybe-html-target-libgloss: html-target-libgloss
+
+html-target-libgloss: \
+    configure-target-libgloss 
+       @[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(NORMAL_TARGET_EXPORTS) \
+       echo "Doing html in $(TARGET_SUBDIR)/libgloss" ; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/libgloss && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                  html) \
           || exit 1
  
  @endif target-libgloss
@@ -24294,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 \
@@ -24305,7 +26149,7 @@ TAGS-target-libgloss: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  TAGS) \
           || exit 1
  
  @endif target-libgloss
@@ -24321,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 \
@@ -24332,7 +26175,7 @@ install-info-target-libgloss: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  install-info) \
           || exit 1
  
  @endif target-libgloss
@@ -24347,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 \
@@ -24358,7 +26200,7 @@ installcheck-target-libgloss: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
           || exit 1
  
  @endif target-libgloss
@@ -24372,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 \
@@ -24383,7 +26224,7 @@ mostlyclean-target-libgloss:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  mostlyclean) \
           || exit 1
  
  @endif target-libgloss
@@ -24397,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 \
@@ -24408,7 +26248,7 @@ clean-target-libgloss:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  clean) \
           || exit 1
  
  @endif target-libgloss
@@ -24422,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 \
@@ -24433,7 +26272,7 @@ distclean-target-libgloss:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  distclean) \
           || exit 1
  
  @endif target-libgloss
@@ -24447,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 \
@@ -24458,63 +26296,65 @@ maintainer-clean-target-libgloss:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  maintainer-clean) \
           || exit 1
  
  @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; \
         case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) \
-           topdir=$(srcdir) ;; \
-         *) \
-           case "$(TARGET_SUBDIR)" in \
-             .) topdir="../$(srcdir)" ;; \
-             *) topdir="../../$(srcdir)" ;; \
-           esac ;; \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(TARGET_SUBDIR)/libiberty/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-         srcdiroption="--srcdir=$${topdir}/libiberty"; \
-         libsrcdir="$$s/libiberty"; \
+       srcdiroption="--srcdir=$${topdir}/libiberty"; \
+       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
+TARGET-target-libiberty=all
  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)  all)
+         $(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
@@ -24523,10 +26363,9 @@ 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)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
  
  @endif target-libiberty
  
@@ -24538,10 +26377,9 @@ 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)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
  
  @endif target-libiberty
  
@@ -24557,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 \
@@ -24568,7 +26405,7 @@ info-target-libiberty: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
           || exit 1
  
  @endif target-libiberty
@@ -24583,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 \
@@ -24594,7 +26430,32 @@ dvi-target-libiberty: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  dvi) \
+         || exit 1
+
+@endif target-libiberty
+
+.PHONY: maybe-html-target-libiberty html-target-libiberty
+maybe-html-target-libiberty:
+@if target-libiberty
+maybe-html-target-libiberty: html-target-libiberty
+
+html-target-libiberty: \
+    configure-target-libiberty 
+       @[ -f $(TARGET_SUBDIR)/libiberty/Makefile ] || exit 0 ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(NORMAL_TARGET_EXPORTS) \
+       echo "Doing html in $(TARGET_SUBDIR)/libiberty" ; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/libiberty && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                  html) \
           || exit 1
  
  @endif target-libiberty
@@ -24609,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 \
@@ -24620,7 +26480,7 @@ TAGS-target-libiberty: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  TAGS) \
           || exit 1
  
  @endif target-libiberty
@@ -24636,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 \
@@ -24647,7 +26506,7 @@ install-info-target-libiberty: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  install-info) \
           || exit 1
  
  @endif target-libiberty
@@ -24662,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 \
@@ -24673,7 +26531,7 @@ installcheck-target-libiberty: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
           || exit 1
  
  @endif target-libiberty
@@ -24687,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 \
@@ -24698,7 +26555,7 @@ mostlyclean-target-libiberty:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  mostlyclean) \
           || exit 1
  
  @endif target-libiberty
@@ -24712,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 \
@@ -24723,7 +26579,7 @@ clean-target-libiberty:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  clean) \
           || exit 1
  
  @endif target-libiberty
@@ -24737,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 \
@@ -24748,7 +26603,7 @@ distclean-target-libiberty:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  distclean) \
           || exit 1
  
  @endif target-libiberty
@@ -24762,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 \
@@ -24773,63 +26627,65 @@ maintainer-clean-target-libiberty:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  maintainer-clean) \
           || exit 1
  
  @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; \
         case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) \
-           topdir=$(srcdir) ;; \
-         *) \
-           case "$(TARGET_SUBDIR)" in \
-             .) topdir="../$(srcdir)" ;; \
-             *) topdir="../../$(srcdir)" ;; \
-           esac ;; \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(TARGET_SUBDIR)/gperf/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-         srcdiroption="--srcdir=$${topdir}/gperf"; \
-         libsrcdir="$$s/gperf"; \
+       srcdiroption="--srcdir=$${topdir}/gperf"; \
+       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
+TARGET-target-gperf=all
  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)  all)
+         $(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
@@ -24838,10 +26694,9 @@ 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)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
  
  @endif target-gperf
  
@@ -24853,10 +26708,9 @@ 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)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
  
  @endif target-gperf
  
@@ -24872,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 \
@@ -24883,7 +26736,7 @@ info-target-gperf: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
           || exit 1
  
  @endif target-gperf
@@ -24898,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 \
@@ -24909,7 +26761,32 @@ dvi-target-gperf: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  dvi) \
+         || exit 1
+
+@endif target-gperf
+
+.PHONY: maybe-html-target-gperf html-target-gperf
+maybe-html-target-gperf:
+@if target-gperf
+maybe-html-target-gperf: html-target-gperf
+
+html-target-gperf: \
+    configure-target-gperf 
+       @[ -f $(TARGET_SUBDIR)/gperf/Makefile ] || exit 0 ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(NORMAL_TARGET_EXPORTS) \
+       echo "Doing html in $(TARGET_SUBDIR)/gperf" ; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/gperf && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                  html) \
           || exit 1
  
  @endif target-gperf
@@ -24924,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 \
@@ -24935,7 +26811,7 @@ TAGS-target-gperf: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  TAGS) \
           || exit 1
  
  @endif target-gperf
@@ -24951,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 \
@@ -24962,7 +26837,7 @@ install-info-target-gperf: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  install-info) \
           || exit 1
  
  @endif target-gperf
@@ -24977,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 \
@@ -24988,7 +26862,7 @@ installcheck-target-gperf: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
           || exit 1
  
  @endif target-gperf
@@ -25002,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 \
@@ -25013,7 +26886,7 @@ mostlyclean-target-gperf:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  mostlyclean) \
           || exit 1
  
  @endif target-gperf
@@ -25027,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 \
@@ -25038,7 +26910,7 @@ clean-target-gperf:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  clean) \
           || exit 1
  
  @endif target-gperf
@@ -25052,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 \
@@ -25063,7 +26934,7 @@ distclean-target-gperf:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  distclean) \
           || exit 1
  
  @endif target-gperf
@@ -25077,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 \
@@ -25088,63 +26958,65 @@ maintainer-clean-target-gperf:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  maintainer-clean) \
           || exit 1
  
  @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; \
         case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) \
-           topdir=$(srcdir) ;; \
-         *) \
-           case "$(TARGET_SUBDIR)" in \
-             .) topdir="../$(srcdir)" ;; \
-             *) topdir="../../$(srcdir)" ;; \
-           esac ;; \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(TARGET_SUBDIR)/examples/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-         srcdiroption="--srcdir=$${topdir}/examples"; \
-         libsrcdir="$$s/examples"; \
+       srcdiroption="--srcdir=$${topdir}/examples"; \
+       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
+TARGET-target-examples=all
  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)  all)
+         $(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
@@ -25177,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 \
@@ -25188,7 +27059,7 @@ info-target-examples: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
           || exit 1
  
  @endif target-examples
@@ -25203,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 \
@@ -25214,7 +27084,32 @@ dvi-target-examples: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  dvi) \
+         || exit 1
+
+@endif target-examples
+
+.PHONY: maybe-html-target-examples html-target-examples
+maybe-html-target-examples:
+@if target-examples
+maybe-html-target-examples: html-target-examples
+
+html-target-examples: \
+    configure-target-examples 
+       @[ -f $(TARGET_SUBDIR)/examples/Makefile ] || exit 0 ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(NORMAL_TARGET_EXPORTS) \
+       echo "Doing html in $(TARGET_SUBDIR)/examples" ; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/examples && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                  html) \
           || exit 1
  
  @endif target-examples
@@ -25229,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 \
@@ -25240,7 +27134,7 @@ TAGS-target-examples: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  TAGS) \
           || exit 1
  
  @endif target-examples
@@ -25256,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 \
@@ -25267,7 +27160,7 @@ install-info-target-examples: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  install-info) \
           || exit 1
  
  @endif target-examples
@@ -25282,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 \
@@ -25293,7 +27185,7 @@ installcheck-target-examples: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
           || exit 1
  
  @endif target-examples
@@ -25307,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 \
@@ -25318,7 +27209,7 @@ mostlyclean-target-examples:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  mostlyclean) \
           || exit 1
  
  @endif target-examples
@@ -25332,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 \
@@ -25343,7 +27233,7 @@ clean-target-examples:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  clean) \
           || exit 1
  
  @endif target-examples
@@ -25357,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 \
@@ -25368,7 +27257,7 @@ distclean-target-examples:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  distclean) \
           || exit 1
  
  @endif target-examples
@@ -25382,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 \
@@ -25393,63 +27281,65 @@ maintainer-clean-target-examples:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  maintainer-clean) \
           || exit 1
  
  @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; \
         case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) \
-           topdir=$(srcdir) ;; \
-         *) \
-           case "$(TARGET_SUBDIR)" in \
-             .) topdir="../$(srcdir)" ;; \
-             *) topdir="../../$(srcdir)" ;; \
-           esac ;; \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(TARGET_SUBDIR)/libffi/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-         srcdiroption="--srcdir=$${topdir}/libffi"; \
-         libsrcdir="$$s/libffi"; \
+       srcdiroption="--srcdir=$${topdir}/libffi"; \
+       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
+TARGET-target-libffi=all
  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)  all)
+         $(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
@@ -25458,10 +27348,9 @@ 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)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
  
  @endif target-libffi
  
@@ -25473,10 +27362,9 @@ 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)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
  
  @endif target-libffi
  
@@ -25492,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 \
@@ -25503,7 +27390,7 @@ info-target-libffi: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
           || exit 1
  
  @endif target-libffi
@@ -25518,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 \
@@ -25529,7 +27415,32 @@ dvi-target-libffi: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  dvi) \
+         || exit 1
+
+@endif target-libffi
+
+.PHONY: maybe-html-target-libffi html-target-libffi
+maybe-html-target-libffi:
+@if target-libffi
+maybe-html-target-libffi: html-target-libffi
+
+html-target-libffi: \
+    configure-target-libffi 
+       @[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(NORMAL_TARGET_EXPORTS) \
+       echo "Doing html in $(TARGET_SUBDIR)/libffi" ; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/libffi && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                  html) \
           || exit 1
  
  @endif target-libffi
@@ -25544,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 \
@@ -25555,7 +27465,7 @@ TAGS-target-libffi: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  TAGS) \
           || exit 1
  
  @endif target-libffi
@@ -25571,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 \
@@ -25582,7 +27491,7 @@ install-info-target-libffi: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  install-info) \
           || exit 1
  
  @endif target-libffi
@@ -25597,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 \
@@ -25608,7 +27516,7 @@ installcheck-target-libffi: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
           || exit 1
  
  @endif target-libffi
@@ -25622,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 \
@@ -25633,7 +27540,7 @@ mostlyclean-target-libffi:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  mostlyclean) \
           || exit 1
  
  @endif target-libffi
@@ -25647,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 \
@@ -25658,7 +27564,7 @@ clean-target-libffi:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  clean) \
           || exit 1
  
  @endif target-libffi
@@ -25672,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 \
@@ -25683,7 +27588,7 @@ distclean-target-libffi:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  distclean) \
           || exit 1
  
  @endif target-libffi
@@ -25697,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 \
@@ -25708,63 +27612,65 @@ maintainer-clean-target-libffi:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  maintainer-clean) \
           || exit 1
  
  @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; \
         case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) \
-           topdir=$(srcdir) ;; \
-         *) \
-           case "$(TARGET_SUBDIR)" in \
-             .) topdir="../$(srcdir)" ;; \
-             *) topdir="../../$(srcdir)" ;; \
-           esac ;; \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(TARGET_SUBDIR)/libjava/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-         srcdiroption="--srcdir=$${topdir}/libjava"; \
-         libsrcdir="$$s/libjava"; \
+       srcdiroption="--srcdir=$${topdir}/libjava"; \
+       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
+TARGET-target-libjava=all
  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)'  all)
+         $(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
@@ -25773,10 +27679,9 @@ 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)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   check)
  
  @endif target-libjava
  
@@ -25788,10 +27693,9 @@ 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)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
  
  @endif target-libjava
  
@@ -25807,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 \
@@ -25818,7 +27721,7 @@ info-target-libjava: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
           || exit 1
  
  @endif target-libjava
@@ -25833,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 \
@@ -25844,7 +27746,32 @@ dvi-target-libjava: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  dvi) \
+         || exit 1
+
+@endif target-libjava
+
+.PHONY: maybe-html-target-libjava html-target-libjava
+maybe-html-target-libjava:
+@if target-libjava
+maybe-html-target-libjava: html-target-libjava
+
+html-target-libjava: \
+    configure-target-libjava 
+       @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(RAW_CXX_TARGET_EXPORTS) \
+       echo "Doing html in $(TARGET_SUBDIR)/libjava" ; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/libjava && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                  html) \
           || exit 1
  
  @endif target-libjava
@@ -25859,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 \
@@ -25870,7 +27796,7 @@ TAGS-target-libjava: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  TAGS) \
           || exit 1
  
  @endif target-libjava
@@ -25886,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 \
@@ -25897,7 +27822,7 @@ install-info-target-libjava: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  install-info) \
           || exit 1
  
  @endif target-libjava
@@ -25912,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 \
@@ -25923,7 +27847,7 @@ installcheck-target-libjava: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
           || exit 1
  
  @endif target-libjava
@@ -25937,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 \
@@ -25948,7 +27871,7 @@ mostlyclean-target-libjava:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  mostlyclean) \
           || exit 1
  
  @endif target-libjava
@@ -25962,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 \
@@ -25973,7 +27895,7 @@ clean-target-libjava:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  clean) \
           || exit 1
  
  @endif target-libjava
@@ -25987,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 \
@@ -25998,7 +27919,7 @@ distclean-target-libjava:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  distclean) \
           || exit 1
  
  @endif target-libjava
@@ -26012,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 \
@@ -26023,85 +27943,65 @@ maintainer-clean-target-libjava:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  maintainer-clean) \
           || exit 1
  
  @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; \
         case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) \
-           topdir=$(srcdir) ;; \
-         *) \
-           case "$(TARGET_SUBDIR)" in \
-             .) topdir="../$(srcdir)" ;; \
-             *) topdir="../../$(srcdir)" ;; \
-           esac ;; \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(TARGET_SUBDIR)/zlib/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       if [ "$(srcdir)" = "." ] ; then \
-         if [ "$(TARGET_SUBDIR)" != "." ] ; then \
-           if $(SHELL) $$s/symlink-tree $${topdir}/zlib "no-such-file" ; then \
-             if [ -f Makefile ]; then \
-               if $(MAKE) distclean; then \
-                 true; \
-               else \
-                 exit 1; \
-               fi; \
-             else \
-               true; \
-             fi; \
-           else \
-             exit 1; \
-           fi; \
-         else \
-           true; \
-         fi; \
-         srcdiroption="--srcdir=."; \
-         libsrcdir="."; \
-       else \
-         srcdiroption="--srcdir=$${topdir}/zlib"; \
-         libsrcdir="$$s/zlib"; \
-       fi; \
+       srcdiroption="--srcdir=$${topdir}/zlib"; \
+       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
+TARGET-target-zlib=all
  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)  all)
+         $(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
@@ -26110,10 +28010,9 @@ 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)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
  
  @endif target-zlib
  
@@ -26125,10 +28024,9 @@ 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)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
  
  @endif target-zlib
  
@@ -26144,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 \
@@ -26155,7 +28052,7 @@ info-target-zlib: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
           || exit 1
  
  @endif target-zlib
@@ -26170,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 \
@@ -26181,7 +28077,32 @@ dvi-target-zlib: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  dvi) \
+         || exit 1
+
+@endif target-zlib
+
+.PHONY: maybe-html-target-zlib html-target-zlib
+maybe-html-target-zlib:
+@if target-zlib
+maybe-html-target-zlib: html-target-zlib
+
+html-target-zlib: \
+    configure-target-zlib 
+       @[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0 ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(NORMAL_TARGET_EXPORTS) \
+       echo "Doing html in $(TARGET_SUBDIR)/zlib" ; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/zlib && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                  html) \
           || exit 1
  
  @endif target-zlib
@@ -26196,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 \
@@ -26207,7 +28127,7 @@ TAGS-target-zlib: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  TAGS) \
           || exit 1
  
  @endif target-zlib
@@ -26223,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 \
@@ -26234,7 +28153,7 @@ install-info-target-zlib: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  install-info) \
           || exit 1
  
  @endif target-zlib
@@ -26249,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 \
@@ -26260,7 +28178,7 @@ installcheck-target-zlib: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
           || exit 1
  
  @endif target-zlib
@@ -26274,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 \
@@ -26285,7 +28202,7 @@ mostlyclean-target-zlib:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  mostlyclean) \
           || exit 1
  
  @endif target-zlib
@@ -26299,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 \
@@ -26310,7 +28226,7 @@ clean-target-zlib:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  clean) \
           || exit 1
  
  @endif target-zlib
@@ -26324,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 \
@@ -26335,7 +28250,7 @@ distclean-target-zlib:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  distclean) \
           || exit 1
  
  @endif target-zlib
@@ -26349,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 \
@@ -26360,63 +28274,65 @@ maintainer-clean-target-zlib:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  maintainer-clean) \
           || exit 1
  
  @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; \
         case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) \
-           topdir=$(srcdir) ;; \
-         *) \
-           case "$(TARGET_SUBDIR)" in \
-             .) topdir="../$(srcdir)" ;; \
-             *) topdir="../../$(srcdir)" ;; \
-           esac ;; \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(TARGET_SUBDIR)/boehm-gc/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-         srcdiroption="--srcdir=$${topdir}/boehm-gc"; \
-         libsrcdir="$$s/boehm-gc"; \
+       srcdiroption="--srcdir=$${topdir}/boehm-gc"; \
+       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
+TARGET-target-boehm-gc=all
  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)  all)
+         $(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
@@ -26425,10 +28341,9 @@ 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)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
  
  @endif target-boehm-gc
  
@@ -26440,10 +28355,9 @@ 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)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
  
  @endif target-boehm-gc
  
@@ -26459,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 \
@@ -26470,7 +28383,7 @@ info-target-boehm-gc: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
           || exit 1
  
  @endif target-boehm-gc
@@ -26485,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 \
@@ -26496,7 +28408,32 @@ dvi-target-boehm-gc: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  dvi) \
+         || exit 1
+
+@endif target-boehm-gc
+
+.PHONY: maybe-html-target-boehm-gc html-target-boehm-gc
+maybe-html-target-boehm-gc:
+@if target-boehm-gc
+maybe-html-target-boehm-gc: html-target-boehm-gc
+
+html-target-boehm-gc: \
+    configure-target-boehm-gc 
+       @[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0 ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(NORMAL_TARGET_EXPORTS) \
+       echo "Doing html in $(TARGET_SUBDIR)/boehm-gc" ; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/boehm-gc && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                  html) \
           || exit 1
  
  @endif target-boehm-gc
@@ -26511,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 \
@@ -26522,7 +28458,7 @@ TAGS-target-boehm-gc: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  TAGS) \
           || exit 1
  
  @endif target-boehm-gc
@@ -26538,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 \
@@ -26549,7 +28484,7 @@ install-info-target-boehm-gc: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  install-info) \
           || exit 1
  
  @endif target-boehm-gc
@@ -26564,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 \
@@ -26575,7 +28509,7 @@ installcheck-target-boehm-gc: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
           || exit 1
  
  @endif target-boehm-gc
@@ -26589,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 \
@@ -26600,7 +28533,7 @@ mostlyclean-target-boehm-gc:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  mostlyclean) \
           || exit 1
  
  @endif target-boehm-gc
@@ -26614,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 \
@@ -26625,7 +28557,7 @@ clean-target-boehm-gc:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  clean) \
           || exit 1
  
  @endif target-boehm-gc
@@ -26639,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 \
@@ -26650,7 +28581,7 @@ distclean-target-boehm-gc:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  distclean) \
           || exit 1
  
  @endif target-boehm-gc
@@ -26664,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 \
@@ -26675,63 +28605,65 @@ maintainer-clean-target-boehm-gc:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  maintainer-clean) \
           || exit 1
  
  @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; \
         case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) \
-           topdir=$(srcdir) ;; \
-         *) \
-           case "$(TARGET_SUBDIR)" in \
-             .) topdir="../$(srcdir)" ;; \
-             *) topdir="../../$(srcdir)" ;; \
-           esac ;; \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(TARGET_SUBDIR)/qthreads/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-         srcdiroption="--srcdir=$${topdir}/qthreads"; \
-         libsrcdir="$$s/qthreads"; \
+       srcdiroption="--srcdir=$${topdir}/qthreads"; \
+       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
+TARGET-target-qthreads=all
  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)  all)
+         $(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
@@ -26740,10 +28672,9 @@ 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)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
  
  @endif target-qthreads
  
@@ -26755,10 +28686,9 @@ 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)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
  
  @endif target-qthreads
  
@@ -26774,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 \
@@ -26785,7 +28714,7 @@ info-target-qthreads: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
           || exit 1
  
  @endif target-qthreads
@@ -26800,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 \
@@ -26811,7 +28739,32 @@ dvi-target-qthreads: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  dvi) \
+         || exit 1
+
+@endif target-qthreads
+
+.PHONY: maybe-html-target-qthreads html-target-qthreads
+maybe-html-target-qthreads:
+@if target-qthreads
+maybe-html-target-qthreads: html-target-qthreads
+
+html-target-qthreads: \
+    configure-target-qthreads 
+       @[ -f $(TARGET_SUBDIR)/qthreads/Makefile ] || exit 0 ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(NORMAL_TARGET_EXPORTS) \
+       echo "Doing html in $(TARGET_SUBDIR)/qthreads" ; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/qthreads && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                  html) \
           || exit 1
  
  @endif target-qthreads
@@ -26826,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 \
@@ -26837,7 +28789,7 @@ TAGS-target-qthreads: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  TAGS) \
           || exit 1
  
  @endif target-qthreads
@@ -26853,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 \
@@ -26864,7 +28815,7 @@ install-info-target-qthreads: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  install-info) \
           || exit 1
  
  @endif target-qthreads
@@ -26879,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 \
@@ -26890,7 +28840,7 @@ installcheck-target-qthreads: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
           || exit 1
  
  @endif target-qthreads
@@ -26904,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 \
@@ -26915,7 +28864,7 @@ mostlyclean-target-qthreads:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  mostlyclean) \
           || exit 1
  
  @endif target-qthreads
@@ -26929,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 \
@@ -26940,7 +28888,7 @@ clean-target-qthreads:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  clean) \
           || exit 1
  
  @endif target-qthreads
@@ -26954,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 \
@@ -26965,7 +28912,7 @@ distclean-target-qthreads:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  distclean) \
           || exit 1
  
  @endif target-qthreads
@@ -26979,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 \
@@ -26990,63 +28936,65 @@ maintainer-clean-target-qthreads:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  maintainer-clean) \
           || exit 1
  
  @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; \
         case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) \
-           topdir=$(srcdir) ;; \
-         *) \
-           case "$(TARGET_SUBDIR)" in \
-             .) topdir="../$(srcdir)" ;; \
-             *) topdir="../../$(srcdir)" ;; \
-           esac ;; \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(TARGET_SUBDIR)/rda/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-         srcdiroption="--srcdir=$${topdir}/rda"; \
-         libsrcdir="$$s/rda"; \
+       srcdiroption="--srcdir=$${topdir}/rda"; \
+       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
+TARGET-target-rda=all
  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)  all)
+         $(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
@@ -27055,10 +29003,9 @@ 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)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
  
  @endif target-rda
  
@@ -27070,10 +29017,9 @@ 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)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
  
  @endif target-rda
  
@@ -27089,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 \
@@ -27100,7 +29045,7 @@ info-target-rda: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
           || exit 1
  
  @endif target-rda
@@ -27115,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 \
@@ -27126,7 +29070,32 @@ dvi-target-rda: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  dvi) \
+         || exit 1
+
+@endif target-rda
+
+.PHONY: maybe-html-target-rda html-target-rda
+maybe-html-target-rda:
+@if target-rda
+maybe-html-target-rda: html-target-rda
+
+html-target-rda: \
+    configure-target-rda 
+       @[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0 ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(NORMAL_TARGET_EXPORTS) \
+       echo "Doing html in $(TARGET_SUBDIR)/rda" ; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/rda && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                  html) \
           || exit 1
  
  @endif target-rda
@@ -27141,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 \
@@ -27152,7 +29120,7 @@ TAGS-target-rda: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  TAGS) \
           || exit 1
  
  @endif target-rda
@@ -27168,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 \
@@ -27179,7 +29146,7 @@ install-info-target-rda: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  install-info) \
           || exit 1
  
  @endif target-rda
@@ -27194,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 \
@@ -27205,7 +29171,7 @@ installcheck-target-rda: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
           || exit 1
  
  @endif target-rda
@@ -27219,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 \
@@ -27230,7 +29195,7 @@ mostlyclean-target-rda:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  mostlyclean) \
           || exit 1
  
  @endif target-rda
@@ -27244,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 \
@@ -27255,7 +29219,7 @@ clean-target-rda:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  clean) \
           || exit 1
  
  @endif target-rda
@@ -27269,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 \
@@ -27280,7 +29243,7 @@ distclean-target-rda:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  distclean) \
           || exit 1
  
  @endif target-rda
@@ -27294,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 \
@@ -27305,63 +29267,65 @@ maintainer-clean-target-rda:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  maintainer-clean) \
           || exit 1
  
  @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; \
         case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) \
-           topdir=$(srcdir) ;; \
-         *) \
-           case "$(TARGET_SUBDIR)" in \
-             .) topdir="../$(srcdir)" ;; \
-             *) topdir="../../$(srcdir)" ;; \
-           esac ;; \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(TARGET_SUBDIR)/libada/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-         srcdiroption="--srcdir=$${topdir}/libada"; \
-         libsrcdir="$$s/libada"; \
+       srcdiroption="--srcdir=$${topdir}/libada"; \
+       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
+TARGET-target-libada=all
  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)  all)
+         $(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
@@ -27370,10 +29334,9 @@ 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)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
  
  @endif target-libada
  
@@ -27385,10 +29348,9 @@ 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)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
  
  @endif target-libada
  
@@ -27404,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 \
@@ -27415,7 +29376,7 @@ info-target-libada: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
           || exit 1
  
  @endif target-libada
@@ -27430,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 \
@@ -27441,7 +29401,32 @@ dvi-target-libada: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  dvi) \
+         || exit 1
+
+@endif target-libada
+
+.PHONY: maybe-html-target-libada html-target-libada
+maybe-html-target-libada:
+@if target-libada
+maybe-html-target-libada: html-target-libada
+
+html-target-libada: \
+    configure-target-libada 
+       @[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(NORMAL_TARGET_EXPORTS) \
+       echo "Doing html in $(TARGET_SUBDIR)/libada" ; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/libada && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                  html) \
           || exit 1
  
  @endif target-libada
@@ -27456,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 \
@@ -27467,7 +29451,7 @@ TAGS-target-libada: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  TAGS) \
           || exit 1
  
  @endif target-libada
@@ -27483,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 \
@@ -27494,7 +29477,7 @@ install-info-target-libada: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  install-info) \
           || exit 1
  
  @endif target-libada
@@ -27509,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 \
@@ -27520,7 +29502,7 @@ installcheck-target-libada: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
           || exit 1
  
  @endif target-libada
@@ -27534,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 \
@@ -27545,7 +29526,7 @@ mostlyclean-target-libada:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  mostlyclean) \
           || exit 1
  
  @endif target-libada
@@ -27559,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 \
@@ -27570,7 +29550,7 @@ clean-target-libada:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  clean) \
           || exit 1
  
  @endif target-libada
@@ -27584,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 \
@@ -27595,7 +29574,7 @@ distclean-target-libada:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  distclean) \
           || exit 1
  
  @endif target-libada
@@ -27609,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 \
@@ -27620,7 +29598,7 @@ maintainer-clean-target-libada:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  maintainer-clean) \
           || exit 1
  
  @endif target-libada
@@ -27631,85 +29609,19 @@ maintainer-clean-target-libada:
  # GCC module
  # ----------
  
-# Unfortunately, while gcc _should_ be a host module,
-# libgcc is a target module, and gen* programs are
-# build modules.  So GCC is a sort of hybrid.
-
-# gcc is the only module which uses GCC_FLAGS_TO_PASS.
-# Don't use shared host config.cache, as it will confuse later
-# directories; GCC wants slightly different values for some
-# precious variables.  *sigh*
-
-# We must skip configuring if toplevel bootstrap is going.
-.PHONY: configure-gcc maybe-configure-gcc
-maybe-configure-gcc:
-@if gcc
-maybe-configure-gcc: configure-gcc
-configure-gcc:
-       @test ! -f gcc/Makefile || exit 0; \
-       [ -f stage_last ] && exit 0; \
-       [ -d gcc ] || mkdir gcc; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(GCC_HOST_EXPORTS) \
-       echo Configuring in gcc; \
-       cd gcc || exit 1; \
-       case $(srcdir) in \
-         \.) \
-           srcdiroption="--srcdir=."; \
-           libsrcdir=".";; \
-         /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/gcc"; \
-           libsrcdir="$$s/gcc";; \
-         *) \
-           srcdiroption="--srcdir=../$(srcdir)/gcc"; \
-           libsrcdir="$$s/gcc";; \
-       esac; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
-         || exit 1
-@endif gcc
-
-# Don't 'make all' in gcc if it's already been made by 'bootstrap'; that
-# causes trouble.  This wart will be fixed eventually by moving
-# the bootstrap behavior to this file.
-.PHONY: all-gcc maybe-all-gcc
-maybe-all-gcc:
-@if gcc
-maybe-all-gcc: all-gcc
-all-gcc: configure-gcc
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(GCC_HOST_EXPORTS) \
-       if [ -f stage_last ] ; then \
-         true ; \
-       elif [ -f gcc/stage_last ] ; then \
-         $(SET_LIB_PATH) \
-         (cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) quickstrap); \
-       else \
-         $(SET_LIB_PATH) \
-         (cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) all); \
-       fi
-@endif gcc
+@if gcc-no-bootstrap
+# GCC has some more recursive targets, which trigger the old
+# (but still current, until the toplevel bootstrap project
+# is finished) compiler bootstrapping rules.
  
-# Building GCC uses some tools for rebuilding "source" files
-# like texinfo, bison/byacc, etc.  So we must depend on those.
-#
-# While building GCC, it may be necessary to run various target
-# programs like the assembler, linker, etc.  So we depend on
-# those too.
-#
-# In theory, on an SMP all those dependencies can be resolved
-# in parallel.
-#
  GCC_STRAP_TARGETS = bootstrap bootstrap-lean bootstrap2 bootstrap2-lean bootstrap3 bootstrap3-lean bootstrap4 bootstrap4-lean bubblestrap quickstrap cleanstrap restrap
  .PHONY: $(GCC_STRAP_TARGETS)
-$(GCC_STRAP_TARGETS): all-bootstrap configure-gcc
+$(GCC_STRAP_TARGETS): all-prebootstrap configure-gcc
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
-       $(GCC_HOST_EXPORTS) \
+       $(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; \
@@ -27727,72 +29639,51 @@ $(GCC_STRAP_TARGETS): all-bootstrap configure-gcc
             msg="Comparing stage2 and stage3 of the compiler"; \
             compare=compare ;; \
         esac; \
-       $(SET_LIB_PATH) \
-       $(GCC_HOST_EXPORTS) \
+       $(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) $(BASE_FLAGS_TO_PASS) $(RECURSE_FLAGS) all
+       $(MAKE) $(RECURSE_FLAGS_TO_PASS) all
  
-profiledbootstrap: all-bootstrap configure-gcc
+profiledbootstrap: all-prebootstrap configure-gcc
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
-       $(GCC_HOST_EXPORTS) \
-       echo "Bootstrapping the compiler"; \
+       $(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) \
-       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) \
-       $(GCC_HOST_EXPORTS) \
+       $(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; \
+       echo "Building runtime libraries"; \
+       $(MAKE) $(RECURSE_FLAGS_TO_PASS) all
  
  .PHONY: cross
-cross: all-texinfo all-bison all-byacc all-binutils all-gas all-ld
+cross: all-build all-gas all-ld
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
-       $(GCC_HOST_EXPORTS) \
+       $(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) $(BASE_FLAGS_TO_PASS) $(RECURSE_FLAGS) \
-         LANGUAGES="c c++" all
+       $(MAKE) $(RECURSE_FLAGS_TO_PASS) LANGUAGES="c c++" all
+@endif gcc-no-bootstrap
  
-.PHONY: check-gcc maybe-check-gcc
-maybe-check-gcc:
  @if gcc
-maybe-check-gcc: check-gcc
-check-gcc:
-       @if [ -f ./gcc/Makefile ] ; then \
-         r=`${PWD_COMMAND}`; export r; \
-         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-         $(SET_LIB_PATH) \
-         $(GCC_HOST_EXPORTS) \
-         (cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) check); \
-       else \
-         true; \
-       fi
-
  .PHONY: check-gcc-c++
  check-gcc-c++:
         @if [ -f ./gcc/Makefile ] ; then \
           r=`${PWD_COMMAND}`; export r; \
           s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-         $(SET_LIB_PATH) \
-         $(GCC_HOST_EXPORTS) \
+         $(HOST_EXPORTS) \
           (cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) check-c++); \
         else \
           true; \
@@ -27800,23 +29691,6 @@ check-gcc-c++:
  
  .PHONY: check-c++
  check-c++: check-target-libstdc++-v3 check-gcc-c++
-@endif gcc
-
-.PHONY: install-gcc maybe-install-gcc
-maybe-install-gcc:
-@if gcc
-maybe-install-gcc: install-gcc
-install-gcc:
-       @if [ -f ./gcc/Makefile ] ; then \
-         r=`${PWD_COMMAND}`; export r; \
-         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-         $(SET_LIB_PATH) \
-         $(GCC_HOST_EXPORTS) \
-         (cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) install); \
-       else \
-         true; \
-       fi
-@endif gcc
  
  # Install the gcc headers files, but not the fixed include files,
  # which Cygnus is not allowed to distribute.  This rule is very
@@ -27832,244 +29706,34 @@ 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) \
-         $(GCC_HOST_EXPORTS) \
+         $(HOST_EXPORTS) \
           (cd ./gcc && \
            $(MAKE) $(GCC_FLAGS_TO_PASS) install); \
           rm -rf gcc/include; \
           mv gcc/tmp-include gcc/include 2>/dev/null; \
         else true; fi
-
-# Other targets (dvi, info, etc.)
-
-.PHONY: maybe-info-gcc info-gcc
-maybe-info-gcc:
-@if gcc
-maybe-info-gcc: info-gcc
-info-gcc: \
-    configure-gcc 
-       @[ -f ./gcc/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
-       for flag in $(EXTRA_GCC_FLAGS); do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       $(GCC_HOST_EXPORTS) \
-       echo "Doing info in gcc" ; \
-       (cd gcc && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-                 "RANLIB=$${RANLIB}" \
-                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
-         || exit 1
-@endif gcc
-
-
-.PHONY: maybe-dvi-gcc dvi-gcc
-maybe-dvi-gcc:
-@if gcc
-maybe-dvi-gcc: dvi-gcc
-dvi-gcc: \
-    configure-gcc 
-       @[ -f ./gcc/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
-       for flag in $(EXTRA_GCC_FLAGS); do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       $(GCC_HOST_EXPORTS) \
-       echo "Doing dvi in gcc" ; \
-       (cd gcc && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-                 "RANLIB=$${RANLIB}" \
-                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
-         || exit 1
-@endif gcc
-
-
-.PHONY: maybe-TAGS-gcc TAGS-gcc
-maybe-TAGS-gcc:
-@if gcc
-maybe-TAGS-gcc: TAGS-gcc
-TAGS-gcc: \
-    configure-gcc 
-       @[ -f ./gcc/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
-       for flag in $(EXTRA_GCC_FLAGS); do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       $(GCC_HOST_EXPORTS) \
-       echo "Doing TAGS in gcc" ; \
-       (cd gcc && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-                 "RANLIB=$${RANLIB}" \
-                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
-         || exit 1
-@endif gcc
-
-
-.PHONY: maybe-install-info-gcc install-info-gcc
-maybe-install-info-gcc:
-@if gcc
-maybe-install-info-gcc: install-info-gcc
-install-info-gcc: \
-    configure-gcc \
-    info-gcc 
-       @[ -f ./gcc/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
-       for flag in $(EXTRA_GCC_FLAGS); do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       $(GCC_HOST_EXPORTS) \
-       echo "Doing install-info in gcc" ; \
-       (cd gcc && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-                 "RANLIB=$${RANLIB}" \
-                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
-         || exit 1
-@endif gcc
-
-
-.PHONY: maybe-installcheck-gcc installcheck-gcc
-maybe-installcheck-gcc:
-@if gcc
-maybe-installcheck-gcc: installcheck-gcc
-installcheck-gcc: \
-    configure-gcc 
-       @[ -f ./gcc/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
-       for flag in $(EXTRA_GCC_FLAGS); do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       $(GCC_HOST_EXPORTS) \
-       echo "Doing installcheck in gcc" ; \
-       (cd gcc && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-                 "RANLIB=$${RANLIB}" \
-                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
-         || exit 1
-@endif gcc
-
-
-.PHONY: maybe-mostlyclean-gcc mostlyclean-gcc
-maybe-mostlyclean-gcc:
-@if gcc
-maybe-mostlyclean-gcc: mostlyclean-gcc
-mostlyclean-gcc: 
-       @[ -f ./gcc/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
-       for flag in $(EXTRA_GCC_FLAGS); do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       $(GCC_HOST_EXPORTS) \
-       echo "Doing mostlyclean in gcc" ; \
-       (cd gcc && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-                 "RANLIB=$${RANLIB}" \
-                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
-         || exit 1
-@endif gcc
-
-
-.PHONY: maybe-clean-gcc clean-gcc
-maybe-clean-gcc:
-@if gcc
-maybe-clean-gcc: clean-gcc
-clean-gcc: 
-       @[ -f ./gcc/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
-       for flag in $(EXTRA_GCC_FLAGS); do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       $(GCC_HOST_EXPORTS) \
-       echo "Doing clean in gcc" ; \
-       (cd gcc && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-                 "RANLIB=$${RANLIB}" \
-                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
-         || exit 1
-@endif gcc
-
-
-.PHONY: maybe-distclean-gcc distclean-gcc
-maybe-distclean-gcc:
-@if gcc
-maybe-distclean-gcc: distclean-gcc
-distclean-gcc: 
-       @[ -f ./gcc/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
-       for flag in $(EXTRA_GCC_FLAGS); do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       $(GCC_HOST_EXPORTS) \
-       echo "Doing distclean in gcc" ; \
-       (cd gcc && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-                 "RANLIB=$${RANLIB}" \
-                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
-         || exit 1
-@endif gcc
-
-
-.PHONY: maybe-maintainer-clean-gcc maintainer-clean-gcc
-maybe-maintainer-clean-gcc:
-@if gcc
-maybe-maintainer-clean-gcc: maintainer-clean-gcc
-maintainer-clean-gcc: 
-       @[ -f ./gcc/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
-       for flag in $(EXTRA_GCC_FLAGS); do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       $(GCC_HOST_EXPORTS) \
-       echo "Doing maintainer-clean in gcc" ; \
-       (cd gcc && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-                 "RANLIB=$${RANLIB}" \
-                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
-         || exit 1
  @endif gcc
  
-
-
  # ---------------------
  # GCC bootstrap support
  # ---------------------
  
-# We track the current stage (the one in 'gcc') in the stage_last file.
+# We track the current stage (the one in 'gcc') in the stage_current file.
+# stage_last instead tracks the stage that was built last.  These targets
+# are dummy when toplevel bootstrap is not active.
+
+.PHONY: unstage
+unstage:
+@if gcc-bootstrap
+       @[ -f stage_current ] || $(MAKE) `cat stage_last`-start
+@endif gcc-bootstrap
+
+.PHONY: stage
+stage:
+@if gcc-bootstrap
+       @$(MAKE) `cat stage_current`-end
+@endif gcc-bootstrap
+
  # We name the build directories for the various stages "stage1-gcc",
  # "stage2-gcc","stage3-gcc", etc.
  
@@ -28090,7 +29754,9 @@ maintainer-clean-gcc:
  # (both in a combined tree, or separately).  This however requires some
  # change to the gcc driver, again in order to avoid comparison failures.
  
-# Bugs: This is almost certainly not parallel-make safe.
+# Bugs: This is crippled when doing parallel make, the `make all-host'
+# and `make all-target' phases can be parallelized.
+
  
  # 'touch' doesn't work right on some platforms.
  STAMP = echo timestamp > 
@@ -28107,15 +29773,10 @@ STAGE1_LANGUAGES=@stage1_languages@
  # We only want to compare .o files, so set this!
  objext = .o
  
-# Real targets act phony if they depend on phony targets; this hack
-# prevents gratuitous rebuilding of stage 1.
-prebootstrap:
-       $(MAKE) all-bootstrap
-       $(STAMP) prebootstrap
-
  # Flags to pass to stage2 and later makes.
-BOOT_CFLAGS= -g -O2
  POSTSTAGE1_FLAGS_TO_PASS = \
+       CC="$${CC}" CC_FOR_BUILD="$${CC_FOR_BUILD}" \
+       STAGE_PREFIX=$$r/stage-gcc/ \
         CFLAGS="$(BOOT_CFLAGS)" \
         ADAC="\$$(CC)"
  
@@ -28129,410 +29790,5017 @@ POSTSTAGE1_FLAGS_TO_PASS = \
  # * We build only C (and possibly Ada).
  
  
-.PHONY: new-stage1-start new-stage1-end
+.PHONY: stage1-start stage1-end
  
-new-stage1-start:
-       [ -f stage_last ] && $(MAKE) new-`cat stage_last`-end || :
-       echo stage1 > stage_last ; \
-       [ -d stage1-gcc ] || mkdir stage1-gcc; \
-       set stage1-gcc gcc ; @CREATE_LINK_TO_DIR@ 
-
-new-stage1-end:
-       rm -f stage_last ; \
-       set gcc stage1-gcc ; @UNDO_LINK_TO_DIR@ 
+stage1-start::
+       @[ -f stage_current ] && $(MAKE) `cat stage_current`-end || : ; \
+       echo stage1 > stage_current ; \
+       echo stage1 > stage_last; \
+       $(mkinstalldirs) $(HOST_SUBDIR)
+@if bfd
+       @cd $(HOST_SUBDIR); [ -d stage1-bfd ] || \
+         mkdir stage1-bfd; \
+       set stage1-bfd bfd ; \
+       @CREATE_LINK_TO_DIR@ 
+@endif bfd
+@if opcodes
+       @cd $(HOST_SUBDIR); [ -d stage1-opcodes ] || \
+         mkdir stage1-opcodes; \
+       set stage1-opcodes opcodes ; \
+       @CREATE_LINK_TO_DIR@ 
+@endif opcodes
+@if binutils
+       @cd $(HOST_SUBDIR); [ -d stage1-binutils ] || \
+         mkdir stage1-binutils; \
+       set stage1-binutils binutils ; \
+       @CREATE_LINK_TO_DIR@ 
+@endif binutils
+@if gas
+       @cd $(HOST_SUBDIR); [ -d stage1-gas ] || \
+         mkdir stage1-gas; \
+       set stage1-gas gas ; \
+       @CREATE_LINK_TO_DIR@ 
+@endif gas
+@if gcc
+       @cd $(HOST_SUBDIR); [ -d stage1-gcc ] || \
+         mkdir stage1-gcc; \
+       set stage1-gcc gcc ; \
+       @CREATE_LINK_TO_DIR@ 
+@endif gcc
+@if intl
+       @cd $(HOST_SUBDIR); [ -d stage1-intl ] || \
+         mkdir stage1-intl; \
+       set stage1-intl intl ; \
+       @CREATE_LINK_TO_DIR@ 
+@endif intl
+@if ld
+       @cd $(HOST_SUBDIR); [ -d stage1-ld ] || \
+         mkdir stage1-ld; \
+       set stage1-ld ld ; \
+       @CREATE_LINK_TO_DIR@ 
+@endif ld
+@if libcpp
+       @cd $(HOST_SUBDIR); [ -d stage1-libcpp ] || \
+         mkdir stage1-libcpp; \
+       set stage1-libcpp libcpp ; \
+       @CREATE_LINK_TO_DIR@ 
+@endif libcpp
+@if libiberty
+       @cd $(HOST_SUBDIR); [ -d stage1-libiberty ] || \
+         mkdir stage1-libiberty; \
+       set stage1-libiberty libiberty ; \
+       @CREATE_LINK_TO_DIR@ 
+@endif libiberty
+@if zlib
+       @cd $(HOST_SUBDIR); [ -d stage1-zlib ] || \
+         mkdir stage1-zlib; \
+       set stage1-zlib zlib ; \
+       @CREATE_LINK_TO_DIR@ 
+@endif zlib
  
-# Bubble a bugfix through all the stages up to stage 1.  They
-# are remade, but not reconfigured.  The next stage (if any) will not
-# be reconfigured as well.
-.PHONY: new-stage1-bubble
-new-stage1-bubble: 
-       @if [ -f all-stage1-gcc ] ; then \
-         echo Remaking stage 1 ; \
-         rm -f all-stage1-gcc ; \
-         $(MAKE) all-stage1-gcc  && \
-         if [ -f configure-stage2-gcc ] ; then \
-           $(STAMP) configure-stage2-gcc ; \
-         fi ; \
-       else \
-         $(MAKE) all-stage1-gcc ; \
-       fi
+stage1-end::
+       @rm -f stage_current
+@if bfd
+       @cd $(HOST_SUBDIR); set bfd stage1-bfd ; \
+       @UNDO_LINK_TO_DIR@ 
+@endif bfd
+@if opcodes
+       @cd $(HOST_SUBDIR); set opcodes stage1-opcodes ; \
+       @UNDO_LINK_TO_DIR@ 
+@endif opcodes
+@if binutils
+       @cd $(HOST_SUBDIR); set binutils stage1-binutils ; \
+       @UNDO_LINK_TO_DIR@ 
+@endif binutils
+@if gas
+       @cd $(HOST_SUBDIR); set gas stage1-gas ; \
+       @UNDO_LINK_TO_DIR@ 
+@endif gas
+@if gcc
+       @cd $(HOST_SUBDIR); set gcc stage1-gcc ; \
+       @UNDO_LINK_TO_DIR@ 
+@endif gcc
+@if intl
+       @cd $(HOST_SUBDIR); set intl stage1-intl ; \
+       @UNDO_LINK_TO_DIR@ 
+@endif intl
+@if ld
+       @cd $(HOST_SUBDIR); set ld stage1-ld ; \
+       @UNDO_LINK_TO_DIR@ 
+@endif ld
+@if libcpp
+       @cd $(HOST_SUBDIR); set libcpp stage1-libcpp ; \
+       @UNDO_LINK_TO_DIR@ 
+@endif libcpp
+@if libiberty
+       @cd $(HOST_SUBDIR); set libiberty stage1-libiberty ; \
+       @UNDO_LINK_TO_DIR@ 
+@endif libiberty
+@if zlib
+       @cd $(HOST_SUBDIR); set zlib stage1-zlib ; \
+       @UNDO_LINK_TO_DIR@ 
+@endif zlib
+
+# Bubble a bugfix through all the stages up to stage 1.  They
+# are remade, but not reconfigured.  The next stage (if any) will not
+# be reconfigured as well.
+.PHONY: stage1-bubble
+stage1-bubble:: 
+       @if test -f stage1-lean  ; then \
+         echo Skipping rebuild of stage1 ; \
+       else \
+         $(MAKE) $(RECURSE_FLAGS_TO_PASS) NOTPARALLEL= all-stage1; \
+       fi
+
+.PHONY: all-stage1 clean-stage1
+all-stage1:     \
+  maybe-all-stage1-bfd \
+  maybe-all-stage1-opcodes \
+  maybe-all-stage1-binutils              \
+  maybe-all-stage1-gas \
+  maybe-all-stage1-gcc        \
+  maybe-all-stage1-intl   \
+  maybe-all-stage1-ld \
+  maybe-all-stage1-libcpp  \
+  maybe-all-stage1-libiberty                        \
+  maybe-all-stage1-zlib        
+
+do-clean: clean-stage1
+clean-stage1:     \
+  maybe-clean-stage1-bfd \
+  maybe-clean-stage1-opcodes \
+  maybe-clean-stage1-binutils              \
+  maybe-clean-stage1-gas \
+  maybe-clean-stage1-gcc        \
+  maybe-clean-stage1-intl   \
+  maybe-clean-stage1-ld \
+  maybe-clean-stage1-libcpp  \
+  maybe-clean-stage1-libiberty                        \
+  maybe-clean-stage1-zlib        
+
+
+.PHONY: configure-stage1-bfd maybe-configure-stage1-bfd
+.PHONY: all-stage1-bfd maybe-all-stage1-bfd
+.PHONY: clean-stage1-bfd maybe-clean-stage1-bfd
+
+maybe-configure-stage1-bfd:
+maybe-all-stage1-bfd:
+maybe-clean-stage1-bfd:
+
+@if bfd-bootstrap
+maybe-configure-stage1-bfd: configure-stage1-bfd
+configure-stage1-bfd:
+       @$(MAKE) stage1-start
+       @[ -f bfd/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(HOST_EXPORTS)  \
+       echo Configuring stage 1 in bfd ; \
+       cd $(HOST_SUBDIR)/bfd || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/bfd/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/bfd"; \
+       libsrcdir="$$s/bfd"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         --disable-intermodule           --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" 
+
+maybe-all-stage1-bfd: all-stage1-bfd
+all-stage1-bfd: configure-stage1-bfd
+       @$(MAKE) stage1-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/bfd && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               CFLAGS="$(STAGE1_CFLAGS)" 
+
+maybe-clean-stage1-bfd: clean-stage1-bfd
+clean-stage1-bfd:
+       @[ -f bfd/Makefile ] || [ -f stage1-bfd/Makefile ] \
+         || exit 0 ; \
+       [ -f bfd/Makefile ] || $(MAKE) stage1-start ; \
+       cd $(HOST_SUBDIR)/bfd && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               CFLAGS="$(STAGE1_CFLAGS)"  clean
+@endif bfd-bootstrap
+
+
+.PHONY: configure-stage1-opcodes maybe-configure-stage1-opcodes
+.PHONY: all-stage1-opcodes maybe-all-stage1-opcodes
+.PHONY: clean-stage1-opcodes maybe-clean-stage1-opcodes
+
+maybe-configure-stage1-opcodes:
+maybe-all-stage1-opcodes:
+maybe-clean-stage1-opcodes:
+
+@if opcodes-bootstrap
+maybe-configure-stage1-opcodes: configure-stage1-opcodes
+configure-stage1-opcodes:
+       @$(MAKE) stage1-start
+       @[ -f opcodes/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(HOST_EXPORTS)  \
+       echo Configuring stage 1 in opcodes ; \
+       cd $(HOST_SUBDIR)/opcodes || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/opcodes/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/opcodes"; \
+       libsrcdir="$$s/opcodes"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         --disable-intermodule           --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" 
+
+maybe-all-stage1-opcodes: all-stage1-opcodes
+all-stage1-opcodes: configure-stage1-opcodes
+       @$(MAKE) stage1-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/opcodes && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               CFLAGS="$(STAGE1_CFLAGS)" 
+
+maybe-clean-stage1-opcodes: clean-stage1-opcodes
+clean-stage1-opcodes:
+       @[ -f opcodes/Makefile ] || [ -f stage1-opcodes/Makefile ] \
+         || exit 0 ; \
+       [ -f opcodes/Makefile ] || $(MAKE) stage1-start ; \
+       cd $(HOST_SUBDIR)/opcodes && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               CFLAGS="$(STAGE1_CFLAGS)"  clean
+@endif opcodes-bootstrap
+
+
+.PHONY: configure-stage1-binutils maybe-configure-stage1-binutils
+.PHONY: all-stage1-binutils maybe-all-stage1-binutils
+.PHONY: clean-stage1-binutils maybe-clean-stage1-binutils
+
+maybe-configure-stage1-binutils:
+maybe-all-stage1-binutils:
+maybe-clean-stage1-binutils:
+
+@if binutils-bootstrap
+maybe-configure-stage1-binutils: configure-stage1-binutils
+configure-stage1-binutils:
+       @$(MAKE) stage1-start
+       @[ -f binutils/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(HOST_EXPORTS)  \
+       echo Configuring stage 1 in binutils ; \
+       cd $(HOST_SUBDIR)/binutils || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/binutils/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/binutils"; \
+       libsrcdir="$$s/binutils"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         --disable-intermodule           --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" 
+
+maybe-all-stage1-binutils: all-stage1-binutils
+all-stage1-binutils: configure-stage1-binutils
+       @$(MAKE) stage1-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/binutils && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               CFLAGS="$(STAGE1_CFLAGS)" 
+
+maybe-clean-stage1-binutils: clean-stage1-binutils
+clean-stage1-binutils:
+       @[ -f binutils/Makefile ] || [ -f stage1-binutils/Makefile ] \
+         || exit 0 ; \
+       [ -f binutils/Makefile ] || $(MAKE) stage1-start ; \
+       cd $(HOST_SUBDIR)/binutils && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               CFLAGS="$(STAGE1_CFLAGS)"  clean
+@endif binutils-bootstrap
+
+
+.PHONY: configure-stage1-gas maybe-configure-stage1-gas
+.PHONY: all-stage1-gas maybe-all-stage1-gas
+.PHONY: clean-stage1-gas maybe-clean-stage1-gas
+
+maybe-configure-stage1-gas:
+maybe-all-stage1-gas:
+maybe-clean-stage1-gas:
+
+@if gas-bootstrap
+maybe-configure-stage1-gas: configure-stage1-gas
+configure-stage1-gas:
+       @$(MAKE) stage1-start
+       @[ -f gas/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(HOST_EXPORTS)  \
+       echo Configuring stage 1 in gas ; \
+       cd $(HOST_SUBDIR)/gas || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/gas/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/gas"; \
+       libsrcdir="$$s/gas"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         --disable-intermodule           --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" 
+
+maybe-all-stage1-gas: all-stage1-gas
+all-stage1-gas: configure-stage1-gas
+       @$(MAKE) stage1-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/gas && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               CFLAGS="$(STAGE1_CFLAGS)" 
+
+maybe-clean-stage1-gas: clean-stage1-gas
+clean-stage1-gas:
+       @[ -f gas/Makefile ] || [ -f stage1-gas/Makefile ] \
+         || exit 0 ; \
+       [ -f gas/Makefile ] || $(MAKE) stage1-start ; \
+       cd $(HOST_SUBDIR)/gas && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               CFLAGS="$(STAGE1_CFLAGS)"  clean
+@endif gas-bootstrap
+
+
+.PHONY: configure-stage1-gcc maybe-configure-stage1-gcc
+.PHONY: all-stage1-gcc maybe-all-stage1-gcc
+.PHONY: clean-stage1-gcc maybe-clean-stage1-gcc
+
+maybe-configure-stage1-gcc:
+maybe-all-stage1-gcc:
+maybe-clean-stage1-gcc:
+
+@if gcc-bootstrap
+maybe-configure-stage1-gcc: configure-stage1-gcc
+configure-stage1-gcc:
+       @$(MAKE) stage1-start
+       @[ -f gcc/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(HOST_EXPORTS)  \
+       echo Configuring stage 1 in gcc ; \
+       cd $(HOST_SUBDIR)/gcc || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/gcc/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/gcc"; \
+       libsrcdir="$$s/gcc"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         --disable-intermodule           --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" 
+
+maybe-all-stage1-gcc: all-stage1-gcc
+all-stage1-gcc: configure-stage1-gcc
+       @$(MAKE) stage1-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/gcc && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               CFLAGS="$(STAGE1_CFLAGS)" $(EXTRA_GCC_FLAGS)
+
+maybe-clean-stage1-gcc: clean-stage1-gcc
+clean-stage1-gcc:
+       @[ -f gcc/Makefile ] || [ -f stage1-gcc/Makefile ] \
+         || exit 0 ; \
+       [ -f gcc/Makefile ] || $(MAKE) stage1-start ; \
+       cd $(HOST_SUBDIR)/gcc && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               CFLAGS="$(STAGE1_CFLAGS)" $(EXTRA_GCC_FLAGS) clean
+@endif gcc-bootstrap
+
+
+.PHONY: configure-stage1-intl maybe-configure-stage1-intl
+.PHONY: all-stage1-intl maybe-all-stage1-intl
+.PHONY: clean-stage1-intl maybe-clean-stage1-intl
+
+maybe-configure-stage1-intl:
+maybe-all-stage1-intl:
+maybe-clean-stage1-intl:
+
+@if intl-bootstrap
+maybe-configure-stage1-intl: configure-stage1-intl
+configure-stage1-intl:
+       @$(MAKE) stage1-start
+       @[ -f intl/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(HOST_EXPORTS)  \
+       echo Configuring stage 1 in intl ; \
+       cd $(HOST_SUBDIR)/intl || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/intl/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/intl"; \
+       libsrcdir="$$s/intl"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         --disable-intermodule           --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" 
+
+maybe-all-stage1-intl: all-stage1-intl
+all-stage1-intl: configure-stage1-intl
+       @$(MAKE) stage1-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/intl && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               CFLAGS="$(STAGE1_CFLAGS)" 
+
+maybe-clean-stage1-intl: clean-stage1-intl
+clean-stage1-intl:
+       @[ -f intl/Makefile ] || [ -f stage1-intl/Makefile ] \
+         || exit 0 ; \
+       [ -f intl/Makefile ] || $(MAKE) stage1-start ; \
+       cd $(HOST_SUBDIR)/intl && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               CFLAGS="$(STAGE1_CFLAGS)"  clean
+@endif intl-bootstrap
+
+
+.PHONY: configure-stage1-ld maybe-configure-stage1-ld
+.PHONY: all-stage1-ld maybe-all-stage1-ld
+.PHONY: clean-stage1-ld maybe-clean-stage1-ld
+
+maybe-configure-stage1-ld:
+maybe-all-stage1-ld:
+maybe-clean-stage1-ld:
+
+@if ld-bootstrap
+maybe-configure-stage1-ld: configure-stage1-ld
+configure-stage1-ld:
+       @$(MAKE) stage1-start
+       @[ -f ld/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(HOST_EXPORTS)  \
+       echo Configuring stage 1 in ld ; \
+       cd $(HOST_SUBDIR)/ld || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/ld/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/ld"; \
+       libsrcdir="$$s/ld"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         --disable-intermodule           --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" 
+
+maybe-all-stage1-ld: all-stage1-ld
+all-stage1-ld: configure-stage1-ld
+       @$(MAKE) stage1-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/ld && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               CFLAGS="$(STAGE1_CFLAGS)" 
+
+maybe-clean-stage1-ld: clean-stage1-ld
+clean-stage1-ld:
+       @[ -f ld/Makefile ] || [ -f stage1-ld/Makefile ] \
+         || exit 0 ; \
+       [ -f ld/Makefile ] || $(MAKE) stage1-start ; \
+       cd $(HOST_SUBDIR)/ld && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               CFLAGS="$(STAGE1_CFLAGS)"  clean
+@endif ld-bootstrap
+
+
+.PHONY: configure-stage1-libcpp maybe-configure-stage1-libcpp
+.PHONY: all-stage1-libcpp maybe-all-stage1-libcpp
+.PHONY: clean-stage1-libcpp maybe-clean-stage1-libcpp
+
+maybe-configure-stage1-libcpp:
+maybe-all-stage1-libcpp:
+maybe-clean-stage1-libcpp:
+
+@if libcpp-bootstrap
+maybe-configure-stage1-libcpp: configure-stage1-libcpp
+configure-stage1-libcpp:
+       @$(MAKE) stage1-start
+       @[ -f libcpp/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(HOST_EXPORTS)  \
+       echo Configuring stage 1 in libcpp ; \
+       cd $(HOST_SUBDIR)/libcpp || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/libcpp/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/libcpp"; \
+       libsrcdir="$$s/libcpp"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         --disable-intermodule           --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" 
+
+maybe-all-stage1-libcpp: all-stage1-libcpp
+all-stage1-libcpp: configure-stage1-libcpp
+       @$(MAKE) stage1-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/libcpp && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               CFLAGS="$(STAGE1_CFLAGS)" 
+
+maybe-clean-stage1-libcpp: clean-stage1-libcpp
+clean-stage1-libcpp:
+       @[ -f libcpp/Makefile ] || [ -f stage1-libcpp/Makefile ] \
+         || exit 0 ; \
+       [ -f libcpp/Makefile ] || $(MAKE) stage1-start ; \
+       cd $(HOST_SUBDIR)/libcpp && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               CFLAGS="$(STAGE1_CFLAGS)"  clean
+@endif libcpp-bootstrap
+
+
+.PHONY: configure-stage1-libiberty maybe-configure-stage1-libiberty
+.PHONY: all-stage1-libiberty maybe-all-stage1-libiberty
+.PHONY: clean-stage1-libiberty maybe-clean-stage1-libiberty
+
+maybe-configure-stage1-libiberty:
+maybe-all-stage1-libiberty:
+maybe-clean-stage1-libiberty:
+
+@if libiberty-bootstrap
+maybe-configure-stage1-libiberty: configure-stage1-libiberty
+configure-stage1-libiberty:
+       @$(MAKE) stage1-start
+       @[ -f libiberty/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(HOST_EXPORTS)  \
+       echo Configuring stage 1 in libiberty ; \
+       cd $(HOST_SUBDIR)/libiberty || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/libiberty/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/libiberty"; \
+       libsrcdir="$$s/libiberty"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         --disable-intermodule           --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" 
+
+maybe-all-stage1-libiberty: all-stage1-libiberty
+all-stage1-libiberty: configure-stage1-libiberty
+       @$(MAKE) stage1-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/libiberty && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               CFLAGS="$(STAGE1_CFLAGS)" 
+
+maybe-clean-stage1-libiberty: clean-stage1-libiberty
+clean-stage1-libiberty:
+       @[ -f libiberty/Makefile ] || [ -f stage1-libiberty/Makefile ] \
+         || exit 0 ; \
+       [ -f libiberty/Makefile ] || $(MAKE) stage1-start ; \
+       cd $(HOST_SUBDIR)/libiberty && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               CFLAGS="$(STAGE1_CFLAGS)"  clean
+@endif libiberty-bootstrap
+
+
+.PHONY: configure-stage1-zlib maybe-configure-stage1-zlib
+.PHONY: all-stage1-zlib maybe-all-stage1-zlib
+.PHONY: clean-stage1-zlib maybe-clean-stage1-zlib
+
+maybe-configure-stage1-zlib:
+maybe-all-stage1-zlib:
+maybe-clean-stage1-zlib:
+
+@if zlib-bootstrap
+maybe-configure-stage1-zlib: configure-stage1-zlib
+configure-stage1-zlib:
+       @$(MAKE) stage1-start
+       @[ -f zlib/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(HOST_EXPORTS)  \
+       echo Configuring stage 1 in zlib ; \
+       cd $(HOST_SUBDIR)/zlib || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/zlib/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/zlib"; \
+       libsrcdir="$$s/zlib"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         --disable-intermodule           --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" 
+
+maybe-all-stage1-zlib: all-stage1-zlib
+all-stage1-zlib: configure-stage1-zlib
+       @$(MAKE) stage1-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/zlib && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               CFLAGS="$(STAGE1_CFLAGS)" 
+
+maybe-clean-stage1-zlib: clean-stage1-zlib
+clean-stage1-zlib:
+       @[ -f zlib/Makefile ] || [ -f stage1-zlib/Makefile ] \
+         || exit 0 ; \
+       [ -f zlib/Makefile ] || $(MAKE) stage1-start ; \
+       cd $(HOST_SUBDIR)/zlib && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               CFLAGS="$(STAGE1_CFLAGS)"  clean
+@endif zlib-bootstrap
+
+
+
+# FIXME: Will not need to be conditional when toplevel bootstrap is the
+# only possibility, but now it conflicts with no-bootstrap rules
+@if gcc-bootstrap
+
+
+
+
+# Rules to wipe a stage and all the following ones, also used for cleanstrap
+
+.PHONY: distclean-stage1
+distclean-stage1::
+       [ -f stage_current ] && $(MAKE) `cat stage_current`-end || :
+       rm -rf stage1-* 
+
+
+@endif gcc-bootstrap
+
+
+.PHONY: stage2-start stage2-end
+
+stage2-start::
+       @[ -f stage_current ] && $(MAKE) `cat stage_current`-end || : ; \
+       echo stage2 > stage_current ; \
+       echo stage2 > stage_last; \
+       $(mkinstalldirs) $(HOST_SUBDIR)
+@if bfd
+       @cd $(HOST_SUBDIR); [ -d stage2-bfd ] || \
+         mkdir stage2-bfd; \
+       set stage2-bfd bfd ; \
+       @CREATE_LINK_TO_DIR@  ; \
+       set stage1-bfd prev-bfd ; \
+       @CREATE_LINK_TO_DIR@ 
+@endif bfd
+@if opcodes
+       @cd $(HOST_SUBDIR); [ -d stage2-opcodes ] || \
+         mkdir stage2-opcodes; \
+       set stage2-opcodes opcodes ; \
+       @CREATE_LINK_TO_DIR@  ; \
+       set stage1-opcodes prev-opcodes ; \
+       @CREATE_LINK_TO_DIR@ 
+@endif opcodes
+@if binutils
+       @cd $(HOST_SUBDIR); [ -d stage2-binutils ] || \
+         mkdir stage2-binutils; \
+       set stage2-binutils binutils ; \
+       @CREATE_LINK_TO_DIR@  ; \
+       set stage1-binutils prev-binutils ; \
+       @CREATE_LINK_TO_DIR@ 
+@endif binutils
+@if gas
+       @cd $(HOST_SUBDIR); [ -d stage2-gas ] || \
+         mkdir stage2-gas; \
+       set stage2-gas gas ; \
+       @CREATE_LINK_TO_DIR@  ; \
+       set stage1-gas prev-gas ; \
+       @CREATE_LINK_TO_DIR@ 
+@endif gas
+@if gcc
+       @cd $(HOST_SUBDIR); [ -d stage2-gcc ] || \
+         mkdir stage2-gcc; \
+       set stage2-gcc gcc ; \
+       @CREATE_LINK_TO_DIR@  ; \
+       set stage1-gcc prev-gcc ; \
+       @CREATE_LINK_TO_DIR@ 
+@endif gcc
+@if intl
+       @cd $(HOST_SUBDIR); [ -d stage2-intl ] || \
+         mkdir stage2-intl; \
+       set stage2-intl intl ; \
+       @CREATE_LINK_TO_DIR@  ; \
+       set stage1-intl prev-intl ; \
+       @CREATE_LINK_TO_DIR@ 
+@endif intl
+@if ld
+       @cd $(HOST_SUBDIR); [ -d stage2-ld ] || \
+         mkdir stage2-ld; \
+       set stage2-ld ld ; \
+       @CREATE_LINK_TO_DIR@  ; \
+       set stage1-ld prev-ld ; \
+       @CREATE_LINK_TO_DIR@ 
+@endif ld
+@if libcpp
+       @cd $(HOST_SUBDIR); [ -d stage2-libcpp ] || \
+         mkdir stage2-libcpp; \
+       set stage2-libcpp libcpp ; \
+       @CREATE_LINK_TO_DIR@  ; \
+       set stage1-libcpp prev-libcpp ; \
+       @CREATE_LINK_TO_DIR@ 
+@endif libcpp
+@if libiberty
+       @cd $(HOST_SUBDIR); [ -d stage2-libiberty ] || \
+         mkdir stage2-libiberty; \
+       set stage2-libiberty libiberty ; \
+       @CREATE_LINK_TO_DIR@  ; \
+       set stage1-libiberty prev-libiberty ; \
+       @CREATE_LINK_TO_DIR@ 
+@endif libiberty
+@if zlib
+       @cd $(HOST_SUBDIR); [ -d stage2-zlib ] || \
+         mkdir stage2-zlib; \
+       set stage2-zlib zlib ; \
+       @CREATE_LINK_TO_DIR@  ; \
+       set stage1-zlib prev-zlib ; \
+       @CREATE_LINK_TO_DIR@ 
+@endif zlib
+
+stage2-end::
+       @rm -f stage_current
+@if bfd
+       @cd $(HOST_SUBDIR); set bfd stage2-bfd ; \
+       @UNDO_LINK_TO_DIR@  ; \
+       set prev-bfd stage1-bfd ; \
+       @UNDO_LINK_TO_DIR@ 
+@endif bfd
+@if opcodes
+       @cd $(HOST_SUBDIR); set opcodes stage2-opcodes ; \
+       @UNDO_LINK_TO_DIR@  ; \
+       set prev-opcodes stage1-opcodes ; \
+       @UNDO_LINK_TO_DIR@ 
+@endif opcodes
+@if binutils
+       @cd $(HOST_SUBDIR); set binutils stage2-binutils ; \
+       @UNDO_LINK_TO_DIR@  ; \
+       set prev-binutils stage1-binutils ; \
+       @UNDO_LINK_TO_DIR@ 
+@endif binutils
+@if gas
+       @cd $(HOST_SUBDIR); set gas stage2-gas ; \
+       @UNDO_LINK_TO_DIR@  ; \
+       set prev-gas stage1-gas ; \
+       @UNDO_LINK_TO_DIR@ 
+@endif gas
+@if gcc
+       @cd $(HOST_SUBDIR); set gcc stage2-gcc ; \
+       @UNDO_LINK_TO_DIR@  ; \
+       set prev-gcc stage1-gcc ; \
+       @UNDO_LINK_TO_DIR@ 
+@endif gcc
+@if intl
+       @cd $(HOST_SUBDIR); set intl stage2-intl ; \
+       @UNDO_LINK_TO_DIR@  ; \
+       set prev-intl stage1-intl ; \
+       @UNDO_LINK_TO_DIR@ 
+@endif intl
+@if ld
+       @cd $(HOST_SUBDIR); set ld stage2-ld ; \
+       @UNDO_LINK_TO_DIR@  ; \
+       set prev-ld stage1-ld ; \
+       @UNDO_LINK_TO_DIR@ 
+@endif ld
+@if libcpp
+       @cd $(HOST_SUBDIR); set libcpp stage2-libcpp ; \
+       @UNDO_LINK_TO_DIR@  ; \
+       set prev-libcpp stage1-libcpp ; \
+       @UNDO_LINK_TO_DIR@ 
+@endif libcpp
+@if libiberty
+       @cd $(HOST_SUBDIR); set libiberty stage2-libiberty ; \
+       @UNDO_LINK_TO_DIR@  ; \
+       set prev-libiberty stage1-libiberty ; \
+       @UNDO_LINK_TO_DIR@ 
+@endif libiberty
+@if zlib
+       @cd $(HOST_SUBDIR); set zlib stage2-zlib ; \
+       @UNDO_LINK_TO_DIR@  ; \
+       set prev-zlib stage1-zlib ; \
+       @UNDO_LINK_TO_DIR@ 
+@endif zlib
+
+# Bubble a bugfix through all the stages up to stage 2.  They
+# are remade, but not reconfigured.  The next stage (if any) will not
+# be reconfigured as well.
+.PHONY: stage2-bubble
+stage2-bubble:: stage1-bubble
+       @if test -f stage2-lean || test -f stage1-lean  ; then \
+         echo Skipping rebuild of stage2 ; \
+       else \
+         $(MAKE) $(RECURSE_FLAGS_TO_PASS) NOTPARALLEL= all-stage2; \
+       fi
+
+.PHONY: all-stage2 clean-stage2
+all-stage2:     \
+  maybe-all-stage2-bfd \
+  maybe-all-stage2-opcodes \
+  maybe-all-stage2-binutils              \
+  maybe-all-stage2-gas \
+  maybe-all-stage2-gcc        \
+  maybe-all-stage2-intl   \
+  maybe-all-stage2-ld \
+  maybe-all-stage2-libcpp  \
+  maybe-all-stage2-libiberty                        \
+  maybe-all-stage2-zlib        
+
+do-clean: clean-stage2
+clean-stage2:     \
+  maybe-clean-stage2-bfd \
+  maybe-clean-stage2-opcodes \
+  maybe-clean-stage2-binutils              \
+  maybe-clean-stage2-gas \
+  maybe-clean-stage2-gcc        \
+  maybe-clean-stage2-intl   \
+  maybe-clean-stage2-ld \
+  maybe-clean-stage2-libcpp  \
+  maybe-clean-stage2-libiberty                        \
+  maybe-clean-stage2-zlib        
+
+
+.PHONY: configure-stage2-bfd maybe-configure-stage2-bfd
+.PHONY: all-stage2-bfd maybe-all-stage2-bfd
+.PHONY: clean-stage2-bfd maybe-clean-stage2-bfd
+
+maybe-configure-stage2-bfd:
+maybe-all-stage2-bfd:
+maybe-clean-stage2-bfd:
+
+@if bfd-bootstrap
+maybe-configure-stage2-bfd: configure-stage2-bfd
+configure-stage2-bfd:
+       @$(MAKE) stage2-start
+       @[ -f bfd/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage 2 in bfd ; \
+       cd $(HOST_SUBDIR)/bfd || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/bfd/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/bfd"; \
+       libsrcdir="$$s/bfd"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+
+maybe-all-stage2-bfd: all-stage2-bfd
+all-stage2-bfd: configure-stage2-bfd
+       @$(MAKE) stage2-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/bfd && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                
+
+maybe-clean-stage2-bfd: clean-stage2-bfd
+clean-stage2-bfd:
+       @[ -f bfd/Makefile ] || [ -f stage2-bfd/Makefile ] \
+         || exit 0 ; \
+       [ -f bfd/Makefile ] || $(MAKE) stage2-start ; \
+       cd $(HOST_SUBDIR)/bfd && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                 clean
+@endif bfd-bootstrap
+
+
+.PHONY: configure-stage2-opcodes maybe-configure-stage2-opcodes
+.PHONY: all-stage2-opcodes maybe-all-stage2-opcodes
+.PHONY: clean-stage2-opcodes maybe-clean-stage2-opcodes
+
+maybe-configure-stage2-opcodes:
+maybe-all-stage2-opcodes:
+maybe-clean-stage2-opcodes:
+
+@if opcodes-bootstrap
+maybe-configure-stage2-opcodes: configure-stage2-opcodes
+configure-stage2-opcodes:
+       @$(MAKE) stage2-start
+       @[ -f opcodes/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage 2 in opcodes ; \
+       cd $(HOST_SUBDIR)/opcodes || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/opcodes/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/opcodes"; \
+       libsrcdir="$$s/opcodes"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+
+maybe-all-stage2-opcodes: all-stage2-opcodes
+all-stage2-opcodes: configure-stage2-opcodes
+       @$(MAKE) stage2-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/opcodes && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                
+
+maybe-clean-stage2-opcodes: clean-stage2-opcodes
+clean-stage2-opcodes:
+       @[ -f opcodes/Makefile ] || [ -f stage2-opcodes/Makefile ] \
+         || exit 0 ; \
+       [ -f opcodes/Makefile ] || $(MAKE) stage2-start ; \
+       cd $(HOST_SUBDIR)/opcodes && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                 clean
+@endif opcodes-bootstrap
+
+
+.PHONY: configure-stage2-binutils maybe-configure-stage2-binutils
+.PHONY: all-stage2-binutils maybe-all-stage2-binutils
+.PHONY: clean-stage2-binutils maybe-clean-stage2-binutils
+
+maybe-configure-stage2-binutils:
+maybe-all-stage2-binutils:
+maybe-clean-stage2-binutils:
+
+@if binutils-bootstrap
+maybe-configure-stage2-binutils: configure-stage2-binutils
+configure-stage2-binutils:
+       @$(MAKE) stage2-start
+       @[ -f binutils/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage 2 in binutils ; \
+       cd $(HOST_SUBDIR)/binutils || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/binutils/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/binutils"; \
+       libsrcdir="$$s/binutils"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+
+maybe-all-stage2-binutils: all-stage2-binutils
+all-stage2-binutils: configure-stage2-binutils
+       @$(MAKE) stage2-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/binutils && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                
+
+maybe-clean-stage2-binutils: clean-stage2-binutils
+clean-stage2-binutils:
+       @[ -f binutils/Makefile ] || [ -f stage2-binutils/Makefile ] \
+         || exit 0 ; \
+       [ -f binutils/Makefile ] || $(MAKE) stage2-start ; \
+       cd $(HOST_SUBDIR)/binutils && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                 clean
+@endif binutils-bootstrap
+
+
+.PHONY: configure-stage2-gas maybe-configure-stage2-gas
+.PHONY: all-stage2-gas maybe-all-stage2-gas
+.PHONY: clean-stage2-gas maybe-clean-stage2-gas
+
+maybe-configure-stage2-gas:
+maybe-all-stage2-gas:
+maybe-clean-stage2-gas:
+
+@if gas-bootstrap
+maybe-configure-stage2-gas: configure-stage2-gas
+configure-stage2-gas:
+       @$(MAKE) stage2-start
+       @[ -f gas/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage 2 in gas ; \
+       cd $(HOST_SUBDIR)/gas || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/gas/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/gas"; \
+       libsrcdir="$$s/gas"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+
+maybe-all-stage2-gas: all-stage2-gas
+all-stage2-gas: configure-stage2-gas
+       @$(MAKE) stage2-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/gas && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                
+
+maybe-clean-stage2-gas: clean-stage2-gas
+clean-stage2-gas:
+       @[ -f gas/Makefile ] || [ -f stage2-gas/Makefile ] \
+         || exit 0 ; \
+       [ -f gas/Makefile ] || $(MAKE) stage2-start ; \
+       cd $(HOST_SUBDIR)/gas && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                 clean
+@endif gas-bootstrap
+
+
+.PHONY: configure-stage2-gcc maybe-configure-stage2-gcc
+.PHONY: all-stage2-gcc maybe-all-stage2-gcc
+.PHONY: clean-stage2-gcc maybe-clean-stage2-gcc
+
+maybe-configure-stage2-gcc:
+maybe-all-stage2-gcc:
+maybe-clean-stage2-gcc:
+
+@if gcc-bootstrap
+maybe-configure-stage2-gcc: configure-stage2-gcc
+configure-stage2-gcc:
+       @$(MAKE) stage2-start
+       @[ -f gcc/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage 2 in gcc ; \
+       cd $(HOST_SUBDIR)/gcc || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/gcc/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/gcc"; \
+       libsrcdir="$$s/gcc"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+
+maybe-all-stage2-gcc: all-stage2-gcc
+all-stage2-gcc: configure-stage2-gcc
+       @$(MAKE) stage2-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/gcc && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                $(EXTRA_GCC_FLAGS)
+
+maybe-clean-stage2-gcc: clean-stage2-gcc
+clean-stage2-gcc:
+       @[ -f gcc/Makefile ] || [ -f stage2-gcc/Makefile ] \
+         || exit 0 ; \
+       [ -f gcc/Makefile ] || $(MAKE) stage2-start ; \
+       cd $(HOST_SUBDIR)/gcc && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                $(EXTRA_GCC_FLAGS) clean
+@endif gcc-bootstrap
+
+
+.PHONY: configure-stage2-intl maybe-configure-stage2-intl
+.PHONY: all-stage2-intl maybe-all-stage2-intl
+.PHONY: clean-stage2-intl maybe-clean-stage2-intl
+
+maybe-configure-stage2-intl:
+maybe-all-stage2-intl:
+maybe-clean-stage2-intl:
+
+@if intl-bootstrap
+maybe-configure-stage2-intl: configure-stage2-intl
+configure-stage2-intl:
+       @$(MAKE) stage2-start
+       @[ -f intl/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage 2 in intl ; \
+       cd $(HOST_SUBDIR)/intl || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/intl/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/intl"; \
+       libsrcdir="$$s/intl"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+
+maybe-all-stage2-intl: all-stage2-intl
+all-stage2-intl: configure-stage2-intl
+       @$(MAKE) stage2-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/intl && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                
+
+maybe-clean-stage2-intl: clean-stage2-intl
+clean-stage2-intl:
+       @[ -f intl/Makefile ] || [ -f stage2-intl/Makefile ] \
+         || exit 0 ; \
+       [ -f intl/Makefile ] || $(MAKE) stage2-start ; \
+       cd $(HOST_SUBDIR)/intl && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                 clean
+@endif intl-bootstrap
+
+
+.PHONY: configure-stage2-ld maybe-configure-stage2-ld
+.PHONY: all-stage2-ld maybe-all-stage2-ld
+.PHONY: clean-stage2-ld maybe-clean-stage2-ld
+
+maybe-configure-stage2-ld:
+maybe-all-stage2-ld:
+maybe-clean-stage2-ld:
+
+@if ld-bootstrap
+maybe-configure-stage2-ld: configure-stage2-ld
+configure-stage2-ld:
+       @$(MAKE) stage2-start
+       @[ -f ld/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage 2 in ld ; \
+       cd $(HOST_SUBDIR)/ld || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/ld/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/ld"; \
+       libsrcdir="$$s/ld"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+
+maybe-all-stage2-ld: all-stage2-ld
+all-stage2-ld: configure-stage2-ld
+       @$(MAKE) stage2-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/ld && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                
+
+maybe-clean-stage2-ld: clean-stage2-ld
+clean-stage2-ld:
+       @[ -f ld/Makefile ] || [ -f stage2-ld/Makefile ] \
+         || exit 0 ; \
+       [ -f ld/Makefile ] || $(MAKE) stage2-start ; \
+       cd $(HOST_SUBDIR)/ld && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                 clean
+@endif ld-bootstrap
+
+
+.PHONY: configure-stage2-libcpp maybe-configure-stage2-libcpp
+.PHONY: all-stage2-libcpp maybe-all-stage2-libcpp
+.PHONY: clean-stage2-libcpp maybe-clean-stage2-libcpp
+
+maybe-configure-stage2-libcpp:
+maybe-all-stage2-libcpp:
+maybe-clean-stage2-libcpp:
+
+@if libcpp-bootstrap
+maybe-configure-stage2-libcpp: configure-stage2-libcpp
+configure-stage2-libcpp:
+       @$(MAKE) stage2-start
+       @[ -f libcpp/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage 2 in libcpp ; \
+       cd $(HOST_SUBDIR)/libcpp || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/libcpp/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/libcpp"; \
+       libsrcdir="$$s/libcpp"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+
+maybe-all-stage2-libcpp: all-stage2-libcpp
+all-stage2-libcpp: configure-stage2-libcpp
+       @$(MAKE) stage2-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/libcpp && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                
+
+maybe-clean-stage2-libcpp: clean-stage2-libcpp
+clean-stage2-libcpp:
+       @[ -f libcpp/Makefile ] || [ -f stage2-libcpp/Makefile ] \
+         || exit 0 ; \
+       [ -f libcpp/Makefile ] || $(MAKE) stage2-start ; \
+       cd $(HOST_SUBDIR)/libcpp && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                 clean
+@endif libcpp-bootstrap
+
+
+.PHONY: configure-stage2-libiberty maybe-configure-stage2-libiberty
+.PHONY: all-stage2-libiberty maybe-all-stage2-libiberty
+.PHONY: clean-stage2-libiberty maybe-clean-stage2-libiberty
+
+maybe-configure-stage2-libiberty:
+maybe-all-stage2-libiberty:
+maybe-clean-stage2-libiberty:
+
+@if libiberty-bootstrap
+maybe-configure-stage2-libiberty: configure-stage2-libiberty
+configure-stage2-libiberty:
+       @$(MAKE) stage2-start
+       @[ -f libiberty/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage 2 in libiberty ; \
+       cd $(HOST_SUBDIR)/libiberty || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/libiberty/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/libiberty"; \
+       libsrcdir="$$s/libiberty"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+
+maybe-all-stage2-libiberty: all-stage2-libiberty
+all-stage2-libiberty: configure-stage2-libiberty
+       @$(MAKE) stage2-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/libiberty && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                
+
+maybe-clean-stage2-libiberty: clean-stage2-libiberty
+clean-stage2-libiberty:
+       @[ -f libiberty/Makefile ] || [ -f stage2-libiberty/Makefile ] \
+         || exit 0 ; \
+       [ -f libiberty/Makefile ] || $(MAKE) stage2-start ; \
+       cd $(HOST_SUBDIR)/libiberty && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                 clean
+@endif libiberty-bootstrap
+
+
+.PHONY: configure-stage2-zlib maybe-configure-stage2-zlib
+.PHONY: all-stage2-zlib maybe-all-stage2-zlib
+.PHONY: clean-stage2-zlib maybe-clean-stage2-zlib
+
+maybe-configure-stage2-zlib:
+maybe-all-stage2-zlib:
+maybe-clean-stage2-zlib:
+
+@if zlib-bootstrap
+maybe-configure-stage2-zlib: configure-stage2-zlib
+configure-stage2-zlib:
+       @$(MAKE) stage2-start
+       @[ -f zlib/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage 2 in zlib ; \
+       cd $(HOST_SUBDIR)/zlib || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/zlib/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/zlib"; \
+       libsrcdir="$$s/zlib"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+
+maybe-all-stage2-zlib: all-stage2-zlib
+all-stage2-zlib: configure-stage2-zlib
+       @$(MAKE) stage2-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/zlib && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                
+
+maybe-clean-stage2-zlib: clean-stage2-zlib
+clean-stage2-zlib:
+       @[ -f zlib/Makefile ] || [ -f stage2-zlib/Makefile ] \
+         || exit 0 ; \
+       [ -f zlib/Makefile ] || $(MAKE) stage2-start ; \
+       cd $(HOST_SUBDIR)/zlib && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                 clean
+@endif zlib-bootstrap
+
+
+
+# FIXME: Will not need to be conditional when toplevel bootstrap is the
+# only possibility, but now it conflicts with no-bootstrap rules
+@if gcc-bootstrap
+
+
+
+.PHONY: bootstrap2
+bootstrap2: stage2-bubble  all
+
+
+# Rules to wipe a stage and all the following ones, also used for cleanstrap
+distclean-stage1:: distclean-stage2 
+.PHONY: distclean-stage2
+distclean-stage2::
+       [ -f stage_current ] && $(MAKE) `cat stage_current`-end || :
+       rm -rf stage2-* 
+
+
+@endif gcc-bootstrap
+
+
+.PHONY: stage3-start stage3-end
+
+stage3-start::
+       @[ -f stage_current ] && $(MAKE) `cat stage_current`-end || : ; \
+       echo stage3 > stage_current ; \
+       echo stage3 > stage_last; \
+       $(mkinstalldirs) $(HOST_SUBDIR)
+@if bfd
+       @cd $(HOST_SUBDIR); [ -d stage3-bfd ] || \
+         mkdir stage3-bfd; \
+       set stage3-bfd bfd ; \
+       @CREATE_LINK_TO_DIR@  ; \
+       set stage2-bfd prev-bfd ; \
+       @CREATE_LINK_TO_DIR@ 
+@endif bfd
+@if opcodes
+       @cd $(HOST_SUBDIR); [ -d stage3-opcodes ] || \
+         mkdir stage3-opcodes; \
+       set stage3-opcodes opcodes ; \
+       @CREATE_LINK_TO_DIR@  ; \
+       set stage2-opcodes prev-opcodes ; \
+       @CREATE_LINK_TO_DIR@ 
+@endif opcodes
+@if binutils
+       @cd $(HOST_SUBDIR); [ -d stage3-binutils ] || \
+         mkdir stage3-binutils; \
+       set stage3-binutils binutils ; \
+       @CREATE_LINK_TO_DIR@  ; \
+       set stage2-binutils prev-binutils ; \
+       @CREATE_LINK_TO_DIR@ 
+@endif binutils
+@if gas
+       @cd $(HOST_SUBDIR); [ -d stage3-gas ] || \
+         mkdir stage3-gas; \
+       set stage3-gas gas ; \
+       @CREATE_LINK_TO_DIR@  ; \
+       set stage2-gas prev-gas ; \
+       @CREATE_LINK_TO_DIR@ 
+@endif gas
+@if gcc
+       @cd $(HOST_SUBDIR); [ -d stage3-gcc ] || \
+         mkdir stage3-gcc; \
+       set stage3-gcc gcc ; \
+       @CREATE_LINK_TO_DIR@  ; \
+       set stage2-gcc prev-gcc ; \
+       @CREATE_LINK_TO_DIR@ 
+@endif gcc
+@if intl
+       @cd $(HOST_SUBDIR); [ -d stage3-intl ] || \
+         mkdir stage3-intl; \
+       set stage3-intl intl ; \
+       @CREATE_LINK_TO_DIR@  ; \
+       set stage2-intl prev-intl ; \
+       @CREATE_LINK_TO_DIR@ 
+@endif intl
+@if ld
+       @cd $(HOST_SUBDIR); [ -d stage3-ld ] || \
+         mkdir stage3-ld; \
+       set stage3-ld ld ; \
+       @CREATE_LINK_TO_DIR@  ; \
+       set stage2-ld prev-ld ; \
+       @CREATE_LINK_TO_DIR@ 
+@endif ld
+@if libcpp
+       @cd $(HOST_SUBDIR); [ -d stage3-libcpp ] || \
+         mkdir stage3-libcpp; \
+       set stage3-libcpp libcpp ; \
+       @CREATE_LINK_TO_DIR@  ; \
+       set stage2-libcpp prev-libcpp ; \
+       @CREATE_LINK_TO_DIR@ 
+@endif libcpp
+@if libiberty
+       @cd $(HOST_SUBDIR); [ -d stage3-libiberty ] || \
+         mkdir stage3-libiberty; \
+       set stage3-libiberty libiberty ; \
+       @CREATE_LINK_TO_DIR@  ; \
+       set stage2-libiberty prev-libiberty ; \
+       @CREATE_LINK_TO_DIR@ 
+@endif libiberty
+@if zlib
+       @cd $(HOST_SUBDIR); [ -d stage3-zlib ] || \
+         mkdir stage3-zlib; \
+       set stage3-zlib zlib ; \
+       @CREATE_LINK_TO_DIR@  ; \
+       set stage2-zlib prev-zlib ; \
+       @CREATE_LINK_TO_DIR@ 
+@endif zlib
+
+stage3-end::
+       @rm -f stage_current
+@if bfd
+       @cd $(HOST_SUBDIR); set bfd stage3-bfd ; \
+       @UNDO_LINK_TO_DIR@  ; \
+       set prev-bfd stage2-bfd ; \
+       @UNDO_LINK_TO_DIR@ 
+@endif bfd
+@if opcodes
+       @cd $(HOST_SUBDIR); set opcodes stage3-opcodes ; \
+       @UNDO_LINK_TO_DIR@  ; \
+       set prev-opcodes stage2-opcodes ; \
+       @UNDO_LINK_TO_DIR@ 
+@endif opcodes
+@if binutils
+       @cd $(HOST_SUBDIR); set binutils stage3-binutils ; \
+       @UNDO_LINK_TO_DIR@  ; \
+       set prev-binutils stage2-binutils ; \
+       @UNDO_LINK_TO_DIR@ 
+@endif binutils
+@if gas
+       @cd $(HOST_SUBDIR); set gas stage3-gas ; \
+       @UNDO_LINK_TO_DIR@  ; \
+       set prev-gas stage2-gas ; \
+       @UNDO_LINK_TO_DIR@ 
+@endif gas
+@if gcc
+       @cd $(HOST_SUBDIR); set gcc stage3-gcc ; \
+       @UNDO_LINK_TO_DIR@  ; \
+       set prev-gcc stage2-gcc ; \
+       @UNDO_LINK_TO_DIR@ 
+@endif gcc
+@if intl
+       @cd $(HOST_SUBDIR); set intl stage3-intl ; \
+       @UNDO_LINK_TO_DIR@  ; \
+       set prev-intl stage2-intl ; \
+       @UNDO_LINK_TO_DIR@ 
+@endif intl
+@if ld
+       @cd $(HOST_SUBDIR); set ld stage3-ld ; \
+       @UNDO_LINK_TO_DIR@  ; \
+       set prev-ld stage2-ld ; \
+       @UNDO_LINK_TO_DIR@ 
+@endif ld
+@if libcpp
+       @cd $(HOST_SUBDIR); set libcpp stage3-libcpp ; \
+       @UNDO_LINK_TO_DIR@  ; \
+       set prev-libcpp stage2-libcpp ; \
+       @UNDO_LINK_TO_DIR@ 
+@endif libcpp
+@if libiberty
+       @cd $(HOST_SUBDIR); set libiberty stage3-libiberty ; \
+       @UNDO_LINK_TO_DIR@  ; \
+       set prev-libiberty stage2-libiberty ; \
+       @UNDO_LINK_TO_DIR@ 
+@endif libiberty
+@if zlib
+       @cd $(HOST_SUBDIR); set zlib stage3-zlib ; \
+       @UNDO_LINK_TO_DIR@  ; \
+       set prev-zlib stage2-zlib ; \
+       @UNDO_LINK_TO_DIR@ 
+@endif zlib
+
+# Bubble a bugfix through all the stages up to stage 3.  They
+# are remade, but not reconfigured.  The next stage (if any) will not
+# be reconfigured as well.
+.PHONY: stage3-bubble
+stage3-bubble:: stage2-bubble
+       @bootstrap_lean@-rm -rf stage1-* ; $(STAMP) stage1-lean
+       @if test -f stage3-lean || test -f stage2-lean  ; then \
+         echo Skipping rebuild of stage3 ; \
+       else \
+         $(MAKE) $(RECURSE_FLAGS_TO_PASS) NOTPARALLEL= all-stage3; \
+       fi
+
+.PHONY: all-stage3 clean-stage3
+all-stage3:     \
+  maybe-all-stage3-bfd \
+  maybe-all-stage3-opcodes \
+  maybe-all-stage3-binutils              \
+  maybe-all-stage3-gas \
+  maybe-all-stage3-gcc        \
+  maybe-all-stage3-intl   \
+  maybe-all-stage3-ld \
+  maybe-all-stage3-libcpp  \
+  maybe-all-stage3-libiberty                        \
+  maybe-all-stage3-zlib        
+
+do-clean: clean-stage3
+clean-stage3:     \
+  maybe-clean-stage3-bfd \
+  maybe-clean-stage3-opcodes \
+  maybe-clean-stage3-binutils              \
+  maybe-clean-stage3-gas \
+  maybe-clean-stage3-gcc        \
+  maybe-clean-stage3-intl   \
+  maybe-clean-stage3-ld \
+  maybe-clean-stage3-libcpp  \
+  maybe-clean-stage3-libiberty                        \
+  maybe-clean-stage3-zlib        
+
+
+.PHONY: configure-stage3-bfd maybe-configure-stage3-bfd
+.PHONY: all-stage3-bfd maybe-all-stage3-bfd
+.PHONY: clean-stage3-bfd maybe-clean-stage3-bfd
+
+maybe-configure-stage3-bfd:
+maybe-all-stage3-bfd:
+maybe-clean-stage3-bfd:
+
+@if bfd-bootstrap
+maybe-configure-stage3-bfd: configure-stage3-bfd
+configure-stage3-bfd:
+       @$(MAKE) stage3-start
+       @[ -f bfd/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage 3 in bfd ; \
+       cd $(HOST_SUBDIR)/bfd || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/bfd/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/bfd"; \
+       libsrcdir="$$s/bfd"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+
+maybe-all-stage3-bfd: all-stage3-bfd
+all-stage3-bfd: configure-stage3-bfd
+       @$(MAKE) stage3-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/bfd && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                
+
+maybe-clean-stage3-bfd: clean-stage3-bfd
+clean-stage3-bfd:
+       @[ -f bfd/Makefile ] || [ -f stage3-bfd/Makefile ] \
+         || exit 0 ; \
+       [ -f bfd/Makefile ] || $(MAKE) stage3-start ; \
+       cd $(HOST_SUBDIR)/bfd && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                 clean
+@endif bfd-bootstrap
+
+
+.PHONY: configure-stage3-opcodes maybe-configure-stage3-opcodes
+.PHONY: all-stage3-opcodes maybe-all-stage3-opcodes
+.PHONY: clean-stage3-opcodes maybe-clean-stage3-opcodes
+
+maybe-configure-stage3-opcodes:
+maybe-all-stage3-opcodes:
+maybe-clean-stage3-opcodes:
+
+@if opcodes-bootstrap
+maybe-configure-stage3-opcodes: configure-stage3-opcodes
+configure-stage3-opcodes:
+       @$(MAKE) stage3-start
+       @[ -f opcodes/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage 3 in opcodes ; \
+       cd $(HOST_SUBDIR)/opcodes || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/opcodes/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/opcodes"; \
+       libsrcdir="$$s/opcodes"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+
+maybe-all-stage3-opcodes: all-stage3-opcodes
+all-stage3-opcodes: configure-stage3-opcodes
+       @$(MAKE) stage3-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/opcodes && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                
+
+maybe-clean-stage3-opcodes: clean-stage3-opcodes
+clean-stage3-opcodes:
+       @[ -f opcodes/Makefile ] || [ -f stage3-opcodes/Makefile ] \
+         || exit 0 ; \
+       [ -f opcodes/Makefile ] || $(MAKE) stage3-start ; \
+       cd $(HOST_SUBDIR)/opcodes && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                 clean
+@endif opcodes-bootstrap
+
+
+.PHONY: configure-stage3-binutils maybe-configure-stage3-binutils
+.PHONY: all-stage3-binutils maybe-all-stage3-binutils
+.PHONY: clean-stage3-binutils maybe-clean-stage3-binutils
+
+maybe-configure-stage3-binutils:
+maybe-all-stage3-binutils:
+maybe-clean-stage3-binutils:
+
+@if binutils-bootstrap
+maybe-configure-stage3-binutils: configure-stage3-binutils
+configure-stage3-binutils:
+       @$(MAKE) stage3-start
+       @[ -f binutils/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage 3 in binutils ; \
+       cd $(HOST_SUBDIR)/binutils || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/binutils/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/binutils"; \
+       libsrcdir="$$s/binutils"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+
+maybe-all-stage3-binutils: all-stage3-binutils
+all-stage3-binutils: configure-stage3-binutils
+       @$(MAKE) stage3-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/binutils && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                
+
+maybe-clean-stage3-binutils: clean-stage3-binutils
+clean-stage3-binutils:
+       @[ -f binutils/Makefile ] || [ -f stage3-binutils/Makefile ] \
+         || exit 0 ; \
+       [ -f binutils/Makefile ] || $(MAKE) stage3-start ; \
+       cd $(HOST_SUBDIR)/binutils && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                 clean
+@endif binutils-bootstrap
+
+
+.PHONY: configure-stage3-gas maybe-configure-stage3-gas
+.PHONY: all-stage3-gas maybe-all-stage3-gas
+.PHONY: clean-stage3-gas maybe-clean-stage3-gas
+
+maybe-configure-stage3-gas:
+maybe-all-stage3-gas:
+maybe-clean-stage3-gas:
+
+@if gas-bootstrap
+maybe-configure-stage3-gas: configure-stage3-gas
+configure-stage3-gas:
+       @$(MAKE) stage3-start
+       @[ -f gas/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage 3 in gas ; \
+       cd $(HOST_SUBDIR)/gas || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/gas/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/gas"; \
+       libsrcdir="$$s/gas"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+
+maybe-all-stage3-gas: all-stage3-gas
+all-stage3-gas: configure-stage3-gas
+       @$(MAKE) stage3-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/gas && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                
+
+maybe-clean-stage3-gas: clean-stage3-gas
+clean-stage3-gas:
+       @[ -f gas/Makefile ] || [ -f stage3-gas/Makefile ] \
+         || exit 0 ; \
+       [ -f gas/Makefile ] || $(MAKE) stage3-start ; \
+       cd $(HOST_SUBDIR)/gas && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                 clean
+@endif gas-bootstrap
+
+
+.PHONY: configure-stage3-gcc maybe-configure-stage3-gcc
+.PHONY: all-stage3-gcc maybe-all-stage3-gcc
+.PHONY: clean-stage3-gcc maybe-clean-stage3-gcc
+
+maybe-configure-stage3-gcc:
+maybe-all-stage3-gcc:
+maybe-clean-stage3-gcc:
+
+@if gcc-bootstrap
+maybe-configure-stage3-gcc: configure-stage3-gcc
+configure-stage3-gcc:
+       @$(MAKE) stage3-start
+       @[ -f gcc/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage 3 in gcc ; \
+       cd $(HOST_SUBDIR)/gcc || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/gcc/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/gcc"; \
+       libsrcdir="$$s/gcc"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+
+maybe-all-stage3-gcc: all-stage3-gcc
+all-stage3-gcc: configure-stage3-gcc
+       @$(MAKE) stage3-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/gcc && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                $(EXTRA_GCC_FLAGS)
+
+maybe-clean-stage3-gcc: clean-stage3-gcc
+clean-stage3-gcc:
+       @[ -f gcc/Makefile ] || [ -f stage3-gcc/Makefile ] \
+         || exit 0 ; \
+       [ -f gcc/Makefile ] || $(MAKE) stage3-start ; \
+       cd $(HOST_SUBDIR)/gcc && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                $(EXTRA_GCC_FLAGS) clean
+@endif gcc-bootstrap
+
+
+.PHONY: configure-stage3-intl maybe-configure-stage3-intl
+.PHONY: all-stage3-intl maybe-all-stage3-intl
+.PHONY: clean-stage3-intl maybe-clean-stage3-intl
+
+maybe-configure-stage3-intl:
+maybe-all-stage3-intl:
+maybe-clean-stage3-intl:
+
+@if intl-bootstrap
+maybe-configure-stage3-intl: configure-stage3-intl
+configure-stage3-intl:
+       @$(MAKE) stage3-start
+       @[ -f intl/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage 3 in intl ; \
+       cd $(HOST_SUBDIR)/intl || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/intl/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/intl"; \
+       libsrcdir="$$s/intl"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+
+maybe-all-stage3-intl: all-stage3-intl
+all-stage3-intl: configure-stage3-intl
+       @$(MAKE) stage3-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/intl && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                
+
+maybe-clean-stage3-intl: clean-stage3-intl
+clean-stage3-intl:
+       @[ -f intl/Makefile ] || [ -f stage3-intl/Makefile ] \
+         || exit 0 ; \
+       [ -f intl/Makefile ] || $(MAKE) stage3-start ; \
+       cd $(HOST_SUBDIR)/intl && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                 clean
+@endif intl-bootstrap
+
+
+.PHONY: configure-stage3-ld maybe-configure-stage3-ld
+.PHONY: all-stage3-ld maybe-all-stage3-ld
+.PHONY: clean-stage3-ld maybe-clean-stage3-ld
+
+maybe-configure-stage3-ld:
+maybe-all-stage3-ld:
+maybe-clean-stage3-ld:
+
+@if ld-bootstrap
+maybe-configure-stage3-ld: configure-stage3-ld
+configure-stage3-ld:
+       @$(MAKE) stage3-start
+       @[ -f ld/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage 3 in ld ; \
+       cd $(HOST_SUBDIR)/ld || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/ld/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/ld"; \
+       libsrcdir="$$s/ld"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+
+maybe-all-stage3-ld: all-stage3-ld
+all-stage3-ld: configure-stage3-ld
+       @$(MAKE) stage3-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/ld && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                
+
+maybe-clean-stage3-ld: clean-stage3-ld
+clean-stage3-ld:
+       @[ -f ld/Makefile ] || [ -f stage3-ld/Makefile ] \
+         || exit 0 ; \
+       [ -f ld/Makefile ] || $(MAKE) stage3-start ; \
+       cd $(HOST_SUBDIR)/ld && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                 clean
+@endif ld-bootstrap
+
+
+.PHONY: configure-stage3-libcpp maybe-configure-stage3-libcpp
+.PHONY: all-stage3-libcpp maybe-all-stage3-libcpp
+.PHONY: clean-stage3-libcpp maybe-clean-stage3-libcpp
+
+maybe-configure-stage3-libcpp:
+maybe-all-stage3-libcpp:
+maybe-clean-stage3-libcpp:
+
+@if libcpp-bootstrap
+maybe-configure-stage3-libcpp: configure-stage3-libcpp
+configure-stage3-libcpp:
+       @$(MAKE) stage3-start
+       @[ -f libcpp/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage 3 in libcpp ; \
+       cd $(HOST_SUBDIR)/libcpp || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/libcpp/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/libcpp"; \
+       libsrcdir="$$s/libcpp"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+
+maybe-all-stage3-libcpp: all-stage3-libcpp
+all-stage3-libcpp: configure-stage3-libcpp
+       @$(MAKE) stage3-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/libcpp && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                
+
+maybe-clean-stage3-libcpp: clean-stage3-libcpp
+clean-stage3-libcpp:
+       @[ -f libcpp/Makefile ] || [ -f stage3-libcpp/Makefile ] \
+         || exit 0 ; \
+       [ -f libcpp/Makefile ] || $(MAKE) stage3-start ; \
+       cd $(HOST_SUBDIR)/libcpp && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                 clean
+@endif libcpp-bootstrap
+
+
+.PHONY: configure-stage3-libiberty maybe-configure-stage3-libiberty
+.PHONY: all-stage3-libiberty maybe-all-stage3-libiberty
+.PHONY: clean-stage3-libiberty maybe-clean-stage3-libiberty
+
+maybe-configure-stage3-libiberty:
+maybe-all-stage3-libiberty:
+maybe-clean-stage3-libiberty:
+
+@if libiberty-bootstrap
+maybe-configure-stage3-libiberty: configure-stage3-libiberty
+configure-stage3-libiberty:
+       @$(MAKE) stage3-start
+       @[ -f libiberty/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage 3 in libiberty ; \
+       cd $(HOST_SUBDIR)/libiberty || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/libiberty/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/libiberty"; \
+       libsrcdir="$$s/libiberty"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+
+maybe-all-stage3-libiberty: all-stage3-libiberty
+all-stage3-libiberty: configure-stage3-libiberty
+       @$(MAKE) stage3-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/libiberty && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                
+
+maybe-clean-stage3-libiberty: clean-stage3-libiberty
+clean-stage3-libiberty:
+       @[ -f libiberty/Makefile ] || [ -f stage3-libiberty/Makefile ] \
+         || exit 0 ; \
+       [ -f libiberty/Makefile ] || $(MAKE) stage3-start ; \
+       cd $(HOST_SUBDIR)/libiberty && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                 clean
+@endif libiberty-bootstrap
+
+
+.PHONY: configure-stage3-zlib maybe-configure-stage3-zlib
+.PHONY: all-stage3-zlib maybe-all-stage3-zlib
+.PHONY: clean-stage3-zlib maybe-clean-stage3-zlib
+
+maybe-configure-stage3-zlib:
+maybe-all-stage3-zlib:
+maybe-clean-stage3-zlib:
+
+@if zlib-bootstrap
+maybe-configure-stage3-zlib: configure-stage3-zlib
+configure-stage3-zlib:
+       @$(MAKE) stage3-start
+       @[ -f zlib/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage 3 in zlib ; \
+       cd $(HOST_SUBDIR)/zlib || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/zlib/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/zlib"; \
+       libsrcdir="$$s/zlib"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+
+maybe-all-stage3-zlib: all-stage3-zlib
+all-stage3-zlib: configure-stage3-zlib
+       @$(MAKE) stage3-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/zlib && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                
+
+maybe-clean-stage3-zlib: clean-stage3-zlib
+clean-stage3-zlib:
+       @[ -f zlib/Makefile ] || [ -f stage3-zlib/Makefile ] \
+         || exit 0 ; \
+       [ -f zlib/Makefile ] || $(MAKE) stage3-start ; \
+       cd $(HOST_SUBDIR)/zlib && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                 clean
+@endif zlib-bootstrap
+
+
+
+# FIXME: Will not need to be conditional when toplevel bootstrap is the
+# only possibility, but now it conflicts with no-bootstrap rules
+@if gcc-bootstrap
+
+compare:
+       @if test -f stage2-lean; then \
+         echo Cannot compare object files as stage 2 was deleted. ; \
+         exit 0 ; \
+       fi; \
+       [ -f stage_current ] && $(MAKE) `cat stage_current`-end || : ; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       rm -f .bad_compare ; \
+       cd stage3-gcc; \
+       files=`find . -name "*$(objext)" -print` ; \
+       cd .. ; \
+       for file in $${files} ; do \
+         f1=$$r/stage2-gcc/$$file; f2=$$r/stage3-gcc/$$file; \
+         @do_compare@ > /dev/null 2>&1; \
+         test $$? -eq 1 && echo $$file differs >> .bad_compare || true; \
+       done ; \
+       if [ -f .bad_compare ]; then \
+         echo "Bootstrap comparison failure!"; \
+         cat .bad_compare; \
+         exit 1; \
+       else \
+         true; \
+       fi ; \
+       $(STAMP) compare
+       @bootstrap_lean@-rm -rf stage2-* ; $(STAMP) stage2-lean
+
+
+
+.PHONY: bootstrap
+bootstrap: stage3-bubble compare all
+
+
+# Rules to wipe a stage and all the following ones, also used for cleanstrap
+distclean-stage2:: distclean-stage3 
+.PHONY: distclean-stage3
+distclean-stage3::
+       [ -f stage_current ] && $(MAKE) `cat stage_current`-end || :
+       rm -rf stage3-* compare 
+
+
+.PHONY: cleanstrap
+cleanstrap: distclean bootstrap
+
+@endif gcc-bootstrap
+
+
+.PHONY: stage4-start stage4-end
+
+stage4-start::
+       @[ -f stage_current ] && $(MAKE) `cat stage_current`-end || : ; \
+       echo stage4 > stage_current ; \
+       echo stage4 > stage_last; \
+       $(mkinstalldirs) $(HOST_SUBDIR)
+@if bfd
+       @cd $(HOST_SUBDIR); [ -d stage4-bfd ] || \
+         mkdir stage4-bfd; \
+       set stage4-bfd bfd ; \
+       @CREATE_LINK_TO_DIR@  ; \
+       set stage3-bfd prev-bfd ; \
+       @CREATE_LINK_TO_DIR@ 
+@endif bfd
+@if opcodes
+       @cd $(HOST_SUBDIR); [ -d stage4-opcodes ] || \
+         mkdir stage4-opcodes; \
+       set stage4-opcodes opcodes ; \
+       @CREATE_LINK_TO_DIR@  ; \
+       set stage3-opcodes prev-opcodes ; \
+       @CREATE_LINK_TO_DIR@ 
+@endif opcodes
+@if binutils
+       @cd $(HOST_SUBDIR); [ -d stage4-binutils ] || \
+         mkdir stage4-binutils; \
+       set stage4-binutils binutils ; \
+       @CREATE_LINK_TO_DIR@  ; \
+       set stage3-binutils prev-binutils ; \
+       @CREATE_LINK_TO_DIR@ 
+@endif binutils
+@if gas
+       @cd $(HOST_SUBDIR); [ -d stage4-gas ] || \
+         mkdir stage4-gas; \
+       set stage4-gas gas ; \
+       @CREATE_LINK_TO_DIR@  ; \
+       set stage3-gas prev-gas ; \
+       @CREATE_LINK_TO_DIR@ 
+@endif gas
+@if gcc
+       @cd $(HOST_SUBDIR); [ -d stage4-gcc ] || \
+         mkdir stage4-gcc; \
+       set stage4-gcc gcc ; \
+       @CREATE_LINK_TO_DIR@  ; \
+       set stage3-gcc prev-gcc ; \
+       @CREATE_LINK_TO_DIR@ 
+@endif gcc
+@if intl
+       @cd $(HOST_SUBDIR); [ -d stage4-intl ] || \
+         mkdir stage4-intl; \
+       set stage4-intl intl ; \
+       @CREATE_LINK_TO_DIR@  ; \
+       set stage3-intl prev-intl ; \
+       @CREATE_LINK_TO_DIR@ 
+@endif intl
+@if ld
+       @cd $(HOST_SUBDIR); [ -d stage4-ld ] || \
+         mkdir stage4-ld; \
+       set stage4-ld ld ; \
+       @CREATE_LINK_TO_DIR@  ; \
+       set stage3-ld prev-ld ; \
+       @CREATE_LINK_TO_DIR@ 
+@endif ld
+@if libcpp
+       @cd $(HOST_SUBDIR); [ -d stage4-libcpp ] || \
+         mkdir stage4-libcpp; \
+       set stage4-libcpp libcpp ; \
+       @CREATE_LINK_TO_DIR@  ; \
+       set stage3-libcpp prev-libcpp ; \
+       @CREATE_LINK_TO_DIR@ 
+@endif libcpp
+@if libiberty
+       @cd $(HOST_SUBDIR); [ -d stage4-libiberty ] || \
+         mkdir stage4-libiberty; \
+       set stage4-libiberty libiberty ; \
+       @CREATE_LINK_TO_DIR@  ; \
+       set stage3-libiberty prev-libiberty ; \
+       @CREATE_LINK_TO_DIR@ 
+@endif libiberty
+@if zlib
+       @cd $(HOST_SUBDIR); [ -d stage4-zlib ] || \
+         mkdir stage4-zlib; \
+       set stage4-zlib zlib ; \
+       @CREATE_LINK_TO_DIR@  ; \
+       set stage3-zlib prev-zlib ; \
+       @CREATE_LINK_TO_DIR@ 
+@endif zlib
+
+stage4-end::
+       @rm -f stage_current
+@if bfd
+       @cd $(HOST_SUBDIR); set bfd stage4-bfd ; \
+       @UNDO_LINK_TO_DIR@  ; \
+       set prev-bfd stage3-bfd ; \
+       @UNDO_LINK_TO_DIR@ 
+@endif bfd
+@if opcodes
+       @cd $(HOST_SUBDIR); set opcodes stage4-opcodes ; \
+       @UNDO_LINK_TO_DIR@  ; \
+       set prev-opcodes stage3-opcodes ; \
+       @UNDO_LINK_TO_DIR@ 
+@endif opcodes
+@if binutils
+       @cd $(HOST_SUBDIR); set binutils stage4-binutils ; \
+       @UNDO_LINK_TO_DIR@  ; \
+       set prev-binutils stage3-binutils ; \
+       @UNDO_LINK_TO_DIR@ 
+@endif binutils
+@if gas
+       @cd $(HOST_SUBDIR); set gas stage4-gas ; \
+       @UNDO_LINK_TO_DIR@  ; \
+       set prev-gas stage3-gas ; \
+       @UNDO_LINK_TO_DIR@ 
+@endif gas
+@if gcc
+       @cd $(HOST_SUBDIR); set gcc stage4-gcc ; \
+       @UNDO_LINK_TO_DIR@  ; \
+       set prev-gcc stage3-gcc ; \
+       @UNDO_LINK_TO_DIR@ 
+@endif gcc
+@if intl
+       @cd $(HOST_SUBDIR); set intl stage4-intl ; \
+       @UNDO_LINK_TO_DIR@  ; \
+       set prev-intl stage3-intl ; \
+       @UNDO_LINK_TO_DIR@ 
+@endif intl
+@if ld
+       @cd $(HOST_SUBDIR); set ld stage4-ld ; \
+       @UNDO_LINK_TO_DIR@  ; \
+       set prev-ld stage3-ld ; \
+       @UNDO_LINK_TO_DIR@ 
+@endif ld
+@if libcpp
+       @cd $(HOST_SUBDIR); set libcpp stage4-libcpp ; \
+       @UNDO_LINK_TO_DIR@  ; \
+       set prev-libcpp stage3-libcpp ; \
+       @UNDO_LINK_TO_DIR@ 
+@endif libcpp
+@if libiberty
+       @cd $(HOST_SUBDIR); set libiberty stage4-libiberty ; \
+       @UNDO_LINK_TO_DIR@  ; \
+       set prev-libiberty stage3-libiberty ; \
+       @UNDO_LINK_TO_DIR@ 
+@endif libiberty
+@if zlib
+       @cd $(HOST_SUBDIR); set zlib stage4-zlib ; \
+       @UNDO_LINK_TO_DIR@  ; \
+       set prev-zlib stage3-zlib ; \
+       @UNDO_LINK_TO_DIR@ 
+@endif zlib
+
+# Bubble a bugfix through all the stages up to stage 4.  They
+# are remade, but not reconfigured.  The next stage (if any) will not
+# be reconfigured as well.
+.PHONY: stage4-bubble
+stage4-bubble:: stage3-bubble
+       @bootstrap_lean@-rm -rf stage2-* ; $(STAMP) stage2-lean
+       @if test -f stage4-lean || test -f stage3-lean  ; then \
+         echo Skipping rebuild of stage4 ; \
+       else \
+         $(MAKE) $(RECURSE_FLAGS_TO_PASS) NOTPARALLEL= all-stage4; \
+       fi
+
+.PHONY: all-stage4 clean-stage4
+all-stage4:     \
+  maybe-all-stage4-bfd \
+  maybe-all-stage4-opcodes \
+  maybe-all-stage4-binutils              \
+  maybe-all-stage4-gas \
+  maybe-all-stage4-gcc        \
+  maybe-all-stage4-intl   \
+  maybe-all-stage4-ld \
+  maybe-all-stage4-libcpp  \
+  maybe-all-stage4-libiberty                        \
+  maybe-all-stage4-zlib        
+
+do-clean: clean-stage4
+clean-stage4:     \
+  maybe-clean-stage4-bfd \
+  maybe-clean-stage4-opcodes \
+  maybe-clean-stage4-binutils              \
+  maybe-clean-stage4-gas \
+  maybe-clean-stage4-gcc        \
+  maybe-clean-stage4-intl   \
+  maybe-clean-stage4-ld \
+  maybe-clean-stage4-libcpp  \
+  maybe-clean-stage4-libiberty                        \
+  maybe-clean-stage4-zlib        
+
+
+.PHONY: configure-stage4-bfd maybe-configure-stage4-bfd
+.PHONY: all-stage4-bfd maybe-all-stage4-bfd
+.PHONY: clean-stage4-bfd maybe-clean-stage4-bfd
+
+maybe-configure-stage4-bfd:
+maybe-all-stage4-bfd:
+maybe-clean-stage4-bfd:
+
+@if bfd-bootstrap
+maybe-configure-stage4-bfd: configure-stage4-bfd
+configure-stage4-bfd:
+       @$(MAKE) stage4-start
+       @[ -f bfd/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage 4 in bfd ; \
+       cd $(HOST_SUBDIR)/bfd || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/bfd/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/bfd"; \
+       libsrcdir="$$s/bfd"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+
+maybe-all-stage4-bfd: all-stage4-bfd
+all-stage4-bfd: configure-stage4-bfd
+       @$(MAKE) stage4-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/bfd && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                
+
+maybe-clean-stage4-bfd: clean-stage4-bfd
+clean-stage4-bfd:
+       @[ -f bfd/Makefile ] || [ -f stage4-bfd/Makefile ] \
+         || exit 0 ; \
+       [ -f bfd/Makefile ] || $(MAKE) stage4-start ; \
+       cd $(HOST_SUBDIR)/bfd && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                 clean
+@endif bfd-bootstrap
+
+
+.PHONY: configure-stage4-opcodes maybe-configure-stage4-opcodes
+.PHONY: all-stage4-opcodes maybe-all-stage4-opcodes
+.PHONY: clean-stage4-opcodes maybe-clean-stage4-opcodes
+
+maybe-configure-stage4-opcodes:
+maybe-all-stage4-opcodes:
+maybe-clean-stage4-opcodes:
+
+@if opcodes-bootstrap
+maybe-configure-stage4-opcodes: configure-stage4-opcodes
+configure-stage4-opcodes:
+       @$(MAKE) stage4-start
+       @[ -f opcodes/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage 4 in opcodes ; \
+       cd $(HOST_SUBDIR)/opcodes || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/opcodes/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/opcodes"; \
+       libsrcdir="$$s/opcodes"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+
+maybe-all-stage4-opcodes: all-stage4-opcodes
+all-stage4-opcodes: configure-stage4-opcodes
+       @$(MAKE) stage4-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/opcodes && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                
+
+maybe-clean-stage4-opcodes: clean-stage4-opcodes
+clean-stage4-opcodes:
+       @[ -f opcodes/Makefile ] || [ -f stage4-opcodes/Makefile ] \
+         || exit 0 ; \
+       [ -f opcodes/Makefile ] || $(MAKE) stage4-start ; \
+       cd $(HOST_SUBDIR)/opcodes && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                 clean
+@endif opcodes-bootstrap
+
+
+.PHONY: configure-stage4-binutils maybe-configure-stage4-binutils
+.PHONY: all-stage4-binutils maybe-all-stage4-binutils
+.PHONY: clean-stage4-binutils maybe-clean-stage4-binutils
+
+maybe-configure-stage4-binutils:
+maybe-all-stage4-binutils:
+maybe-clean-stage4-binutils:
+
+@if binutils-bootstrap
+maybe-configure-stage4-binutils: configure-stage4-binutils
+configure-stage4-binutils:
+       @$(MAKE) stage4-start
+       @[ -f binutils/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage 4 in binutils ; \
+       cd $(HOST_SUBDIR)/binutils || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/binutils/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/binutils"; \
+       libsrcdir="$$s/binutils"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+
+maybe-all-stage4-binutils: all-stage4-binutils
+all-stage4-binutils: configure-stage4-binutils
+       @$(MAKE) stage4-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/binutils && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                
+
+maybe-clean-stage4-binutils: clean-stage4-binutils
+clean-stage4-binutils:
+       @[ -f binutils/Makefile ] || [ -f stage4-binutils/Makefile ] \
+         || exit 0 ; \
+       [ -f binutils/Makefile ] || $(MAKE) stage4-start ; \
+       cd $(HOST_SUBDIR)/binutils && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                 clean
+@endif binutils-bootstrap
+
+
+.PHONY: configure-stage4-gas maybe-configure-stage4-gas
+.PHONY: all-stage4-gas maybe-all-stage4-gas
+.PHONY: clean-stage4-gas maybe-clean-stage4-gas
+
+maybe-configure-stage4-gas:
+maybe-all-stage4-gas:
+maybe-clean-stage4-gas:
+
+@if gas-bootstrap
+maybe-configure-stage4-gas: configure-stage4-gas
+configure-stage4-gas:
+       @$(MAKE) stage4-start
+       @[ -f gas/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage 4 in gas ; \
+       cd $(HOST_SUBDIR)/gas || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/gas/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/gas"; \
+       libsrcdir="$$s/gas"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+
+maybe-all-stage4-gas: all-stage4-gas
+all-stage4-gas: configure-stage4-gas
+       @$(MAKE) stage4-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/gas && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                
+
+maybe-clean-stage4-gas: clean-stage4-gas
+clean-stage4-gas:
+       @[ -f gas/Makefile ] || [ -f stage4-gas/Makefile ] \
+         || exit 0 ; \
+       [ -f gas/Makefile ] || $(MAKE) stage4-start ; \
+       cd $(HOST_SUBDIR)/gas && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                 clean
+@endif gas-bootstrap
+
+
+.PHONY: configure-stage4-gcc maybe-configure-stage4-gcc
+.PHONY: all-stage4-gcc maybe-all-stage4-gcc
+.PHONY: clean-stage4-gcc maybe-clean-stage4-gcc
+
+maybe-configure-stage4-gcc:
+maybe-all-stage4-gcc:
+maybe-clean-stage4-gcc:
+
+@if gcc-bootstrap
+maybe-configure-stage4-gcc: configure-stage4-gcc
+configure-stage4-gcc:
+       @$(MAKE) stage4-start
+       @[ -f gcc/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage 4 in gcc ; \
+       cd $(HOST_SUBDIR)/gcc || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/gcc/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/gcc"; \
+       libsrcdir="$$s/gcc"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+
+maybe-all-stage4-gcc: all-stage4-gcc
+all-stage4-gcc: configure-stage4-gcc
+       @$(MAKE) stage4-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/gcc && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                $(EXTRA_GCC_FLAGS)
+
+maybe-clean-stage4-gcc: clean-stage4-gcc
+clean-stage4-gcc:
+       @[ -f gcc/Makefile ] || [ -f stage4-gcc/Makefile ] \
+         || exit 0 ; \
+       [ -f gcc/Makefile ] || $(MAKE) stage4-start ; \
+       cd $(HOST_SUBDIR)/gcc && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                $(EXTRA_GCC_FLAGS) clean
+@endif gcc-bootstrap
+
+
+.PHONY: configure-stage4-intl maybe-configure-stage4-intl
+.PHONY: all-stage4-intl maybe-all-stage4-intl
+.PHONY: clean-stage4-intl maybe-clean-stage4-intl
+
+maybe-configure-stage4-intl:
+maybe-all-stage4-intl:
+maybe-clean-stage4-intl:
+
+@if intl-bootstrap
+maybe-configure-stage4-intl: configure-stage4-intl
+configure-stage4-intl:
+       @$(MAKE) stage4-start
+       @[ -f intl/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage 4 in intl ; \
+       cd $(HOST_SUBDIR)/intl || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/intl/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/intl"; \
+       libsrcdir="$$s/intl"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+
+maybe-all-stage4-intl: all-stage4-intl
+all-stage4-intl: configure-stage4-intl
+       @$(MAKE) stage4-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/intl && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                
+
+maybe-clean-stage4-intl: clean-stage4-intl
+clean-stage4-intl:
+       @[ -f intl/Makefile ] || [ -f stage4-intl/Makefile ] \
+         || exit 0 ; \
+       [ -f intl/Makefile ] || $(MAKE) stage4-start ; \
+       cd $(HOST_SUBDIR)/intl && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                 clean
+@endif intl-bootstrap
+
+
+.PHONY: configure-stage4-ld maybe-configure-stage4-ld
+.PHONY: all-stage4-ld maybe-all-stage4-ld
+.PHONY: clean-stage4-ld maybe-clean-stage4-ld
+
+maybe-configure-stage4-ld:
+maybe-all-stage4-ld:
+maybe-clean-stage4-ld:
+
+@if ld-bootstrap
+maybe-configure-stage4-ld: configure-stage4-ld
+configure-stage4-ld:
+       @$(MAKE) stage4-start
+       @[ -f ld/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage 4 in ld ; \
+       cd $(HOST_SUBDIR)/ld || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/ld/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/ld"; \
+       libsrcdir="$$s/ld"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+
+maybe-all-stage4-ld: all-stage4-ld
+all-stage4-ld: configure-stage4-ld
+       @$(MAKE) stage4-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/ld && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                
+
+maybe-clean-stage4-ld: clean-stage4-ld
+clean-stage4-ld:
+       @[ -f ld/Makefile ] || [ -f stage4-ld/Makefile ] \
+         || exit 0 ; \
+       [ -f ld/Makefile ] || $(MAKE) stage4-start ; \
+       cd $(HOST_SUBDIR)/ld && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                 clean
+@endif ld-bootstrap
+
+
+.PHONY: configure-stage4-libcpp maybe-configure-stage4-libcpp
+.PHONY: all-stage4-libcpp maybe-all-stage4-libcpp
+.PHONY: clean-stage4-libcpp maybe-clean-stage4-libcpp
+
+maybe-configure-stage4-libcpp:
+maybe-all-stage4-libcpp:
+maybe-clean-stage4-libcpp:
+
+@if libcpp-bootstrap
+maybe-configure-stage4-libcpp: configure-stage4-libcpp
+configure-stage4-libcpp:
+       @$(MAKE) stage4-start
+       @[ -f libcpp/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage 4 in libcpp ; \
+       cd $(HOST_SUBDIR)/libcpp || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/libcpp/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/libcpp"; \
+       libsrcdir="$$s/libcpp"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+
+maybe-all-stage4-libcpp: all-stage4-libcpp
+all-stage4-libcpp: configure-stage4-libcpp
+       @$(MAKE) stage4-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/libcpp && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                
+
+maybe-clean-stage4-libcpp: clean-stage4-libcpp
+clean-stage4-libcpp:
+       @[ -f libcpp/Makefile ] || [ -f stage4-libcpp/Makefile ] \
+         || exit 0 ; \
+       [ -f libcpp/Makefile ] || $(MAKE) stage4-start ; \
+       cd $(HOST_SUBDIR)/libcpp && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                 clean
+@endif libcpp-bootstrap
+
+
+.PHONY: configure-stage4-libiberty maybe-configure-stage4-libiberty
+.PHONY: all-stage4-libiberty maybe-all-stage4-libiberty
+.PHONY: clean-stage4-libiberty maybe-clean-stage4-libiberty
+
+maybe-configure-stage4-libiberty:
+maybe-all-stage4-libiberty:
+maybe-clean-stage4-libiberty:
+
+@if libiberty-bootstrap
+maybe-configure-stage4-libiberty: configure-stage4-libiberty
+configure-stage4-libiberty:
+       @$(MAKE) stage4-start
+       @[ -f libiberty/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage 4 in libiberty ; \
+       cd $(HOST_SUBDIR)/libiberty || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/libiberty/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/libiberty"; \
+       libsrcdir="$$s/libiberty"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+
+maybe-all-stage4-libiberty: all-stage4-libiberty
+all-stage4-libiberty: configure-stage4-libiberty
+       @$(MAKE) stage4-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/libiberty && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                
+
+maybe-clean-stage4-libiberty: clean-stage4-libiberty
+clean-stage4-libiberty:
+       @[ -f libiberty/Makefile ] || [ -f stage4-libiberty/Makefile ] \
+         || exit 0 ; \
+       [ -f libiberty/Makefile ] || $(MAKE) stage4-start ; \
+       cd $(HOST_SUBDIR)/libiberty && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                 clean
+@endif libiberty-bootstrap
+
+
+.PHONY: configure-stage4-zlib maybe-configure-stage4-zlib
+.PHONY: all-stage4-zlib maybe-all-stage4-zlib
+.PHONY: clean-stage4-zlib maybe-clean-stage4-zlib
+
+maybe-configure-stage4-zlib:
+maybe-all-stage4-zlib:
+maybe-clean-stage4-zlib:
+
+@if zlib-bootstrap
+maybe-configure-stage4-zlib: configure-stage4-zlib
+configure-stage4-zlib:
+       @$(MAKE) stage4-start
+       @[ -f zlib/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage 4 in zlib ; \
+       cd $(HOST_SUBDIR)/zlib || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/zlib/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/zlib"; \
+       libsrcdir="$$s/zlib"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+
+maybe-all-stage4-zlib: all-stage4-zlib
+all-stage4-zlib: configure-stage4-zlib
+       @$(MAKE) stage4-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/zlib && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                
+
+maybe-clean-stage4-zlib: clean-stage4-zlib
+clean-stage4-zlib:
+       @[ -f zlib/Makefile ] || [ -f stage4-zlib/Makefile ] \
+         || exit 0 ; \
+       [ -f zlib/Makefile ] || $(MAKE) stage4-start ; \
+       cd $(HOST_SUBDIR)/zlib && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                 clean
+@endif zlib-bootstrap
+
+
+
+# FIXME: Will not need to be conditional when toplevel bootstrap is the
+# only possibility, but now it conflicts with no-bootstrap rules
+@if gcc-bootstrap
+
+compare3:
+       @if test -f stage3-lean; then \
+         echo Cannot compare object files as stage 3 was deleted. ; \
+         exit 0 ; \
+       fi; \
+       [ -f stage_current ] && $(MAKE) `cat stage_current`-end || : ; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       rm -f .bad_compare ; \
+       cd stage4-gcc; \
+       files=`find . -name "*$(objext)" -print` ; \
+       cd .. ; \
+       for file in $${files} ; do \
+         f1=$$r/stage3-gcc/$$file; f2=$$r/stage4-gcc/$$file; \
+         @do_compare@ > /dev/null 2>&1; \
+         test $$? -eq 1 && echo $$file differs >> .bad_compare || true; \
+       done ; \
+       if [ -f .bad_compare ]; then \
+         echo "Bootstrap comparison failure!"; \
+         cat .bad_compare; \
+         exit 1; \
+       else \
+         true; \
+       fi ; \
+       $(STAMP) compare3
+       @bootstrap_lean@-rm -rf stage3-* ; $(STAMP) stage3-lean
+
+
+
+.PHONY: bootstrap4
+bootstrap4: stage4-bubble compare3 all
+
+
+# Rules to wipe a stage and all the following ones, also used for cleanstrap
+distclean-stage3:: distclean-stage4 
+.PHONY: distclean-stage4
+distclean-stage4::
+       [ -f stage_current ] && $(MAKE) `cat stage_current`-end || :
+       rm -rf stage4-* compare3 
+
+
+@endif gcc-bootstrap
+
+
+.PHONY: stageprofile-start stageprofile-end
+
+stageprofile-start::
+       @[ -f stage_current ] && $(MAKE) `cat stage_current`-end || : ; \
+       echo stageprofile > stage_current ; \
+       echo stageprofile > stage_last; \
+       $(mkinstalldirs) $(HOST_SUBDIR)
+@if bfd
+       @cd $(HOST_SUBDIR); [ -d stageprofile-bfd ] || \
+         mkdir stageprofile-bfd; \
+       set stageprofile-bfd bfd ; \
+       @CREATE_LINK_TO_DIR@  ; \
+       set stage1-bfd prev-bfd ; \
+       @CREATE_LINK_TO_DIR@ 
+@endif bfd
+@if opcodes
+       @cd $(HOST_SUBDIR); [ -d stageprofile-opcodes ] || \
+         mkdir stageprofile-opcodes; \
+       set stageprofile-opcodes opcodes ; \
+       @CREATE_LINK_TO_DIR@  ; \
+       set stage1-opcodes prev-opcodes ; \
+       @CREATE_LINK_TO_DIR@ 
+@endif opcodes
+@if binutils
+       @cd $(HOST_SUBDIR); [ -d stageprofile-binutils ] || \
+         mkdir stageprofile-binutils; \
+       set stageprofile-binutils binutils ; \
+       @CREATE_LINK_TO_DIR@  ; \
+       set stage1-binutils prev-binutils ; \
+       @CREATE_LINK_TO_DIR@ 
+@endif binutils
+@if gas
+       @cd $(HOST_SUBDIR); [ -d stageprofile-gas ] || \
+         mkdir stageprofile-gas; \
+       set stageprofile-gas gas ; \
+       @CREATE_LINK_TO_DIR@  ; \
+       set stage1-gas prev-gas ; \
+       @CREATE_LINK_TO_DIR@ 
+@endif gas
+@if gcc
+       @cd $(HOST_SUBDIR); [ -d stageprofile-gcc ] || \
+         mkdir stageprofile-gcc; \
+       set stageprofile-gcc gcc ; \
+       @CREATE_LINK_TO_DIR@  ; \
+       set stage1-gcc prev-gcc ; \
+       @CREATE_LINK_TO_DIR@ 
+@endif gcc
+@if intl
+       @cd $(HOST_SUBDIR); [ -d stageprofile-intl ] || \
+         mkdir stageprofile-intl; \
+       set stageprofile-intl intl ; \
+       @CREATE_LINK_TO_DIR@  ; \
+       set stage1-intl prev-intl ; \
+       @CREATE_LINK_TO_DIR@ 
+@endif intl
+@if ld
+       @cd $(HOST_SUBDIR); [ -d stageprofile-ld ] || \
+         mkdir stageprofile-ld; \
+       set stageprofile-ld ld ; \
+       @CREATE_LINK_TO_DIR@  ; \
+       set stage1-ld prev-ld ; \
+       @CREATE_LINK_TO_DIR@ 
+@endif ld
+@if libcpp
+       @cd $(HOST_SUBDIR); [ -d stageprofile-libcpp ] || \
+         mkdir stageprofile-libcpp; \
+       set stageprofile-libcpp libcpp ; \
+       @CREATE_LINK_TO_DIR@  ; \
+       set stage1-libcpp prev-libcpp ; \
+       @CREATE_LINK_TO_DIR@ 
+@endif libcpp
+@if libiberty
+       @cd $(HOST_SUBDIR); [ -d stageprofile-libiberty ] || \
+         mkdir stageprofile-libiberty; \
+       set stageprofile-libiberty libiberty ; \
+       @CREATE_LINK_TO_DIR@  ; \
+       set stage1-libiberty prev-libiberty ; \
+       @CREATE_LINK_TO_DIR@ 
+@endif libiberty
+@if zlib
+       @cd $(HOST_SUBDIR); [ -d stageprofile-zlib ] || \
+         mkdir stageprofile-zlib; \
+       set stageprofile-zlib zlib ; \
+       @CREATE_LINK_TO_DIR@  ; \
+       set stage1-zlib prev-zlib ; \
+       @CREATE_LINK_TO_DIR@ 
+@endif zlib
+
+stageprofile-end::
+       @rm -f stage_current
+@if bfd
+       @cd $(HOST_SUBDIR); set bfd stageprofile-bfd ; \
+       @UNDO_LINK_TO_DIR@  ; \
+       set prev-bfd stage1-bfd ; \
+       @UNDO_LINK_TO_DIR@ 
+@endif bfd
+@if opcodes
+       @cd $(HOST_SUBDIR); set opcodes stageprofile-opcodes ; \
+       @UNDO_LINK_TO_DIR@  ; \
+       set prev-opcodes stage1-opcodes ; \
+       @UNDO_LINK_TO_DIR@ 
+@endif opcodes
+@if binutils
+       @cd $(HOST_SUBDIR); set binutils stageprofile-binutils ; \
+       @UNDO_LINK_TO_DIR@  ; \
+       set prev-binutils stage1-binutils ; \
+       @UNDO_LINK_TO_DIR@ 
+@endif binutils
+@if gas
+       @cd $(HOST_SUBDIR); set gas stageprofile-gas ; \
+       @UNDO_LINK_TO_DIR@  ; \
+       set prev-gas stage1-gas ; \
+       @UNDO_LINK_TO_DIR@ 
+@endif gas
+@if gcc
+       @cd $(HOST_SUBDIR); set gcc stageprofile-gcc ; \
+       @UNDO_LINK_TO_DIR@  ; \
+       set prev-gcc stage1-gcc ; \
+       @UNDO_LINK_TO_DIR@ 
+@endif gcc
+@if intl
+       @cd $(HOST_SUBDIR); set intl stageprofile-intl ; \
+       @UNDO_LINK_TO_DIR@  ; \
+       set prev-intl stage1-intl ; \
+       @UNDO_LINK_TO_DIR@ 
+@endif intl
+@if ld
+       @cd $(HOST_SUBDIR); set ld stageprofile-ld ; \
+       @UNDO_LINK_TO_DIR@  ; \
+       set prev-ld stage1-ld ; \
+       @UNDO_LINK_TO_DIR@ 
+@endif ld
+@if libcpp
+       @cd $(HOST_SUBDIR); set libcpp stageprofile-libcpp ; \
+       @UNDO_LINK_TO_DIR@  ; \
+       set prev-libcpp stage1-libcpp ; \
+       @UNDO_LINK_TO_DIR@ 
+@endif libcpp
+@if libiberty
+       @cd $(HOST_SUBDIR); set libiberty stageprofile-libiberty ; \
+       @UNDO_LINK_TO_DIR@  ; \
+       set prev-libiberty stage1-libiberty ; \
+       @UNDO_LINK_TO_DIR@ 
+@endif libiberty
+@if zlib
+       @cd $(HOST_SUBDIR); set zlib stageprofile-zlib ; \
+       @UNDO_LINK_TO_DIR@  ; \
+       set prev-zlib stage1-zlib ; \
+       @UNDO_LINK_TO_DIR@ 
+@endif zlib
+
+# Bubble a bugfix through all the stages up to stage profile.  They
+# are remade, but not reconfigured.  The next stage (if any) will not
+# be reconfigured as well.
+.PHONY: stageprofile-bubble
+stageprofile-bubble:: stage1-bubble
+       @if test -f stageprofile-lean || test -f stage1-lean  ; then \
+         echo Skipping rebuild of stageprofile ; \
+       else \
+         $(MAKE) $(RECURSE_FLAGS_TO_PASS) NOTPARALLEL= all-stageprofile; \
+       fi
+
+.PHONY: all-stageprofile clean-stageprofile
+all-stageprofile:     \
+  maybe-all-stageprofile-bfd \
+  maybe-all-stageprofile-opcodes \
+  maybe-all-stageprofile-binutils              \
+  maybe-all-stageprofile-gas \
+  maybe-all-stageprofile-gcc        \
+  maybe-all-stageprofile-intl   \
+  maybe-all-stageprofile-ld \
+  maybe-all-stageprofile-libcpp  \
+  maybe-all-stageprofile-libiberty                        \
+  maybe-all-stageprofile-zlib        
+
+do-clean: clean-stageprofile
+clean-stageprofile:     \
+  maybe-clean-stageprofile-bfd \
+  maybe-clean-stageprofile-opcodes \
+  maybe-clean-stageprofile-binutils              \
+  maybe-clean-stageprofile-gas \
+  maybe-clean-stageprofile-gcc        \
+  maybe-clean-stageprofile-intl   \
+  maybe-clean-stageprofile-ld \
+  maybe-clean-stageprofile-libcpp  \
+  maybe-clean-stageprofile-libiberty                        \
+  maybe-clean-stageprofile-zlib        
+
+
+.PHONY: configure-stageprofile-bfd maybe-configure-stageprofile-bfd
+.PHONY: all-stageprofile-bfd maybe-all-stageprofile-bfd
+.PHONY: clean-stageprofile-bfd maybe-clean-stageprofile-bfd
+
+maybe-configure-stageprofile-bfd:
+maybe-all-stageprofile-bfd:
+maybe-clean-stageprofile-bfd:
+
+@if bfd-bootstrap
+maybe-configure-stageprofile-bfd: configure-stageprofile-bfd
+configure-stageprofile-bfd:
+       @$(MAKE) stageprofile-start
+       @[ -f bfd/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage profile in bfd ; \
+       cd $(HOST_SUBDIR)/bfd || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/bfd/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/bfd"; \
+       libsrcdir="$$s/bfd"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+
+maybe-all-stageprofile-bfd: all-stageprofile-bfd
+all-stageprofile-bfd: configure-stageprofile-bfd
+       @$(MAKE) stageprofile-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/bfd && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" 
+
+maybe-clean-stageprofile-bfd: clean-stageprofile-bfd
+clean-stageprofile-bfd:
+       @[ -f bfd/Makefile ] || [ -f stageprofile-bfd/Makefile ] \
+         || exit 0 ; \
+       [ -f bfd/Makefile ] || $(MAKE) stageprofile-start ; \
+       cd $(HOST_SUBDIR)/bfd && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-generate"  clean
+@endif bfd-bootstrap
+
+
+.PHONY: configure-stageprofile-opcodes maybe-configure-stageprofile-opcodes
+.PHONY: all-stageprofile-opcodes maybe-all-stageprofile-opcodes
+.PHONY: clean-stageprofile-opcodes maybe-clean-stageprofile-opcodes
+
+maybe-configure-stageprofile-opcodes:
+maybe-all-stageprofile-opcodes:
+maybe-clean-stageprofile-opcodes:
+
+@if opcodes-bootstrap
+maybe-configure-stageprofile-opcodes: configure-stageprofile-opcodes
+configure-stageprofile-opcodes:
+       @$(MAKE) stageprofile-start
+       @[ -f opcodes/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage profile in opcodes ; \
+       cd $(HOST_SUBDIR)/opcodes || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/opcodes/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/opcodes"; \
+       libsrcdir="$$s/opcodes"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+
+maybe-all-stageprofile-opcodes: all-stageprofile-opcodes
+all-stageprofile-opcodes: configure-stageprofile-opcodes
+       @$(MAKE) stageprofile-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/opcodes && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" 
+
+maybe-clean-stageprofile-opcodes: clean-stageprofile-opcodes
+clean-stageprofile-opcodes:
+       @[ -f opcodes/Makefile ] || [ -f stageprofile-opcodes/Makefile ] \
+         || exit 0 ; \
+       [ -f opcodes/Makefile ] || $(MAKE) stageprofile-start ; \
+       cd $(HOST_SUBDIR)/opcodes && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-generate"  clean
+@endif opcodes-bootstrap
+
+
+.PHONY: configure-stageprofile-binutils maybe-configure-stageprofile-binutils
+.PHONY: all-stageprofile-binutils maybe-all-stageprofile-binutils
+.PHONY: clean-stageprofile-binutils maybe-clean-stageprofile-binutils
+
+maybe-configure-stageprofile-binutils:
+maybe-all-stageprofile-binutils:
+maybe-clean-stageprofile-binutils:
+
+@if binutils-bootstrap
+maybe-configure-stageprofile-binutils: configure-stageprofile-binutils
+configure-stageprofile-binutils:
+       @$(MAKE) stageprofile-start
+       @[ -f binutils/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage profile in binutils ; \
+       cd $(HOST_SUBDIR)/binutils || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/binutils/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/binutils"; \
+       libsrcdir="$$s/binutils"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+
+maybe-all-stageprofile-binutils: all-stageprofile-binutils
+all-stageprofile-binutils: configure-stageprofile-binutils
+       @$(MAKE) stageprofile-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/binutils && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" 
+
+maybe-clean-stageprofile-binutils: clean-stageprofile-binutils
+clean-stageprofile-binutils:
+       @[ -f binutils/Makefile ] || [ -f stageprofile-binutils/Makefile ] \
+         || exit 0 ; \
+       [ -f binutils/Makefile ] || $(MAKE) stageprofile-start ; \
+       cd $(HOST_SUBDIR)/binutils && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-generate"  clean
+@endif binutils-bootstrap
+
+
+.PHONY: configure-stageprofile-gas maybe-configure-stageprofile-gas
+.PHONY: all-stageprofile-gas maybe-all-stageprofile-gas
+.PHONY: clean-stageprofile-gas maybe-clean-stageprofile-gas
+
+maybe-configure-stageprofile-gas:
+maybe-all-stageprofile-gas:
+maybe-clean-stageprofile-gas:
+
+@if gas-bootstrap
+maybe-configure-stageprofile-gas: configure-stageprofile-gas
+configure-stageprofile-gas:
+       @$(MAKE) stageprofile-start
+       @[ -f gas/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage profile in gas ; \
+       cd $(HOST_SUBDIR)/gas || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/gas/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/gas"; \
+       libsrcdir="$$s/gas"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+
+maybe-all-stageprofile-gas: all-stageprofile-gas
+all-stageprofile-gas: configure-stageprofile-gas
+       @$(MAKE) stageprofile-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/gas && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" 
+
+maybe-clean-stageprofile-gas: clean-stageprofile-gas
+clean-stageprofile-gas:
+       @[ -f gas/Makefile ] || [ -f stageprofile-gas/Makefile ] \
+         || exit 0 ; \
+       [ -f gas/Makefile ] || $(MAKE) stageprofile-start ; \
+       cd $(HOST_SUBDIR)/gas && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-generate"  clean
+@endif gas-bootstrap
+
+
+.PHONY: configure-stageprofile-gcc maybe-configure-stageprofile-gcc
+.PHONY: all-stageprofile-gcc maybe-all-stageprofile-gcc
+.PHONY: clean-stageprofile-gcc maybe-clean-stageprofile-gcc
+
+maybe-configure-stageprofile-gcc:
+maybe-all-stageprofile-gcc:
+maybe-clean-stageprofile-gcc:
+
+@if gcc-bootstrap
+maybe-configure-stageprofile-gcc: configure-stageprofile-gcc
+configure-stageprofile-gcc:
+       @$(MAKE) stageprofile-start
+       @[ -f gcc/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage profile in gcc ; \
+       cd $(HOST_SUBDIR)/gcc || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/gcc/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/gcc"; \
+       libsrcdir="$$s/gcc"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+
+maybe-all-stageprofile-gcc: all-stageprofile-gcc
+all-stageprofile-gcc: configure-stageprofile-gcc
+       @$(MAKE) stageprofile-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/gcc && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" $(EXTRA_GCC_FLAGS)
+
+maybe-clean-stageprofile-gcc: clean-stageprofile-gcc
+clean-stageprofile-gcc:
+       @[ -f gcc/Makefile ] || [ -f stageprofile-gcc/Makefile ] \
+         || exit 0 ; \
+       [ -f gcc/Makefile ] || $(MAKE) stageprofile-start ; \
+       cd $(HOST_SUBDIR)/gcc && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" $(EXTRA_GCC_FLAGS) clean
+@endif gcc-bootstrap
+
+
+.PHONY: configure-stageprofile-intl maybe-configure-stageprofile-intl
+.PHONY: all-stageprofile-intl maybe-all-stageprofile-intl
+.PHONY: clean-stageprofile-intl maybe-clean-stageprofile-intl
+
+maybe-configure-stageprofile-intl:
+maybe-all-stageprofile-intl:
+maybe-clean-stageprofile-intl:
+
+@if intl-bootstrap
+maybe-configure-stageprofile-intl: configure-stageprofile-intl
+configure-stageprofile-intl:
+       @$(MAKE) stageprofile-start
+       @[ -f intl/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage profile in intl ; \
+       cd $(HOST_SUBDIR)/intl || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/intl/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/intl"; \
+       libsrcdir="$$s/intl"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+
+maybe-all-stageprofile-intl: all-stageprofile-intl
+all-stageprofile-intl: configure-stageprofile-intl
+       @$(MAKE) stageprofile-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/intl && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" 
+
+maybe-clean-stageprofile-intl: clean-stageprofile-intl
+clean-stageprofile-intl:
+       @[ -f intl/Makefile ] || [ -f stageprofile-intl/Makefile ] \
+         || exit 0 ; \
+       [ -f intl/Makefile ] || $(MAKE) stageprofile-start ; \
+       cd $(HOST_SUBDIR)/intl && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-generate"  clean
+@endif intl-bootstrap
+
+
+.PHONY: configure-stageprofile-ld maybe-configure-stageprofile-ld
+.PHONY: all-stageprofile-ld maybe-all-stageprofile-ld
+.PHONY: clean-stageprofile-ld maybe-clean-stageprofile-ld
+
+maybe-configure-stageprofile-ld:
+maybe-all-stageprofile-ld:
+maybe-clean-stageprofile-ld:
+
+@if ld-bootstrap
+maybe-configure-stageprofile-ld: configure-stageprofile-ld
+configure-stageprofile-ld:
+       @$(MAKE) stageprofile-start
+       @[ -f ld/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage profile in ld ; \
+       cd $(HOST_SUBDIR)/ld || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/ld/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/ld"; \
+       libsrcdir="$$s/ld"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+
+maybe-all-stageprofile-ld: all-stageprofile-ld
+all-stageprofile-ld: configure-stageprofile-ld
+       @$(MAKE) stageprofile-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/ld && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" 
+
+maybe-clean-stageprofile-ld: clean-stageprofile-ld
+clean-stageprofile-ld:
+       @[ -f ld/Makefile ] || [ -f stageprofile-ld/Makefile ] \
+         || exit 0 ; \
+       [ -f ld/Makefile ] || $(MAKE) stageprofile-start ; \
+       cd $(HOST_SUBDIR)/ld && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-generate"  clean
+@endif ld-bootstrap
+
+
+.PHONY: configure-stageprofile-libcpp maybe-configure-stageprofile-libcpp
+.PHONY: all-stageprofile-libcpp maybe-all-stageprofile-libcpp
+.PHONY: clean-stageprofile-libcpp maybe-clean-stageprofile-libcpp
+
+maybe-configure-stageprofile-libcpp:
+maybe-all-stageprofile-libcpp:
+maybe-clean-stageprofile-libcpp:
+
+@if libcpp-bootstrap
+maybe-configure-stageprofile-libcpp: configure-stageprofile-libcpp
+configure-stageprofile-libcpp:
+       @$(MAKE) stageprofile-start
+       @[ -f libcpp/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage profile in libcpp ; \
+       cd $(HOST_SUBDIR)/libcpp || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/libcpp/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/libcpp"; \
+       libsrcdir="$$s/libcpp"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
  
-configure-stage1-gcc:  prebootstrap 
-       $(MAKE) new-stage1-start
-       @if [ -f stage1-gcc/Makefile ] ; then \
-         $(STAMP) configure-stage1-gcc ; \
-         exit 0; \
-       else \
-         true ; \
-       fi ; \
+maybe-all-stageprofile-libcpp: all-stageprofile-libcpp
+all-stageprofile-libcpp: configure-stageprofile-libcpp
+       @$(MAKE) stageprofile-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/libcpp && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" 
+
+maybe-clean-stageprofile-libcpp: clean-stageprofile-libcpp
+clean-stageprofile-libcpp:
+       @[ -f libcpp/Makefile ] || [ -f stageprofile-libcpp/Makefile ] \
+         || exit 0 ; \
+       [ -f libcpp/Makefile ] || $(MAKE) stageprofile-start ; \
+       cd $(HOST_SUBDIR)/libcpp && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-generate"  clean
+@endif libcpp-bootstrap
+
+
+.PHONY: configure-stageprofile-libiberty maybe-configure-stageprofile-libiberty
+.PHONY: all-stageprofile-libiberty maybe-all-stageprofile-libiberty
+.PHONY: clean-stageprofile-libiberty maybe-clean-stageprofile-libiberty
+
+maybe-configure-stageprofile-libiberty:
+maybe-all-stageprofile-libiberty:
+maybe-clean-stageprofile-libiberty:
+
+@if libiberty-bootstrap
+maybe-configure-stageprofile-libiberty: configure-stageprofile-libiberty
+configure-stageprofile-libiberty:
+       @$(MAKE) stageprofile-start
+       @[ -f libiberty/Makefile ] && exit 0 || : ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-       $(GCC_HOST_EXPORTS)  \
-       echo Configuring stage 1 in gcc ; \
-       cd gcc || exit 1; \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage profile in libiberty ; \
+       cd $(HOST_SUBDIR)/libiberty || exit 1; \
         case $(srcdir) in \
-         \.) \
-           srcdiroption="--srcdir=."; \
-           libsrcdir=".";; \
-         /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/gcc"; \
-           libsrcdir="$$s/gcc";; \
-         *) \
-           srcdiroption="--srcdir=../$(srcdir)/gcc"; \
-           libsrcdir="$$s/gcc";; \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/libiberty/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
+       srcdiroption="--srcdir=$${topdir}/libiberty"; \
+       libsrcdir="$$s/libiberty"; \
         $(SHELL) $${libsrcdir}/configure \
           $(HOST_CONFIGARGS) $${srcdiroption} \
-         --disable-intermodule           --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" && \
-         $(STAMP) ../configure-stage1-gcc
+         @stage2_werror_flag@ 
  
-all-stage1-gcc: configure-stage1-gcc
-       $(MAKE) new-stage1-start
+maybe-all-stageprofile-libiberty: all-stageprofile-libiberty
+all-stageprofile-libiberty: configure-stageprofile-libiberty
+       @$(MAKE) stageprofile-start
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-       $(GCC_HOST_EXPORTS)  \
-       cd gcc && \
-       $(MAKE) $(GCC_FLAGS_TO_PASS)  \
-               CFLAGS="$(STAGE1_CFLAGS)" && $(STAMP) ../all-stage1-gcc
+       $(STAGE_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/libiberty && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" 
+
+maybe-clean-stageprofile-libiberty: clean-stageprofile-libiberty
+clean-stageprofile-libiberty:
+       @[ -f libiberty/Makefile ] || [ -f stageprofile-libiberty/Makefile ] \
+         || exit 0 ; \
+       [ -f libiberty/Makefile ] || $(MAKE) stageprofile-start ; \
+       cd $(HOST_SUBDIR)/libiberty && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-generate"  clean
+@endif libiberty-bootstrap
+
+
+.PHONY: configure-stageprofile-zlib maybe-configure-stageprofile-zlib
+.PHONY: all-stageprofile-zlib maybe-all-stageprofile-zlib
+.PHONY: clean-stageprofile-zlib maybe-clean-stageprofile-zlib
+
+maybe-configure-stageprofile-zlib:
+maybe-all-stageprofile-zlib:
+maybe-clean-stageprofile-zlib:
+
+@if zlib-bootstrap
+maybe-configure-stageprofile-zlib: configure-stageprofile-zlib
+configure-stageprofile-zlib:
+       @$(MAKE) stageprofile-start
+       @[ -f zlib/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage profile in zlib ; \
+       cd $(HOST_SUBDIR)/zlib || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/zlib/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/zlib"; \
+       libsrcdir="$$s/zlib"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
  
+maybe-all-stageprofile-zlib: all-stageprofile-zlib
+all-stageprofile-zlib: configure-stageprofile-zlib
+       @$(MAKE) stageprofile-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/zlib && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" 
  
+maybe-clean-stageprofile-zlib: clean-stageprofile-zlib
+clean-stageprofile-zlib:
+       @[ -f zlib/Makefile ] || [ -f stageprofile-zlib/Makefile ] \
+         || exit 0 ; \
+       [ -f zlib/Makefile ] || $(MAKE) stageprofile-start ; \
+       cd $(HOST_SUBDIR)/zlib && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-generate"  clean
+@endif zlib-bootstrap
  
  
  
-.PHONY: new-restage1 distclean-stage1
+# FIXME: Will not need to be conditional when toplevel bootstrap is the
+# only possibility, but now it conflicts with no-bootstrap rules
+@if gcc-bootstrap
  
-distclean-stage1:  distclean-stage2 
-       [ -f stage_last ] && $(MAKE) new-`cat stage_last`-end || :
-       rm -rf configure-stage1-gcc all-stage1-gcc stage1-gcc 
  
-new-restage1:  distclean-stage2 
-       rm -rf all-stage1-gcc 
-       $(MAKE)  all-stage1-gcc 
  
  
+# Rules to wipe a stage and all the following ones, also used for cleanstrap
+distclean-stage1:: distclean-stageprofile 
+.PHONY: distclean-stageprofile
+distclean-stageprofile::
+       [ -f stage_current ] && $(MAKE) `cat stage_current`-end || :
+       rm -rf stageprofile-* 
  
  
-.PHONY: new-stage2-start new-stage2-end
+@endif gcc-bootstrap
  
-new-stage2-start:
-       [ -f stage_last ] && $(MAKE) new-`cat stage_last`-end || :
-       echo stage2 > stage_last ; \
-       [ -d stage2-gcc ] || mkdir stage2-gcc; \
-       set stage2-gcc gcc ; @CREATE_LINK_TO_DIR@  ; \
-       set stage1-gcc prev-gcc ; @CREATE_LINK_TO_DIR@ 
  
-new-stage2-end:
-       rm -f stage_last ; \
-       set gcc stage2-gcc ; @UNDO_LINK_TO_DIR@  ; \
-       set prev-gcc stage1-gcc ; @UNDO_LINK_TO_DIR@ 
+.PHONY: stagefeedback-start stagefeedback-end
  
-# Bubble a bugfix through all the stages up to stage 2.  They
+stagefeedback-start::
+       @[ -f stage_current ] && $(MAKE) `cat stage_current`-end || : ; \
+       echo stagefeedback > stage_current ; \
+       echo stagefeedback > stage_last; \
+       $(mkinstalldirs) $(HOST_SUBDIR)
+@if bfd
+       @cd $(HOST_SUBDIR); [ -d stagefeedback-bfd ] || \
+         mkdir stagefeedback-bfd; \
+       set stagefeedback-bfd bfd ; \
+       @CREATE_LINK_TO_DIR@  ; \
+       set stage1-bfd prev-bfd ; \
+       @CREATE_LINK_TO_DIR@ 
+@endif bfd
+@if opcodes
+       @cd $(HOST_SUBDIR); [ -d stagefeedback-opcodes ] || \
+         mkdir stagefeedback-opcodes; \
+       set stagefeedback-opcodes opcodes ; \
+       @CREATE_LINK_TO_DIR@  ; \
+       set stage1-opcodes prev-opcodes ; \
+       @CREATE_LINK_TO_DIR@ 
+@endif opcodes
+@if binutils
+       @cd $(HOST_SUBDIR); [ -d stagefeedback-binutils ] || \
+         mkdir stagefeedback-binutils; \
+       set stagefeedback-binutils binutils ; \
+       @CREATE_LINK_TO_DIR@  ; \
+       set stage1-binutils prev-binutils ; \
+       @CREATE_LINK_TO_DIR@ 
+@endif binutils
+@if gas
+       @cd $(HOST_SUBDIR); [ -d stagefeedback-gas ] || \
+         mkdir stagefeedback-gas; \
+       set stagefeedback-gas gas ; \
+       @CREATE_LINK_TO_DIR@  ; \
+       set stage1-gas prev-gas ; \
+       @CREATE_LINK_TO_DIR@ 
+@endif gas
+@if gcc
+       @cd $(HOST_SUBDIR); [ -d stagefeedback-gcc ] || \
+         mkdir stagefeedback-gcc; \
+       set stagefeedback-gcc gcc ; \
+       @CREATE_LINK_TO_DIR@  ; \
+       set stage1-gcc prev-gcc ; \
+       @CREATE_LINK_TO_DIR@ 
+@endif gcc
+@if intl
+       @cd $(HOST_SUBDIR); [ -d stagefeedback-intl ] || \
+         mkdir stagefeedback-intl; \
+       set stagefeedback-intl intl ; \
+       @CREATE_LINK_TO_DIR@  ; \
+       set stage1-intl prev-intl ; \
+       @CREATE_LINK_TO_DIR@ 
+@endif intl
+@if ld
+       @cd $(HOST_SUBDIR); [ -d stagefeedback-ld ] || \
+         mkdir stagefeedback-ld; \
+       set stagefeedback-ld ld ; \
+       @CREATE_LINK_TO_DIR@  ; \
+       set stage1-ld prev-ld ; \
+       @CREATE_LINK_TO_DIR@ 
+@endif ld
+@if libcpp
+       @cd $(HOST_SUBDIR); [ -d stagefeedback-libcpp ] || \
+         mkdir stagefeedback-libcpp; \
+       set stagefeedback-libcpp libcpp ; \
+       @CREATE_LINK_TO_DIR@  ; \
+       set stage1-libcpp prev-libcpp ; \
+       @CREATE_LINK_TO_DIR@ 
+@endif libcpp
+@if libiberty
+       @cd $(HOST_SUBDIR); [ -d stagefeedback-libiberty ] || \
+         mkdir stagefeedback-libiberty; \
+       set stagefeedback-libiberty libiberty ; \
+       @CREATE_LINK_TO_DIR@  ; \
+       set stage1-libiberty prev-libiberty ; \
+       @CREATE_LINK_TO_DIR@ 
+@endif libiberty
+@if zlib
+       @cd $(HOST_SUBDIR); [ -d stagefeedback-zlib ] || \
+         mkdir stagefeedback-zlib; \
+       set stagefeedback-zlib zlib ; \
+       @CREATE_LINK_TO_DIR@  ; \
+       set stage1-zlib prev-zlib ; \
+       @CREATE_LINK_TO_DIR@ 
+@endif zlib
+
+stagefeedback-end::
+       @rm -f stage_current
+@if bfd
+       @cd $(HOST_SUBDIR); set bfd stagefeedback-bfd ; \
+       @UNDO_LINK_TO_DIR@  ; \
+       set prev-bfd stage1-bfd ; \
+       @UNDO_LINK_TO_DIR@ 
+@endif bfd
+@if opcodes
+       @cd $(HOST_SUBDIR); set opcodes stagefeedback-opcodes ; \
+       @UNDO_LINK_TO_DIR@  ; \
+       set prev-opcodes stage1-opcodes ; \
+       @UNDO_LINK_TO_DIR@ 
+@endif opcodes
+@if binutils
+       @cd $(HOST_SUBDIR); set binutils stagefeedback-binutils ; \
+       @UNDO_LINK_TO_DIR@  ; \
+       set prev-binutils stage1-binutils ; \
+       @UNDO_LINK_TO_DIR@ 
+@endif binutils
+@if gas
+       @cd $(HOST_SUBDIR); set gas stagefeedback-gas ; \
+       @UNDO_LINK_TO_DIR@  ; \
+       set prev-gas stage1-gas ; \
+       @UNDO_LINK_TO_DIR@ 
+@endif gas
+@if gcc
+       @cd $(HOST_SUBDIR); set gcc stagefeedback-gcc ; \
+       @UNDO_LINK_TO_DIR@  ; \
+       set prev-gcc stage1-gcc ; \
+       @UNDO_LINK_TO_DIR@ 
+@endif gcc
+@if intl
+       @cd $(HOST_SUBDIR); set intl stagefeedback-intl ; \
+       @UNDO_LINK_TO_DIR@  ; \
+       set prev-intl stage1-intl ; \
+       @UNDO_LINK_TO_DIR@ 
+@endif intl
+@if ld
+       @cd $(HOST_SUBDIR); set ld stagefeedback-ld ; \
+       @UNDO_LINK_TO_DIR@  ; \
+       set prev-ld stage1-ld ; \
+       @UNDO_LINK_TO_DIR@ 
+@endif ld
+@if libcpp
+       @cd $(HOST_SUBDIR); set libcpp stagefeedback-libcpp ; \
+       @UNDO_LINK_TO_DIR@  ; \
+       set prev-libcpp stage1-libcpp ; \
+       @UNDO_LINK_TO_DIR@ 
+@endif libcpp
+@if libiberty
+       @cd $(HOST_SUBDIR); set libiberty stagefeedback-libiberty ; \
+       @UNDO_LINK_TO_DIR@  ; \
+       set prev-libiberty stage1-libiberty ; \
+       @UNDO_LINK_TO_DIR@ 
+@endif libiberty
+@if zlib
+       @cd $(HOST_SUBDIR); set zlib stagefeedback-zlib ; \
+       @UNDO_LINK_TO_DIR@  ; \
+       set prev-zlib stage1-zlib ; \
+       @UNDO_LINK_TO_DIR@ 
+@endif zlib
+
+# Bubble a bugfix through all the stages up to stage feedback.  They
  # are remade, but not reconfigured.  The next stage (if any) will not
  # be reconfigured as well.
-.PHONY: new-stage2-bubble
-new-stage2-bubble: new-stage1-bubble
-       @if [ -f all-stage2-gcc ] ; then \
-         echo Remaking stage 2 ; \
-         rm -f all-stage2-gcc ; \
-         $(MAKE) all-stage2-gcc  && \
-         if [ -f configure-stage3-gcc ] ; then \
-           $(STAMP) configure-stage3-gcc ; \
-         fi ; \
+.PHONY: stagefeedback-bubble
+stagefeedback-bubble:: stage1-bubble
+       @if test -f stagefeedback-lean || test -f stage1-lean  ; then \
+         echo Skipping rebuild of stagefeedback ; \
         else \
-         $(MAKE) all-stage2-gcc ; \
+         $(MAKE) $(RECURSE_FLAGS_TO_PASS) NOTPARALLEL= all-stagefeedback; \
         fi
  
-configure-stage2-gcc:  all-stage1-gcc 
-       $(MAKE) new-stage2-start
-       @if [ -f stage2-gcc/Makefile ] ; then \
-         $(STAMP) configure-stage2-gcc ; \
-         exit 0; \
-       else \
-         true ; \
-       fi ; \
+.PHONY: all-stagefeedback clean-stagefeedback
+all-stagefeedback:     \
+  maybe-all-stagefeedback-bfd \
+  maybe-all-stagefeedback-opcodes \
+  maybe-all-stagefeedback-binutils              \
+  maybe-all-stagefeedback-gas \
+  maybe-all-stagefeedback-gcc        \
+  maybe-all-stagefeedback-intl   \
+  maybe-all-stagefeedback-ld \
+  maybe-all-stagefeedback-libcpp  \
+  maybe-all-stagefeedback-libiberty                        \
+  maybe-all-stagefeedback-zlib        
+
+do-clean: clean-stagefeedback
+clean-stagefeedback:     \
+  maybe-clean-stagefeedback-bfd \
+  maybe-clean-stagefeedback-opcodes \
+  maybe-clean-stagefeedback-binutils              \
+  maybe-clean-stagefeedback-gas \
+  maybe-clean-stagefeedback-gcc        \
+  maybe-clean-stagefeedback-intl   \
+  maybe-clean-stagefeedback-ld \
+  maybe-clean-stagefeedback-libcpp  \
+  maybe-clean-stagefeedback-libiberty                        \
+  maybe-clean-stagefeedback-zlib        
+
+
+.PHONY: configure-stagefeedback-bfd maybe-configure-stagefeedback-bfd
+.PHONY: all-stagefeedback-bfd maybe-all-stagefeedback-bfd
+.PHONY: clean-stagefeedback-bfd maybe-clean-stagefeedback-bfd
+
+maybe-configure-stagefeedback-bfd:
+maybe-all-stagefeedback-bfd:
+maybe-clean-stagefeedback-bfd:
+
+@if bfd-bootstrap
+maybe-configure-stagefeedback-bfd: configure-stagefeedback-bfd
+configure-stagefeedback-bfd:
+       @$(MAKE) stagefeedback-start
+       @[ -f bfd/Makefile ] && exit 0 || : ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
         $(STAGE_HOST_EXPORTS)  \
-       echo Configuring stage 2 in gcc ; \
-       cd gcc || exit 1; \
+       echo Configuring stage feedback in bfd ; \
+       cd $(HOST_SUBDIR)/bfd || exit 1; \
         case $(srcdir) in \
-         \.) \
-           srcdiroption="--srcdir=."; \
-           libsrcdir=".";; \
-         /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/gcc"; \
-           libsrcdir="$$s/gcc";; \
-         *) \
-           srcdiroption="--srcdir=../$(srcdir)/gcc"; \
-           libsrcdir="$$s/gcc";; \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/bfd/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
+       srcdiroption="--srcdir=$${topdir}/bfd"; \
+       libsrcdir="$$s/bfd"; \
         $(SHELL) $${libsrcdir}/configure \
           $(HOST_CONFIGARGS) $${srcdiroption} \
-         @stage2_werror_flag@ && \
-         $(STAMP) ../configure-stage2-gcc
+         @stage2_werror_flag@ 
  
-all-stage2-gcc: configure-stage2-gcc
-       $(MAKE) new-stage2-start
+maybe-all-stagefeedback-bfd: all-stagefeedback-bfd
+all-stagefeedback-bfd: configure-stagefeedback-bfd
+       @$(MAKE) stagefeedback-start
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
         $(STAGE_HOST_EXPORTS)  \
-       cd gcc && \
-       $(MAKE) $(GCC_FLAGS_TO_PASS)  \
-               CC="$${CC}" CC_FOR_BUILD="${CC_FOR_BUILD}" \
-               STAGE_PREFIX=$$r/stage1-gcc/  \
-               $(POSTSTAGE1_FLAGS_TO_PASS) && $(STAMP) ../all-stage2-gcc
-
-
-
-
-
-.PHONY: new-restage2 distclean-stage2
-
-distclean-stage2:  distclean-stage3 
-       [ -f stage_last ] && $(MAKE) new-`cat stage_last`-end || :
-       rm -rf configure-stage2-gcc all-stage2-gcc stage2-gcc 
-
-new-restage2:  distclean-stage3 
-       rm -rf all-stage2-gcc 
-       $(MAKE)  all-stage2-gcc 
+       cd $(HOST_SUBDIR)/bfd && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-use" 
+
+maybe-clean-stagefeedback-bfd: clean-stagefeedback-bfd
+clean-stagefeedback-bfd:
+       @[ -f bfd/Makefile ] || [ -f stagefeedback-bfd/Makefile ] \
+         || exit 0 ; \
+       [ -f bfd/Makefile ] || $(MAKE) stagefeedback-start ; \
+       cd $(HOST_SUBDIR)/bfd && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-use"  clean
+@endif bfd-bootstrap
+
+
+.PHONY: configure-stagefeedback-opcodes maybe-configure-stagefeedback-opcodes
+.PHONY: all-stagefeedback-opcodes maybe-all-stagefeedback-opcodes
+.PHONY: clean-stagefeedback-opcodes maybe-clean-stagefeedback-opcodes
+
+maybe-configure-stagefeedback-opcodes:
+maybe-all-stagefeedback-opcodes:
+maybe-clean-stagefeedback-opcodes:
+
+@if opcodes-bootstrap
+maybe-configure-stagefeedback-opcodes: configure-stagefeedback-opcodes
+configure-stagefeedback-opcodes:
+       @$(MAKE) stagefeedback-start
+       @[ -f opcodes/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage feedback in opcodes ; \
+       cd $(HOST_SUBDIR)/opcodes || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/opcodes/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/opcodes"; \
+       libsrcdir="$$s/opcodes"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
  
+maybe-all-stagefeedback-opcodes: all-stagefeedback-opcodes
+all-stagefeedback-opcodes: configure-stagefeedback-opcodes
+       @$(MAKE) stagefeedback-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/opcodes && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-use" 
+
+maybe-clean-stagefeedback-opcodes: clean-stagefeedback-opcodes
+clean-stagefeedback-opcodes:
+       @[ -f opcodes/Makefile ] || [ -f stagefeedback-opcodes/Makefile ] \
+         || exit 0 ; \
+       [ -f opcodes/Makefile ] || $(MAKE) stagefeedback-start ; \
+       cd $(HOST_SUBDIR)/opcodes && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-use"  clean
+@endif opcodes-bootstrap
+
+
+.PHONY: configure-stagefeedback-binutils maybe-configure-stagefeedback-binutils
+.PHONY: all-stagefeedback-binutils maybe-all-stagefeedback-binutils
+.PHONY: clean-stagefeedback-binutils maybe-clean-stagefeedback-binutils
+
+maybe-configure-stagefeedback-binutils:
+maybe-all-stagefeedback-binutils:
+maybe-clean-stagefeedback-binutils:
+
+@if binutils-bootstrap
+maybe-configure-stagefeedback-binutils: configure-stagefeedback-binutils
+configure-stagefeedback-binutils:
+       @$(MAKE) stagefeedback-start
+       @[ -f binutils/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage feedback in binutils ; \
+       cd $(HOST_SUBDIR)/binutils || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/binutils/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/binutils"; \
+       libsrcdir="$$s/binutils"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
  
+maybe-all-stagefeedback-binutils: all-stagefeedback-binutils
+all-stagefeedback-binutils: configure-stagefeedback-binutils
+       @$(MAKE) stagefeedback-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/binutils && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-use" 
+
+maybe-clean-stagefeedback-binutils: clean-stagefeedback-binutils
+clean-stagefeedback-binutils:
+       @[ -f binutils/Makefile ] || [ -f stagefeedback-binutils/Makefile ] \
+         || exit 0 ; \
+       [ -f binutils/Makefile ] || $(MAKE) stagefeedback-start ; \
+       cd $(HOST_SUBDIR)/binutils && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-use"  clean
+@endif binutils-bootstrap
+
+
+.PHONY: configure-stagefeedback-gas maybe-configure-stagefeedback-gas
+.PHONY: all-stagefeedback-gas maybe-all-stagefeedback-gas
+.PHONY: clean-stagefeedback-gas maybe-clean-stagefeedback-gas
+
+maybe-configure-stagefeedback-gas:
+maybe-all-stagefeedback-gas:
+maybe-clean-stagefeedback-gas:
+
+@if gas-bootstrap
+maybe-configure-stagefeedback-gas: configure-stagefeedback-gas
+configure-stagefeedback-gas:
+       @$(MAKE) stagefeedback-start
+       @[ -f gas/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage feedback in gas ; \
+       cd $(HOST_SUBDIR)/gas || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/gas/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/gas"; \
+       libsrcdir="$$s/gas"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
  
+maybe-all-stagefeedback-gas: all-stagefeedback-gas
+all-stagefeedback-gas: configure-stagefeedback-gas
+       @$(MAKE) stagefeedback-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/gas && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-use" 
+
+maybe-clean-stagefeedback-gas: clean-stagefeedback-gas
+clean-stagefeedback-gas:
+       @[ -f gas/Makefile ] || [ -f stagefeedback-gas/Makefile ] \
+         || exit 0 ; \
+       [ -f gas/Makefile ] || $(MAKE) stagefeedback-start ; \
+       cd $(HOST_SUBDIR)/gas && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-use"  clean
+@endif gas-bootstrap
+
+
+.PHONY: configure-stagefeedback-gcc maybe-configure-stagefeedback-gcc
+.PHONY: all-stagefeedback-gcc maybe-all-stagefeedback-gcc
+.PHONY: clean-stagefeedback-gcc maybe-clean-stagefeedback-gcc
+
+maybe-configure-stagefeedback-gcc:
+maybe-all-stagefeedback-gcc:
+maybe-clean-stagefeedback-gcc:
+
+@if gcc-bootstrap
+maybe-configure-stagefeedback-gcc: configure-stagefeedback-gcc
+configure-stagefeedback-gcc:
+       @$(MAKE) stagefeedback-start
+       @[ -f gcc/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage feedback in gcc ; \
+       cd $(HOST_SUBDIR)/gcc || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/gcc/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/gcc"; \
+       libsrcdir="$$s/gcc"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
  
-.PHONY: new-stage3-start new-stage3-end
+maybe-all-stagefeedback-gcc: all-stagefeedback-gcc
+all-stagefeedback-gcc: configure-stagefeedback-gcc
+       @$(MAKE) stagefeedback-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/gcc && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-use" $(EXTRA_GCC_FLAGS)
+
+maybe-clean-stagefeedback-gcc: clean-stagefeedback-gcc
+clean-stagefeedback-gcc:
+       @[ -f gcc/Makefile ] || [ -f stagefeedback-gcc/Makefile ] \
+         || exit 0 ; \
+       [ -f gcc/Makefile ] || $(MAKE) stagefeedback-start ; \
+       cd $(HOST_SUBDIR)/gcc && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-use" $(EXTRA_GCC_FLAGS) clean
+@endif gcc-bootstrap
+
+
+.PHONY: configure-stagefeedback-intl maybe-configure-stagefeedback-intl
+.PHONY: all-stagefeedback-intl maybe-all-stagefeedback-intl
+.PHONY: clean-stagefeedback-intl maybe-clean-stagefeedback-intl
+
+maybe-configure-stagefeedback-intl:
+maybe-all-stagefeedback-intl:
+maybe-clean-stagefeedback-intl:
+
+@if intl-bootstrap
+maybe-configure-stagefeedback-intl: configure-stagefeedback-intl
+configure-stagefeedback-intl:
+       @$(MAKE) stagefeedback-start
+       @[ -f intl/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage feedback in intl ; \
+       cd $(HOST_SUBDIR)/intl || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/intl/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/intl"; \
+       libsrcdir="$$s/intl"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
  
-new-stage3-start:
-       [ -f stage_last ] && $(MAKE) new-`cat stage_last`-end || :
-       echo stage3 > stage_last ; \
-       [ -d stage3-gcc ] || mkdir stage3-gcc; \
-       set stage3-gcc gcc ; @CREATE_LINK_TO_DIR@  ; \
-       set stage2-gcc prev-gcc ; @CREATE_LINK_TO_DIR@ 
+maybe-all-stagefeedback-intl: all-stagefeedback-intl
+all-stagefeedback-intl: configure-stagefeedback-intl
+       @$(MAKE) stagefeedback-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/intl && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-use" 
+
+maybe-clean-stagefeedback-intl: clean-stagefeedback-intl
+clean-stagefeedback-intl:
+       @[ -f intl/Makefile ] || [ -f stagefeedback-intl/Makefile ] \
+         || exit 0 ; \
+       [ -f intl/Makefile ] || $(MAKE) stagefeedback-start ; \
+       cd $(HOST_SUBDIR)/intl && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-use"  clean
+@endif intl-bootstrap
+
+
+.PHONY: configure-stagefeedback-ld maybe-configure-stagefeedback-ld
+.PHONY: all-stagefeedback-ld maybe-all-stagefeedback-ld
+.PHONY: clean-stagefeedback-ld maybe-clean-stagefeedback-ld
+
+maybe-configure-stagefeedback-ld:
+maybe-all-stagefeedback-ld:
+maybe-clean-stagefeedback-ld:
+
+@if ld-bootstrap
+maybe-configure-stagefeedback-ld: configure-stagefeedback-ld
+configure-stagefeedback-ld:
+       @$(MAKE) stagefeedback-start
+       @[ -f ld/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage feedback in ld ; \
+       cd $(HOST_SUBDIR)/ld || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/ld/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/ld"; \
+       libsrcdir="$$s/ld"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
  
-new-stage3-end:
-       rm -f stage_last ; \
-       set gcc stage3-gcc ; @UNDO_LINK_TO_DIR@  ; \
-       set prev-gcc stage2-gcc ; @UNDO_LINK_TO_DIR@ 
+maybe-all-stagefeedback-ld: all-stagefeedback-ld
+all-stagefeedback-ld: configure-stagefeedback-ld
+       @$(MAKE) stagefeedback-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/ld && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-use" 
+
+maybe-clean-stagefeedback-ld: clean-stagefeedback-ld
+clean-stagefeedback-ld:
+       @[ -f ld/Makefile ] || [ -f stagefeedback-ld/Makefile ] \
+         || exit 0 ; \
+       [ -f ld/Makefile ] || $(MAKE) stagefeedback-start ; \
+       cd $(HOST_SUBDIR)/ld && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-use"  clean
+@endif ld-bootstrap
+
+
+.PHONY: configure-stagefeedback-libcpp maybe-configure-stagefeedback-libcpp
+.PHONY: all-stagefeedback-libcpp maybe-all-stagefeedback-libcpp
+.PHONY: clean-stagefeedback-libcpp maybe-clean-stagefeedback-libcpp
+
+maybe-configure-stagefeedback-libcpp:
+maybe-all-stagefeedback-libcpp:
+maybe-clean-stagefeedback-libcpp:
+
+@if libcpp-bootstrap
+maybe-configure-stagefeedback-libcpp: configure-stagefeedback-libcpp
+configure-stagefeedback-libcpp:
+       @$(MAKE) stagefeedback-start
+       @[ -f libcpp/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage feedback in libcpp ; \
+       cd $(HOST_SUBDIR)/libcpp || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/libcpp/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/libcpp"; \
+       libsrcdir="$$s/libcpp"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
  
-# Bubble a bugfix through all the stages up to stage 3.  They
-# are remade, but not reconfigured.  The next stage (if any) will not
-# be reconfigured as well.
-.PHONY: new-stage3-bubble
-new-stage3-bubble: new-stage2-bubble
-       @if [ -f all-stage3-gcc ] ; then \
-         echo Remaking stage 3 ; \
-         rm -f all-stage3-gcc ; \
-         $(MAKE) all-stage3-gcc ; \
-       else \
-         $(MAKE) all-stage3-gcc ; \
-       fi
+maybe-all-stagefeedback-libcpp: all-stagefeedback-libcpp
+all-stagefeedback-libcpp: configure-stagefeedback-libcpp
+       @$(MAKE) stagefeedback-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/libcpp && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-use" 
+
+maybe-clean-stagefeedback-libcpp: clean-stagefeedback-libcpp
+clean-stagefeedback-libcpp:
+       @[ -f libcpp/Makefile ] || [ -f stagefeedback-libcpp/Makefile ] \
+         || exit 0 ; \
+       [ -f libcpp/Makefile ] || $(MAKE) stagefeedback-start ; \
+       cd $(HOST_SUBDIR)/libcpp && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-use"  clean
+@endif libcpp-bootstrap
+
+
+.PHONY: configure-stagefeedback-libiberty maybe-configure-stagefeedback-libiberty
+.PHONY: all-stagefeedback-libiberty maybe-all-stagefeedback-libiberty
+.PHONY: clean-stagefeedback-libiberty maybe-clean-stagefeedback-libiberty
+
+maybe-configure-stagefeedback-libiberty:
+maybe-all-stagefeedback-libiberty:
+maybe-clean-stagefeedback-libiberty:
+
+@if libiberty-bootstrap
+maybe-configure-stagefeedback-libiberty: configure-stagefeedback-libiberty
+configure-stagefeedback-libiberty:
+       @$(MAKE) stagefeedback-start
+       @[ -f libiberty/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage feedback in libiberty ; \
+       cd $(HOST_SUBDIR)/libiberty || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/libiberty/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/libiberty"; \
+       libsrcdir="$$s/libiberty"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
  
-configure-stage3-gcc:  all-stage2-gcc 
-       $(MAKE) new-stage3-start
-       @if [ -f stage3-gcc/Makefile ] ; then \
-         $(STAMP) configure-stage3-gcc ; \
-         exit 0; \
-       else \
-         true ; \
-       fi ; \
+maybe-all-stagefeedback-libiberty: all-stagefeedback-libiberty
+all-stagefeedback-libiberty: configure-stagefeedback-libiberty
+       @$(MAKE) stagefeedback-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/libiberty && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-use" 
+
+maybe-clean-stagefeedback-libiberty: clean-stagefeedback-libiberty
+clean-stagefeedback-libiberty:
+       @[ -f libiberty/Makefile ] || [ -f stagefeedback-libiberty/Makefile ] \
+         || exit 0 ; \
+       [ -f libiberty/Makefile ] || $(MAKE) stagefeedback-start ; \
+       cd $(HOST_SUBDIR)/libiberty && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-use"  clean
+@endif libiberty-bootstrap
+
+
+.PHONY: configure-stagefeedback-zlib maybe-configure-stagefeedback-zlib
+.PHONY: all-stagefeedback-zlib maybe-all-stagefeedback-zlib
+.PHONY: clean-stagefeedback-zlib maybe-clean-stagefeedback-zlib
+
+maybe-configure-stagefeedback-zlib:
+maybe-all-stagefeedback-zlib:
+maybe-clean-stagefeedback-zlib:
+
+@if zlib-bootstrap
+maybe-configure-stagefeedback-zlib: configure-stagefeedback-zlib
+configure-stagefeedback-zlib:
+       @$(MAKE) stagefeedback-start
+       @[ -f zlib/Makefile ] && exit 0 || : ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
         $(STAGE_HOST_EXPORTS)  \
-       echo Configuring stage 3 in gcc ; \
-       cd gcc || exit 1; \
+       echo Configuring stage feedback in zlib ; \
+       cd $(HOST_SUBDIR)/zlib || exit 1; \
         case $(srcdir) in \
-         \.) \
-           srcdiroption="--srcdir=."; \
-           libsrcdir=".";; \
-         /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/gcc"; \
-           libsrcdir="$$s/gcc";; \
-         *) \
-           srcdiroption="--srcdir=../$(srcdir)/gcc"; \
-           libsrcdir="$$s/gcc";; \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/zlib/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
+       srcdiroption="--srcdir=$${topdir}/zlib"; \
+       libsrcdir="$$s/zlib"; \
         $(SHELL) $${libsrcdir}/configure \
           $(HOST_CONFIGARGS) $${srcdiroption} \
-         @stage2_werror_flag@ && \
-         $(STAMP) ../configure-stage3-gcc
+         @stage2_werror_flag@ 
  
-all-stage3-gcc: configure-stage3-gcc
-       $(MAKE) new-stage3-start
+maybe-all-stagefeedback-zlib: all-stagefeedback-zlib
+all-stagefeedback-zlib: configure-stagefeedback-zlib
+       @$(MAKE) stagefeedback-start
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
         $(STAGE_HOST_EXPORTS)  \
-       cd gcc && \
-       $(MAKE) $(GCC_FLAGS_TO_PASS)  \
-               CC="$${CC}" CC_FOR_BUILD="${CC_FOR_BUILD}" \
-               STAGE_PREFIX=$$r/stage2-gcc/  \
-               $(POSTSTAGE1_FLAGS_TO_PASS) && $(STAMP) ../all-stage3-gcc
+       cd $(HOST_SUBDIR)/zlib && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-use" 
  
+maybe-clean-stagefeedback-zlib: clean-stagefeedback-zlib
+clean-stagefeedback-zlib:
+       @[ -f zlib/Makefile ] || [ -f stagefeedback-zlib/Makefile ] \
+         || exit 0 ; \
+       [ -f zlib/Makefile ] || $(MAKE) stagefeedback-start ; \
+       cd $(HOST_SUBDIR)/zlib && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-use"  clean
+@endif zlib-bootstrap
  
-compare: all-stage3-gcc
-       [ -f stage_last ] && $(MAKE) new-`cat stage_last`-end || :
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       rm -f .bad_compare ; \
-       cd stage3-gcc; \
-       files=`find . -name "*$(objext)" -print` ; \
-       cd .. ; \
-       for file in $${files} ; do \
-         f1=$$r/stage2-gcc/$$file; f2=$$r/stage3-gcc/$$file; \
-         @do_compare@ > /dev/null 2>&1; \
-         test $$? -eq 1 && echo $$file differs >> .bad_compare || true; \
-       done ; \
-       if [ -f .bad_compare ]; then \
-         echo "Bootstrap comparison failure!"; \
-         cat .bad_compare; \
-         exit 1; \
-       else \
-         true; \
-       fi ; \
-       $(STAMP) compare
  
  
+# FIXME: Will not need to be conditional when toplevel bootstrap is the
+# only possibility, but now it conflicts with no-bootstrap rules
+@if gcc-bootstrap
  
-.PHONY: new-bootstrap
-new-bootstrap:
-       $(MAKE) new-stage3-bubble  compare  \
-         new-stage3-start all new-stage3-end 
  
  
-.PHONY: new-restage3 distclean-stage3
  
-distclean-stage3: 
-       [ -f stage_last ] && $(MAKE) new-`cat stage_last`-end || :
-       rm -rf configure-stage3-gcc all-stage3-gcc stage3-gcc compare 
+# Rules to wipe a stage and all the following ones, also used for cleanstrap
+distclean-stage1:: distclean-stagefeedback 
+.PHONY: distclean-stagefeedback
+distclean-stagefeedback::
+       [ -f stage_current ] && $(MAKE) `cat stage_current`-end || :
+       rm -rf stagefeedback-* 
  
-new-restage3: 
-       rm -rf all-stage3-gcc compare 
-       $(MAKE) compare 
  
+@endif gcc-bootstrap
  
-.PHONY: new-cleanstrap
-new-cleanstrap: distclean-stage1 new-bootstrap
  
  
+stagefeedback-start::
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       cd stageprofile-gcc && \
+         { find . -type d | sort | sed 's,.*,$(SHELL) '"$$s"'/mkinstalldirs "../gcc/&",' | $(SHELL); } && \
+         { find . -name '*.*da' | sed 's,.*,$(LN) -f "&" "../gcc/&",' | $(SHELL); }
+
+# FIXME: Will not need to be conditional when toplevel bootstrap is the
+# only possibility, but now it conflicts with no-bootstrap rules
+@if gcc-bootstrap
+profiledbootstrap:
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       echo "Bootstrapping the compiler"; \
+       $(MAKE) stageprofile-bubble distclean-stagefeedback
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}` ; export s; \
+       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; \
+       $(HOST_EXPORTS) \
+       echo "Building feedback based compiler"; \
+       $(MAKE) stagefeedback-bubble stagefeedback-end
+@endif gcc-bootstrap
  
+@if gcc-bootstrap
+NOTPARALLEL = .NOTPARALLEL
+$(NOTPARALLEL):
+do-distclean: distclean-stage1
+@endif gcc-bootstrap
  
  # --------------------------------------
  # Dependencies between different modules
  # --------------------------------------
  
+# Generic dependencies for target modules on host stuff, especially gcc
+
+configure-target-libstdc++-v3: maybe-all-gcc
+
+configure-target-libmudflap: maybe-all-gcc
+
+configure-target-newlib: maybe-all-gcc
+
+configure-target-libgfortran: maybe-all-gcc
+
+configure-target-libobjc: maybe-all-gcc
+
+configure-target-libtermcap: maybe-all-gcc
+
+configure-target-winsup: maybe-all-gcc
+
+configure-target-libgloss: maybe-all-gcc
+
+configure-target-libiberty: maybe-all-gcc
+
+configure-target-gperf: maybe-all-gcc
+
+configure-target-examples: maybe-all-gcc
+
+configure-target-libffi: maybe-all-gcc
+
+configure-target-libjava: maybe-all-gcc
+
+configure-target-zlib: maybe-all-gcc
+
+configure-target-boehm-gc: maybe-all-gcc
+
+configure-target-qthreads: maybe-all-gcc
+
+configure-target-rda: maybe-all-gcc
+
+configure-target-libada: maybe-all-gcc
+
+
+
+configure-target-boehm-gc: maybe-all-target-newlib maybe-all-target-libgloss
+
+configure-target-gperf: maybe-all-target-newlib maybe-all-target-libgloss
+configure-target-gperf: maybe-all-target-libstdc++-v3
+
+configure-target-libada: maybe-all-target-newlib maybe-all-target-libgloss
+
+configure-target-libgfortran: maybe-all-target-newlib maybe-all-target-libgloss
+
+configure-target-libffi: maybe-all-target-newlib maybe-all-target-libgloss
+
+configure-target-libjava: maybe-all-target-newlib maybe-all-target-libgloss
+configure-target-libjava: maybe-all-target-libstdc++-v3
+
+configure-target-libobjc: maybe-all-target-newlib maybe-all-target-libgloss
+
+configure-target-libstdc++-v3: maybe-all-target-newlib maybe-all-target-libgloss
+
+configure-target-zlib: maybe-all-target-newlib maybe-all-target-libgloss
+
+configure-target-examples: maybe-all-target-newlib maybe-all-target-libgloss
+
+configure-target-libtermcap: maybe-all-target-newlib maybe-all-target-libgloss
+
+configure-target-rda: maybe-all-target-newlib maybe-all-target-libgloss
+
+configure-target-winsup: maybe-all-target-newlib maybe-all-target-libgloss
+
+configure-target-qthreads: maybe-all-target-newlib maybe-all-target-libgloss
+
+
  # There are two types of dependencies here: 'hard' dependencies, where one
  # module simply won't build without the other; and 'soft' dependencies, where
  # if the depended-on module is missing, the depending module will do without
  # or find a substitute somewhere (perhaps installed).  Soft dependencies
-# are specified by depending on a 'maybe-' target.  If you're not sure,
+# are made here to depend on a 'maybe-' target.  If you're not sure,
  # it's safer to use a soft dependency.
  
-# Host modules specific to gcc.
-# GCC needs to identify certain tools.
-# GCC also needs the information exported by the intl configure script.
-configure-gcc: maybe-configure-intl maybe-configure-binutils maybe-configure-gas maybe-configure-ld maybe-configure-bison maybe-configure-flex
-all-gcc: maybe-all-libiberty maybe-all-intl maybe-all-bison maybe-all-byacc maybe-all-binutils maybe-all-gas maybe-all-ld maybe-all-zlib maybe-all-libbanshee maybe-all-libcpp
-configure-libcpp: maybe-configure-libiberty maybe-configure-intl
-all-libcpp: maybe-all-libiberty maybe-all-intl
-# This is a slightly kludgy method of getting dependencies on 
-# all-build-libiberty correct; it would be better to build it every time.
-all-gcc: maybe-all-build-libiberty
-all-bootstrap: maybe-all-binutils maybe-all-bison maybe-all-byacc maybe-all-gas maybe-all-intl maybe-all-ld maybe-all-libcpp maybe-all-libbanshee maybe-all-libiberty maybe-all-texinfo maybe-all-zlib 
  
-# Host modules specific to gdb.
-# GDB needs to know that the simulator is being built.
-configure-gdb: maybe-configure-itcl maybe-configure-tcl maybe-configure-tk maybe-configure-sim
-GDB_TK = @GDB_TK@
-all-gdb: maybe-all-libiberty maybe-all-opcodes maybe-all-bfd maybe-all-mmalloc maybe-all-readline maybe-all-bison maybe-all-byacc maybe-all-sim $(gdbnlmrequirements) $(GDB_TK)
-install-gdb: maybe-install-tcl maybe-install-tk maybe-install-itcl maybe-install-tix maybe-install-libgui
-configure-libgui: maybe-configure-tcl maybe-configure-tk
-all-libgui: maybe-all-tcl maybe-all-tk maybe-all-itcl
  
-# Host modules specific to binutils.
+
+
+# With all the machinery above in place, it is pretty easy to generate
+# dependencies.  Host dependencies are a bit more complex because we have
+# to check for bootstrap/prebootstrap dependencies.  To resolve
+# prebootstrap dependencies, prebootstrap modules are gathered in
+# a hash table.
+all-build-bison: maybe-all-build-texinfo
+all-build-byacc: maybe-all-build-texinfo
+all-build-flex: maybe-all-build-texinfo
+all-build-flex: maybe-all-build-bison
+all-build-flex: maybe-all-build-byacc
+all-build-flex: maybe-all-build-m4
+all-build-libiberty: maybe-all-build-texinfo
+all-build-m4: maybe-all-build-texinfo
+all-build-fixincludes: maybe-all-build-libiberty
+configure-gcc: maybe-configure-intl
+
+configure-stage1-gcc: maybe-configure-stage1-intl
+configure-stage2-gcc: maybe-configure-stage2-intl
+configure-stage3-gcc: maybe-configure-stage3-intl
+configure-stage4-gcc: maybe-configure-stage4-intl
+configure-stageprofile-gcc: maybe-configure-stageprofile-intl
+configure-stagefeedback-gcc: maybe-configure-stagefeedback-intl
+configure-gcc: maybe-configure-binutils
+
+configure-stage1-gcc: maybe-configure-stage1-binutils
+configure-stage2-gcc: maybe-configure-stage2-binutils
+configure-stage3-gcc: maybe-configure-stage3-binutils
+configure-stage4-gcc: maybe-configure-stage4-binutils
+configure-stageprofile-gcc: maybe-configure-stageprofile-binutils
+configure-stagefeedback-gcc: maybe-configure-stagefeedback-binutils
+configure-gcc: maybe-configure-gas
+
+configure-stage1-gcc: maybe-configure-stage1-gas
+configure-stage2-gcc: maybe-configure-stage2-gas
+configure-stage3-gcc: maybe-configure-stage3-gas
+configure-stage4-gcc: maybe-configure-stage4-gas
+configure-stageprofile-gcc: maybe-configure-stageprofile-gas
+configure-stagefeedback-gcc: maybe-configure-stagefeedback-gas
+configure-gcc: maybe-configure-ld
+
+configure-stage1-gcc: maybe-configure-stage1-ld
+configure-stage2-gcc: maybe-configure-stage2-ld
+configure-stage3-gcc: maybe-configure-stage3-ld
+configure-stage4-gcc: maybe-configure-stage4-ld
+configure-stageprofile-gcc: maybe-configure-stageprofile-ld
+configure-stagefeedback-gcc: maybe-configure-stagefeedback-ld
+all-gcc: all-libiberty
+
+all-stage1-gcc: all-stage1-libiberty
+all-stage2-gcc: all-stage2-libiberty
+all-stage3-gcc: all-stage3-libiberty
+all-stage4-gcc: all-stage4-libiberty
+all-stageprofile-gcc: all-stageprofile-libiberty
+all-stagefeedback-gcc: all-stagefeedback-libiberty
+all-gcc: maybe-all-intl
+
+all-stage1-gcc: maybe-all-stage1-intl
+all-stage2-gcc: maybe-all-stage2-intl
+all-stage3-gcc: maybe-all-stage3-intl
+all-stage4-gcc: maybe-all-stage4-intl
+all-stageprofile-gcc: maybe-all-stageprofile-intl
+all-stagefeedback-gcc: maybe-all-stagefeedback-intl
+all-gcc: maybe-all-build-texinfo
+
+all-stage1-gcc: maybe-all-build-texinfo
+all-stage2-gcc: maybe-all-build-texinfo
+all-stage3-gcc: maybe-all-build-texinfo
+all-stage4-gcc: maybe-all-build-texinfo
+all-stageprofile-gcc: maybe-all-build-texinfo
+all-stagefeedback-gcc: maybe-all-build-texinfo
+all-prebootstrap: maybe-all-build-texinfo
+all-gcc: maybe-all-build-bison
+
+all-stage1-gcc: maybe-all-build-bison
+all-stage2-gcc: maybe-all-build-bison
+all-stage3-gcc: maybe-all-build-bison
+all-stage4-gcc: maybe-all-build-bison
+all-stageprofile-gcc: maybe-all-build-bison
+all-stagefeedback-gcc: maybe-all-build-bison
+all-prebootstrap: maybe-all-build-bison
+all-gcc: maybe-all-build-byacc
+
+all-stage1-gcc: maybe-all-build-byacc
+all-stage2-gcc: maybe-all-build-byacc
+all-stage3-gcc: maybe-all-build-byacc
+all-stage4-gcc: maybe-all-build-byacc
+all-stageprofile-gcc: maybe-all-build-byacc
+all-stagefeedback-gcc: maybe-all-build-byacc
+all-prebootstrap: maybe-all-build-byacc
+all-gcc: maybe-all-build-flex
+
+all-stage1-gcc: maybe-all-build-flex
+all-stage2-gcc: maybe-all-build-flex
+all-stage3-gcc: maybe-all-build-flex
+all-stage4-gcc: maybe-all-build-flex
+all-stageprofile-gcc: maybe-all-build-flex
+all-stagefeedback-gcc: maybe-all-build-flex
+all-prebootstrap: maybe-all-build-flex
+all-gcc: maybe-all-build-libiberty
+
+all-stage1-gcc: maybe-all-build-libiberty
+all-stage2-gcc: maybe-all-build-libiberty
+all-stage3-gcc: maybe-all-build-libiberty
+all-stage4-gcc: maybe-all-build-libiberty
+all-stageprofile-gcc: maybe-all-build-libiberty
+all-stagefeedback-gcc: maybe-all-build-libiberty
+all-prebootstrap: maybe-all-build-libiberty
+all-gcc: maybe-all-build-fixincludes
+
+all-stage1-gcc: maybe-all-build-fixincludes
+all-stage2-gcc: maybe-all-build-fixincludes
+all-stage3-gcc: maybe-all-build-fixincludes
+all-stage4-gcc: maybe-all-build-fixincludes
+all-stageprofile-gcc: maybe-all-build-fixincludes
+all-stagefeedback-gcc: maybe-all-build-fixincludes
+all-prebootstrap: maybe-all-build-fixincludes
+all-gcc: maybe-all-binutils
+
+all-stage1-gcc: maybe-all-stage1-binutils
+all-stage2-gcc: maybe-all-stage2-binutils
+all-stage3-gcc: maybe-all-stage3-binutils
+all-stage4-gcc: maybe-all-stage4-binutils
+all-stageprofile-gcc: maybe-all-stageprofile-binutils
+all-stagefeedback-gcc: maybe-all-stagefeedback-binutils
+all-gcc: maybe-all-gas
+
+all-stage1-gcc: maybe-all-stage1-gas
+all-stage2-gcc: maybe-all-stage2-gas
+all-stage3-gcc: maybe-all-stage3-gas
+all-stage4-gcc: maybe-all-stage4-gas
+all-stageprofile-gcc: maybe-all-stageprofile-gas
+all-stagefeedback-gcc: maybe-all-stagefeedback-gas
+all-gcc: maybe-all-ld
+
+all-stage1-gcc: maybe-all-stage1-ld
+all-stage2-gcc: maybe-all-stage2-ld
+all-stage3-gcc: maybe-all-stage3-ld
+all-stage4-gcc: maybe-all-stage4-ld
+all-stageprofile-gcc: maybe-all-stageprofile-ld
+all-stagefeedback-gcc: maybe-all-stagefeedback-ld
+all-gcc: maybe-all-zlib
+
+all-stage1-gcc: maybe-all-stage1-zlib
+all-stage2-gcc: maybe-all-stage2-zlib
+all-stage3-gcc: maybe-all-stage3-zlib
+all-stage4-gcc: maybe-all-stage4-zlib
+all-stageprofile-gcc: maybe-all-stageprofile-zlib
+all-stagefeedback-gcc: maybe-all-stagefeedback-zlib
+all-gcc: all-libcpp
+
+all-stage1-gcc: all-stage1-libcpp
+all-stage2-gcc: all-stage2-libcpp
+all-stage3-gcc: all-stage3-libcpp
+all-stage4-gcc: all-stage4-libcpp
+all-stageprofile-gcc: all-stageprofile-libcpp
+all-stagefeedback-gcc: all-stagefeedback-libcpp
+all-gcc: maybe-all-libiberty
+
+all-stage1-gcc: maybe-all-stage1-libiberty
+all-stage2-gcc: maybe-all-stage2-libiberty
+all-stage3-gcc: maybe-all-stage3-libiberty
+all-stage4-gcc: maybe-all-stage4-libiberty
+all-stageprofile-gcc: maybe-all-stageprofile-libiberty
+all-stagefeedback-gcc: maybe-all-stagefeedback-libiberty
+all-gcc: maybe-all-fixincludes
+install-gcc: maybe-install-fixincludes
+configure-libcpp: configure-libiberty
+
+configure-stage1-libcpp: configure-stage1-libiberty
+configure-stage2-libcpp: configure-stage2-libiberty
+configure-stage3-libcpp: configure-stage3-libiberty
+configure-stage4-libcpp: configure-stage4-libiberty
+configure-stageprofile-libcpp: configure-stageprofile-libiberty
+configure-stagefeedback-libcpp: configure-stagefeedback-libiberty
+configure-libcpp: maybe-configure-intl
+
+configure-stage1-libcpp: maybe-configure-stage1-intl
+configure-stage2-libcpp: maybe-configure-stage2-intl
+configure-stage3-libcpp: maybe-configure-stage3-intl
+configure-stage4-libcpp: maybe-configure-stage4-intl
+configure-stageprofile-libcpp: maybe-configure-stageprofile-intl
+configure-stagefeedback-libcpp: maybe-configure-stagefeedback-intl
+all-libcpp: all-libiberty
+
+all-stage1-libcpp: all-stage1-libiberty
+all-stage2-libcpp: all-stage2-libiberty
+all-stage3-libcpp: all-stage3-libiberty
+all-stage4-libcpp: all-stage4-libiberty
+all-stageprofile-libcpp: all-stageprofile-libiberty
+all-stagefeedback-libcpp: all-stagefeedback-libiberty
+all-libcpp: maybe-all-intl
+
+all-stage1-libcpp: maybe-all-stage1-intl
+all-stage2-libcpp: maybe-all-stage2-intl
+all-stage3-libcpp: maybe-all-stage3-intl
+all-stage4-libcpp: maybe-all-stage4-intl
+all-stageprofile-libcpp: maybe-all-stageprofile-intl
+all-stagefeedback-libcpp: maybe-all-stagefeedback-intl
+all-fixincludes: maybe-all-libiberty
+all-gnattools: maybe-all-target-libada
+configure-gdb: maybe-configure-itcl
+configure-gdb: maybe-configure-tcl
+configure-gdb: maybe-configure-tk
+configure-gdb: maybe-configure-sim
+all-gdb: maybe-all-libiberty
+all-gdb: maybe-all-opcodes
+all-gdb: maybe-all-bfd
+all-gdb: maybe-all-readline
+all-gdb: maybe-all-build-bison
+all-gdb: maybe-all-build-byacc
+all-gdb: maybe-all-sim
+install-gdb: maybe-install-tcl
+install-gdb: maybe-install-tk
+install-gdb: maybe-install-itcl
+install-gdb: maybe-install-libgui
+configure-libgui: maybe-configure-tcl
+configure-libgui: maybe-configure-tk
+all-libgui: maybe-all-tcl
+all-libgui: maybe-all-tk
+all-libgui: maybe-all-itcl
  configure-bfd: configure-libiberty
-all-bfd: maybe-all-libiberty maybe-all-intl
-all-binutils: maybe-all-libiberty maybe-all-opcodes maybe-all-bfd maybe-all-flex maybe-all-bison maybe-all-byacc maybe-all-intl
-# We put install-opcodes before install-binutils because the installed
-# binutils might be on PATH, and they might need the shared opcodes
-# library.
+
+configure-stage1-bfd: configure-stage1-libiberty
+configure-stage2-bfd: configure-stage2-libiberty
+configure-stage3-bfd: configure-stage3-libiberty
+configure-stage4-bfd: configure-stage4-libiberty
+configure-stageprofile-bfd: configure-stageprofile-libiberty
+configure-stagefeedback-bfd: configure-stagefeedback-libiberty
+all-bfd: maybe-all-libiberty
+
+all-stage1-bfd: maybe-all-stage1-libiberty
+all-stage2-bfd: maybe-all-stage2-libiberty
+all-stage3-bfd: maybe-all-stage3-libiberty
+all-stage4-bfd: maybe-all-stage4-libiberty
+all-stageprofile-bfd: maybe-all-stageprofile-libiberty
+all-stagefeedback-bfd: maybe-all-stagefeedback-libiberty
+all-bfd: maybe-all-intl
+
+all-stage1-bfd: maybe-all-stage1-intl
+all-stage2-bfd: maybe-all-stage2-intl
+all-stage3-bfd: maybe-all-stage3-intl
+all-stage4-bfd: maybe-all-stage4-intl
+all-stageprofile-bfd: maybe-all-stageprofile-intl
+all-stagefeedback-bfd: maybe-all-stagefeedback-intl
+all-binutils: maybe-all-libiberty
+
+all-stage1-binutils: maybe-all-stage1-libiberty
+all-stage2-binutils: maybe-all-stage2-libiberty
+all-stage3-binutils: maybe-all-stage3-libiberty
+all-stage4-binutils: maybe-all-stage4-libiberty
+all-stageprofile-binutils: maybe-all-stageprofile-libiberty
+all-stagefeedback-binutils: maybe-all-stagefeedback-libiberty
+all-binutils: maybe-all-opcodes
+
+all-stage1-binutils: maybe-all-stage1-opcodes
+all-stage2-binutils: maybe-all-stage2-opcodes
+all-stage3-binutils: maybe-all-stage3-opcodes
+all-stage4-binutils: maybe-all-stage4-opcodes
+all-stageprofile-binutils: maybe-all-stageprofile-opcodes
+all-stagefeedback-binutils: maybe-all-stagefeedback-opcodes
+all-binutils: maybe-all-bfd
+
+all-stage1-binutils: maybe-all-stage1-bfd
+all-stage2-binutils: maybe-all-stage2-bfd
+all-stage3-binutils: maybe-all-stage3-bfd
+all-stage4-binutils: maybe-all-stage4-bfd
+all-stageprofile-binutils: maybe-all-stageprofile-bfd
+all-stagefeedback-binutils: maybe-all-stagefeedback-bfd
+all-binutils: maybe-all-build-flex
+
+all-stage1-binutils: maybe-all-build-flex
+all-stage2-binutils: maybe-all-build-flex
+all-stage3-binutils: maybe-all-build-flex
+all-stage4-binutils: maybe-all-build-flex
+all-stageprofile-binutils: maybe-all-build-flex
+all-stagefeedback-binutils: maybe-all-build-flex
+all-prebootstrap: maybe-all-build-flex
+all-binutils: maybe-all-build-bison
+
+all-stage1-binutils: maybe-all-build-bison
+all-stage2-binutils: maybe-all-build-bison
+all-stage3-binutils: maybe-all-build-bison
+all-stage4-binutils: maybe-all-build-bison
+all-stageprofile-binutils: maybe-all-build-bison
+all-stagefeedback-binutils: maybe-all-build-bison
+all-prebootstrap: maybe-all-build-bison
+all-binutils: maybe-all-build-byacc
+
+all-stage1-binutils: maybe-all-build-byacc
+all-stage2-binutils: maybe-all-build-byacc
+all-stage3-binutils: maybe-all-build-byacc
+all-stage4-binutils: maybe-all-build-byacc
+all-stageprofile-binutils: maybe-all-build-byacc
+all-stagefeedback-binutils: maybe-all-build-byacc
+all-prebootstrap: maybe-all-build-byacc
+all-binutils: maybe-all-intl
+
+all-stage1-binutils: maybe-all-stage1-intl
+all-stage2-binutils: maybe-all-stage2-intl
+all-stage3-binutils: maybe-all-stage3-intl
+all-stage4-binutils: maybe-all-stage4-intl
+all-stageprofile-binutils: maybe-all-stageprofile-intl
+all-stagefeedback-binutils: maybe-all-stagefeedback-intl
  install-binutils: maybe-install-opcodes
-# libopcodes depends on libbfd
  install-opcodes: maybe-install-bfd
-all-gas: maybe-all-libiberty maybe-all-opcodes maybe-all-bfd maybe-all-intl
-all-gprof: maybe-all-libiberty maybe-all-bfd maybe-all-opcodes maybe-all-intl
-all-ld: maybe-all-libiberty maybe-all-bfd maybe-all-opcodes maybe-all-bison maybe-all-byacc maybe-all-flex maybe-all-intl
-all-opcodes: maybe-all-bfd maybe-all-libiberty
-
-# Other host modules in the 'src' repository.
-all-dejagnu: maybe-all-tcl maybe-all-expect maybe-all-tk
-configure-expect: maybe-configure-tcl maybe-configure-tk
-all-expect: maybe-all-tcl maybe-all-tk
-configure-itcl: maybe-configure-tcl maybe-configure-tk
-all-itcl: maybe-all-tcl maybe-all-tk
-# We put install-tcl before install-itcl because itcl wants to run a
-# program on installation which uses the Tcl libraries.
+all-gas: maybe-all-libiberty
+
+all-stage1-gas: maybe-all-stage1-libiberty
+all-stage2-gas: maybe-all-stage2-libiberty
+all-stage3-gas: maybe-all-stage3-libiberty
+all-stage4-gas: maybe-all-stage4-libiberty
+all-stageprofile-gas: maybe-all-stageprofile-libiberty
+all-stagefeedback-gas: maybe-all-stagefeedback-libiberty
+all-gas: maybe-all-opcodes
+
+all-stage1-gas: maybe-all-stage1-opcodes
+all-stage2-gas: maybe-all-stage2-opcodes
+all-stage3-gas: maybe-all-stage3-opcodes
+all-stage4-gas: maybe-all-stage4-opcodes
+all-stageprofile-gas: maybe-all-stageprofile-opcodes
+all-stagefeedback-gas: maybe-all-stagefeedback-opcodes
+all-gas: maybe-all-bfd
+
+all-stage1-gas: maybe-all-stage1-bfd
+all-stage2-gas: maybe-all-stage2-bfd
+all-stage3-gas: maybe-all-stage3-bfd
+all-stage4-gas: maybe-all-stage4-bfd
+all-stageprofile-gas: maybe-all-stageprofile-bfd
+all-stagefeedback-gas: maybe-all-stagefeedback-bfd
+all-gas: maybe-all-intl
+
+all-stage1-gas: maybe-all-stage1-intl
+all-stage2-gas: maybe-all-stage2-intl
+all-stage3-gas: maybe-all-stage3-intl
+all-stage4-gas: maybe-all-stage4-intl
+all-stageprofile-gas: maybe-all-stageprofile-intl
+all-stagefeedback-gas: maybe-all-stagefeedback-intl
+all-gprof: maybe-all-libiberty
+all-gprof: maybe-all-bfd
+all-gprof: maybe-all-opcodes
+all-gprof: maybe-all-intl
+all-ld: maybe-all-libiberty
+
+all-stage1-ld: maybe-all-stage1-libiberty
+all-stage2-ld: maybe-all-stage2-libiberty
+all-stage3-ld: maybe-all-stage3-libiberty
+all-stage4-ld: maybe-all-stage4-libiberty
+all-stageprofile-ld: maybe-all-stageprofile-libiberty
+all-stagefeedback-ld: maybe-all-stagefeedback-libiberty
+all-ld: maybe-all-bfd
+
+all-stage1-ld: maybe-all-stage1-bfd
+all-stage2-ld: maybe-all-stage2-bfd
+all-stage3-ld: maybe-all-stage3-bfd
+all-stage4-ld: maybe-all-stage4-bfd
+all-stageprofile-ld: maybe-all-stageprofile-bfd
+all-stagefeedback-ld: maybe-all-stagefeedback-bfd
+all-ld: maybe-all-opcodes
+
+all-stage1-ld: maybe-all-stage1-opcodes
+all-stage2-ld: maybe-all-stage2-opcodes
+all-stage3-ld: maybe-all-stage3-opcodes
+all-stage4-ld: maybe-all-stage4-opcodes
+all-stageprofile-ld: maybe-all-stageprofile-opcodes
+all-stagefeedback-ld: maybe-all-stagefeedback-opcodes
+all-ld: maybe-all-build-bison
+
+all-stage1-ld: maybe-all-build-bison
+all-stage2-ld: maybe-all-build-bison
+all-stage3-ld: maybe-all-build-bison
+all-stage4-ld: maybe-all-build-bison
+all-stageprofile-ld: maybe-all-build-bison
+all-stagefeedback-ld: maybe-all-build-bison
+all-prebootstrap: maybe-all-build-bison
+all-ld: maybe-all-build-byacc
+
+all-stage1-ld: maybe-all-build-byacc
+all-stage2-ld: maybe-all-build-byacc
+all-stage3-ld: maybe-all-build-byacc
+all-stage4-ld: maybe-all-build-byacc
+all-stageprofile-ld: maybe-all-build-byacc
+all-stagefeedback-ld: maybe-all-build-byacc
+all-prebootstrap: maybe-all-build-byacc
+all-ld: maybe-all-build-flex
+
+all-stage1-ld: maybe-all-build-flex
+all-stage2-ld: maybe-all-build-flex
+all-stage3-ld: maybe-all-build-flex
+all-stage4-ld: maybe-all-build-flex
+all-stageprofile-ld: maybe-all-build-flex
+all-stagefeedback-ld: maybe-all-build-flex
+all-prebootstrap: maybe-all-build-flex
+all-ld: maybe-all-intl
+
+all-stage1-ld: maybe-all-stage1-intl
+all-stage2-ld: maybe-all-stage2-intl
+all-stage3-ld: maybe-all-stage3-intl
+all-stage4-ld: maybe-all-stage4-intl
+all-stageprofile-ld: maybe-all-stageprofile-intl
+all-stagefeedback-ld: maybe-all-stagefeedback-intl
+all-opcodes: maybe-all-bfd
+
+all-stage1-opcodes: maybe-all-stage1-bfd
+all-stage2-opcodes: maybe-all-stage2-bfd
+all-stage3-opcodes: maybe-all-stage3-bfd
+all-stage4-opcodes: maybe-all-stage4-bfd
+all-stageprofile-opcodes: maybe-all-stageprofile-bfd
+all-stagefeedback-opcodes: maybe-all-stagefeedback-bfd
+all-opcodes: maybe-all-libiberty
+
+all-stage1-opcodes: maybe-all-stage1-libiberty
+all-stage2-opcodes: maybe-all-stage2-libiberty
+all-stage3-opcodes: maybe-all-stage3-libiberty
+all-stage4-opcodes: maybe-all-stage4-libiberty
+all-stageprofile-opcodes: maybe-all-stageprofile-libiberty
+all-stagefeedback-opcodes: maybe-all-stagefeedback-libiberty
+all-dejagnu: maybe-all-tcl
+all-dejagnu: maybe-all-expect
+all-dejagnu: maybe-all-tk
+configure-expect: maybe-configure-tcl
+configure-expect: maybe-configure-tk
+all-expect: maybe-all-tcl
+all-expect: maybe-all-tk
+configure-itcl: maybe-configure-tcl
+configure-itcl: maybe-configure-tk
+all-itcl: maybe-all-tcl
+all-itcl: maybe-all-tk
  install-itcl: maybe-install-tcl
-all-sid: maybe-all-libiberty maybe-all-bfd maybe-all-opcodes maybe-all-tcl maybe-all-tk
-install-sid: maybe-install-tcl maybe-install-tk
-all-sim: maybe-all-libiberty maybe-all-bfd maybe-all-opcodes maybe-all-readline maybe-configure-gdb
  configure-tk: maybe-configure-tcl
  all-tk: maybe-all-tcl
-configure-tix: maybe-configure-tcl maybe-configure-tk
-all-tix: maybe-all-tcl maybe-all-tk
-all-texinfo: maybe-all-libiberty
-
-# Other host modules.  Warning, these are not well tested.
-all-autoconf: maybe-all-m4 maybe-all-texinfo
-all-automake: maybe-all-m4 maybe-all-texinfo
-all-bison: maybe-all-texinfo
-all-diff: maybe-all-libiberty
-all-fastjar: maybe-all-zlib maybe-all-libiberty
-all-fileutils: maybe-all-libiberty
-all-flex: maybe-all-libiberty maybe-all-bison maybe-all-byacc
-all-gzip: maybe-all-libiberty
-all-hello: maybe-all-libiberty
-all-m4: maybe-all-libiberty maybe-all-texinfo
-all-make: maybe-all-libiberty maybe-all-intl
-all-patch: maybe-all-libiberty
+all-sid: maybe-all-libiberty
+all-sid: maybe-all-bfd
+all-sid: maybe-all-opcodes
+all-sid: maybe-all-tcl
+all-sid: maybe-all-tk
+install-sid: maybe-install-tcl
+install-sid: maybe-install-tk
+all-sim: maybe-all-libiberty
+all-sim: maybe-all-bfd
+all-sim: maybe-all-opcodes
+all-sim: maybe-all-readline
+all-sim: maybe-configure-gdb
+all-fastjar: maybe-all-zlib
+all-fastjar: maybe-all-build-texinfo
+all-fastjar: maybe-all-libiberty
+all-autoconf: maybe-all-m4
+all-autoconf: maybe-all-build-texinfo
+all-automake: maybe-all-m4
+all-automake: maybe-all-build-texinfo
+all-automake: maybe-all-autoconf
+all-bison: maybe-all-intl
+all-bison: maybe-all-build-texinfo
+all-diff: maybe-all-intl
+all-diff: maybe-all-build-texinfo
+all-fileutils: maybe-all-intl
+all-fileutils: maybe-all-build-texinfo
+all-flex: maybe-all-build-bison
+all-flex: maybe-all-build-byacc
+all-flex: maybe-all-intl
+all-flex: maybe-all-m4
+all-flex: maybe-all-build-texinfo
+all-gzip: maybe-all-intl
+all-gzip: maybe-all-zlib
+all-gzip: maybe-all-build-texinfo
+all-hello: maybe-all-intl
+all-hello: maybe-all-build-texinfo
+all-m4: maybe-all-intl
+all-m4: maybe-all-build-texinfo
+all-make: maybe-all-intl
+all-make: maybe-all-build-texinfo
+all-patch: maybe-all-build-texinfo
+all-make: maybe-all-build-texinfo
  all-prms: maybe-all-libiberty
-all-recode: maybe-all-libiberty
-all-sed: maybe-all-libiberty
+all-recode: maybe-all-build-texinfo
+all-sed: maybe-all-build-texinfo
  all-send-pr: maybe-all-prms
-all-tar: maybe-all-libiberty
-all-uudecode: maybe-all-libiberty
-
-ALL_GCC = maybe-all-gcc
-ALL_GCC_C = $(ALL_GCC) maybe-all-target-newlib maybe-all-target-libgloss
-ALL_GCC_CXX = $(ALL_GCC_C) maybe-all-target-libstdc++-v3
-
-# Target modules specific to gcc.
-configure-target-boehm-gc: $(ALL_GCC_C) maybe-configure-target-qthreads
+all-tar: maybe-all-build-texinfo
+all-uudecode: maybe-all-build-texinfo
+configure-target-boehm-gc: maybe-configure-target-qthreads
  configure-target-fastjar: maybe-configure-target-zlib
-all-target-fastjar: maybe-all-target-zlib maybe-all-target-libiberty
-configure-target-libada: $(ALL_GCC_C)
-configure-target-libgfortran: $(ALL_GCC_C)
-configure-target-libffi: $(ALL_GCC_C) 
-configure-target-libjava: $(ALL_GCC_C) maybe-configure-target-zlib maybe-configure-target-boehm-gc maybe-configure-target-qthreads maybe-configure-target-libffi
-all-target-libjava: maybe-all-fastjar maybe-all-target-zlib maybe-all-target-boehm-gc maybe-all-target-qthreads maybe-all-target-libffi
-configure-target-libobjc: $(ALL_GCC_C)
+all-target-fastjar: maybe-all-target-zlib
+all-target-fastjar: maybe-all-target-libiberty
+configure-target-libjava: maybe-configure-target-zlib
+configure-target-libjava: maybe-configure-target-boehm-gc
+configure-target-libjava: maybe-configure-target-qthreads
+configure-target-libjava: maybe-configure-target-libffi
+all-target-libjava: maybe-all-fastjar
+all-target-libjava: maybe-all-target-zlib
+all-target-libjava: maybe-all-target-boehm-gc
+all-target-libjava: maybe-all-target-qthreads
+all-target-libjava: maybe-all-target-libffi
  all-target-libobjc: maybe-all-target-libiberty
-configure-target-libstdc++-v3: $(ALL_GCC_C)
  all-target-libstdc++-v3: maybe-all-target-libiberty
-configure-target-zlib: $(ALL_GCC_C)
-
-# Target modules in the 'src' repository.
-configure-target-examples: $(ALL_GCC_C)
-configure-target-libgloss: $(ALL_GCC)
  all-target-libgloss: maybe-configure-target-newlib
-configure-target-libiberty: $(ALL_GCC)
-configure-target-libtermcap: $(ALL_GCC_C)
-configure-target-newlib: $(ALL_GCC)
-configure-target-rda: $(ALL_GCC_C)
-configure-target-winsup: $(ALL_GCC_C)
-all-target-winsup: maybe-all-target-libiberty maybe-all-target-libtermcap
-
-# Other target modules.  Warning, these are not well tested.
-configure-target-gperf: $(ALL_GCC_CXX)
-all-target-gperf: maybe-all-target-libiberty maybe-all-target-libstdc++-v3
-configure-target-qthreads: $(ALL_GCC_C)
+all-target-winsup: maybe-all-target-libiberty
+all-target-winsup: maybe-all-target-libtermcap
+
+
+# Non-toplevel bootstrap rules must depend on several packages, to be built
+# before gcc.  Another wart that will go away, hopefully soon.
+@if gcc-no-bootstrap
+
+all-prebootstrap: maybe-all-bfd
+all-prebootstrap: maybe-all-opcodes
+all-prebootstrap: maybe-all-binutils
+all-prebootstrap: maybe-all-gas
+all-prebootstrap: maybe-all-intl
+all-prebootstrap: maybe-all-ld
+all-prebootstrap: maybe-all-libcpp
+all-prebootstrap: maybe-all-libiberty
+all-prebootstrap: maybe-all-zlib
+@endif gcc-no-bootstrap
+
+GDB_TK = @GDB_TK@
+all-gdb: $(gdbnlmrequirements) $(GDB_TK)
  
  # Serialization dependencies.  Host configures don't work well in parallel to
  # each other, due to contention over config.cache.  Target configures and 
@@ -28563,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.