2005-04-05 Paolo Bonzini <bonzini@gnu.org>
authorPaolo Bonzini <bonzini@gnu.org>
Tue, 5 Apr 2005 08:16:33 +0000 (08:16 +0000)
committerPaolo Bonzini <bonzini@gnu.org>
Tue, 5 Apr 2005 08:16:33 +0000 (08:16 +0000)
* Makefile.tpl: Sync with gcc.
* Makefile.in: Regenerate.

ChangeLog
Makefile.in
Makefile.tpl

index 1770ca29fa672cbd1bcbacf33b51e0f4d2d280f6..7957983a493d68cce72ca03f57df1fc619a9e0a5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-04-05  Paolo Bonzini  <bonzini@gnu.org>
+
+       * Makefile.tpl: Sync with gcc.
+       * Makefile.in: Regenerate.
+
 2005-03-30  J"orn Rennecke <joern.rennecke@st.com>
 
        * config/mh-mingw32: Delete.
index 1c3917db50eb7f2c0c81539ccbacdafe4812f413..51c0596d39f9791fb4fa84221504f3cc019aa96f 100644 (file)
@@ -90,7 +90,7 @@ BUILD_CONFIGDIRS = libiberty
 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@ --with-build-subdir="$(BUILD_SUBDIR)"
+BUILD_CONFIGARGS = @build_configargs@
 
 # This is the list of variables to export in the environment when
 # configuring any subdirectory.  It must also be exported whenever
@@ -175,7 +175,7 @@ TARGET_CONFIGDIRS = @target_configdirs@
 TARGET_SUBDIR = @target_subdir@
 # This is set by the configure script to the arguments to use when configuring
 # directories built for the target.
-TARGET_CONFIGARGS = @target_configargs@ --with-target-subdir="$(TARGET_SUBDIR)"
+TARGET_CONFIGARGS = @target_configargs@
 # This is the list of variables to export in the environment when
 # configuring subdirectories for the host system.
 BASE_TARGET_EXPORTS = \
@@ -2185,24 +2185,15 @@ 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; \
@@ -2219,12 +2210,11 @@ configure-build-libiberty:
        libsrcdir="$$s/libiberty"; \
        rm -f no-such-file || : ; \
        CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
-         $(BUILD_CONFIGARGS) $${srcdiroption}  \
+         $(BUILD_CONFIGARGS) $${srcdiroption} \
+         --with-build-subdir="$(BUILD_SUBDIR)"  \
          || exit 1
 @endif build-libiberty
 
-
-
 .PHONY: all-build-libiberty maybe-all-build-libiberty
 maybe-all-build-libiberty:
 @if build-libiberty
@@ -2235,16 +2225,14 @@ all-build-libiberty: configure-build-libiberty
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(BUILD_EXPORTS) \
        (cd $(BUILD_SUBDIR)/libiberty && \
-         $(MAKE)   $(TARGET-build-libiberty))
+         $(MAKE)  $(TARGET-build-libiberty))
 @endif build-libiberty
 
-
-
 .PHONY: configure-build-bison maybe-configure-build-bison
 maybe-configure-build-bison:
 @if build-bison
 maybe-configure-build-bison: configure-build-bison
-configure-build-bison: 
+configure-build-bison:
        @test ! -f $(BUILD_SUBDIR)/bison/Makefile || exit 0; \
        $(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/bison ; \
        r=`${PWD_COMMAND}`; export r; \
@@ -2261,12 +2249,11 @@ configure-build-bison:
        libsrcdir="$$s/bison"; \
        rm -f no-such-file || : ; \
        CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
-         $(BUILD_CONFIGARGS) $${srcdiroption}  \
+         $(BUILD_CONFIGARGS) $${srcdiroption} \
+         --with-build-subdir="$(BUILD_SUBDIR)"  \
          || exit 1
 @endif build-bison
 
-
-
 .PHONY: all-build-bison maybe-all-build-bison
 maybe-all-build-bison:
 @if build-bison
@@ -2277,16 +2264,14 @@ all-build-bison: configure-build-bison
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(BUILD_EXPORTS) \
        (cd $(BUILD_SUBDIR)/bison && \
-         $(MAKE)   $(TARGET-build-bison))
+         $(MAKE)  $(TARGET-build-bison))
 @endif build-bison
 
-
-
 .PHONY: configure-build-byacc maybe-configure-build-byacc
 maybe-configure-build-byacc:
 @if build-byacc
 maybe-configure-build-byacc: configure-build-byacc
-configure-build-byacc: 
+configure-build-byacc:
        @test ! -f $(BUILD_SUBDIR)/byacc/Makefile || exit 0; \
        $(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/byacc ; \
        r=`${PWD_COMMAND}`; export r; \
@@ -2303,12 +2288,11 @@ configure-build-byacc:
        libsrcdir="$$s/byacc"; \
        rm -f no-such-file || : ; \
        CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
-         $(BUILD_CONFIGARGS) $${srcdiroption}  \
+         $(BUILD_CONFIGARGS) $${srcdiroption} \
+         --with-build-subdir="$(BUILD_SUBDIR)"  \
          || exit 1
 @endif build-byacc
 
-
-
 .PHONY: all-build-byacc maybe-all-build-byacc
 maybe-all-build-byacc:
 @if build-byacc
@@ -2319,16 +2303,14 @@ all-build-byacc: configure-build-byacc
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(BUILD_EXPORTS) \
        (cd $(BUILD_SUBDIR)/byacc && \
-         $(MAKE)   $(TARGET-build-byacc))
+         $(MAKE)  $(TARGET-build-byacc))
 @endif build-byacc
 
-
-
 .PHONY: configure-build-flex maybe-configure-build-flex
 maybe-configure-build-flex:
 @if build-flex
 maybe-configure-build-flex: configure-build-flex
-configure-build-flex: 
+configure-build-flex:
        @test ! -f $(BUILD_SUBDIR)/flex/Makefile || exit 0; \
        $(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/flex ; \
        r=`${PWD_COMMAND}`; export r; \
@@ -2345,12 +2327,11 @@ configure-build-flex:
        libsrcdir="$$s/flex"; \
        rm -f no-such-file || : ; \
        CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
-         $(BUILD_CONFIGARGS) $${srcdiroption}  \
+         $(BUILD_CONFIGARGS) $${srcdiroption} \
+         --with-build-subdir="$(BUILD_SUBDIR)"  \
          || exit 1
 @endif build-flex
 
-
-
 .PHONY: all-build-flex maybe-all-build-flex
 maybe-all-build-flex:
 @if build-flex
@@ -2361,16 +2342,14 @@ all-build-flex: configure-build-flex
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(BUILD_EXPORTS) \
        (cd $(BUILD_SUBDIR)/flex && \
-         $(MAKE)   $(TARGET-build-flex))
+         $(MAKE)  $(TARGET-build-flex))
 @endif build-flex
 
-
-
 .PHONY: configure-build-m4 maybe-configure-build-m4
 maybe-configure-build-m4:
 @if build-m4
 maybe-configure-build-m4: configure-build-m4
-configure-build-m4: 
+configure-build-m4:
        @test ! -f $(BUILD_SUBDIR)/m4/Makefile || exit 0; \
        $(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/m4 ; \
        r=`${PWD_COMMAND}`; export r; \
@@ -2387,12 +2366,11 @@ configure-build-m4:
        libsrcdir="$$s/m4"; \
        rm -f no-such-file || : ; \
        CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
-         $(BUILD_CONFIGARGS) $${srcdiroption}  \
+         $(BUILD_CONFIGARGS) $${srcdiroption} \
+         --with-build-subdir="$(BUILD_SUBDIR)"  \
          || exit 1
 @endif build-m4
 
-
-
 .PHONY: all-build-m4 maybe-all-build-m4
 maybe-all-build-m4:
 @if build-m4
@@ -2403,16 +2381,14 @@ all-build-m4: configure-build-m4
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(BUILD_EXPORTS) \
        (cd $(BUILD_SUBDIR)/m4 && \
-         $(MAKE)   $(TARGET-build-m4))
+         $(MAKE)  $(TARGET-build-m4))
 @endif build-m4
 
-
-
 .PHONY: configure-build-texinfo maybe-configure-build-texinfo
 maybe-configure-build-texinfo:
 @if build-texinfo
 maybe-configure-build-texinfo: configure-build-texinfo
-configure-build-texinfo: 
+configure-build-texinfo:
        @test ! -f $(BUILD_SUBDIR)/texinfo/Makefile || exit 0; \
        $(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/texinfo ; \
        r=`${PWD_COMMAND}`; export r; \
@@ -2429,12 +2405,11 @@ configure-build-texinfo:
        libsrcdir="$$s/texinfo"; \
        rm -f no-such-file || : ; \
        CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
-         $(BUILD_CONFIGARGS) $${srcdiroption}  \
+         $(BUILD_CONFIGARGS) $${srcdiroption} \
+         --with-build-subdir="$(BUILD_SUBDIR)"  \
          || exit 1
 @endif build-texinfo
 
-
-
 .PHONY: all-build-texinfo maybe-all-build-texinfo
 maybe-all-build-texinfo:
 @if build-texinfo
@@ -2445,16 +2420,14 @@ all-build-texinfo: configure-build-texinfo
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(BUILD_EXPORTS) \
        (cd $(BUILD_SUBDIR)/texinfo && \
-         $(MAKE)   $(TARGET-build-texinfo))
+         $(MAKE)  $(TARGET-build-texinfo))
 @endif build-texinfo
 
-
-
 .PHONY: configure-build-fixincludes maybe-configure-build-fixincludes
 maybe-configure-build-fixincludes:
 @if build-fixincludes
 maybe-configure-build-fixincludes: configure-build-fixincludes
-configure-build-fixincludes: 
+configure-build-fixincludes:
        @test ! -f $(BUILD_SUBDIR)/fixincludes/Makefile || exit 0; \
        $(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/fixincludes ; \
        r=`${PWD_COMMAND}`; export r; \
@@ -2471,12 +2444,11 @@ configure-build-fixincludes:
        libsrcdir="$$s/fixincludes"; \
        rm -f no-such-file || : ; \
        CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
-         $(BUILD_CONFIGARGS) $${srcdiroption}  \
+         $(BUILD_CONFIGARGS) $${srcdiroption} \
+         --with-build-subdir="$(BUILD_SUBDIR)"  \
          || exit 1
 @endif build-fixincludes
 
-
-
 .PHONY: all-build-fixincludes maybe-all-build-fixincludes
 maybe-all-build-fixincludes:
 @if build-fixincludes
@@ -2487,28 +2459,26 @@ all-build-fixincludes: configure-build-fixincludes
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(BUILD_EXPORTS) \
        (cd $(BUILD_SUBDIR)/fixincludes && \
-         $(MAKE)   $(TARGET-build-fixincludes))
+         $(MAKE)  $(TARGET-build-fixincludes))
 @endif build-fixincludes
 
 
-
 # --------------------------------------
 # Modules which run on the host machine
 # --------------------------------------
 
-
 .PHONY: configure-ash maybe-configure-ash
 maybe-configure-ash:
 @if ash
 maybe-configure-ash: configure-ash
-configure-ash: 
+configure-ash:
        @test ! -f $(HOST_SUBDIR)/ash/Makefile || exit 0; \
        $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ash ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       echo Configuring in $(HOST_SUBDIR)/ash; \
-       cd "$(HOST_SUBDIR)/ash" || exit 1; \
+       echo Configuring in ash; \
+       cd $(HOST_SUBDIR)/ash || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
          *) topdir=`echo $(HOST_SUBDIR)/ash/ | \
@@ -2521,8 +2491,6 @@ configure-ash:
          || exit 1
 @endif ash
 
-
-
 .PHONY: all-ash maybe-all-ash
 maybe-all-ash:
 @if ash
@@ -2536,7 +2504,6 @@ all-ash: configure-ash
          $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-ash))
 @endif ash
 
-
 .PHONY: check-ash maybe-check-ash
 maybe-check-ash:
 @if ash
@@ -2815,19 +2782,18 @@ maintainer-clean-ash:
 @endif ash
 
 
-
 .PHONY: configure-autoconf maybe-configure-autoconf
 maybe-configure-autoconf:
 @if autoconf
 maybe-configure-autoconf: configure-autoconf
-configure-autoconf: 
+configure-autoconf:
        @test ! -f $(HOST_SUBDIR)/autoconf/Makefile || exit 0; \
        $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/autoconf ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       echo Configuring in $(HOST_SUBDIR)/autoconf; \
-       cd "$(HOST_SUBDIR)/autoconf" || exit 1; \
+       echo Configuring in autoconf; \
+       cd $(HOST_SUBDIR)/autoconf || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
          *) topdir=`echo $(HOST_SUBDIR)/autoconf/ | \
@@ -2840,8 +2806,6 @@ configure-autoconf:
          || exit 1
 @endif autoconf
 
-
-
 .PHONY: all-autoconf maybe-all-autoconf
 maybe-all-autoconf:
 @if autoconf
@@ -2855,7 +2819,6 @@ all-autoconf: configure-autoconf
          $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-autoconf))
 @endif autoconf
 
-
 .PHONY: check-autoconf maybe-check-autoconf
 maybe-check-autoconf:
 @if autoconf
@@ -3134,19 +3097,18 @@ maintainer-clean-autoconf:
 @endif autoconf
 
 
-
 .PHONY: configure-automake maybe-configure-automake
 maybe-configure-automake:
 @if automake
 maybe-configure-automake: configure-automake
-configure-automake: 
+configure-automake:
        @test ! -f $(HOST_SUBDIR)/automake/Makefile || exit 0; \
        $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/automake ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       echo Configuring in $(HOST_SUBDIR)/automake; \
-       cd "$(HOST_SUBDIR)/automake" || exit 1; \
+       echo Configuring in automake; \
+       cd $(HOST_SUBDIR)/automake || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
          *) topdir=`echo $(HOST_SUBDIR)/automake/ | \
@@ -3159,8 +3121,6 @@ configure-automake:
          || exit 1
 @endif automake
 
-
-
 .PHONY: all-automake maybe-all-automake
 maybe-all-automake:
 @if automake
@@ -3174,7 +3134,6 @@ all-automake: configure-automake
          $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-automake))
 @endif automake
 
-
 .PHONY: check-automake maybe-check-automake
 maybe-check-automake:
 @if automake
@@ -3453,19 +3412,18 @@ maintainer-clean-automake:
 @endif automake
 
 
-
 .PHONY: configure-bash maybe-configure-bash
 maybe-configure-bash:
 @if bash
 maybe-configure-bash: configure-bash
-configure-bash: 
+configure-bash:
        @test ! -f $(HOST_SUBDIR)/bash/Makefile || exit 0; \
        $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bash ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       echo Configuring in $(HOST_SUBDIR)/bash; \
-       cd "$(HOST_SUBDIR)/bash" || exit 1; \
+       echo Configuring in bash; \
+       cd $(HOST_SUBDIR)/bash || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
          *) topdir=`echo $(HOST_SUBDIR)/bash/ | \
@@ -3478,8 +3436,6 @@ configure-bash:
          || exit 1
 @endif bash
 
-
-
 .PHONY: all-bash maybe-all-bash
 maybe-all-bash:
 @if bash
@@ -3493,7 +3449,6 @@ all-bash: configure-bash
          $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-bash))
 @endif bash
 
-
 .PHONY: check-bash maybe-check-bash
 maybe-check-bash:
 @if bash
@@ -3772,20 +3727,19 @@ maintainer-clean-bash:
 @endif bash
 
 
-
 .PHONY: configure-bfd maybe-configure-bfd
 maybe-configure-bfd:
 @if bfd
 maybe-configure-bfd: configure-bfd
-configure-bfd: 
+configure-bfd:
        @test -f stage_last && exit 0; \
        test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \
        $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       echo Configuring in $(HOST_SUBDIR)/bfd; \
-       cd "$(HOST_SUBDIR)/bfd" || exit 1; \
+       echo Configuring in bfd; \
+       cd $(HOST_SUBDIR)/bfd || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
          *) topdir=`echo $(HOST_SUBDIR)/bfd/ | \
@@ -3798,8 +3752,6 @@ configure-bfd:
          || exit 1
 @endif bfd
 
-
-
 .PHONY: all-bfd maybe-all-bfd
 maybe-all-bfd:
 @if bfd
@@ -3814,7 +3766,6 @@ all-bfd: configure-bfd
          $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-bfd))
 @endif bfd
 
-
 .PHONY: check-bfd maybe-check-bfd
 maybe-check-bfd:
 @if bfd
@@ -4093,20 +4044,19 @@ maintainer-clean-bfd:
 @endif bfd
 
 
-
 .PHONY: configure-opcodes maybe-configure-opcodes
 maybe-configure-opcodes:
 @if opcodes
 maybe-configure-opcodes: configure-opcodes
-configure-opcodes: 
+configure-opcodes:
        @test -f stage_last && exit 0; \
        test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \
        $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       echo Configuring in $(HOST_SUBDIR)/opcodes; \
-       cd "$(HOST_SUBDIR)/opcodes" || exit 1; \
+       echo Configuring in opcodes; \
+       cd $(HOST_SUBDIR)/opcodes || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
          *) topdir=`echo $(HOST_SUBDIR)/opcodes/ | \
@@ -4119,8 +4069,6 @@ configure-opcodes:
          || exit 1
 @endif opcodes
 
-
-
 .PHONY: all-opcodes maybe-all-opcodes
 maybe-all-opcodes:
 @if opcodes
@@ -4135,7 +4083,6 @@ all-opcodes: configure-opcodes
          $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-opcodes))
 @endif opcodes
 
-
 .PHONY: check-opcodes maybe-check-opcodes
 maybe-check-opcodes:
 @if opcodes
@@ -4414,20 +4361,19 @@ maintainer-clean-opcodes:
 @endif opcodes
 
 
-
 .PHONY: configure-binutils maybe-configure-binutils
 maybe-configure-binutils:
 @if binutils
 maybe-configure-binutils: configure-binutils
-configure-binutils: 
+configure-binutils:
        @test -f stage_last && exit 0; \
        test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \
        $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       echo Configuring in $(HOST_SUBDIR)/binutils; \
-       cd "$(HOST_SUBDIR)/binutils" || exit 1; \
+       echo Configuring in binutils; \
+       cd $(HOST_SUBDIR)/binutils || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
          *) topdir=`echo $(HOST_SUBDIR)/binutils/ | \
@@ -4440,8 +4386,6 @@ configure-binutils:
          || exit 1
 @endif binutils
 
-
-
 .PHONY: all-binutils maybe-all-binutils
 maybe-all-binutils:
 @if binutils
@@ -4456,7 +4400,6 @@ all-binutils: configure-binutils
          $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-binutils))
 @endif binutils
 
-
 .PHONY: check-binutils maybe-check-binutils
 maybe-check-binutils:
 @if binutils
@@ -4735,19 +4678,18 @@ maintainer-clean-binutils:
 @endif binutils
 
 
-
 .PHONY: configure-bison maybe-configure-bison
 maybe-configure-bison:
 @if bison
 maybe-configure-bison: configure-bison
-configure-bison: 
+configure-bison:
        @test ! -f $(HOST_SUBDIR)/bison/Makefile || exit 0; \
        $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bison ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       echo Configuring in $(HOST_SUBDIR)/bison; \
-       cd "$(HOST_SUBDIR)/bison" || exit 1; \
+       echo Configuring in bison; \
+       cd $(HOST_SUBDIR)/bison || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
          *) topdir=`echo $(HOST_SUBDIR)/bison/ | \
@@ -4760,8 +4702,6 @@ configure-bison:
          || exit 1
 @endif bison
 
-
-
 .PHONY: all-bison maybe-all-bison
 maybe-all-bison:
 @if bison
@@ -4775,7 +4715,6 @@ all-bison: configure-bison
          $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-bison))
 @endif bison
 
-
 .PHONY: check-bison maybe-check-bison
 maybe-check-bison:
 @if bison
@@ -5057,19 +4996,18 @@ maintainer-clean-bison:
 @endif bison
 
 
-
 .PHONY: configure-byacc maybe-configure-byacc
 maybe-configure-byacc:
 @if byacc
 maybe-configure-byacc: configure-byacc
-configure-byacc: 
+configure-byacc:
        @test ! -f $(HOST_SUBDIR)/byacc/Makefile || exit 0; \
        $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/byacc ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       echo Configuring in $(HOST_SUBDIR)/byacc; \
-       cd "$(HOST_SUBDIR)/byacc" || exit 1; \
+       echo Configuring in byacc; \
+       cd $(HOST_SUBDIR)/byacc || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
          *) topdir=`echo $(HOST_SUBDIR)/byacc/ | \
@@ -5082,8 +5020,6 @@ configure-byacc:
          || exit 1
 @endif byacc
 
-
-
 .PHONY: all-byacc maybe-all-byacc
 maybe-all-byacc:
 @if byacc
@@ -5097,7 +5033,6 @@ all-byacc: configure-byacc
          $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-byacc))
 @endif byacc
 
-
 .PHONY: check-byacc maybe-check-byacc
 maybe-check-byacc:
 @if byacc
@@ -5379,19 +5314,18 @@ maintainer-clean-byacc:
 @endif byacc
 
 
-
 .PHONY: configure-bzip2 maybe-configure-bzip2
 maybe-configure-bzip2:
 @if bzip2
 maybe-configure-bzip2: configure-bzip2
-configure-bzip2: 
+configure-bzip2:
        @test ! -f $(HOST_SUBDIR)/bzip2/Makefile || exit 0; \
        $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bzip2 ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       echo Configuring in $(HOST_SUBDIR)/bzip2; \
-       cd "$(HOST_SUBDIR)/bzip2" || exit 1; \
+       echo Configuring in bzip2; \
+       cd $(HOST_SUBDIR)/bzip2 || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
          *) topdir=`echo $(HOST_SUBDIR)/bzip2/ | \
@@ -5404,8 +5338,6 @@ configure-bzip2:
          || exit 1
 @endif bzip2
 
-
-
 .PHONY: all-bzip2 maybe-all-bzip2
 maybe-all-bzip2:
 @if bzip2
@@ -5419,7 +5351,6 @@ all-bzip2: configure-bzip2
          $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-bzip2))
 @endif bzip2
 
-
 .PHONY: check-bzip2 maybe-check-bzip2
 maybe-check-bzip2:
 @if bzip2
@@ -5698,19 +5629,18 @@ maintainer-clean-bzip2:
 @endif bzip2
 
 
-
 .PHONY: configure-dejagnu maybe-configure-dejagnu
 maybe-configure-dejagnu:
 @if dejagnu
 maybe-configure-dejagnu: configure-dejagnu
-configure-dejagnu: 
+configure-dejagnu:
        @test ! -f $(HOST_SUBDIR)/dejagnu/Makefile || exit 0; \
        $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/dejagnu ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       echo Configuring in $(HOST_SUBDIR)/dejagnu; \
-       cd "$(HOST_SUBDIR)/dejagnu" || exit 1; \
+       echo Configuring in dejagnu; \
+       cd $(HOST_SUBDIR)/dejagnu || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
          *) topdir=`echo $(HOST_SUBDIR)/dejagnu/ | \
@@ -5723,8 +5653,6 @@ configure-dejagnu:
          || exit 1
 @endif dejagnu
 
-
-
 .PHONY: all-dejagnu maybe-all-dejagnu
 maybe-all-dejagnu:
 @if dejagnu
@@ -5738,7 +5666,6 @@ all-dejagnu: configure-dejagnu
          $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-dejagnu))
 @endif dejagnu
 
-
 .PHONY: check-dejagnu maybe-check-dejagnu
 maybe-check-dejagnu:
 @if dejagnu
@@ -6017,19 +5944,18 @@ maintainer-clean-dejagnu:
 @endif dejagnu
 
 
-
 .PHONY: configure-diff maybe-configure-diff
 maybe-configure-diff:
 @if diff
 maybe-configure-diff: configure-diff
-configure-diff: 
+configure-diff:
        @test ! -f $(HOST_SUBDIR)/diff/Makefile || exit 0; \
        $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/diff ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       echo Configuring in $(HOST_SUBDIR)/diff; \
-       cd "$(HOST_SUBDIR)/diff" || exit 1; \
+       echo Configuring in diff; \
+       cd $(HOST_SUBDIR)/diff || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
          *) topdir=`echo $(HOST_SUBDIR)/diff/ | \
@@ -6042,8 +5968,6 @@ configure-diff:
          || exit 1
 @endif diff
 
-
-
 .PHONY: all-diff maybe-all-diff
 maybe-all-diff:
 @if diff
@@ -6057,7 +5981,6 @@ all-diff: configure-diff
          $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-diff))
 @endif diff
 
-
 .PHONY: check-diff maybe-check-diff
 maybe-check-diff:
 @if diff
@@ -6336,19 +6259,18 @@ maintainer-clean-diff:
 @endif diff
 
 
-
 .PHONY: configure-dosutils maybe-configure-dosutils
 maybe-configure-dosutils:
 @if dosutils
 maybe-configure-dosutils: configure-dosutils
-configure-dosutils: 
+configure-dosutils:
        @test ! -f $(HOST_SUBDIR)/dosutils/Makefile || exit 0; \
        $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/dosutils ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       echo Configuring in $(HOST_SUBDIR)/dosutils; \
-       cd "$(HOST_SUBDIR)/dosutils" || exit 1; \
+       echo Configuring in dosutils; \
+       cd $(HOST_SUBDIR)/dosutils || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
          *) topdir=`echo $(HOST_SUBDIR)/dosutils/ | \
@@ -6361,8 +6283,6 @@ configure-dosutils:
          || exit 1
 @endif dosutils
 
-
-
 .PHONY: all-dosutils maybe-all-dosutils
 maybe-all-dosutils:
 @if dosutils
@@ -6376,7 +6296,6 @@ all-dosutils: configure-dosutils
          $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-dosutils))
 @endif dosutils
 
-
 .PHONY: check-dosutils maybe-check-dosutils
 maybe-check-dosutils:
 @if dosutils
@@ -6650,19 +6569,18 @@ maintainer-clean-dosutils:
 @endif dosutils
 
 
-
 .PHONY: configure-etc maybe-configure-etc
 maybe-configure-etc:
 @if etc
 maybe-configure-etc: configure-etc
-configure-etc: 
+configure-etc:
        @test ! -f $(HOST_SUBDIR)/etc/Makefile || exit 0; \
        $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/etc ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       echo Configuring in $(HOST_SUBDIR)/etc; \
-       cd "$(HOST_SUBDIR)/etc" || exit 1; \
+       echo Configuring in etc; \
+       cd $(HOST_SUBDIR)/etc || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
          *) topdir=`echo $(HOST_SUBDIR)/etc/ | \
@@ -6675,8 +6593,6 @@ configure-etc:
          || exit 1
 @endif etc
 
-
-
 .PHONY: all-etc maybe-all-etc
 maybe-all-etc:
 @if etc
@@ -6690,7 +6606,6 @@ all-etc: configure-etc
          $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-etc))
 @endif etc
 
-
 .PHONY: check-etc maybe-check-etc
 maybe-check-etc:
 @if etc
@@ -6969,19 +6884,18 @@ maintainer-clean-etc:
 @endif etc
 
 
-
 .PHONY: configure-fastjar maybe-configure-fastjar
 maybe-configure-fastjar:
 @if fastjar
 maybe-configure-fastjar: configure-fastjar
-configure-fastjar: 
+configure-fastjar:
        @test ! -f $(HOST_SUBDIR)/fastjar/Makefile || exit 0; \
        $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/fastjar ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       echo Configuring in $(HOST_SUBDIR)/fastjar; \
-       cd "$(HOST_SUBDIR)/fastjar" || exit 1; \
+       echo Configuring in fastjar; \
+       cd $(HOST_SUBDIR)/fastjar || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
          *) topdir=`echo $(HOST_SUBDIR)/fastjar/ | \
@@ -6994,8 +6908,6 @@ configure-fastjar:
          || exit 1
 @endif fastjar
 
-
-
 .PHONY: all-fastjar maybe-all-fastjar
 maybe-all-fastjar:
 @if fastjar
@@ -7009,7 +6921,6 @@ all-fastjar: configure-fastjar
          $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-fastjar))
 @endif fastjar
 
-
 .PHONY: check-fastjar maybe-check-fastjar
 maybe-check-fastjar:
 @if fastjar
@@ -7291,19 +7202,18 @@ maintainer-clean-fastjar:
 @endif fastjar
 
 
-
 .PHONY: configure-fileutils maybe-configure-fileutils
 maybe-configure-fileutils:
 @if fileutils
 maybe-configure-fileutils: configure-fileutils
-configure-fileutils: 
+configure-fileutils:
        @test ! -f $(HOST_SUBDIR)/fileutils/Makefile || exit 0; \
        $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/fileutils ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       echo Configuring in $(HOST_SUBDIR)/fileutils; \
-       cd "$(HOST_SUBDIR)/fileutils" || exit 1; \
+       echo Configuring in fileutils; \
+       cd $(HOST_SUBDIR)/fileutils || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
          *) topdir=`echo $(HOST_SUBDIR)/fileutils/ | \
@@ -7316,8 +7226,6 @@ configure-fileutils:
          || exit 1
 @endif fileutils
 
-
-
 .PHONY: all-fileutils maybe-all-fileutils
 maybe-all-fileutils:
 @if fileutils
@@ -7331,7 +7239,6 @@ all-fileutils: configure-fileutils
          $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-fileutils))
 @endif fileutils
 
-
 .PHONY: check-fileutils maybe-check-fileutils
 maybe-check-fileutils:
 @if fileutils
@@ -7610,19 +7517,18 @@ maintainer-clean-fileutils:
 @endif fileutils
 
 
-
 .PHONY: configure-findutils maybe-configure-findutils
 maybe-configure-findutils:
 @if findutils
 maybe-configure-findutils: configure-findutils
-configure-findutils: 
+configure-findutils:
        @test ! -f $(HOST_SUBDIR)/findutils/Makefile || exit 0; \
        $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/findutils ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       echo Configuring in $(HOST_SUBDIR)/findutils; \
-       cd "$(HOST_SUBDIR)/findutils" || exit 1; \
+       echo Configuring in findutils; \
+       cd $(HOST_SUBDIR)/findutils || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
          *) topdir=`echo $(HOST_SUBDIR)/findutils/ | \
@@ -7635,8 +7541,6 @@ configure-findutils:
          || exit 1
 @endif findutils
 
-
-
 .PHONY: all-findutils maybe-all-findutils
 maybe-all-findutils:
 @if findutils
@@ -7650,7 +7554,6 @@ all-findutils: configure-findutils
          $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-findutils))
 @endif findutils
 
-
 .PHONY: check-findutils maybe-check-findutils
 maybe-check-findutils:
 @if findutils
@@ -7929,19 +7832,18 @@ maintainer-clean-findutils:
 @endif findutils
 
 
-
 .PHONY: configure-find maybe-configure-find
 maybe-configure-find:
 @if find
 maybe-configure-find: configure-find
-configure-find: 
+configure-find:
        @test ! -f $(HOST_SUBDIR)/find/Makefile || exit 0; \
        $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/find ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       echo Configuring in $(HOST_SUBDIR)/find; \
-       cd "$(HOST_SUBDIR)/find" || exit 1; \
+       echo Configuring in find; \
+       cd $(HOST_SUBDIR)/find || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
          *) topdir=`echo $(HOST_SUBDIR)/find/ | \
@@ -7954,8 +7856,6 @@ configure-find:
          || exit 1
 @endif find
 
-
-
 .PHONY: all-find maybe-all-find
 maybe-all-find:
 @if find
@@ -7969,7 +7869,6 @@ all-find: configure-find
          $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-find))
 @endif find
 
-
 .PHONY: check-find maybe-check-find
 maybe-check-find:
 @if find
@@ -8248,19 +8147,18 @@ maintainer-clean-find:
 @endif find
 
 
-
 .PHONY: configure-fixincludes maybe-configure-fixincludes
 maybe-configure-fixincludes:
 @if fixincludes
 maybe-configure-fixincludes: configure-fixincludes
-configure-fixincludes: 
+configure-fixincludes:
        @test ! -f $(HOST_SUBDIR)/fixincludes/Makefile || exit 0; \
        $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/fixincludes ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       echo Configuring in $(HOST_SUBDIR)/fixincludes; \
-       cd "$(HOST_SUBDIR)/fixincludes" || exit 1; \
+       echo Configuring in fixincludes; \
+       cd $(HOST_SUBDIR)/fixincludes || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
          *) topdir=`echo $(HOST_SUBDIR)/fixincludes/ | \
@@ -8273,8 +8171,6 @@ configure-fixincludes:
          || exit 1
 @endif fixincludes
 
-
-
 .PHONY: all-fixincludes maybe-all-fixincludes
 maybe-all-fixincludes:
 @if fixincludes
@@ -8288,7 +8184,6 @@ all-fixincludes: configure-fixincludes
          $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-fixincludes))
 @endif fixincludes
 
-
 .PHONY: check-fixincludes maybe-check-fixincludes
 maybe-check-fixincludes:
 @if fixincludes
@@ -8491,19 +8386,18 @@ maintainer-clean-fixincludes:
 @endif fixincludes
 
 
-
 .PHONY: configure-flex maybe-configure-flex
 maybe-configure-flex:
 @if flex
 maybe-configure-flex: configure-flex
-configure-flex: 
+configure-flex:
        @test ! -f $(HOST_SUBDIR)/flex/Makefile || exit 0; \
        $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/flex ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       echo Configuring in $(HOST_SUBDIR)/flex; \
-       cd "$(HOST_SUBDIR)/flex" || exit 1; \
+       echo Configuring in flex; \
+       cd $(HOST_SUBDIR)/flex || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
          *) topdir=`echo $(HOST_SUBDIR)/flex/ | \
@@ -8516,8 +8410,6 @@ configure-flex:
          || exit 1
 @endif flex
 
-
-
 .PHONY: all-flex maybe-all-flex
 maybe-all-flex:
 @if flex
@@ -8531,7 +8423,6 @@ all-flex: configure-flex
          $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-flex))
 @endif flex
 
-
 .PHONY: check-flex maybe-check-flex
 maybe-check-flex:
 @if flex
@@ -8813,20 +8704,19 @@ maintainer-clean-flex:
 @endif flex
 
 
-
 .PHONY: configure-gas maybe-configure-gas
 maybe-configure-gas:
 @if gas
 maybe-configure-gas: configure-gas
-configure-gas: 
+configure-gas:
        @test -f stage_last && exit 0; \
        test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \
        $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       echo Configuring in $(HOST_SUBDIR)/gas; \
-       cd "$(HOST_SUBDIR)/gas" || exit 1; \
+       echo Configuring in gas; \
+       cd $(HOST_SUBDIR)/gas || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
          *) topdir=`echo $(HOST_SUBDIR)/gas/ | \
@@ -8839,8 +8729,6 @@ configure-gas:
          || exit 1
 @endif gas
 
-
-
 .PHONY: all-gas maybe-all-gas
 maybe-all-gas:
 @if gas
@@ -8855,7 +8743,6 @@ all-gas: configure-gas
          $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-gas))
 @endif gas
 
-
 .PHONY: check-gas maybe-check-gas
 maybe-check-gas:
 @if gas
@@ -9134,20 +9021,19 @@ maintainer-clean-gas:
 @endif gas
 
 
-
 .PHONY: configure-gcc maybe-configure-gcc
 maybe-configure-gcc:
 @if gcc
 maybe-configure-gcc: configure-gcc
-configure-gcc: 
+configure-gcc:
        @test -f stage_last && exit 0; \
        test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \
        $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       echo Configuring in $(HOST_SUBDIR)/gcc; \
-       cd "$(HOST_SUBDIR)/gcc" || exit 1; \
+       echo Configuring in gcc; \
+       cd $(HOST_SUBDIR)/gcc || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
          *) topdir=`echo $(HOST_SUBDIR)/gcc/ | \
@@ -9160,8 +9046,6 @@ configure-gcc:
          || exit 1
 @endif gcc
 
-
-
 .PHONY: all-gcc maybe-all-gcc
 maybe-all-gcc:
 @if gcc
@@ -9176,7 +9060,6 @@ all-gcc: configure-gcc
          $(MAKE) $(FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) $(TARGET-gcc))
 @endif gcc
 
-
 .PHONY: check-gcc maybe-check-gcc
 maybe-check-gcc:
 @if gcc
@@ -9455,19 +9338,18 @@ maintainer-clean-gcc:
 @endif gcc
 
 
-
 .PHONY: configure-gawk maybe-configure-gawk
 maybe-configure-gawk:
 @if gawk
 maybe-configure-gawk: configure-gawk
-configure-gawk: 
+configure-gawk:
        @test ! -f $(HOST_SUBDIR)/gawk/Makefile || exit 0; \
        $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gawk ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       echo Configuring in $(HOST_SUBDIR)/gawk; \
-       cd "$(HOST_SUBDIR)/gawk" || exit 1; \
+       echo Configuring in gawk; \
+       cd $(HOST_SUBDIR)/gawk || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
          *) topdir=`echo $(HOST_SUBDIR)/gawk/ | \
@@ -9480,8 +9362,6 @@ configure-gawk:
          || exit 1
 @endif gawk
 
-
-
 .PHONY: all-gawk maybe-all-gawk
 maybe-all-gawk:
 @if gawk
@@ -9495,7 +9375,6 @@ all-gawk: configure-gawk
          $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-gawk))
 @endif gawk
 
-
 .PHONY: check-gawk maybe-check-gawk
 maybe-check-gawk:
 @if gawk
@@ -9774,19 +9653,18 @@ maintainer-clean-gawk:
 @endif gawk
 
 
-
 .PHONY: configure-gettext maybe-configure-gettext
 maybe-configure-gettext:
 @if gettext
 maybe-configure-gettext: configure-gettext
-configure-gettext: 
+configure-gettext:
        @test ! -f $(HOST_SUBDIR)/gettext/Makefile || exit 0; \
        $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gettext ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       echo Configuring in $(HOST_SUBDIR)/gettext; \
-       cd "$(HOST_SUBDIR)/gettext" || exit 1; \
+       echo Configuring in gettext; \
+       cd $(HOST_SUBDIR)/gettext || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
          *) topdir=`echo $(HOST_SUBDIR)/gettext/ | \
@@ -9799,8 +9677,6 @@ configure-gettext:
          || exit 1
 @endif gettext
 
-
-
 .PHONY: all-gettext maybe-all-gettext
 maybe-all-gettext:
 @if gettext
@@ -9814,7 +9690,6 @@ all-gettext: configure-gettext
          $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-gettext))
 @endif gettext
 
-
 .PHONY: check-gettext maybe-check-gettext
 maybe-check-gettext:
 @if gettext
@@ -10093,19 +9968,18 @@ maintainer-clean-gettext:
 @endif gettext
 
 
-
 .PHONY: configure-gnuserv maybe-configure-gnuserv
 maybe-configure-gnuserv:
 @if gnuserv
 maybe-configure-gnuserv: configure-gnuserv
-configure-gnuserv: 
+configure-gnuserv:
        @test ! -f $(HOST_SUBDIR)/gnuserv/Makefile || exit 0; \
        $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gnuserv ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       echo Configuring in $(HOST_SUBDIR)/gnuserv; \
-       cd "$(HOST_SUBDIR)/gnuserv" || exit 1; \
+       echo Configuring in gnuserv; \
+       cd $(HOST_SUBDIR)/gnuserv || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
          *) topdir=`echo $(HOST_SUBDIR)/gnuserv/ | \
@@ -10118,8 +9992,6 @@ configure-gnuserv:
          || exit 1
 @endif gnuserv
 
-
-
 .PHONY: all-gnuserv maybe-all-gnuserv
 maybe-all-gnuserv:
 @if gnuserv
@@ -10133,7 +10005,6 @@ all-gnuserv: configure-gnuserv
          $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-gnuserv))
 @endif gnuserv
 
-
 .PHONY: check-gnuserv maybe-check-gnuserv
 maybe-check-gnuserv:
 @if gnuserv
@@ -10412,19 +10283,18 @@ maintainer-clean-gnuserv:
 @endif gnuserv
 
 
-
 .PHONY: configure-gprof maybe-configure-gprof
 maybe-configure-gprof:
 @if gprof
 maybe-configure-gprof: configure-gprof
-configure-gprof: 
+configure-gprof:
        @test ! -f $(HOST_SUBDIR)/gprof/Makefile || exit 0; \
        $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gprof ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       echo Configuring in $(HOST_SUBDIR)/gprof; \
-       cd "$(HOST_SUBDIR)/gprof" || exit 1; \
+       echo Configuring in gprof; \
+       cd $(HOST_SUBDIR)/gprof || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
          *) topdir=`echo $(HOST_SUBDIR)/gprof/ | \
@@ -10437,8 +10307,6 @@ configure-gprof:
          || exit 1
 @endif gprof
 
-
-
 .PHONY: all-gprof maybe-all-gprof
 maybe-all-gprof:
 @if gprof
@@ -10452,7 +10320,6 @@ all-gprof: configure-gprof
          $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-gprof))
 @endif gprof
 
-
 .PHONY: check-gprof maybe-check-gprof
 maybe-check-gprof:
 @if gprof
@@ -10731,19 +10598,18 @@ maintainer-clean-gprof:
 @endif gprof
 
 
-
 .PHONY: configure-gzip maybe-configure-gzip
 maybe-configure-gzip:
 @if gzip
 maybe-configure-gzip: configure-gzip
-configure-gzip: 
+configure-gzip:
        @test ! -f $(HOST_SUBDIR)/gzip/Makefile || exit 0; \
        $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gzip ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       echo Configuring in $(HOST_SUBDIR)/gzip; \
-       cd "$(HOST_SUBDIR)/gzip" || exit 1; \
+       echo Configuring in gzip; \
+       cd $(HOST_SUBDIR)/gzip || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
          *) topdir=`echo $(HOST_SUBDIR)/gzip/ | \
@@ -10756,8 +10622,6 @@ configure-gzip:
          || exit 1
 @endif gzip
 
-
-
 .PHONY: all-gzip maybe-all-gzip
 maybe-all-gzip:
 @if gzip
@@ -10771,7 +10635,6 @@ all-gzip: configure-gzip
          $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-gzip))
 @endif gzip
 
-
 .PHONY: check-gzip maybe-check-gzip
 maybe-check-gzip:
 @if gzip
@@ -11050,19 +10913,18 @@ maintainer-clean-gzip:
 @endif gzip
 
 
-
 .PHONY: configure-hello maybe-configure-hello
 maybe-configure-hello:
 @if hello
 maybe-configure-hello: configure-hello
-configure-hello: 
+configure-hello:
        @test ! -f $(HOST_SUBDIR)/hello/Makefile || exit 0; \
        $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/hello ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       echo Configuring in $(HOST_SUBDIR)/hello; \
-       cd "$(HOST_SUBDIR)/hello" || exit 1; \
+       echo Configuring in hello; \
+       cd $(HOST_SUBDIR)/hello || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
          *) topdir=`echo $(HOST_SUBDIR)/hello/ | \
@@ -11075,8 +10937,6 @@ configure-hello:
          || exit 1
 @endif hello
 
-
-
 .PHONY: all-hello maybe-all-hello
 maybe-all-hello:
 @if hello
@@ -11090,7 +10950,6 @@ all-hello: configure-hello
          $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-hello))
 @endif hello
 
-
 .PHONY: check-hello maybe-check-hello
 maybe-check-hello:
 @if hello
@@ -11369,19 +11228,18 @@ maintainer-clean-hello:
 @endif hello
 
 
-
 .PHONY: configure-indent maybe-configure-indent
 maybe-configure-indent:
 @if indent
 maybe-configure-indent: configure-indent
-configure-indent: 
+configure-indent:
        @test ! -f $(HOST_SUBDIR)/indent/Makefile || exit 0; \
        $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/indent ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       echo Configuring in $(HOST_SUBDIR)/indent; \
-       cd "$(HOST_SUBDIR)/indent" || exit 1; \
+       echo Configuring in indent; \
+       cd $(HOST_SUBDIR)/indent || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
          *) topdir=`echo $(HOST_SUBDIR)/indent/ | \
@@ -11394,8 +11252,6 @@ configure-indent:
          || exit 1
 @endif indent
 
-
-
 .PHONY: all-indent maybe-all-indent
 maybe-all-indent:
 @if indent
@@ -11409,7 +11265,6 @@ all-indent: configure-indent
          $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-indent))
 @endif indent
 
-
 .PHONY: check-indent maybe-check-indent
 maybe-check-indent:
 @if indent
@@ -11688,20 +11543,19 @@ maintainer-clean-indent:
 @endif indent
 
 
-
 .PHONY: configure-intl maybe-configure-intl
 maybe-configure-intl:
 @if intl
 maybe-configure-intl: configure-intl
-configure-intl: 
+configure-intl:
        @test -f stage_last && exit 0; \
        test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \
        $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       echo Configuring in $(HOST_SUBDIR)/intl; \
-       cd "$(HOST_SUBDIR)/intl" || exit 1; \
+       echo Configuring in intl; \
+       cd $(HOST_SUBDIR)/intl || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
          *) topdir=`echo $(HOST_SUBDIR)/intl/ | \
@@ -11714,8 +11568,6 @@ configure-intl:
          || exit 1
 @endif intl
 
-
-
 .PHONY: all-intl maybe-all-intl
 maybe-all-intl:
 @if intl
@@ -11730,7 +11582,6 @@ all-intl: configure-intl
          $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-intl))
 @endif intl
 
-
 .PHONY: check-intl maybe-check-intl
 maybe-check-intl:
 @if intl
@@ -12009,19 +11860,18 @@ maintainer-clean-intl:
 @endif intl
 
 
-
 .PHONY: configure-tcl maybe-configure-tcl
 maybe-configure-tcl:
 @if tcl
 maybe-configure-tcl: configure-tcl
-configure-tcl: 
+configure-tcl:
        @test ! -f $(HOST_SUBDIR)/tcl/Makefile || exit 0; \
        $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/tcl ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       echo Configuring in $(HOST_SUBDIR)/tcl; \
-       cd "$(HOST_SUBDIR)/tcl" || exit 1; \
+       echo Configuring in tcl; \
+       cd $(HOST_SUBDIR)/tcl || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
          *) topdir=`echo $(HOST_SUBDIR)/tcl/ | \
@@ -12034,8 +11884,6 @@ configure-tcl:
          || exit 1
 @endif tcl
 
-
-
 .PHONY: all-tcl maybe-all-tcl
 maybe-all-tcl:
 @if tcl
@@ -12049,7 +11897,6 @@ all-tcl: configure-tcl
          $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-tcl))
 @endif tcl
 
-
 .PHONY: check-tcl maybe-check-tcl
 maybe-check-tcl:
 @if tcl
@@ -12314,19 +12161,18 @@ maintainer-clean-tcl:
 @endif tcl
 
 
-
 .PHONY: configure-itcl maybe-configure-itcl
 maybe-configure-itcl:
 @if itcl
 maybe-configure-itcl: configure-itcl
-configure-itcl: 
+configure-itcl:
        @test ! -f $(HOST_SUBDIR)/itcl/Makefile || exit 0; \
        $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/itcl ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       echo Configuring in $(HOST_SUBDIR)/itcl; \
-       cd "$(HOST_SUBDIR)/itcl" || exit 1; \
+       echo Configuring in itcl; \
+       cd $(HOST_SUBDIR)/itcl || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
          *) topdir=`echo $(HOST_SUBDIR)/itcl/ | \
@@ -12339,8 +12185,6 @@ configure-itcl:
          || exit 1
 @endif itcl
 
-
-
 .PHONY: all-itcl maybe-all-itcl
 maybe-all-itcl:
 @if itcl
@@ -12354,7 +12198,6 @@ all-itcl: configure-itcl
          $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-itcl))
 @endif itcl
 
-
 .PHONY: check-itcl maybe-check-itcl
 maybe-check-itcl:
 @if itcl
@@ -12633,20 +12476,19 @@ maintainer-clean-itcl:
 @endif itcl
 
 
-
 .PHONY: configure-ld maybe-configure-ld
 maybe-configure-ld:
 @if ld
 maybe-configure-ld: configure-ld
-configure-ld: 
+configure-ld:
        @test -f stage_last && exit 0; \
        test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \
        $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       echo Configuring in $(HOST_SUBDIR)/ld; \
-       cd "$(HOST_SUBDIR)/ld" || exit 1; \
+       echo Configuring in ld; \
+       cd $(HOST_SUBDIR)/ld || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
          *) topdir=`echo $(HOST_SUBDIR)/ld/ | \
@@ -12659,8 +12501,6 @@ configure-ld:
          || exit 1
 @endif ld
 
-
-
 .PHONY: all-ld maybe-all-ld
 maybe-all-ld:
 @if ld
@@ -12675,7 +12515,6 @@ all-ld: configure-ld
          $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-ld))
 @endif ld
 
-
 .PHONY: check-ld maybe-check-ld
 maybe-check-ld:
 @if ld
@@ -12954,20 +12793,19 @@ maintainer-clean-ld:
 @endif ld
 
 
-
 .PHONY: configure-libcpp maybe-configure-libcpp
 maybe-configure-libcpp:
 @if libcpp
 maybe-configure-libcpp: configure-libcpp
-configure-libcpp: 
+configure-libcpp:
        @test -f stage_last && exit 0; \
        test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \
        $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       echo Configuring in $(HOST_SUBDIR)/libcpp; \
-       cd "$(HOST_SUBDIR)/libcpp" || exit 1; \
+       echo Configuring in libcpp; \
+       cd $(HOST_SUBDIR)/libcpp || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
          *) topdir=`echo $(HOST_SUBDIR)/libcpp/ | \
@@ -12980,8 +12818,6 @@ configure-libcpp:
          || exit 1
 @endif libcpp
 
-
-
 .PHONY: all-libcpp maybe-all-libcpp
 maybe-all-libcpp:
 @if libcpp
@@ -12996,7 +12832,6 @@ all-libcpp: configure-libcpp
          $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-libcpp))
 @endif libcpp
 
-
 .PHONY: check-libcpp maybe-check-libcpp
 maybe-check-libcpp:
 @if libcpp
@@ -13275,19 +13110,18 @@ maintainer-clean-libcpp:
 @endif libcpp
 
 
-
 .PHONY: configure-libgui maybe-configure-libgui
 maybe-configure-libgui:
 @if libgui
 maybe-configure-libgui: configure-libgui
-configure-libgui: 
+configure-libgui:
        @test ! -f $(HOST_SUBDIR)/libgui/Makefile || exit 0; \
        $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libgui ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       echo Configuring in $(HOST_SUBDIR)/libgui; \
-       cd "$(HOST_SUBDIR)/libgui" || exit 1; \
+       echo Configuring in libgui; \
+       cd $(HOST_SUBDIR)/libgui || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
          *) topdir=`echo $(HOST_SUBDIR)/libgui/ | \
@@ -13300,8 +13134,6 @@ configure-libgui:
          || exit 1
 @endif libgui
 
-
-
 .PHONY: all-libgui maybe-all-libgui
 maybe-all-libgui:
 @if libgui
@@ -13315,7 +13147,6 @@ all-libgui: configure-libgui
          $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-libgui))
 @endif libgui
 
-
 .PHONY: check-libgui maybe-check-libgui
 maybe-check-libgui:
 @if libgui
@@ -13594,20 +13425,19 @@ maintainer-clean-libgui:
 @endif libgui
 
 
-
 .PHONY: configure-libiberty maybe-configure-libiberty
 maybe-configure-libiberty:
 @if libiberty
 maybe-configure-libiberty: configure-libiberty
-configure-libiberty: 
+configure-libiberty:
        @test -f stage_last && exit 0; \
        test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \
        $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       echo Configuring in $(HOST_SUBDIR)/libiberty; \
-       cd "$(HOST_SUBDIR)/libiberty" || exit 1; \
+       echo Configuring in libiberty; \
+       cd $(HOST_SUBDIR)/libiberty || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
          *) topdir=`echo $(HOST_SUBDIR)/libiberty/ | \
@@ -13620,8 +13450,6 @@ configure-libiberty:
          || exit 1
 @endif libiberty
 
-
-
 .PHONY: all-libiberty maybe-all-libiberty
 maybe-all-libiberty:
 @if libiberty
@@ -13636,7 +13464,6 @@ all-libiberty: configure-libiberty
          $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-libiberty))
 @endif libiberty
 
-
 .PHONY: check-libiberty maybe-check-libiberty
 maybe-check-libiberty:
 @if libiberty
@@ -13915,19 +13742,18 @@ maintainer-clean-libiberty:
 @endif libiberty
 
 
-
 .PHONY: configure-libtool maybe-configure-libtool
 maybe-configure-libtool:
 @if libtool
 maybe-configure-libtool: configure-libtool
-configure-libtool: 
+configure-libtool:
        @test ! -f $(HOST_SUBDIR)/libtool/Makefile || exit 0; \
        $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libtool ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       echo Configuring in $(HOST_SUBDIR)/libtool; \
-       cd "$(HOST_SUBDIR)/libtool" || exit 1; \
+       echo Configuring in libtool; \
+       cd $(HOST_SUBDIR)/libtool || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
          *) topdir=`echo $(HOST_SUBDIR)/libtool/ | \
@@ -13940,8 +13766,6 @@ configure-libtool:
          || exit 1
 @endif libtool
 
-
-
 .PHONY: all-libtool maybe-all-libtool
 maybe-all-libtool:
 @if libtool
@@ -13955,7 +13779,6 @@ all-libtool: configure-libtool
          $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-libtool))
 @endif libtool
 
-
 .PHONY: check-libtool maybe-check-libtool
 maybe-check-libtool:
 @if libtool
@@ -14234,19 +14057,18 @@ maintainer-clean-libtool:
 @endif libtool
 
 
-
 .PHONY: configure-m4 maybe-configure-m4
 maybe-configure-m4:
 @if m4
 maybe-configure-m4: configure-m4
-configure-m4: 
+configure-m4:
        @test ! -f $(HOST_SUBDIR)/m4/Makefile || exit 0; \
        $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/m4 ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       echo Configuring in $(HOST_SUBDIR)/m4; \
-       cd "$(HOST_SUBDIR)/m4" || exit 1; \
+       echo Configuring in m4; \
+       cd $(HOST_SUBDIR)/m4 || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
          *) topdir=`echo $(HOST_SUBDIR)/m4/ | \
@@ -14259,8 +14081,6 @@ configure-m4:
          || exit 1
 @endif m4
 
-
-
 .PHONY: all-m4 maybe-all-m4
 maybe-all-m4:
 @if m4
@@ -14274,7 +14094,6 @@ all-m4: configure-m4
          $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-m4))
 @endif m4
 
-
 .PHONY: check-m4 maybe-check-m4
 maybe-check-m4:
 @if m4
@@ -14553,19 +14372,18 @@ maintainer-clean-m4:
 @endif m4
 
 
-
 .PHONY: configure-make maybe-configure-make
 maybe-configure-make:
 @if make
 maybe-configure-make: configure-make
-configure-make: 
+configure-make:
        @test ! -f $(HOST_SUBDIR)/make/Makefile || exit 0; \
        $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/make ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       echo Configuring in $(HOST_SUBDIR)/make; \
-       cd "$(HOST_SUBDIR)/make" || exit 1; \
+       echo Configuring in make; \
+       cd $(HOST_SUBDIR)/make || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
          *) topdir=`echo $(HOST_SUBDIR)/make/ | \
@@ -14578,8 +14396,6 @@ configure-make:
          || exit 1
 @endif make
 
-
-
 .PHONY: all-make maybe-all-make
 maybe-all-make:
 @if make
@@ -14593,7 +14409,6 @@ all-make: configure-make
          $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-make))
 @endif make
 
-
 .PHONY: check-make maybe-check-make
 maybe-check-make:
 @if make
@@ -14872,19 +14687,18 @@ maintainer-clean-make:
 @endif make
 
 
-
 .PHONY: configure-mmalloc maybe-configure-mmalloc
 maybe-configure-mmalloc:
 @if mmalloc
 maybe-configure-mmalloc: configure-mmalloc
-configure-mmalloc: 
+configure-mmalloc:
        @test ! -f $(HOST_SUBDIR)/mmalloc/Makefile || exit 0; \
        $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mmalloc ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       echo Configuring in $(HOST_SUBDIR)/mmalloc; \
-       cd "$(HOST_SUBDIR)/mmalloc" || exit 1; \
+       echo Configuring in mmalloc; \
+       cd $(HOST_SUBDIR)/mmalloc || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
          *) topdir=`echo $(HOST_SUBDIR)/mmalloc/ | \
@@ -14897,8 +14711,6 @@ configure-mmalloc:
          || exit 1
 @endif mmalloc
 
-
-
 .PHONY: all-mmalloc maybe-all-mmalloc
 maybe-all-mmalloc:
 @if mmalloc
@@ -14912,7 +14724,6 @@ all-mmalloc: configure-mmalloc
          $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-mmalloc))
 @endif mmalloc
 
-
 .PHONY: check-mmalloc maybe-check-mmalloc
 maybe-check-mmalloc:
 @if mmalloc
@@ -15186,19 +14997,18 @@ maintainer-clean-mmalloc:
 @endif mmalloc
 
 
-
 .PHONY: configure-patch maybe-configure-patch
 maybe-configure-patch:
 @if patch
 maybe-configure-patch: configure-patch
-configure-patch: 
+configure-patch:
        @test ! -f $(HOST_SUBDIR)/patch/Makefile || exit 0; \
        $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/patch ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       echo Configuring in $(HOST_SUBDIR)/patch; \
-       cd "$(HOST_SUBDIR)/patch" || exit 1; \
+       echo Configuring in patch; \
+       cd $(HOST_SUBDIR)/patch || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
          *) topdir=`echo $(HOST_SUBDIR)/patch/ | \
@@ -15211,8 +15021,6 @@ configure-patch:
          || exit 1
 @endif patch
 
-
-
 .PHONY: all-patch maybe-all-patch
 maybe-all-patch:
 @if patch
@@ -15226,7 +15034,6 @@ all-patch: configure-patch
          $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-patch))
 @endif patch
 
-
 .PHONY: check-patch maybe-check-patch
 maybe-check-patch:
 @if patch
@@ -15505,19 +15312,18 @@ maintainer-clean-patch:
 @endif patch
 
 
-
 .PHONY: configure-perl maybe-configure-perl
 maybe-configure-perl:
 @if perl
 maybe-configure-perl: configure-perl
-configure-perl: 
+configure-perl:
        @test ! -f $(HOST_SUBDIR)/perl/Makefile || exit 0; \
        $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/perl ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       echo Configuring in $(HOST_SUBDIR)/perl; \
-       cd "$(HOST_SUBDIR)/perl" || exit 1; \
+       echo Configuring in perl; \
+       cd $(HOST_SUBDIR)/perl || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
          *) topdir=`echo $(HOST_SUBDIR)/perl/ | \
@@ -15530,8 +15336,6 @@ configure-perl:
          || exit 1
 @endif perl
 
-
-
 .PHONY: all-perl maybe-all-perl
 maybe-all-perl:
 @if perl
@@ -15545,7 +15349,6 @@ all-perl: configure-perl
          $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-perl))
 @endif perl
 
-
 .PHONY: check-perl maybe-check-perl
 maybe-check-perl:
 @if perl
@@ -15824,19 +15627,18 @@ maintainer-clean-perl:
 @endif perl
 
 
-
 .PHONY: configure-prms maybe-configure-prms
 maybe-configure-prms:
 @if prms
 maybe-configure-prms: configure-prms
-configure-prms: 
+configure-prms:
        @test ! -f $(HOST_SUBDIR)/prms/Makefile || exit 0; \
        $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/prms ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       echo Configuring in $(HOST_SUBDIR)/prms; \
-       cd "$(HOST_SUBDIR)/prms" || exit 1; \
+       echo Configuring in prms; \
+       cd $(HOST_SUBDIR)/prms || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
          *) topdir=`echo $(HOST_SUBDIR)/prms/ | \
@@ -15849,8 +15651,6 @@ configure-prms:
          || exit 1
 @endif prms
 
-
-
 .PHONY: all-prms maybe-all-prms
 maybe-all-prms:
 @if prms
@@ -15864,7 +15664,6 @@ all-prms: configure-prms
          $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-prms))
 @endif prms
 
-
 .PHONY: check-prms maybe-check-prms
 maybe-check-prms:
 @if prms
@@ -16143,19 +15942,18 @@ maintainer-clean-prms:
 @endif prms
 
 
-
 .PHONY: configure-rcs maybe-configure-rcs
 maybe-configure-rcs:
 @if rcs
 maybe-configure-rcs: configure-rcs
-configure-rcs: 
+configure-rcs:
        @test ! -f $(HOST_SUBDIR)/rcs/Makefile || exit 0; \
        $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/rcs ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       echo Configuring in $(HOST_SUBDIR)/rcs; \
-       cd "$(HOST_SUBDIR)/rcs" || exit 1; \
+       echo Configuring in rcs; \
+       cd $(HOST_SUBDIR)/rcs || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
          *) topdir=`echo $(HOST_SUBDIR)/rcs/ | \
@@ -16168,8 +15966,6 @@ configure-rcs:
          || exit 1
 @endif rcs
 
-
-
 .PHONY: all-rcs maybe-all-rcs
 maybe-all-rcs:
 @if rcs
@@ -16183,7 +15979,6 @@ all-rcs: configure-rcs
          $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-rcs))
 @endif rcs
 
-
 .PHONY: check-rcs maybe-check-rcs
 maybe-check-rcs:
 @if rcs
@@ -16462,19 +16257,18 @@ maintainer-clean-rcs:
 @endif rcs
 
 
-
 .PHONY: configure-readline maybe-configure-readline
 maybe-configure-readline:
 @if readline
 maybe-configure-readline: configure-readline
-configure-readline: 
+configure-readline:
        @test ! -f $(HOST_SUBDIR)/readline/Makefile || exit 0; \
        $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/readline ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       echo Configuring in $(HOST_SUBDIR)/readline; \
-       cd "$(HOST_SUBDIR)/readline" || exit 1; \
+       echo Configuring in readline; \
+       cd $(HOST_SUBDIR)/readline || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
          *) topdir=`echo $(HOST_SUBDIR)/readline/ | \
@@ -16487,8 +16281,6 @@ configure-readline:
          || exit 1
 @endif readline
 
-
-
 .PHONY: all-readline maybe-all-readline
 maybe-all-readline:
 @if readline
@@ -16502,7 +16294,6 @@ all-readline: configure-readline
          $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-readline))
 @endif readline
 
-
 .PHONY: check-readline maybe-check-readline
 maybe-check-readline:
 @if readline
@@ -16781,19 +16572,18 @@ maintainer-clean-readline:
 @endif readline
 
 
-
 .PHONY: configure-release maybe-configure-release
 maybe-configure-release:
 @if release
 maybe-configure-release: configure-release
-configure-release: 
+configure-release:
        @test ! -f $(HOST_SUBDIR)/release/Makefile || exit 0; \
        $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/release ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       echo Configuring in $(HOST_SUBDIR)/release; \
-       cd "$(HOST_SUBDIR)/release" || exit 1; \
+       echo Configuring in release; \
+       cd $(HOST_SUBDIR)/release || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
          *) topdir=`echo $(HOST_SUBDIR)/release/ | \
@@ -16806,8 +16596,6 @@ configure-release:
          || exit 1
 @endif release
 
-
-
 .PHONY: all-release maybe-all-release
 maybe-all-release:
 @if release
@@ -16821,7 +16609,6 @@ all-release: configure-release
          $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-release))
 @endif release
 
-
 .PHONY: check-release maybe-check-release
 maybe-check-release:
 @if release
@@ -17090,19 +16877,18 @@ maintainer-clean-release:
 @endif release
 
 
-
 .PHONY: configure-recode maybe-configure-recode
 maybe-configure-recode:
 @if recode
 maybe-configure-recode: configure-recode
-configure-recode: 
+configure-recode:
        @test ! -f $(HOST_SUBDIR)/recode/Makefile || exit 0; \
        $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/recode ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       echo Configuring in $(HOST_SUBDIR)/recode; \
-       cd "$(HOST_SUBDIR)/recode" || exit 1; \
+       echo Configuring in recode; \
+       cd $(HOST_SUBDIR)/recode || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
          *) topdir=`echo $(HOST_SUBDIR)/recode/ | \
@@ -17115,8 +16901,6 @@ configure-recode:
          || exit 1
 @endif recode
 
-
-
 .PHONY: all-recode maybe-all-recode
 maybe-all-recode:
 @if recode
@@ -17130,7 +16914,6 @@ all-recode: configure-recode
          $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-recode))
 @endif recode
 
-
 .PHONY: check-recode maybe-check-recode
 maybe-check-recode:
 @if recode
@@ -17409,19 +17192,18 @@ maintainer-clean-recode:
 @endif recode
 
 
-
 .PHONY: configure-sed maybe-configure-sed
 maybe-configure-sed:
 @if sed
 maybe-configure-sed: configure-sed
-configure-sed: 
+configure-sed:
        @test ! -f $(HOST_SUBDIR)/sed/Makefile || exit 0; \
        $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/sed ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       echo Configuring in $(HOST_SUBDIR)/sed; \
-       cd "$(HOST_SUBDIR)/sed" || exit 1; \
+       echo Configuring in sed; \
+       cd $(HOST_SUBDIR)/sed || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
          *) topdir=`echo $(HOST_SUBDIR)/sed/ | \
@@ -17434,8 +17216,6 @@ configure-sed:
          || exit 1
 @endif sed
 
-
-
 .PHONY: all-sed maybe-all-sed
 maybe-all-sed:
 @if sed
@@ -17449,7 +17229,6 @@ all-sed: configure-sed
          $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-sed))
 @endif sed
 
-
 .PHONY: check-sed maybe-check-sed
 maybe-check-sed:
 @if sed
@@ -17728,19 +17507,18 @@ maintainer-clean-sed:
 @endif sed
 
 
-
 .PHONY: configure-send-pr maybe-configure-send-pr
 maybe-configure-send-pr:
 @if send-pr
 maybe-configure-send-pr: configure-send-pr
-configure-send-pr: 
+configure-send-pr:
        @test ! -f $(HOST_SUBDIR)/send-pr/Makefile || exit 0; \
        $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/send-pr ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       echo Configuring in $(HOST_SUBDIR)/send-pr; \
-       cd "$(HOST_SUBDIR)/send-pr" || exit 1; \
+       echo Configuring in send-pr; \
+       cd $(HOST_SUBDIR)/send-pr || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
          *) topdir=`echo $(HOST_SUBDIR)/send-pr/ | \
@@ -17753,8 +17531,6 @@ configure-send-pr:
          || exit 1
 @endif send-pr
 
-
-
 .PHONY: all-send-pr maybe-all-send-pr
 maybe-all-send-pr:
 @if send-pr
@@ -17768,7 +17544,6 @@ all-send-pr: configure-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
@@ -18047,19 +17822,18 @@ maintainer-clean-send-pr:
 @endif send-pr
 
 
-
 .PHONY: configure-shellutils maybe-configure-shellutils
 maybe-configure-shellutils:
 @if shellutils
 maybe-configure-shellutils: configure-shellutils
-configure-shellutils: 
+configure-shellutils:
        @test ! -f $(HOST_SUBDIR)/shellutils/Makefile || exit 0; \
        $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/shellutils ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       echo Configuring in $(HOST_SUBDIR)/shellutils; \
-       cd "$(HOST_SUBDIR)/shellutils" || exit 1; \
+       echo Configuring in shellutils; \
+       cd $(HOST_SUBDIR)/shellutils || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
          *) topdir=`echo $(HOST_SUBDIR)/shellutils/ | \
@@ -18072,8 +17846,6 @@ configure-shellutils:
          || exit 1
 @endif shellutils
 
-
-
 .PHONY: all-shellutils maybe-all-shellutils
 maybe-all-shellutils:
 @if shellutils
@@ -18087,7 +17859,6 @@ all-shellutils: configure-shellutils
          $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-shellutils))
 @endif shellutils
 
-
 .PHONY: check-shellutils maybe-check-shellutils
 maybe-check-shellutils:
 @if shellutils
@@ -18366,19 +18137,18 @@ maintainer-clean-shellutils:
 @endif shellutils
 
 
-
 .PHONY: configure-sid maybe-configure-sid
 maybe-configure-sid:
 @if sid
 maybe-configure-sid: configure-sid
-configure-sid: 
+configure-sid:
        @test ! -f $(HOST_SUBDIR)/sid/Makefile || exit 0; \
        $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/sid ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       echo Configuring in $(HOST_SUBDIR)/sid; \
-       cd "$(HOST_SUBDIR)/sid" || exit 1; \
+       echo Configuring in sid; \
+       cd $(HOST_SUBDIR)/sid || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
          *) topdir=`echo $(HOST_SUBDIR)/sid/ | \
@@ -18391,8 +18161,6 @@ configure-sid:
          || exit 1
 @endif sid
 
-
-
 .PHONY: all-sid maybe-all-sid
 maybe-all-sid:
 @if sid
@@ -18406,7 +18174,6 @@ all-sid: configure-sid
          $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-sid))
 @endif sid
 
-
 .PHONY: check-sid maybe-check-sid
 maybe-check-sid:
 @if sid
@@ -18685,19 +18452,18 @@ maintainer-clean-sid:
 @endif sid
 
 
-
 .PHONY: configure-sim maybe-configure-sim
 maybe-configure-sim:
 @if sim
 maybe-configure-sim: configure-sim
-configure-sim: 
+configure-sim:
        @test ! -f $(HOST_SUBDIR)/sim/Makefile || exit 0; \
        $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/sim ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       echo Configuring in $(HOST_SUBDIR)/sim; \
-       cd "$(HOST_SUBDIR)/sim" || exit 1; \
+       echo Configuring in sim; \
+       cd $(HOST_SUBDIR)/sim || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
          *) topdir=`echo $(HOST_SUBDIR)/sim/ | \
@@ -18710,8 +18476,6 @@ configure-sim:
          || exit 1
 @endif sim
 
-
-
 .PHONY: all-sim maybe-all-sim
 maybe-all-sim:
 @if sim
@@ -18725,7 +18489,6 @@ all-sim: configure-sim
          $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-sim))
 @endif sim
 
-
 .PHONY: check-sim maybe-check-sim
 maybe-check-sim:
 @if sim
@@ -19004,19 +18767,18 @@ maintainer-clean-sim:
 @endif sim
 
 
-
 .PHONY: configure-tar maybe-configure-tar
 maybe-configure-tar:
 @if tar
 maybe-configure-tar: configure-tar
-configure-tar: 
+configure-tar:
        @test ! -f $(HOST_SUBDIR)/tar/Makefile || exit 0; \
        $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/tar ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       echo Configuring in $(HOST_SUBDIR)/tar; \
-       cd "$(HOST_SUBDIR)/tar" || exit 1; \
+       echo Configuring in tar; \
+       cd $(HOST_SUBDIR)/tar || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
          *) topdir=`echo $(HOST_SUBDIR)/tar/ | \
@@ -19029,8 +18791,6 @@ configure-tar:
          || exit 1
 @endif tar
 
-
-
 .PHONY: all-tar maybe-all-tar
 maybe-all-tar:
 @if tar
@@ -19044,7 +18804,6 @@ all-tar: configure-tar
          $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-tar))
 @endif tar
 
-
 .PHONY: check-tar maybe-check-tar
 maybe-check-tar:
 @if tar
@@ -19323,19 +19082,18 @@ maintainer-clean-tar:
 @endif tar
 
 
-
 .PHONY: configure-texinfo maybe-configure-texinfo
 maybe-configure-texinfo:
 @if texinfo
 maybe-configure-texinfo: configure-texinfo
-configure-texinfo: 
+configure-texinfo:
        @test ! -f $(HOST_SUBDIR)/texinfo/Makefile || exit 0; \
        $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/texinfo ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       echo Configuring in $(HOST_SUBDIR)/texinfo; \
-       cd "$(HOST_SUBDIR)/texinfo" || exit 1; \
+       echo Configuring in texinfo; \
+       cd $(HOST_SUBDIR)/texinfo || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
          *) topdir=`echo $(HOST_SUBDIR)/texinfo/ | \
@@ -19348,8 +19106,6 @@ configure-texinfo:
          || exit 1
 @endif texinfo
 
-
-
 .PHONY: all-texinfo maybe-all-texinfo
 maybe-all-texinfo:
 @if texinfo
@@ -19363,7 +19119,6 @@ all-texinfo: configure-texinfo
          $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-texinfo))
 @endif texinfo
 
-
 .PHONY: check-texinfo maybe-check-texinfo
 maybe-check-texinfo:
 @if texinfo
@@ -19637,19 +19392,18 @@ maintainer-clean-texinfo:
 @endif texinfo
 
 
-
 .PHONY: configure-textutils maybe-configure-textutils
 maybe-configure-textutils:
 @if textutils
 maybe-configure-textutils: configure-textutils
-configure-textutils: 
+configure-textutils:
        @test ! -f $(HOST_SUBDIR)/textutils/Makefile || exit 0; \
        $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/textutils ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       echo Configuring in $(HOST_SUBDIR)/textutils; \
-       cd "$(HOST_SUBDIR)/textutils" || exit 1; \
+       echo Configuring in textutils; \
+       cd $(HOST_SUBDIR)/textutils || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
          *) topdir=`echo $(HOST_SUBDIR)/textutils/ | \
@@ -19662,8 +19416,6 @@ configure-textutils:
          || exit 1
 @endif textutils
 
-
-
 .PHONY: all-textutils maybe-all-textutils
 maybe-all-textutils:
 @if textutils
@@ -19677,7 +19429,6 @@ all-textutils: configure-textutils
          $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-textutils))
 @endif textutils
 
-
 .PHONY: check-textutils maybe-check-textutils
 maybe-check-textutils:
 @if textutils
@@ -19956,19 +19707,18 @@ maintainer-clean-textutils:
 @endif textutils
 
 
-
 .PHONY: configure-time maybe-configure-time
 maybe-configure-time:
 @if time
 maybe-configure-time: configure-time
-configure-time: 
+configure-time:
        @test ! -f $(HOST_SUBDIR)/time/Makefile || exit 0; \
        $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/time ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       echo Configuring in $(HOST_SUBDIR)/time; \
-       cd "$(HOST_SUBDIR)/time" || exit 1; \
+       echo Configuring in time; \
+       cd $(HOST_SUBDIR)/time || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
          *) topdir=`echo $(HOST_SUBDIR)/time/ | \
@@ -19981,8 +19731,6 @@ configure-time:
          || exit 1
 @endif time
 
-
-
 .PHONY: all-time maybe-all-time
 maybe-all-time:
 @if time
@@ -19996,7 +19744,6 @@ all-time: configure-time
          $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-time))
 @endif time
 
-
 .PHONY: check-time maybe-check-time
 maybe-check-time:
 @if time
@@ -20275,19 +20022,18 @@ maintainer-clean-time:
 @endif time
 
 
-
 .PHONY: configure-uudecode maybe-configure-uudecode
 maybe-configure-uudecode:
 @if uudecode
 maybe-configure-uudecode: configure-uudecode
-configure-uudecode: 
+configure-uudecode:
        @test ! -f $(HOST_SUBDIR)/uudecode/Makefile || exit 0; \
        $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/uudecode ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       echo Configuring in $(HOST_SUBDIR)/uudecode; \
-       cd "$(HOST_SUBDIR)/uudecode" || exit 1; \
+       echo Configuring in uudecode; \
+       cd $(HOST_SUBDIR)/uudecode || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
          *) topdir=`echo $(HOST_SUBDIR)/uudecode/ | \
@@ -20300,8 +20046,6 @@ configure-uudecode:
          || exit 1
 @endif uudecode
 
-
-
 .PHONY: all-uudecode maybe-all-uudecode
 maybe-all-uudecode:
 @if uudecode
@@ -20315,7 +20059,6 @@ all-uudecode: configure-uudecode
          $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-uudecode))
 @endif uudecode
 
-
 .PHONY: check-uudecode maybe-check-uudecode
 maybe-check-uudecode:
 @if uudecode
@@ -20594,19 +20337,18 @@ maintainer-clean-uudecode:
 @endif uudecode
 
 
-
 .PHONY: configure-wdiff maybe-configure-wdiff
 maybe-configure-wdiff:
 @if wdiff
 maybe-configure-wdiff: configure-wdiff
-configure-wdiff: 
+configure-wdiff:
        @test ! -f $(HOST_SUBDIR)/wdiff/Makefile || exit 0; \
        $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/wdiff ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       echo Configuring in $(HOST_SUBDIR)/wdiff; \
-       cd "$(HOST_SUBDIR)/wdiff" || exit 1; \
+       echo Configuring in wdiff; \
+       cd $(HOST_SUBDIR)/wdiff || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
          *) topdir=`echo $(HOST_SUBDIR)/wdiff/ | \
@@ -20619,8 +20361,6 @@ configure-wdiff:
          || exit 1
 @endif wdiff
 
-
-
 .PHONY: all-wdiff maybe-all-wdiff
 maybe-all-wdiff:
 @if wdiff
@@ -20634,7 +20374,6 @@ all-wdiff: configure-wdiff
          $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-wdiff))
 @endif wdiff
 
-
 .PHONY: check-wdiff maybe-check-wdiff
 maybe-check-wdiff:
 @if wdiff
@@ -20913,19 +20652,18 @@ maintainer-clean-wdiff:
 @endif wdiff
 
 
-
 .PHONY: configure-zip maybe-configure-zip
 maybe-configure-zip:
 @if zip
 maybe-configure-zip: configure-zip
-configure-zip: 
+configure-zip:
        @test ! -f $(HOST_SUBDIR)/zip/Makefile || exit 0; \
        $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zip ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       echo Configuring in $(HOST_SUBDIR)/zip; \
-       cd "$(HOST_SUBDIR)/zip" || exit 1; \
+       echo Configuring in zip; \
+       cd $(HOST_SUBDIR)/zip || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
          *) topdir=`echo $(HOST_SUBDIR)/zip/ | \
@@ -20938,8 +20676,6 @@ configure-zip:
          || exit 1
 @endif zip
 
-
-
 .PHONY: all-zip maybe-all-zip
 maybe-all-zip:
 @if zip
@@ -20953,7 +20689,6 @@ all-zip: configure-zip
          $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-zip))
 @endif zip
 
-
 .PHONY: check-zip maybe-check-zip
 maybe-check-zip:
 @if zip
@@ -21235,20 +20970,19 @@ maintainer-clean-zip:
 @endif zip
 
 
-
 .PHONY: configure-zlib maybe-configure-zlib
 maybe-configure-zlib:
 @if zlib
 maybe-configure-zlib: configure-zlib
-configure-zlib: 
+configure-zlib:
        @test -f stage_last && exit 0; \
        test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \
        $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       echo Configuring in $(HOST_SUBDIR)/zlib; \
-       cd "$(HOST_SUBDIR)/zlib" || exit 1; \
+       echo Configuring in zlib; \
+       cd $(HOST_SUBDIR)/zlib || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
          *) topdir=`echo $(HOST_SUBDIR)/zlib/ | \
@@ -21261,8 +20995,6 @@ configure-zlib:
          || exit 1
 @endif zlib
 
-
-
 .PHONY: all-zlib maybe-all-zlib
 maybe-all-zlib:
 @if zlib
@@ -21277,7 +21009,6 @@ all-zlib: configure-zlib
          $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-zlib))
 @endif zlib
 
-
 .PHONY: check-zlib maybe-check-zlib
 maybe-check-zlib:
 @if zlib
@@ -21546,19 +21277,18 @@ maintainer-clean-zlib:
 @endif zlib
 
 
-
 .PHONY: configure-gdb maybe-configure-gdb
 maybe-configure-gdb:
 @if gdb
 maybe-configure-gdb: configure-gdb
-configure-gdb: 
+configure-gdb:
        @test ! -f $(HOST_SUBDIR)/gdb/Makefile || exit 0; \
        $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gdb ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       echo Configuring in $(HOST_SUBDIR)/gdb; \
-       cd "$(HOST_SUBDIR)/gdb" || exit 1; \
+       echo Configuring in gdb; \
+       cd $(HOST_SUBDIR)/gdb || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
          *) topdir=`echo $(HOST_SUBDIR)/gdb/ | \
@@ -21571,8 +21301,6 @@ configure-gdb:
          || exit 1
 @endif gdb
 
-
-
 .PHONY: all-gdb maybe-all-gdb
 maybe-all-gdb:
 @if gdb
@@ -21586,7 +21314,6 @@ all-gdb: configure-gdb
          $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) $(TARGET-gdb))
 @endif gdb
 
-
 .PHONY: check-gdb maybe-check-gdb
 maybe-check-gdb:
 @if gdb
@@ -21865,19 +21592,18 @@ maintainer-clean-gdb:
 @endif gdb
 
 
-
 .PHONY: configure-expect maybe-configure-expect
 maybe-configure-expect:
 @if expect
 maybe-configure-expect: configure-expect
-configure-expect: 
+configure-expect:
        @test ! -f $(HOST_SUBDIR)/expect/Makefile || exit 0; \
        $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/expect ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       echo Configuring in $(HOST_SUBDIR)/expect; \
-       cd "$(HOST_SUBDIR)/expect" || exit 1; \
+       echo Configuring in expect; \
+       cd $(HOST_SUBDIR)/expect || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
          *) topdir=`echo $(HOST_SUBDIR)/expect/ | \
@@ -21890,8 +21616,6 @@ configure-expect:
          || exit 1
 @endif expect
 
-
-
 .PHONY: all-expect maybe-all-expect
 maybe-all-expect:
 @if expect
@@ -21905,7 +21629,6 @@ all-expect: configure-expect
          $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) $(TARGET-expect))
 @endif expect
 
-
 .PHONY: check-expect maybe-check-expect
 maybe-check-expect:
 @if expect
@@ -22184,19 +21907,18 @@ maintainer-clean-expect:
 @endif expect
 
 
-
 .PHONY: configure-guile maybe-configure-guile
 maybe-configure-guile:
 @if guile
 maybe-configure-guile: configure-guile
-configure-guile: 
+configure-guile:
        @test ! -f $(HOST_SUBDIR)/guile/Makefile || exit 0; \
        $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/guile ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       echo Configuring in $(HOST_SUBDIR)/guile; \
-       cd "$(HOST_SUBDIR)/guile" || exit 1; \
+       echo Configuring in guile; \
+       cd $(HOST_SUBDIR)/guile || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
          *) topdir=`echo $(HOST_SUBDIR)/guile/ | \
@@ -22209,8 +21931,6 @@ configure-guile:
          || exit 1
 @endif guile
 
-
-
 .PHONY: all-guile maybe-all-guile
 maybe-all-guile:
 @if guile
@@ -22224,7 +21944,6 @@ all-guile: configure-guile
          $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) $(TARGET-guile))
 @endif guile
 
-
 .PHONY: check-guile maybe-check-guile
 maybe-check-guile:
 @if guile
@@ -22503,19 +22222,18 @@ maintainer-clean-guile:
 @endif guile
 
 
-
 .PHONY: configure-tk maybe-configure-tk
 maybe-configure-tk:
 @if tk
 maybe-configure-tk: configure-tk
-configure-tk: 
+configure-tk:
        @test ! -f $(HOST_SUBDIR)/tk/Makefile || exit 0; \
        $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/tk ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       echo Configuring in $(HOST_SUBDIR)/tk; \
-       cd "$(HOST_SUBDIR)/tk" || exit 1; \
+       echo Configuring in tk; \
+       cd $(HOST_SUBDIR)/tk || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
          *) topdir=`echo $(HOST_SUBDIR)/tk/ | \
@@ -22528,8 +22246,6 @@ configure-tk:
          || exit 1
 @endif tk
 
-
-
 .PHONY: all-tk maybe-all-tk
 maybe-all-tk:
 @if tk
@@ -22543,7 +22259,6 @@ all-tk: configure-tk
          $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) $(TARGET-tk))
 @endif tk
 
-
 .PHONY: check-tk maybe-check-tk
 maybe-check-tk:
 @if tk
@@ -22822,19 +22537,18 @@ maintainer-clean-tk:
 @endif tk
 
 
-
 .PHONY: configure-libtermcap maybe-configure-libtermcap
 maybe-configure-libtermcap:
 @if libtermcap
 maybe-configure-libtermcap: configure-libtermcap
-configure-libtermcap: 
+configure-libtermcap:
        @test ! -f $(HOST_SUBDIR)/libtermcap/Makefile || exit 0; \
        $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libtermcap ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       echo Configuring in $(HOST_SUBDIR)/libtermcap; \
-       cd "$(HOST_SUBDIR)/libtermcap" || exit 1; \
+       echo Configuring in libtermcap; \
+       cd $(HOST_SUBDIR)/libtermcap || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
          *) topdir=`echo $(HOST_SUBDIR)/libtermcap/ | \
@@ -22847,8 +22561,6 @@ configure-libtermcap:
          || exit 1
 @endif libtermcap
 
-
-
 .PHONY: all-libtermcap maybe-all-libtermcap
 maybe-all-libtermcap:
 @if libtermcap
@@ -22862,7 +22574,6 @@ all-libtermcap: configure-libtermcap
          $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-libtermcap))
 @endif libtermcap
 
-
 .PHONY: check-libtermcap maybe-check-libtermcap
 maybe-check-libtermcap:
 @if libtermcap
@@ -23080,19 +22791,18 @@ maintainer-clean-libtermcap:
 @endif libtermcap
 
 
-
 .PHONY: configure-utils maybe-configure-utils
 maybe-configure-utils:
 @if utils
 maybe-configure-utils: configure-utils
-configure-utils: 
+configure-utils:
        @test ! -f $(HOST_SUBDIR)/utils/Makefile || exit 0; \
        $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/utils ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       echo Configuring in $(HOST_SUBDIR)/utils; \
-       cd "$(HOST_SUBDIR)/utils" || exit 1; \
+       echo Configuring in utils; \
+       cd $(HOST_SUBDIR)/utils || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
          *) topdir=`echo $(HOST_SUBDIR)/utils/ | \
@@ -23105,8 +22815,6 @@ configure-utils:
          || exit 1
 @endif utils
 
-
-
 .PHONY: all-utils maybe-all-utils
 maybe-all-utils:
 @if utils
@@ -23120,7 +22828,6 @@ all-utils: configure-utils
          $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-utils))
 @endif utils
 
-
 .PHONY: check-utils maybe-check-utils
 maybe-check-utils:
 @if utils
@@ -23394,19 +23101,18 @@ maintainer-clean-utils:
 @endif utils
 
 
-
 .PHONY: configure-gnattools maybe-configure-gnattools
 maybe-configure-gnattools:
 @if gnattools
 maybe-configure-gnattools: configure-gnattools
-configure-gnattools: 
+configure-gnattools:
        @test ! -f $(HOST_SUBDIR)/gnattools/Makefile || exit 0; \
        $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gnattools ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       echo Configuring in $(HOST_SUBDIR)/gnattools; \
-       cd "$(HOST_SUBDIR)/gnattools" || exit 1; \
+       echo Configuring in gnattools; \
+       cd $(HOST_SUBDIR)/gnattools || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
          *) topdir=`echo $(HOST_SUBDIR)/gnattools/ | \
@@ -23419,8 +23125,6 @@ configure-gnattools:
          || exit 1
 @endif gnattools
 
-
-
 .PHONY: all-gnattools maybe-all-gnattools
 maybe-all-gnattools:
 @if gnattools
@@ -23434,7 +23138,6 @@ all-gnattools: configure-gnattools
          $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-gnattools))
 @endif gnattools
 
-
 .PHONY: check-gnattools maybe-check-gnattools
 maybe-check-gnattools:
 @if gnattools
@@ -23718,21 +23421,17 @@ maintainer-clean-gnattools:
 # Modules which run on the target machine
 # ---------------------------------------
 
+.PHONY: configure-target-libstdc++-v3 maybe-configure-target-libstdc++-v3
+maybe-configure-target-libstdc++-v3:
+@if target-libstdc++-v3
+maybe-configure-target-libstdc++-v3: configure-target-libstdc++-v3
 
 # There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
-@if target-libstdc++-v3
 $(TARGET_SUBDIR)/libstdc++-v3/multilib.out: multilib.out
        $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3 ; \
        rm -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile || : ; \
        cp multilib.out $(TARGET_SUBDIR)/libstdc++-v3/multilib.out
-@endif target-libstdc++-v3
-
 
-
-.PHONY: configure-target-libstdc++-v3 maybe-configure-target-libstdc++-v3
-maybe-configure-target-libstdc++-v3:
-@if target-libstdc++-v3
-maybe-configure-target-libstdc++-v3: configure-target-libstdc++-v3
 configure-target-libstdc++-v3: $(TARGET_SUBDIR)/libstdc++-v3/multilib.out
        @test ! -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile || exit 0; \
        $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3 ; \
@@ -23750,12 +23449,11 @@ configure-target-libstdc++-v3: $(TARGET_SUBDIR)/libstdc++-v3/multilib.out
        libsrcdir="$$s/libstdc++-v3"; \
        rm -f no-such-file || : ; \
        CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
-         $(TARGET_CONFIGARGS) $${srcdiroption}  \
+         $(TARGET_CONFIGARGS) $${srcdiroption} \
+         --with-target-subdir="$(TARGET_SUBDIR)"  \
          || 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
@@ -23766,11 +23464,9 @@ all-target-libstdc++-v3: configure-target-libstdc++-v3
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(RAW_CXX_TARGET_EXPORTS) \
        (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'  $(TARGET-target-libstdc++-v3))
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   $(TARGET-target-libstdc++-v3))
 @endif target-libstdc++-v3
 
-
-
 .PHONY: check-target-libstdc++-v3 maybe-check-target-libstdc++-v3
 maybe-check-target-libstdc++-v3:
 @if target-libstdc++-v3
@@ -24049,21 +23745,17 @@ maintainer-clean-target-libstdc++-v3:
 @endif target-libstdc++-v3
 
 
+.PHONY: configure-target-libmudflap maybe-configure-target-libmudflap
+maybe-configure-target-libmudflap:
+@if target-libmudflap
+maybe-configure-target-libmudflap: configure-target-libmudflap
 
 # There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
-@if target-libmudflap
 $(TARGET_SUBDIR)/libmudflap/multilib.out: multilib.out
        $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libmudflap ; \
        rm -f $(TARGET_SUBDIR)/libmudflap/Makefile || : ; \
        cp multilib.out $(TARGET_SUBDIR)/libmudflap/multilib.out
-@endif target-libmudflap
-
 
-
-.PHONY: configure-target-libmudflap maybe-configure-target-libmudflap
-maybe-configure-target-libmudflap:
-@if target-libmudflap
-maybe-configure-target-libmudflap: configure-target-libmudflap
 configure-target-libmudflap: $(TARGET_SUBDIR)/libmudflap/multilib.out
        @test ! -f $(TARGET_SUBDIR)/libmudflap/Makefile || exit 0; \
        $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libmudflap ; \
@@ -24081,12 +23773,11 @@ configure-target-libmudflap: $(TARGET_SUBDIR)/libmudflap/multilib.out
        libsrcdir="$$s/libmudflap"; \
        rm -f no-such-file || : ; \
        CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
-         $(TARGET_CONFIGARGS) $${srcdiroption}  \
+         $(TARGET_CONFIGARGS) $${srcdiroption} \
+         --with-target-subdir="$(TARGET_SUBDIR)"  \
          || exit 1
 @endif target-libmudflap
 
-
-
 .PHONY: all-target-libmudflap maybe-all-target-libmudflap
 maybe-all-target-libmudflap:
 @if target-libmudflap
@@ -24097,11 +23788,9 @@ all-target-libmudflap: configure-target-libmudflap
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
        (cd $(TARGET_SUBDIR)/libmudflap && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)  $(TARGET-target-libmudflap))
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)   $(TARGET-target-libmudflap))
 @endif target-libmudflap
 
-
-
 .PHONY: check-target-libmudflap maybe-check-target-libmudflap
 maybe-check-target-libmudflap:
 @if target-libmudflap
@@ -24380,21 +24069,17 @@ maintainer-clean-target-libmudflap:
 @endif target-libmudflap
 
 
+.PHONY: configure-target-newlib maybe-configure-target-newlib
+maybe-configure-target-newlib:
+@if target-newlib
+maybe-configure-target-newlib: configure-target-newlib
 
 # There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
-@if target-newlib
 $(TARGET_SUBDIR)/newlib/multilib.out: multilib.out
        $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/newlib ; \
        rm -f $(TARGET_SUBDIR)/newlib/Makefile || : ; \
        cp multilib.out $(TARGET_SUBDIR)/newlib/multilib.out
-@endif target-newlib
-
 
-
-.PHONY: configure-target-newlib maybe-configure-target-newlib
-maybe-configure-target-newlib:
-@if target-newlib
-maybe-configure-target-newlib: configure-target-newlib
 configure-target-newlib: $(TARGET_SUBDIR)/newlib/multilib.out
        @test ! -f $(TARGET_SUBDIR)/newlib/Makefile || exit 0; \
        $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/newlib ; \
@@ -24412,12 +24097,11 @@ configure-target-newlib: $(TARGET_SUBDIR)/newlib/multilib.out
        libsrcdir="$$s/newlib"; \
        rm -f no-such-file || : ; \
        CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
-         $(TARGET_CONFIGARGS) $${srcdiroption}  \
+         $(TARGET_CONFIGARGS) $${srcdiroption} \
+         --with-target-subdir="$(TARGET_SUBDIR)"  \
          || exit 1
 @endif target-newlib
 
-
-
 .PHONY: all-target-newlib maybe-all-target-newlib
 maybe-all-target-newlib:
 @if target-newlib
@@ -24428,11 +24112,9 @@ all-target-newlib: configure-target-newlib
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
        (cd $(TARGET_SUBDIR)/newlib && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)  $(TARGET-target-newlib))
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)   $(TARGET-target-newlib))
 @endif target-newlib
 
-
-
 .PHONY: check-target-newlib maybe-check-target-newlib
 maybe-check-target-newlib:
 @if target-newlib
@@ -24711,21 +24393,17 @@ maintainer-clean-target-newlib:
 @endif target-newlib
 
 
+.PHONY: configure-target-libgfortran maybe-configure-target-libgfortran
+maybe-configure-target-libgfortran:
+@if target-libgfortran
+maybe-configure-target-libgfortran: configure-target-libgfortran
 
 # There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
-@if target-libgfortran
 $(TARGET_SUBDIR)/libgfortran/multilib.out: multilib.out
        $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgfortran ; \
        rm -f $(TARGET_SUBDIR)/libgfortran/Makefile || : ; \
        cp multilib.out $(TARGET_SUBDIR)/libgfortran/multilib.out
-@endif target-libgfortran
-
 
-
-.PHONY: configure-target-libgfortran maybe-configure-target-libgfortran
-maybe-configure-target-libgfortran:
-@if target-libgfortran
-maybe-configure-target-libgfortran: configure-target-libgfortran
 configure-target-libgfortran: $(TARGET_SUBDIR)/libgfortran/multilib.out
        @test ! -f $(TARGET_SUBDIR)/libgfortran/Makefile || exit 0; \
        $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgfortran ; \
@@ -24743,12 +24421,11 @@ configure-target-libgfortran: $(TARGET_SUBDIR)/libgfortran/multilib.out
        libsrcdir="$$s/libgfortran"; \
        rm -f no-such-file || : ; \
        CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
-         $(TARGET_CONFIGARGS) $${srcdiroption}  \
+         $(TARGET_CONFIGARGS) $${srcdiroption} \
+         --with-target-subdir="$(TARGET_SUBDIR)"  \
          || exit 1
 @endif target-libgfortran
 
-
-
 .PHONY: all-target-libgfortran maybe-all-target-libgfortran
 maybe-all-target-libgfortran:
 @if target-libgfortran
@@ -24759,11 +24436,9 @@ all-target-libgfortran: configure-target-libgfortran
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
        (cd $(TARGET_SUBDIR)/libgfortran && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)  $(TARGET-target-libgfortran))
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)   $(TARGET-target-libgfortran))
 @endif target-libgfortran
 
-
-
 .PHONY: check-target-libgfortran maybe-check-target-libgfortran
 maybe-check-target-libgfortran:
 @if target-libgfortran
@@ -25042,21 +24717,17 @@ maintainer-clean-target-libgfortran:
 @endif target-libgfortran
 
 
+.PHONY: configure-target-libobjc maybe-configure-target-libobjc
+maybe-configure-target-libobjc:
+@if target-libobjc
+maybe-configure-target-libobjc: configure-target-libobjc
 
 # There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
-@if target-libobjc
 $(TARGET_SUBDIR)/libobjc/multilib.out: multilib.out
        $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libobjc ; \
        rm -f $(TARGET_SUBDIR)/libobjc/Makefile || : ; \
        cp multilib.out $(TARGET_SUBDIR)/libobjc/multilib.out
-@endif target-libobjc
-
 
-
-.PHONY: configure-target-libobjc maybe-configure-target-libobjc
-maybe-configure-target-libobjc:
-@if target-libobjc
-maybe-configure-target-libobjc: configure-target-libobjc
 configure-target-libobjc: $(TARGET_SUBDIR)/libobjc/multilib.out
        @test ! -f $(TARGET_SUBDIR)/libobjc/Makefile || exit 0; \
        $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libobjc ; \
@@ -25074,12 +24745,11 @@ configure-target-libobjc: $(TARGET_SUBDIR)/libobjc/multilib.out
        libsrcdir="$$s/libobjc"; \
        rm -f no-such-file || : ; \
        CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
-         $(TARGET_CONFIGARGS) $${srcdiroption}  \
+         $(TARGET_CONFIGARGS) $${srcdiroption} \
+         --with-target-subdir="$(TARGET_SUBDIR)"  \
          || exit 1
 @endif target-libobjc
 
-
-
 .PHONY: all-target-libobjc maybe-all-target-libobjc
 maybe-all-target-libobjc:
 @if target-libobjc
@@ -25090,11 +24760,9 @@ all-target-libobjc: configure-target-libobjc
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
        (cd $(TARGET_SUBDIR)/libobjc && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)  $(TARGET-target-libobjc))
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)   $(TARGET-target-libobjc))
 @endif target-libobjc
 
-
-
 .PHONY: check-target-libobjc maybe-check-target-libobjc
 maybe-check-target-libobjc:
 @if target-libobjc
@@ -25373,21 +25041,17 @@ maintainer-clean-target-libobjc:
 @endif target-libobjc
 
 
+.PHONY: configure-target-libtermcap maybe-configure-target-libtermcap
+maybe-configure-target-libtermcap:
+@if target-libtermcap
+maybe-configure-target-libtermcap: configure-target-libtermcap
 
 # There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
-@if target-libtermcap
 $(TARGET_SUBDIR)/libtermcap/multilib.out: multilib.out
        $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libtermcap ; \
        rm -f $(TARGET_SUBDIR)/libtermcap/Makefile || : ; \
        cp multilib.out $(TARGET_SUBDIR)/libtermcap/multilib.out
-@endif target-libtermcap
-
 
-
-.PHONY: configure-target-libtermcap maybe-configure-target-libtermcap
-maybe-configure-target-libtermcap:
-@if target-libtermcap
-maybe-configure-target-libtermcap: configure-target-libtermcap
 configure-target-libtermcap: $(TARGET_SUBDIR)/libtermcap/multilib.out
        @test ! -f $(TARGET_SUBDIR)/libtermcap/Makefile || exit 0; \
        $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libtermcap ; \
@@ -25405,12 +25069,11 @@ configure-target-libtermcap: $(TARGET_SUBDIR)/libtermcap/multilib.out
        libsrcdir="$$s/libtermcap"; \
        rm -f no-such-file || : ; \
        CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
-         $(TARGET_CONFIGARGS) $${srcdiroption}  \
+         $(TARGET_CONFIGARGS) $${srcdiroption} \
+         --with-target-subdir="$(TARGET_SUBDIR)"  \
          || exit 1
 @endif target-libtermcap
 
-
-
 .PHONY: all-target-libtermcap maybe-all-target-libtermcap
 maybe-all-target-libtermcap:
 @if target-libtermcap
@@ -25421,11 +25084,9 @@ all-target-libtermcap: configure-target-libtermcap
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
        (cd $(TARGET_SUBDIR)/libtermcap && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)  $(TARGET-target-libtermcap))
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)   $(TARGET-target-libtermcap))
 @endif target-libtermcap
 
-
-
 .PHONY: check-target-libtermcap maybe-check-target-libtermcap
 maybe-check-target-libtermcap:
 @if target-libtermcap
@@ -25644,21 +25305,17 @@ 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 ; \
@@ -25676,12 +25333,11 @@ configure-target-winsup: $(TARGET_SUBDIR)/winsup/multilib.out
        libsrcdir="$$s/winsup"; \
        rm -f no-such-file || : ; \
        CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
-         $(TARGET_CONFIGARGS) $${srcdiroption}  \
+         $(TARGET_CONFIGARGS) $${srcdiroption} \
+         --with-target-subdir="$(TARGET_SUBDIR)"  \
          || exit 1
 @endif target-winsup
 
-
-
 .PHONY: all-target-winsup maybe-all-target-winsup
 maybe-all-target-winsup:
 @if target-winsup
@@ -25692,11 +25348,9 @@ all-target-winsup: configure-target-winsup
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
        (cd $(TARGET_SUBDIR)/winsup && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)  $(TARGET-target-winsup))
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)   $(TARGET-target-winsup))
 @endif target-winsup
 
-
-
 .PHONY: check-target-winsup maybe-check-target-winsup
 maybe-check-target-winsup:
 @if target-winsup
@@ -25975,21 +25629,17 @@ maintainer-clean-target-winsup:
 @endif target-winsup
 
 
+.PHONY: configure-target-libgloss maybe-configure-target-libgloss
+maybe-configure-target-libgloss:
+@if target-libgloss
+maybe-configure-target-libgloss: configure-target-libgloss
 
 # There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
-@if target-libgloss
 $(TARGET_SUBDIR)/libgloss/multilib.out: multilib.out
        $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgloss ; \
        rm -f $(TARGET_SUBDIR)/libgloss/Makefile || : ; \
        cp multilib.out $(TARGET_SUBDIR)/libgloss/multilib.out
-@endif target-libgloss
-
 
-
-.PHONY: configure-target-libgloss maybe-configure-target-libgloss
-maybe-configure-target-libgloss:
-@if target-libgloss
-maybe-configure-target-libgloss: configure-target-libgloss
 configure-target-libgloss: $(TARGET_SUBDIR)/libgloss/multilib.out
        @test ! -f $(TARGET_SUBDIR)/libgloss/Makefile || exit 0; \
        $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgloss ; \
@@ -26007,12 +25657,11 @@ configure-target-libgloss: $(TARGET_SUBDIR)/libgloss/multilib.out
        libsrcdir="$$s/libgloss"; \
        rm -f no-such-file || : ; \
        CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
-         $(TARGET_CONFIGARGS) $${srcdiroption}  \
+         $(TARGET_CONFIGARGS) $${srcdiroption} \
+         --with-target-subdir="$(TARGET_SUBDIR)"  \
          || exit 1
 @endif target-libgloss
 
-
-
 .PHONY: all-target-libgloss maybe-all-target-libgloss
 maybe-all-target-libgloss:
 @if target-libgloss
@@ -26023,11 +25672,9 @@ all-target-libgloss: configure-target-libgloss
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
        (cd $(TARGET_SUBDIR)/libgloss && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)  $(TARGET-target-libgloss))
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)   $(TARGET-target-libgloss))
 @endif target-libgloss
 
-
-
 .PHONY: check-target-libgloss maybe-check-target-libgloss
 maybe-check-target-libgloss:
 @if target-libgloss
@@ -26302,21 +25949,17 @@ maintainer-clean-target-libgloss:
 @endif target-libgloss
 
 
+.PHONY: configure-target-libiberty maybe-configure-target-libiberty
+maybe-configure-target-libiberty:
+@if target-libiberty
+maybe-configure-target-libiberty: configure-target-libiberty
 
 # There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
-@if target-libiberty
 $(TARGET_SUBDIR)/libiberty/multilib.out: multilib.out
        $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libiberty ; \
        rm -f $(TARGET_SUBDIR)/libiberty/Makefile || : ; \
        cp multilib.out $(TARGET_SUBDIR)/libiberty/multilib.out
-@endif target-libiberty
-
-
 
-.PHONY: configure-target-libiberty maybe-configure-target-libiberty
-maybe-configure-target-libiberty:
-@if target-libiberty
-maybe-configure-target-libiberty: configure-target-libiberty
 configure-target-libiberty: $(TARGET_SUBDIR)/libiberty/multilib.out
        @test ! -f $(TARGET_SUBDIR)/libiberty/Makefile || exit 0; \
        $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libiberty ; \
@@ -26334,12 +25977,11 @@ configure-target-libiberty: $(TARGET_SUBDIR)/libiberty/multilib.out
        libsrcdir="$$s/libiberty"; \
        rm -f no-such-file || : ; \
        CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
-         $(TARGET_CONFIGARGS) $${srcdiroption}  \
+         $(TARGET_CONFIGARGS) $${srcdiroption} \
+         --with-target-subdir="$(TARGET_SUBDIR)"  \
          || exit 1
 @endif target-libiberty
 
-
-
 .PHONY: all-target-libiberty maybe-all-target-libiberty
 maybe-all-target-libiberty:
 @if target-libiberty
@@ -26350,11 +25992,9 @@ all-target-libiberty: configure-target-libiberty
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
        (cd $(TARGET_SUBDIR)/libiberty && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)  $(TARGET-target-libiberty))
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)   $(TARGET-target-libiberty))
 @endif target-libiberty
 
-
-
 .PHONY: check-target-libiberty maybe-check-target-libiberty
 maybe-check-target-libiberty:
 @if target-libiberty
@@ -26633,21 +26273,17 @@ maintainer-clean-target-libiberty:
 @endif target-libiberty
 
 
+.PHONY: configure-target-gperf maybe-configure-target-gperf
+maybe-configure-target-gperf:
+@if target-gperf
+maybe-configure-target-gperf: configure-target-gperf
 
 # There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
-@if target-gperf
 $(TARGET_SUBDIR)/gperf/multilib.out: multilib.out
        $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/gperf ; \
        rm -f $(TARGET_SUBDIR)/gperf/Makefile || : ; \
        cp multilib.out $(TARGET_SUBDIR)/gperf/multilib.out
-@endif target-gperf
-
-
 
-.PHONY: configure-target-gperf maybe-configure-target-gperf
-maybe-configure-target-gperf:
-@if target-gperf
-maybe-configure-target-gperf: configure-target-gperf
 configure-target-gperf: $(TARGET_SUBDIR)/gperf/multilib.out
        @test ! -f $(TARGET_SUBDIR)/gperf/Makefile || exit 0; \
        $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/gperf ; \
@@ -26665,12 +26301,11 @@ configure-target-gperf: $(TARGET_SUBDIR)/gperf/multilib.out
        libsrcdir="$$s/gperf"; \
        rm -f no-such-file || : ; \
        CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
-         $(TARGET_CONFIGARGS) $${srcdiroption}  \
+         $(TARGET_CONFIGARGS) $${srcdiroption} \
+         --with-target-subdir="$(TARGET_SUBDIR)"  \
          || exit 1
 @endif target-gperf
 
-
-
 .PHONY: all-target-gperf maybe-all-target-gperf
 maybe-all-target-gperf:
 @if target-gperf
@@ -26681,11 +26316,9 @@ all-target-gperf: configure-target-gperf
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
        (cd $(TARGET_SUBDIR)/gperf && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)  $(TARGET-target-gperf))
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)   $(TARGET-target-gperf))
 @endif target-gperf
 
-
-
 .PHONY: check-target-gperf maybe-check-target-gperf
 maybe-check-target-gperf:
 @if target-gperf
@@ -26964,21 +26597,17 @@ maintainer-clean-target-gperf:
 @endif target-gperf
 
 
+.PHONY: configure-target-examples maybe-configure-target-examples
+maybe-configure-target-examples:
+@if target-examples
+maybe-configure-target-examples: configure-target-examples
 
 # There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
-@if target-examples
 $(TARGET_SUBDIR)/examples/multilib.out: multilib.out
        $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/examples ; \
        rm -f $(TARGET_SUBDIR)/examples/Makefile || : ; \
        cp multilib.out $(TARGET_SUBDIR)/examples/multilib.out
-@endif target-examples
-
-
 
-.PHONY: configure-target-examples maybe-configure-target-examples
-maybe-configure-target-examples:
-@if target-examples
-maybe-configure-target-examples: configure-target-examples
 configure-target-examples: $(TARGET_SUBDIR)/examples/multilib.out
        @test ! -f $(TARGET_SUBDIR)/examples/Makefile || exit 0; \
        $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/examples ; \
@@ -26996,12 +26625,11 @@ configure-target-examples: $(TARGET_SUBDIR)/examples/multilib.out
        libsrcdir="$$s/examples"; \
        rm -f no-such-file || : ; \
        CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
-         $(TARGET_CONFIGARGS) $${srcdiroption}  \
+         $(TARGET_CONFIGARGS) $${srcdiroption} \
+         --with-target-subdir="$(TARGET_SUBDIR)"  \
          || exit 1
 @endif target-examples
 
-
-
 .PHONY: all-target-examples maybe-all-target-examples
 maybe-all-target-examples:
 @if target-examples
@@ -27012,11 +26640,9 @@ all-target-examples: configure-target-examples
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
        (cd $(TARGET_SUBDIR)/examples && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)  $(TARGET-target-examples))
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)   $(TARGET-target-examples))
 @endif target-examples
 
-
-
 .PHONY: check-target-examples maybe-check-target-examples
 maybe-check-target-examples:
 @if target-examples
@@ -27287,21 +26913,17 @@ maintainer-clean-target-examples:
 @endif target-examples
 
 
+.PHONY: configure-target-libffi maybe-configure-target-libffi
+maybe-configure-target-libffi:
+@if target-libffi
+maybe-configure-target-libffi: configure-target-libffi
 
 # There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
-@if target-libffi
 $(TARGET_SUBDIR)/libffi/multilib.out: multilib.out
        $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libffi ; \
        rm -f $(TARGET_SUBDIR)/libffi/Makefile || : ; \
        cp multilib.out $(TARGET_SUBDIR)/libffi/multilib.out
-@endif target-libffi
-
-
 
-.PHONY: configure-target-libffi maybe-configure-target-libffi
-maybe-configure-target-libffi:
-@if target-libffi
-maybe-configure-target-libffi: configure-target-libffi
 configure-target-libffi: $(TARGET_SUBDIR)/libffi/multilib.out
        @test ! -f $(TARGET_SUBDIR)/libffi/Makefile || exit 0; \
        $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libffi ; \
@@ -27319,12 +26941,11 @@ configure-target-libffi: $(TARGET_SUBDIR)/libffi/multilib.out
        libsrcdir="$$s/libffi"; \
        rm -f no-such-file || : ; \
        CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
-         $(TARGET_CONFIGARGS) $${srcdiroption}  \
+         $(TARGET_CONFIGARGS) $${srcdiroption} \
+         --with-target-subdir="$(TARGET_SUBDIR)"  \
          || exit 1
 @endif target-libffi
 
-
-
 .PHONY: all-target-libffi maybe-all-target-libffi
 maybe-all-target-libffi:
 @if target-libffi
@@ -27335,11 +26956,9 @@ all-target-libffi: configure-target-libffi
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
        (cd $(TARGET_SUBDIR)/libffi && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)  $(TARGET-target-libffi))
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)   $(TARGET-target-libffi))
 @endif target-libffi
 
-
-
 .PHONY: check-target-libffi maybe-check-target-libffi
 maybe-check-target-libffi:
 @if target-libffi
@@ -27618,21 +27237,17 @@ maintainer-clean-target-libffi:
 @endif target-libffi
 
 
+.PHONY: configure-target-libjava maybe-configure-target-libjava
+maybe-configure-target-libjava:
+@if target-libjava
+maybe-configure-target-libjava: configure-target-libjava
 
 # There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
-@if target-libjava
 $(TARGET_SUBDIR)/libjava/multilib.out: multilib.out
        $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libjava ; \
        rm -f $(TARGET_SUBDIR)/libjava/Makefile || : ; \
        cp multilib.out $(TARGET_SUBDIR)/libjava/multilib.out
-@endif target-libjava
-
-
 
-.PHONY: configure-target-libjava maybe-configure-target-libjava
-maybe-configure-target-libjava:
-@if target-libjava
-maybe-configure-target-libjava: configure-target-libjava
 configure-target-libjava: $(TARGET_SUBDIR)/libjava/multilib.out
        @test ! -f $(TARGET_SUBDIR)/libjava/Makefile || exit 0; \
        $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libjava ; \
@@ -27650,12 +27265,11 @@ configure-target-libjava: $(TARGET_SUBDIR)/libjava/multilib.out
        libsrcdir="$$s/libjava"; \
        rm -f no-such-file || : ; \
        CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
-         $(TARGET_CONFIGARGS) $${srcdiroption}  \
+         $(TARGET_CONFIGARGS) $${srcdiroption} \
+         --with-target-subdir="$(TARGET_SUBDIR)"  \
          || exit 1
 @endif target-libjava
 
-
-
 .PHONY: all-target-libjava maybe-all-target-libjava
 maybe-all-target-libjava:
 @if target-libjava
@@ -27666,11 +27280,9 @@ all-target-libjava: configure-target-libjava
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(RAW_CXX_TARGET_EXPORTS) \
        (cd $(TARGET_SUBDIR)/libjava && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'  $(TARGET-target-libjava))
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   $(TARGET-target-libjava))
 @endif target-libjava
 
-
-
 .PHONY: check-target-libjava maybe-check-target-libjava
 maybe-check-target-libjava:
 @if target-libjava
@@ -27949,21 +27561,17 @@ maintainer-clean-target-libjava:
 @endif target-libjava
 
 
+.PHONY: configure-target-zlib maybe-configure-target-zlib
+maybe-configure-target-zlib:
+@if target-zlib
+maybe-configure-target-zlib: configure-target-zlib
 
 # There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
-@if target-zlib
 $(TARGET_SUBDIR)/zlib/multilib.out: multilib.out
        $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/zlib ; \
        rm -f $(TARGET_SUBDIR)/zlib/Makefile || : ; \
        cp multilib.out $(TARGET_SUBDIR)/zlib/multilib.out
-@endif target-zlib
-
-
 
-.PHONY: configure-target-zlib maybe-configure-target-zlib
-maybe-configure-target-zlib:
-@if target-zlib
-maybe-configure-target-zlib: configure-target-zlib
 configure-target-zlib: $(TARGET_SUBDIR)/zlib/multilib.out
        @test ! -f $(TARGET_SUBDIR)/zlib/Makefile || exit 0; \
        $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/zlib ; \
@@ -27981,12 +27589,11 @@ configure-target-zlib: $(TARGET_SUBDIR)/zlib/multilib.out
        libsrcdir="$$s/zlib"; \
        rm -f no-such-file || : ; \
        CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
-         $(TARGET_CONFIGARGS) $${srcdiroption}  \
+         $(TARGET_CONFIGARGS) $${srcdiroption} \
+         --with-target-subdir="$(TARGET_SUBDIR)"  \
          || exit 1
 @endif target-zlib
 
-
-
 .PHONY: all-target-zlib maybe-all-target-zlib
 maybe-all-target-zlib:
 @if target-zlib
@@ -27997,11 +27604,9 @@ all-target-zlib: configure-target-zlib
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
        (cd $(TARGET_SUBDIR)/zlib && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)  $(TARGET-target-zlib))
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)   $(TARGET-target-zlib))
 @endif target-zlib
 
-
-
 .PHONY: check-target-zlib maybe-check-target-zlib
 maybe-check-target-zlib:
 @if target-zlib
@@ -28280,21 +27885,17 @@ maintainer-clean-target-zlib:
 @endif target-zlib
 
 
+.PHONY: configure-target-boehm-gc maybe-configure-target-boehm-gc
+maybe-configure-target-boehm-gc:
+@if target-boehm-gc
+maybe-configure-target-boehm-gc: configure-target-boehm-gc
 
 # There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
-@if target-boehm-gc
 $(TARGET_SUBDIR)/boehm-gc/multilib.out: multilib.out
        $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/boehm-gc ; \
        rm -f $(TARGET_SUBDIR)/boehm-gc/Makefile || : ; \
        cp multilib.out $(TARGET_SUBDIR)/boehm-gc/multilib.out
-@endif target-boehm-gc
 
-
-
-.PHONY: configure-target-boehm-gc maybe-configure-target-boehm-gc
-maybe-configure-target-boehm-gc:
-@if target-boehm-gc
-maybe-configure-target-boehm-gc: configure-target-boehm-gc
 configure-target-boehm-gc: $(TARGET_SUBDIR)/boehm-gc/multilib.out
        @test ! -f $(TARGET_SUBDIR)/boehm-gc/Makefile || exit 0; \
        $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/boehm-gc ; \
@@ -28312,12 +27913,11 @@ configure-target-boehm-gc: $(TARGET_SUBDIR)/boehm-gc/multilib.out
        libsrcdir="$$s/boehm-gc"; \
        rm -f no-such-file || : ; \
        CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
-         $(TARGET_CONFIGARGS) $${srcdiroption}  \
+         $(TARGET_CONFIGARGS) $${srcdiroption} \
+         --with-target-subdir="$(TARGET_SUBDIR)"  \
          || 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
@@ -28328,11 +27928,9 @@ all-target-boehm-gc: configure-target-boehm-gc
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
        (cd $(TARGET_SUBDIR)/boehm-gc && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)  $(TARGET-target-boehm-gc))
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)   $(TARGET-target-boehm-gc))
 @endif target-boehm-gc
 
-
-
 .PHONY: check-target-boehm-gc maybe-check-target-boehm-gc
 maybe-check-target-boehm-gc:
 @if target-boehm-gc
@@ -28611,21 +28209,17 @@ maintainer-clean-target-boehm-gc:
 @endif target-boehm-gc
 
 
+.PHONY: configure-target-qthreads maybe-configure-target-qthreads
+maybe-configure-target-qthreads:
+@if target-qthreads
+maybe-configure-target-qthreads: configure-target-qthreads
 
 # There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
-@if target-qthreads
 $(TARGET_SUBDIR)/qthreads/multilib.out: multilib.out
        $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/qthreads ; \
        rm -f $(TARGET_SUBDIR)/qthreads/Makefile || : ; \
        cp multilib.out $(TARGET_SUBDIR)/qthreads/multilib.out
-@endif target-qthreads
-
-
 
-.PHONY: configure-target-qthreads maybe-configure-target-qthreads
-maybe-configure-target-qthreads:
-@if target-qthreads
-maybe-configure-target-qthreads: configure-target-qthreads
 configure-target-qthreads: $(TARGET_SUBDIR)/qthreads/multilib.out
        @test ! -f $(TARGET_SUBDIR)/qthreads/Makefile || exit 0; \
        $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/qthreads ; \
@@ -28643,12 +28237,11 @@ configure-target-qthreads: $(TARGET_SUBDIR)/qthreads/multilib.out
        libsrcdir="$$s/qthreads"; \
        rm -f no-such-file || : ; \
        CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
-         $(TARGET_CONFIGARGS) $${srcdiroption}  \
+         $(TARGET_CONFIGARGS) $${srcdiroption} \
+         --with-target-subdir="$(TARGET_SUBDIR)"  \
          || exit 1
 @endif target-qthreads
 
-
-
 .PHONY: all-target-qthreads maybe-all-target-qthreads
 maybe-all-target-qthreads:
 @if target-qthreads
@@ -28659,11 +28252,9 @@ all-target-qthreads: configure-target-qthreads
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
        (cd $(TARGET_SUBDIR)/qthreads && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)  $(TARGET-target-qthreads))
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)   $(TARGET-target-qthreads))
 @endif target-qthreads
 
-
-
 .PHONY: check-target-qthreads maybe-check-target-qthreads
 maybe-check-target-qthreads:
 @if target-qthreads
@@ -28942,21 +28533,17 @@ maintainer-clean-target-qthreads:
 @endif target-qthreads
 
 
+.PHONY: configure-target-rda maybe-configure-target-rda
+maybe-configure-target-rda:
+@if target-rda
+maybe-configure-target-rda: configure-target-rda
 
 # There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
-@if target-rda
 $(TARGET_SUBDIR)/rda/multilib.out: multilib.out
        $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/rda ; \
        rm -f $(TARGET_SUBDIR)/rda/Makefile || : ; \
        cp multilib.out $(TARGET_SUBDIR)/rda/multilib.out
-@endif target-rda
 
-
-
-.PHONY: configure-target-rda maybe-configure-target-rda
-maybe-configure-target-rda:
-@if target-rda
-maybe-configure-target-rda: configure-target-rda
 configure-target-rda: $(TARGET_SUBDIR)/rda/multilib.out
        @test ! -f $(TARGET_SUBDIR)/rda/Makefile || exit 0; \
        $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/rda ; \
@@ -28974,12 +28561,11 @@ configure-target-rda: $(TARGET_SUBDIR)/rda/multilib.out
        libsrcdir="$$s/rda"; \
        rm -f no-such-file || : ; \
        CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
-         $(TARGET_CONFIGARGS) $${srcdiroption}  \
+         $(TARGET_CONFIGARGS) $${srcdiroption} \
+         --with-target-subdir="$(TARGET_SUBDIR)"  \
          || exit 1
 @endif target-rda
 
-
-
 .PHONY: all-target-rda maybe-all-target-rda
 maybe-all-target-rda:
 @if target-rda
@@ -28990,11 +28576,9 @@ all-target-rda: configure-target-rda
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
        (cd $(TARGET_SUBDIR)/rda && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)  $(TARGET-target-rda))
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)   $(TARGET-target-rda))
 @endif target-rda
 
-
-
 .PHONY: check-target-rda maybe-check-target-rda
 maybe-check-target-rda:
 @if target-rda
@@ -29273,21 +28857,17 @@ maintainer-clean-target-rda:
 @endif target-rda
 
 
+.PHONY: configure-target-libada maybe-configure-target-libada
+maybe-configure-target-libada:
+@if target-libada
+maybe-configure-target-libada: configure-target-libada
 
 # There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
-@if target-libada
 $(TARGET_SUBDIR)/libada/multilib.out: multilib.out
        $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libada ; \
        rm -f $(TARGET_SUBDIR)/libada/Makefile || : ; \
        cp multilib.out $(TARGET_SUBDIR)/libada/multilib.out
-@endif target-libada
 
-
-
-.PHONY: configure-target-libada maybe-configure-target-libada
-maybe-configure-target-libada:
-@if target-libada
-maybe-configure-target-libada: configure-target-libada
 configure-target-libada: $(TARGET_SUBDIR)/libada/multilib.out
        @test ! -f $(TARGET_SUBDIR)/libada/Makefile || exit 0; \
        $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libada ; \
@@ -29305,12 +28885,11 @@ configure-target-libada: $(TARGET_SUBDIR)/libada/multilib.out
        libsrcdir="$$s/libada"; \
        rm -f no-such-file || : ; \
        CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
-         $(TARGET_CONFIGARGS) $${srcdiroption}  \
+         $(TARGET_CONFIGARGS) $${srcdiroption} \
+         --with-target-subdir="$(TARGET_SUBDIR)"  \
          || exit 1
 @endif target-libada
 
-
-
 .PHONY: all-target-libada maybe-all-target-libada
 maybe-all-target-libada:
 @if target-libada
@@ -29321,11 +28900,9 @@ all-target-libada: configure-target-libada
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
        (cd $(TARGET_SUBDIR)/libada && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)  $(TARGET-target-libada))
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)   $(TARGET-target-libada))
 @endif target-libada
 
-
-
 .PHONY: check-target-libada maybe-check-target-libada
 maybe-check-target-libada:
 @if target-libada
index b5415949e998823394caa6a99fb7cff597d42a98..ea0de59ed1c29997a31c1a425f79f0d676963eb6 100644 (file)
@@ -93,7 +93,7 @@ BUILD_CONFIGDIRS = libiberty
 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@ --with-build-subdir="$(BUILD_SUBDIR)"
+BUILD_CONFIGARGS = @build_configargs@
 
 # This is the list of variables to export in the environment when
 # configuring any subdirectory.  It must also be exported whenever
@@ -178,7 +178,7 @@ TARGET_CONFIGDIRS = @target_configdirs@
 TARGET_SUBDIR = @target_subdir@
 # This is set by the configure script to the arguments to use when configuring
 # directories built for the target.
-TARGET_CONFIGARGS = @target_configargs@ --with-target-subdir="$(TARGET_SUBDIR)"
+TARGET_CONFIGARGS = @target_configargs@
 # This is the list of variables to export in the environment when
 # configuring subdirectories for the host system.
 BASE_TARGET_EXPORTS = \
@@ -818,74 +818,92 @@ etags tags: TAGS
 # built are.
 TAGS: do-TAGS
 
-# ------------------------------------
-# Macros for configure and all targets
-# ------------------------------------
-
-[+ DEFINE configure +]
-.PHONY: configure-[+prefix+][+module+] maybe-configure-[+prefix+][+module+]
-maybe-configure-[+prefix+][+module+]:
-@if [+prefix+][+module+]
-maybe-configure-[+prefix+][+module+]: configure-[+prefix+][+module+]
-configure-[+prefix+][+module+]: [+deps+]
-       @[+ IF bootstrap +]test -f stage_last && exit 0; \
-       [+ ENDIF bootstrap +]test ! -f [+subdir+]/[+module+]/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs [+subdir+]/[+module+] ; \
+# --------------------------------------
+# Modules which run on the build machine
+# --------------------------------------
+[+ FOR build_modules +]
+.PHONY: configure-build-[+module+] maybe-configure-build-[+module+]
+maybe-configure-build-[+module+]:
+@if build-[+module+]
+maybe-configure-build-[+module+]: configure-build-[+module+]
+configure-build-[+module+]:
+       @test ! -f $(BUILD_SUBDIR)/[+module+]/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/[+module+] ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       [+exports+] \
-       echo Configuring in [+subdir+]/[+module+]; \
-       cd "[+subdir+]/[+module+]" || exit 1; \
+       $(BUILD_EXPORTS) \
+       echo Configuring in $(BUILD_SUBDIR)/[+module+]; \
+       cd "$(BUILD_SUBDIR)/[+module+]" || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo [+subdir+]/[+module+]/ | \
+         *) topdir=`echo $(BUILD_SUBDIR)/[+module+]/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
        srcdiroption="--srcdir=$${topdir}/[+module+]"; \
        libsrcdir="$$s/[+module+]"; \
-       [+ IF no-config-site +]rm -f no-such-file || : ; \
-       CONFIG_SITE=no-such-file [+ ENDIF +]$(SHELL) $${libsrcdir}/configure \
-         [+args+] $${srcdiroption} [+extra_configure_flags+] \
+       rm -f no-such-file || : ; \
+       CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+         $(BUILD_CONFIGARGS) $${srcdiroption} \
+         --with-build-subdir="$(BUILD_SUBDIR)" [+extra_configure_flags+] \
          || exit 1
-@endif [+prefix+][+module+]
-[+ ENDDEF +]
-
-[+ DEFINE all +]
-.PHONY: all-[+prefix+][+module+] maybe-all-[+prefix+][+module+]
-maybe-all-[+prefix+][+module+]:
-@if [+prefix+][+module+]
-TARGET-[+prefix+][+module+]=[+
-  IF target +][+target+][+ ELSE +]all[+ ENDIF target +]
-maybe-all-[+prefix+][+module+]: all-[+prefix+][+module+]
-all-[+prefix+][+module+]: configure-[+prefix+][+module+]
-       @[+ IF bootstrap +]test -f stage_last && exit 0; \
-       [+ ENDIF bootstrap +]r=`${PWD_COMMAND}`; export r; \
+@endif build-[+module+]
+
+.PHONY: all-build-[+module+] maybe-all-build-[+module+]
+maybe-all-build-[+module+]:
+@if build-[+module+]
+TARGET-build-[+module+]=[+ IF target +][+target+][+ ELSE +]all[+ ENDIF target +]
+maybe-all-build-[+module+]: all-build-[+module+]
+all-build-[+module+]: configure-build-[+module+]
+       @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       [+exports+] \
-       (cd [+subdir+]/[+module+] && \
-         $(MAKE) [+args+] [+extra_make_flags+] $(TARGET-[+prefix+][+module+]))
-@endif [+prefix+][+module+]
-[+ ENDDEF +]
-
-# --------------------------------------
-# Modules which run on the build machine
-# --------------------------------------
-[+ FOR build_modules +]
-[+ configure prefix="build-" subdir="$(BUILD_SUBDIR)" exports="$(BUILD_EXPORTS)"
-            args="$(BUILD_CONFIGARGS)" no-config-site=true +]
-
-[+ all prefix="build-" subdir="$(BUILD_SUBDIR)" exports="$(BUILD_EXPORTS)" +]
-[+ ENDFOR build_module +]
+       $(BUILD_EXPORTS) \
+       (cd $(BUILD_SUBDIR)/[+module+] && \
+         $(MAKE) [+extra_make_flags+] $(TARGET-build-[+module+]))
+@endif build-[+module+]
+[+ ENDFOR build_modules +]
 
 # --------------------------------------
 # Modules which run on the host machine
 # --------------------------------------
 [+ FOR host_modules +]
-[+ configure prefix="" subdir="$(HOST_SUBDIR)" exports="$(HOST_EXPORTS)"
-            args="$(HOST_CONFIGARGS)" +]
+.PHONY: configure-[+module+] maybe-configure-[+module+]
+maybe-configure-[+module+]:
+@if [+module+]
+maybe-configure-[+module+]: configure-[+module+]
+configure-[+module+]:
+       @[+ IF bootstrap +]test -f stage_last && exit 0; \
+       [+ ENDIF bootstrap +]test ! -f $(HOST_SUBDIR)/[+module+]/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/[+module+] ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       echo Configuring in [+module+]; \
+       cd $(HOST_SUBDIR)/[+module+] || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/[+module+]/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/[+module+]"; \
+       libsrcdir="$$s/[+module+]"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} [+extra_configure_flags+] \
+         || exit 1
+@endif [+module+]
 
-[+ all prefix="" subdir="$(HOST_SUBDIR)" exports="$(HOST_EXPORTS)"
-       args="$(FLAGS_TO_PASS)" +]
+.PHONY: all-[+module+] maybe-all-[+module+]
+maybe-all-[+module+]:
+@if [+module+]
+TARGET-[+module+]=[+ IF target +][+target+][+ ELSE +]all[+ ENDIF target +]
+maybe-all-[+module+]: all-[+module+]
+all-[+module+]: configure-[+module+]
+       @[+ IF bootstrap +]test -f stage_last && exit 0; \
+       [+ ENDIF bootstrap +]r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       (cd $(HOST_SUBDIR)/[+module+] && \
+         $(MAKE) $(FLAGS_TO_PASS) [+extra_make_flags+] $(TARGET-[+module+]))
+@endif [+module+]
 
 .PHONY: check-[+module+] maybe-check-[+module+]
 maybe-check-[+module+]:
@@ -967,34 +985,63 @@ maybe-[+make_target+]-[+module+]: [+make_target+]-[+module+]
 # Modules which run on the target machine
 # ---------------------------------------
 [+ FOR target_modules +]
+.PHONY: configure-target-[+module+] maybe-configure-target-[+module+]
+maybe-configure-target-[+module+]:
+@if target-[+module+]
+maybe-configure-target-[+module+]: configure-target-[+module+]
 
 # There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
-@if target-[+module+]
 $(TARGET_SUBDIR)/[+module+]/multilib.out: multilib.out
        $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/[+module+] ; \
        rm -f $(TARGET_SUBDIR)/[+module+]/Makefile || : ; \
        cp multilib.out $(TARGET_SUBDIR)/[+module+]/multilib.out
-@endif target-[+module+]
 
-[+ IF raw_cxx +]
-[+ configure prefix="target-" subdir="$(TARGET_SUBDIR)"
-            deps=(string-append "$(TARGET_SUBDIR)/" (get "module") "/multilib.out")
-            exports="$(RAW_CXX_TARGET_EXPORTS)"
-            args="$(TARGET_CONFIGARGS)" no-config-site=true +]
+configure-target-[+module+]: $(TARGET_SUBDIR)/[+module+]/multilib.out
+       @test ! -f $(TARGET_SUBDIR)/[+module+]/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/[+module+] ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \[+
+IF raw_cxx +]
+       $(RAW_CXX_TARGET_EXPORTS) \[+
+ELSE normal_cxx +]
+       $(NORMAL_TARGET_EXPORTS) \[+
+ENDIF raw_cxx +]
+       echo Configuring in $(TARGET_SUBDIR)/[+module+]; \
+       cd "$(TARGET_SUBDIR)/[+module+]" || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(TARGET_SUBDIR)/[+module+]/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/[+module+]"; \
+       libsrcdir="$$s/[+module+]"; \
+       rm -f no-such-file || : ; \
+       CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+         $(TARGET_CONFIGARGS) $${srcdiroption} \
+         --with-target-subdir="$(TARGET_SUBDIR)" [+extra_configure_flags+] \
+         || exit 1
+@endif target-[+module+]
 
-[+ all prefix="target-" subdir="$(TARGET_SUBDIR)"
-       exports="$(RAW_CXX_TARGET_EXPORTS)"
-       args="$(TARGET_FLAGS_TO_PASS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'" +]
-[+ ELSE +]
-[+ configure prefix="target-" subdir="$(TARGET_SUBDIR)"
-            deps=(string-append "$(TARGET_SUBDIR)/" (get "module") "/multilib.out")
-            exports="$(NORMAL_TARGET_EXPORTS)"
-            args="$(TARGET_CONFIGARGS)" no-config-site=true +]
-
-[+ all prefix="target-" subdir="$(TARGET_SUBDIR)"
-       exports="$(NORMAL_TARGET_EXPORTS)"
-       args="$(TARGET_FLAGS_TO_PASS)" +]
-[+ ENDIF +]
+.PHONY: all-target-[+module+] maybe-all-target-[+module+]
+maybe-all-target-[+module+]:
+@if target-[+module+]
+TARGET-target-[+module+]=[+ IF target +][+target+][+ ELSE +]all[+ ENDIF target +]
+maybe-all-target-[+module+]: all-target-[+module+]
+all-target-[+module+]: configure-target-[+module+]
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \[+
+IF raw_cxx +]
+       $(RAW_CXX_TARGET_EXPORTS) \[+
+ELSE normal_cxx +]
+       $(NORMAL_TARGET_EXPORTS) \[+
+ENDIF raw_cxx +]
+       (cd $(TARGET_SUBDIR)/[+module+] && \
+         $(MAKE) $(TARGET_FLAGS_TO_PASS) [+
+           IF raw_cxx 
+         +] 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)' [+ 
+           ENDIF raw_cxx 
+         +] [+extra_make_flags+] $(TARGET-target-[+module+]))
+@endif target-[+module+]
 
 .PHONY: check-target-[+module+] maybe-check-target-[+module+]
 maybe-check-target-[+module+]: