projects / binutils-gdb.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 5cae1f5)
2004-06-22 Paolo Bonzini <bonzini@gnu.org>
authorPaolo Bonzini <bonzini@gnu.org>
Wed, 23 Jun 2004 08:36:51 +0000 (08:36 +0000)
committerPaolo Bonzini <bonzini@gnu.org>
Wed, 23 Jun 2004 08:36:51 +0000 (08:36 +0000)
* Makefile.tpl (configure-build-[+module+],
configure-[+module+], configure-target-[+module+]): Pass
[+extra_configure_args+].
(all-build-[+module+], all-[+module+], check-[+module+],
install-[+module+], [+make_target+]-[+module+],
all-target-[+module+], check-target-[+module+],
install-target-[+module+], [+make_target+]-target-[+module+]):
Pass [+extra_make_args+].
(HOST_EXPORTS): Include the former GCC_HOST_EXPORTS.
(GCC_HOST_EXPORTS): Remove.
(configure-gcc, all-gcc, GCC_STRAP_TARGETS, profiledbootstrap,
cross, check-gcc, check-gcc-c++, install-gcc,
gcc-no-fixedincludes, [+make_target+]-gcc, stage[+id+]-bubble):
Replace GCC_HOST_EXPORTS with HOST_EXPORTS.
* Makefile.in: Regenerate.

ChangeLog patch | blob | history
Makefile.in patch | blob | history
Makefile.tpl patch | blob | history

diff --git a/ChangeLog b/ChangeLog
index d706d562fd28d16ad4160cecb88323e8e7b5c1b8..27aa5a9a359dc093c961604c4d282dd6ff78351b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+2004-06-22  Paolo Bonzini  <bonzini@gnu.org>
+
+       * Makefile.tpl (configure-build-[+module+],
+       configure-[+module+], configure-target-[+module+]): Pass
+       [+extra_configure_args+].
+       (all-build-[+module+], all-[+module+], check-[+module+],
+       install-[+module+], [+make_target+]-[+module+],
+       all-target-[+module+], check-target-[+module+],
+       install-target-[+module+], [+make_target+]-target-[+module+]):
+       Pass [+extra_make_args+].
+       (HOST_EXPORTS): Include the former GCC_HOST_EXPORTS.
+       (GCC_HOST_EXPORTS): Remove.
+       (configure-gcc, all-gcc, GCC_STRAP_TARGETS, profiledbootstrap,
+       cross, check-gcc, check-gcc-c++, install-gcc,
+       gcc-no-fixedincludes, [+make_target+]-gcc, stage[+id+]-bubble):
+       Replace GCC_HOST_EXPORTS with HOST_EXPORTS.
+       * Makefile.in: Regenerate.
+
 2004-06-21  Christopher Faylor  <cgf@alum.bu.edu>
 
        * configure.in: Check for srcdir/winsup rather than build directory
diff --git a/Makefile.in b/Makefile.in
index 02d9f7ed2e562085335e47cafc7dea119950c6b6..4b63e90857c33f78f6bd0435d5f768faf3542e80 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -157,17 +157,13 @@ HOST_EXPORTS = \
        WINDRES="$(WINDRES)"; export WINDRES; \
        OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
        OBJDUMP="$(OBJDUMP)"; export OBJDUMP;
-
-# Similar, for the gcc directory.
-GCC_HOST_EXPORTS = \
-       $(HOST_EXPORTS) \
        TOPLEVEL_CONFIGURE_ARGUMENTS="$(TOPLEVEL_CONFIGURE_ARGUMENTS)"; export TOPLEVEL_CONFIGURE_ARGUMENTS; \
        GMPLIBS="$(HOST_GMPLIBS)"; export GMPLIBS; \
        GMPINC="$(HOST_GMPINC)"; export GMPINC;
 
 # Similar, for later GCC stages.
 STAGE_HOST_EXPORTS = \
-       $(GCC_HOST_EXPORTS) \
+       $(HOST_EXPORTS) \
        CC="$(STAGE_CC_WRAPPER) $$r/prev-gcc/xgcc$(exeext) -B$$r/prev-gcc/ -B$(build_tooldir)/bin/"; export CC; \
        CC_FOR_BUILD="$(STAGE_CC_WRAPPER) $$r/prev-gcc/xgcc$(exeext) -B$$r/prev-gcc/ -B$(build_tooldir)/bin/"; export CC_FOR_BUILD;
 
@@ -1990,7 +1986,7 @@ install.all: install-no-fixedincludes
        @if [ -f ./gcc/Makefile ] ; then \
                r=`${PWD_COMMAND}` ; export r ; \
                $(SET_LIB_PATH) \
-               $(GCC_HOST_EXPORTS) \
+               $(HOST_EXPORTS) \
                (cd ./gcc && \
                $(MAKE) $(FLAGS_TO_PASS) install-headers) ; \
        else \
@@ -2085,7 +2081,7 @@ configure-build-libiberty:
        rm -f no-such-file || : ; \
        CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
          $(BUILD_CONFIGARGS) $${srcdiroption} \
-         --with-build-subdir="$(BUILD_SUBDIR)" \
+         --with-build-subdir="$(BUILD_SUBDIR)"  \
          || exit 1
 @endif build-libiberty
 
@@ -2097,7 +2093,7 @@ all-build-libiberty: configure-build-libiberty
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(BUILD_EXPORTS) \
-       (cd $(BUILD_SUBDIR)/libiberty && $(MAKE) all)
+       (cd $(BUILD_SUBDIR)/libiberty && $(MAKE)  all)
 @endif build-libiberty
 
 .PHONY: configure-build-libbanshee maybe-configure-build-libbanshee
@@ -2148,7 +2144,7 @@ configure-build-libbanshee:
        rm -f no-such-file || : ; \
        CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
          $(BUILD_CONFIGARGS) $${srcdiroption} \
-         --with-build-subdir="$(BUILD_SUBDIR)" \
+         --with-build-subdir="$(BUILD_SUBDIR)"  \
          || exit 1
 @endif build-libbanshee
 
@@ -2160,7 +2156,7 @@ all-build-libbanshee: configure-build-libbanshee
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(BUILD_EXPORTS) \
-       (cd $(BUILD_SUBDIR)/libbanshee && $(MAKE) all)
+       (cd $(BUILD_SUBDIR)/libbanshee && $(MAKE)  all)
 @endif build-libbanshee
 
 
@@ -2192,7 +2188,7 @@ configure-ash:
            libsrcdir="$$s/ash";; \
        esac; \
        $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
          || exit 1
 @endif ash
 
@@ -2205,7 +2201,7 @@ all-ash: configure-ash
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd ash && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd ash && $(MAKE) $(FLAGS_TO_PASS)  all)
 @endif ash
 
 .PHONY: check-ash maybe-check-ash
@@ -2218,7 +2214,7 @@ check-ash:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd ash && $(MAKE) $(FLAGS_TO_PASS) check)
+       (cd ash && $(MAKE) $(FLAGS_TO_PASS)  check)
 
 @endif ash
 
@@ -2232,7 +2228,7 @@ install-ash: installdirs
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd ash && $(MAKE) $(FLAGS_TO_PASS) install)
+       (cd ash && $(MAKE) $(FLAGS_TO_PASS)  install)
 
 @endif ash
 
@@ -2259,7 +2255,7 @@ info-ash: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
          || exit 1
 
 @endif ash
@@ -2285,7 +2281,7 @@ dvi-ash: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  dvi) \
          || exit 1
 
 @endif ash
@@ -2311,7 +2307,7 @@ TAGS-ash: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  TAGS) \
          || exit 1
 
 @endif ash
@@ -2338,7 +2334,7 @@ install-info-ash: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  install-info) \
          || exit 1
 
 @endif ash
@@ -2364,7 +2360,7 @@ installcheck-ash: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
          || exit 1
 
 @endif ash
@@ -2389,7 +2385,7 @@ mostlyclean-ash:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  mostlyclean) \
          || exit 1
 
 @endif ash
@@ -2414,7 +2410,7 @@ clean-ash:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  clean) \
          || exit 1
 
 @endif ash
@@ -2439,7 +2435,7 @@ distclean-ash:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  distclean) \
          || exit 1
 
 @endif ash
@@ -2464,7 +2460,7 @@ maintainer-clean-ash:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  maintainer-clean) \
          || exit 1
 
 @endif ash
@@ -2494,7 +2490,7 @@ configure-autoconf:
            libsrcdir="$$s/autoconf";; \
        esac; \
        $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
          || exit 1
 @endif autoconf
 
@@ -2507,7 +2503,7 @@ all-autoconf: configure-autoconf
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd autoconf && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd autoconf && $(MAKE) $(FLAGS_TO_PASS)  all)
 @endif autoconf
 
 .PHONY: check-autoconf maybe-check-autoconf
@@ -2520,7 +2516,7 @@ check-autoconf:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd autoconf && $(MAKE) $(FLAGS_TO_PASS) check)
+       (cd autoconf && $(MAKE) $(FLAGS_TO_PASS)  check)
 
 @endif autoconf
 
@@ -2534,7 +2530,7 @@ install-autoconf: installdirs
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd autoconf && $(MAKE) $(FLAGS_TO_PASS) install)
+       (cd autoconf && $(MAKE) $(FLAGS_TO_PASS)  install)
 
 @endif autoconf
 
@@ -2561,7 +2557,7 @@ info-autoconf: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
          || exit 1
 
 @endif autoconf
@@ -2587,7 +2583,7 @@ dvi-autoconf: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  dvi) \
          || exit 1
 
 @endif autoconf
@@ -2613,7 +2609,7 @@ TAGS-autoconf: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  TAGS) \
          || exit 1
 
 @endif autoconf
@@ -2640,7 +2636,7 @@ install-info-autoconf: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  install-info) \
          || exit 1
 
 @endif autoconf
@@ -2666,7 +2662,7 @@ installcheck-autoconf: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
          || exit 1
 
 @endif autoconf
@@ -2691,7 +2687,7 @@ mostlyclean-autoconf:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  mostlyclean) \
          || exit 1
 
 @endif autoconf
@@ -2716,7 +2712,7 @@ clean-autoconf:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  clean) \
          || exit 1
 
 @endif autoconf
@@ -2741,7 +2737,7 @@ distclean-autoconf:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  distclean) \
          || exit 1
 
 @endif autoconf
@@ -2766,7 +2762,7 @@ maintainer-clean-autoconf:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  maintainer-clean) \
          || exit 1
 
 @endif autoconf
@@ -2796,7 +2792,7 @@ configure-automake:
            libsrcdir="$$s/automake";; \
        esac; \
        $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
          || exit 1
 @endif automake
 
@@ -2809,7 +2805,7 @@ all-automake: configure-automake
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd automake && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd automake && $(MAKE) $(FLAGS_TO_PASS)  all)
 @endif automake
 
 .PHONY: check-automake maybe-check-automake
@@ -2822,7 +2818,7 @@ check-automake:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd automake && $(MAKE) $(FLAGS_TO_PASS) check)
+       (cd automake && $(MAKE) $(FLAGS_TO_PASS)  check)
 
 @endif automake
 
@@ -2836,7 +2832,7 @@ install-automake: installdirs
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd automake && $(MAKE) $(FLAGS_TO_PASS) install)
+       (cd automake && $(MAKE) $(FLAGS_TO_PASS)  install)
 
 @endif automake
 
@@ -2863,7 +2859,7 @@ info-automake: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
          || exit 1
 
 @endif automake
@@ -2889,7 +2885,7 @@ dvi-automake: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  dvi) \
          || exit 1
 
 @endif automake
@@ -2915,7 +2911,7 @@ TAGS-automake: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  TAGS) \
          || exit 1
 
 @endif automake
@@ -2942,7 +2938,7 @@ install-info-automake: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  install-info) \
          || exit 1
 
 @endif automake
@@ -2968,7 +2964,7 @@ installcheck-automake: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
          || exit 1
 
 @endif automake
@@ -2993,7 +2989,7 @@ mostlyclean-automake:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  mostlyclean) \
          || exit 1
 
 @endif automake
@@ -3018,7 +3014,7 @@ clean-automake:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  clean) \
          || exit 1
 
 @endif automake
@@ -3043,7 +3039,7 @@ distclean-automake:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  distclean) \
          || exit 1
 
 @endif automake
@@ -3068,7 +3064,7 @@ maintainer-clean-automake:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  maintainer-clean) \
          || exit 1
 
 @endif automake
@@ -3098,7 +3094,7 @@ configure-bash:
            libsrcdir="$$s/bash";; \
        esac; \
        $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
          || exit 1
 @endif bash
 
@@ -3111,7 +3107,7 @@ all-bash: configure-bash
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd bash && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd bash && $(MAKE) $(FLAGS_TO_PASS)  all)
 @endif bash
 
 .PHONY: check-bash maybe-check-bash
@@ -3124,7 +3120,7 @@ check-bash:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd bash && $(MAKE) $(FLAGS_TO_PASS) check)
+       (cd bash && $(MAKE) $(FLAGS_TO_PASS)  check)
 
 @endif bash
 
@@ -3138,7 +3134,7 @@ install-bash: installdirs
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd bash && $(MAKE) $(FLAGS_TO_PASS) install)
+       (cd bash && $(MAKE) $(FLAGS_TO_PASS)  install)
 
 @endif bash
 
@@ -3165,7 +3161,7 @@ info-bash: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
          || exit 1
 
 @endif bash
@@ -3191,7 +3187,7 @@ dvi-bash: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  dvi) \
          || exit 1
 
 @endif bash
@@ -3217,7 +3213,7 @@ TAGS-bash: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  TAGS) \
          || exit 1
 
 @endif bash
@@ -3244,7 +3240,7 @@ install-info-bash: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  install-info) \
          || exit 1
 
 @endif bash
@@ -3270,7 +3266,7 @@ installcheck-bash: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
          || exit 1
 
 @endif bash
@@ -3295,7 +3291,7 @@ mostlyclean-bash:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  mostlyclean) \
          || exit 1
 
 @endif bash
@@ -3320,7 +3316,7 @@ clean-bash:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  clean) \
          || exit 1
 
 @endif bash
@@ -3345,7 +3341,7 @@ distclean-bash:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  distclean) \
          || exit 1
 
 @endif bash
@@ -3370,7 +3366,7 @@ maintainer-clean-bash:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  maintainer-clean) \
          || exit 1
 
 @endif bash
@@ -3400,7 +3396,7 @@ configure-bfd:
            libsrcdir="$$s/bfd";; \
        esac; \
        $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
          || exit 1
 @endif bfd
 
@@ -3413,7 +3409,7 @@ all-bfd: configure-bfd
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd bfd && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd bfd && $(MAKE) $(FLAGS_TO_PASS)  all)
 @endif bfd
 
 .PHONY: check-bfd maybe-check-bfd
@@ -3426,7 +3422,7 @@ check-bfd:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd bfd && $(MAKE) $(FLAGS_TO_PASS) check)
+       (cd bfd && $(MAKE) $(FLAGS_TO_PASS)  check)
 
 @endif bfd
 
@@ -3440,7 +3436,7 @@ install-bfd: installdirs
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd bfd && $(MAKE) $(FLAGS_TO_PASS) install)
+       (cd bfd && $(MAKE) $(FLAGS_TO_PASS)  install)
 
 @endif bfd
 
@@ -3467,7 +3463,7 @@ info-bfd: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
          || exit 1
 
 @endif bfd
@@ -3493,7 +3489,7 @@ dvi-bfd: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  dvi) \
          || exit 1
 
 @endif bfd
@@ -3519,7 +3515,7 @@ TAGS-bfd: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  TAGS) \
          || exit 1
 
 @endif bfd
@@ -3546,7 +3542,7 @@ install-info-bfd: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  install-info) \
          || exit 1
 
 @endif bfd
@@ -3572,7 +3568,7 @@ installcheck-bfd: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
          || exit 1
 
 @endif bfd
@@ -3597,7 +3593,7 @@ mostlyclean-bfd:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  mostlyclean) \
          || exit 1
 
 @endif bfd
@@ -3622,7 +3618,7 @@ clean-bfd:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  clean) \
          || exit 1
 
 @endif bfd
@@ -3647,7 +3643,7 @@ distclean-bfd:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  distclean) \
          || exit 1
 
 @endif bfd
@@ -3672,7 +3668,7 @@ maintainer-clean-bfd:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  maintainer-clean) \
          || exit 1
 
 @endif bfd
@@ -3702,7 +3698,7 @@ configure-opcodes:
            libsrcdir="$$s/opcodes";; \
        esac; \
        $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
          || exit 1
 @endif opcodes
 
@@ -3715,7 +3711,7 @@ all-opcodes: configure-opcodes
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd opcodes && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd opcodes && $(MAKE) $(FLAGS_TO_PASS)  all)
 @endif opcodes
 
 .PHONY: check-opcodes maybe-check-opcodes
@@ -3728,7 +3724,7 @@ check-opcodes:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd opcodes && $(MAKE) $(FLAGS_TO_PASS) check)
+       (cd opcodes && $(MAKE) $(FLAGS_TO_PASS)  check)
 
 @endif opcodes
 
@@ -3742,7 +3738,7 @@ install-opcodes: installdirs
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd opcodes && $(MAKE) $(FLAGS_TO_PASS) install)
+       (cd opcodes && $(MAKE) $(FLAGS_TO_PASS)  install)
 
 @endif opcodes
 
@@ -3769,7 +3765,7 @@ info-opcodes: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
          || exit 1
 
 @endif opcodes
@@ -3795,7 +3791,7 @@ dvi-opcodes: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  dvi) \
          || exit 1
 
 @endif opcodes
@@ -3821,7 +3817,7 @@ TAGS-opcodes: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  TAGS) \
          || exit 1
 
 @endif opcodes
@@ -3848,7 +3844,7 @@ install-info-opcodes: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  install-info) \
          || exit 1
 
 @endif opcodes
@@ -3874,7 +3870,7 @@ installcheck-opcodes: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
          || exit 1
 
 @endif opcodes
@@ -3899,7 +3895,7 @@ mostlyclean-opcodes:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  mostlyclean) \
          || exit 1
 
 @endif opcodes
@@ -3924,7 +3920,7 @@ clean-opcodes:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  clean) \
          || exit 1
 
 @endif opcodes
@@ -3949,7 +3945,7 @@ distclean-opcodes:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  distclean) \
          || exit 1
 
 @endif opcodes
@@ -3974,7 +3970,7 @@ maintainer-clean-opcodes:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  maintainer-clean) \
          || exit 1
 
 @endif opcodes
@@ -4004,7 +4000,7 @@ configure-binutils:
            libsrcdir="$$s/binutils";; \
        esac; \
        $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
          || exit 1
 @endif binutils
 
@@ -4017,7 +4013,7 @@ all-binutils: configure-binutils
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd binutils && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd binutils && $(MAKE) $(FLAGS_TO_PASS)  all)
 @endif binutils
 
 .PHONY: check-binutils maybe-check-binutils
@@ -4030,7 +4026,7 @@ check-binutils:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd binutils && $(MAKE) $(FLAGS_TO_PASS) check)
+       (cd binutils && $(MAKE) $(FLAGS_TO_PASS)  check)
 
 @endif binutils
 
@@ -4044,7 +4040,7 @@ install-binutils: installdirs
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd binutils && $(MAKE) $(FLAGS_TO_PASS) install)
+       (cd binutils && $(MAKE) $(FLAGS_TO_PASS)  install)
 
 @endif binutils
 
@@ -4071,7 +4067,7 @@ info-binutils: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
          || exit 1
 
 @endif binutils
@@ -4097,7 +4093,7 @@ dvi-binutils: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  dvi) \
          || exit 1
 
 @endif binutils
@@ -4123,7 +4119,7 @@ TAGS-binutils: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  TAGS) \
          || exit 1
 
 @endif binutils
@@ -4150,7 +4146,7 @@ install-info-binutils: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  install-info) \
          || exit 1
 
 @endif binutils
@@ -4176,7 +4172,7 @@ installcheck-binutils: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
          || exit 1
 
 @endif binutils
@@ -4201,7 +4197,7 @@ mostlyclean-binutils:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  mostlyclean) \
          || exit 1
 
 @endif binutils
@@ -4226,7 +4222,7 @@ clean-binutils:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  clean) \
          || exit 1
 
 @endif binutils
@@ -4251,7 +4247,7 @@ distclean-binutils:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  distclean) \
          || exit 1
 
 @endif binutils
@@ -4276,7 +4272,7 @@ maintainer-clean-binutils:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  maintainer-clean) \
          || exit 1
 
 @endif binutils
@@ -4306,7 +4302,7 @@ configure-bison:
            libsrcdir="$$s/bison";; \
        esac; \
        $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
          || exit 1
 @endif bison
 
@@ -4319,7 +4315,7 @@ all-bison: configure-bison
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd bison && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd bison && $(MAKE) $(FLAGS_TO_PASS)  all)
 @endif bison
 
 .PHONY: check-bison maybe-check-bison
@@ -4334,7 +4330,7 @@ check-bison:
          s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
          $(SET_LIB_PATH) \
          $(HOST_EXPORTS) \
-         (cd bison && $(MAKE) $(FLAGS_TO_PASS) check); \
+         (cd bison && $(MAKE) $(FLAGS_TO_PASS)  check); \
        fi
 
 @endif bison
@@ -4349,7 +4345,7 @@ install-bison: installdirs
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd bison && $(MAKE) $(FLAGS_TO_PASS) install)
+       (cd bison && $(MAKE) $(FLAGS_TO_PASS)  install)
 
 @endif bison
 
@@ -4376,7 +4372,7 @@ info-bison: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
          || exit 1
 
 @endif bison
@@ -4402,7 +4398,7 @@ dvi-bison: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  dvi) \
          || exit 1
 
 @endif bison
@@ -4428,7 +4424,7 @@ TAGS-bison: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  TAGS) \
          || exit 1
 
 @endif bison
@@ -4455,7 +4451,7 @@ install-info-bison: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  install-info) \
          || exit 1
 
 @endif bison
@@ -4481,7 +4477,7 @@ installcheck-bison: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
          || exit 1
 
 @endif bison
@@ -4506,7 +4502,7 @@ mostlyclean-bison:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  mostlyclean) \
          || exit 1
 
 @endif bison
@@ -4531,7 +4527,7 @@ clean-bison:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  clean) \
          || exit 1
 
 @endif bison
@@ -4556,7 +4552,7 @@ distclean-bison:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  distclean) \
          || exit 1
 
 @endif bison
@@ -4581,7 +4577,7 @@ maintainer-clean-bison:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  maintainer-clean) \
          || exit 1
 
 @endif bison
@@ -4611,7 +4607,7 @@ configure-byacc:
            libsrcdir="$$s/byacc";; \
        esac; \
        $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
          || exit 1
 @endif byacc
 
@@ -4624,7 +4620,7 @@ all-byacc: configure-byacc
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd byacc && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd byacc && $(MAKE) $(FLAGS_TO_PASS)  all)
 @endif byacc
 
 .PHONY: check-byacc maybe-check-byacc
@@ -4639,7 +4635,7 @@ check-byacc:
          s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
          $(SET_LIB_PATH) \
          $(HOST_EXPORTS) \
-         (cd byacc && $(MAKE) $(FLAGS_TO_PASS) check); \
+         (cd byacc && $(MAKE) $(FLAGS_TO_PASS)  check); \
        fi
 
 @endif byacc
@@ -4654,7 +4650,7 @@ install-byacc: installdirs
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd byacc && $(MAKE) $(FLAGS_TO_PASS) install)
+       (cd byacc && $(MAKE) $(FLAGS_TO_PASS)  install)
 
 @endif byacc
 
@@ -4681,7 +4677,7 @@ info-byacc: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
          || exit 1
 
 @endif byacc
@@ -4707,7 +4703,7 @@ dvi-byacc: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  dvi) \
          || exit 1
 
 @endif byacc
@@ -4733,7 +4729,7 @@ TAGS-byacc: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  TAGS) \
          || exit 1
 
 @endif byacc
@@ -4760,7 +4756,7 @@ install-info-byacc: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  install-info) \
          || exit 1
 
 @endif byacc
@@ -4786,7 +4782,7 @@ installcheck-byacc: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
          || exit 1
 
 @endif byacc
@@ -4811,7 +4807,7 @@ mostlyclean-byacc:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  mostlyclean) \
          || exit 1
 
 @endif byacc
@@ -4836,7 +4832,7 @@ clean-byacc:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  clean) \
          || exit 1
 
 @endif byacc
@@ -4861,7 +4857,7 @@ distclean-byacc:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  distclean) \
          || exit 1
 
 @endif byacc
@@ -4886,7 +4882,7 @@ maintainer-clean-byacc:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  maintainer-clean) \
          || exit 1
 
 @endif byacc
@@ -4916,7 +4912,7 @@ configure-bzip2:
            libsrcdir="$$s/bzip2";; \
        esac; \
        $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
          || exit 1
 @endif bzip2
 
@@ -4929,7 +4925,7 @@ all-bzip2: configure-bzip2
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd bzip2 && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd bzip2 && $(MAKE) $(FLAGS_TO_PASS)  all)
 @endif bzip2
 
 .PHONY: check-bzip2 maybe-check-bzip2
@@ -4942,7 +4938,7 @@ check-bzip2:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd bzip2 && $(MAKE) $(FLAGS_TO_PASS) check)
+       (cd bzip2 && $(MAKE) $(FLAGS_TO_PASS)  check)
 
 @endif bzip2
 
@@ -4956,7 +4952,7 @@ install-bzip2: installdirs
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd bzip2 && $(MAKE) $(FLAGS_TO_PASS) install)
+       (cd bzip2 && $(MAKE) $(FLAGS_TO_PASS)  install)
 
 @endif bzip2
 
@@ -4983,7 +4979,7 @@ info-bzip2: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
          || exit 1
 
 @endif bzip2
@@ -5009,7 +5005,7 @@ dvi-bzip2: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  dvi) \
          || exit 1
 
 @endif bzip2
@@ -5035,7 +5031,7 @@ TAGS-bzip2: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  TAGS) \
          || exit 1
 
 @endif bzip2
@@ -5062,7 +5058,7 @@ install-info-bzip2: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  install-info) \
          || exit 1
 
 @endif bzip2
@@ -5088,7 +5084,7 @@ installcheck-bzip2: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
          || exit 1
 
 @endif bzip2
@@ -5113,7 +5109,7 @@ mostlyclean-bzip2:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  mostlyclean) \
          || exit 1
 
 @endif bzip2
@@ -5138,7 +5134,7 @@ clean-bzip2:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  clean) \
          || exit 1
 
 @endif bzip2
@@ -5163,7 +5159,7 @@ distclean-bzip2:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  distclean) \
          || exit 1
 
 @endif bzip2
@@ -5188,7 +5184,7 @@ maintainer-clean-bzip2:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  maintainer-clean) \
          || exit 1
 
 @endif bzip2
@@ -5218,7 +5214,7 @@ configure-dejagnu:
            libsrcdir="$$s/dejagnu";; \
        esac; \
        $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
          || exit 1
 @endif dejagnu
 
@@ -5231,7 +5227,7 @@ all-dejagnu: configure-dejagnu
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd dejagnu && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd dejagnu && $(MAKE) $(FLAGS_TO_PASS)  all)
 @endif dejagnu
 
 .PHONY: check-dejagnu maybe-check-dejagnu
@@ -5244,7 +5240,7 @@ check-dejagnu:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd dejagnu && $(MAKE) $(FLAGS_TO_PASS) check)
+       (cd dejagnu && $(MAKE) $(FLAGS_TO_PASS)  check)
 
 @endif dejagnu
 
@@ -5258,7 +5254,7 @@ install-dejagnu: installdirs
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd dejagnu && $(MAKE) $(FLAGS_TO_PASS) install)
+       (cd dejagnu && $(MAKE) $(FLAGS_TO_PASS)  install)
 
 @endif dejagnu
 
@@ -5285,7 +5281,7 @@ info-dejagnu: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
          || exit 1
 
 @endif dejagnu
@@ -5311,7 +5307,7 @@ dvi-dejagnu: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  dvi) \
          || exit 1
 
 @endif dejagnu
@@ -5337,7 +5333,7 @@ TAGS-dejagnu: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  TAGS) \
          || exit 1
 
 @endif dejagnu
@@ -5364,7 +5360,7 @@ install-info-dejagnu: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  install-info) \
          || exit 1
 
 @endif dejagnu
@@ -5390,7 +5386,7 @@ installcheck-dejagnu: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
          || exit 1
 
 @endif dejagnu
@@ -5415,7 +5411,7 @@ mostlyclean-dejagnu:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  mostlyclean) \
          || exit 1
 
 @endif dejagnu
@@ -5440,7 +5436,7 @@ clean-dejagnu:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  clean) \
          || exit 1
 
 @endif dejagnu
@@ -5465,7 +5461,7 @@ distclean-dejagnu:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  distclean) \
          || exit 1
 
 @endif dejagnu
@@ -5490,7 +5486,7 @@ maintainer-clean-dejagnu:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  maintainer-clean) \
          || exit 1
 
 @endif dejagnu
@@ -5520,7 +5516,7 @@ configure-diff:
            libsrcdir="$$s/diff";; \
        esac; \
        $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
          || exit 1
 @endif diff
 
@@ -5533,7 +5529,7 @@ all-diff: configure-diff
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd diff && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd diff && $(MAKE) $(FLAGS_TO_PASS)  all)
 @endif diff
 
 .PHONY: check-diff maybe-check-diff
@@ -5546,7 +5542,7 @@ check-diff:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd diff && $(MAKE) $(FLAGS_TO_PASS) check)
+       (cd diff && $(MAKE) $(FLAGS_TO_PASS)  check)
 
 @endif diff
 
@@ -5560,7 +5556,7 @@ install-diff: installdirs
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd diff && $(MAKE) $(FLAGS_TO_PASS) install)
+       (cd diff && $(MAKE) $(FLAGS_TO_PASS)  install)
 
 @endif diff
 
@@ -5587,7 +5583,7 @@ info-diff: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
          || exit 1
 
 @endif diff
@@ -5613,7 +5609,7 @@ dvi-diff: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  dvi) \
          || exit 1
 
 @endif diff
@@ -5639,7 +5635,7 @@ TAGS-diff: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  TAGS) \
          || exit 1
 
 @endif diff
@@ -5666,7 +5662,7 @@ install-info-diff: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  install-info) \
          || exit 1
 
 @endif diff
@@ -5692,7 +5688,7 @@ installcheck-diff: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
          || exit 1
 
 @endif diff
@@ -5717,7 +5713,7 @@ mostlyclean-diff:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  mostlyclean) \
          || exit 1
 
 @endif diff
@@ -5742,7 +5738,7 @@ clean-diff:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  clean) \
          || exit 1
 
 @endif diff
@@ -5767,7 +5763,7 @@ distclean-diff:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  distclean) \
          || exit 1
 
 @endif diff
@@ -5792,7 +5788,7 @@ maintainer-clean-diff:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  maintainer-clean) \
          || exit 1
 
 @endif diff
@@ -5822,7 +5818,7 @@ configure-dosutils:
            libsrcdir="$$s/dosutils";; \
        esac; \
        $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
          || exit 1
 @endif dosutils
 
@@ -5835,7 +5831,7 @@ all-dosutils: configure-dosutils
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd dosutils && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd dosutils && $(MAKE) $(FLAGS_TO_PASS)  all)
 @endif dosutils
 
 .PHONY: check-dosutils maybe-check-dosutils
@@ -5857,7 +5853,7 @@ install-dosutils: installdirs
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd dosutils && $(MAKE) $(FLAGS_TO_PASS) install)
+       (cd dosutils && $(MAKE) $(FLAGS_TO_PASS)  install)
 
 @endif dosutils
 
@@ -5884,7 +5880,7 @@ info-dosutils: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
          || exit 1
 
 @endif dosutils
@@ -5910,7 +5906,7 @@ dvi-dosutils: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  dvi) \
          || exit 1
 
 @endif dosutils
@@ -5936,7 +5932,7 @@ TAGS-dosutils: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  TAGS) \
          || exit 1
 
 @endif dosutils
@@ -5963,7 +5959,7 @@ install-info-dosutils: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  install-info) \
          || exit 1
 
 @endif dosutils
@@ -5989,7 +5985,7 @@ installcheck-dosutils: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
          || exit 1
 
 @endif dosutils
@@ -6014,7 +6010,7 @@ mostlyclean-dosutils:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  mostlyclean) \
          || exit 1
 
 @endif dosutils
@@ -6039,7 +6035,7 @@ clean-dosutils:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  clean) \
          || exit 1
 
 @endif dosutils
@@ -6064,7 +6060,7 @@ distclean-dosutils:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  distclean) \
          || exit 1
 
 @endif dosutils
@@ -6089,7 +6085,7 @@ maintainer-clean-dosutils:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  maintainer-clean) \
          || exit 1
 
 @endif dosutils
@@ -6119,7 +6115,7 @@ configure-etc:
            libsrcdir="$$s/etc";; \
        esac; \
        $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
          || exit 1
 @endif etc
 
@@ -6132,7 +6128,7 @@ all-etc: configure-etc
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd etc && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd etc && $(MAKE) $(FLAGS_TO_PASS)  all)
 @endif etc
 
 .PHONY: check-etc maybe-check-etc
@@ -6145,7 +6141,7 @@ check-etc:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd etc && $(MAKE) $(FLAGS_TO_PASS) check)
+       (cd etc && $(MAKE) $(FLAGS_TO_PASS)  check)
 
 @endif etc
 
@@ -6159,7 +6155,7 @@ install-etc: installdirs
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd etc && $(MAKE) $(FLAGS_TO_PASS) install)
+       (cd etc && $(MAKE) $(FLAGS_TO_PASS)  install)
 
 @endif etc
 
@@ -6186,7 +6182,7 @@ info-etc: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
          || exit 1
 
 @endif etc
@@ -6212,7 +6208,7 @@ dvi-etc: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  dvi) \
          || exit 1
 
 @endif etc
@@ -6238,7 +6234,7 @@ TAGS-etc: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  TAGS) \
          || exit 1
 
 @endif etc
@@ -6265,7 +6261,7 @@ install-info-etc: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  install-info) \
          || exit 1
 
 @endif etc
@@ -6291,7 +6287,7 @@ installcheck-etc: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
          || exit 1
 
 @endif etc
@@ -6316,7 +6312,7 @@ mostlyclean-etc:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  mostlyclean) \
          || exit 1
 
 @endif etc
@@ -6341,7 +6337,7 @@ clean-etc:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  clean) \
          || exit 1
 
 @endif etc
@@ -6366,7 +6362,7 @@ distclean-etc:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  distclean) \
          || exit 1
 
 @endif etc
@@ -6391,7 +6387,7 @@ maintainer-clean-etc:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  maintainer-clean) \
          || exit 1
 
 @endif etc
@@ -6421,7 +6417,7 @@ configure-fastjar:
            libsrcdir="$$s/fastjar";; \
        esac; \
        $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
          || exit 1
 @endif fastjar
 
@@ -6434,7 +6430,7 @@ all-fastjar: configure-fastjar
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd fastjar && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd fastjar && $(MAKE) $(FLAGS_TO_PASS)  all)
 @endif fastjar
 
 .PHONY: check-fastjar maybe-check-fastjar
@@ -6449,7 +6445,7 @@ check-fastjar:
          s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
          $(SET_LIB_PATH) \
          $(HOST_EXPORTS) \
-         (cd fastjar && $(MAKE) $(FLAGS_TO_PASS) check); \
+         (cd fastjar && $(MAKE) $(FLAGS_TO_PASS)  check); \
        fi
 
 @endif fastjar
@@ -6464,7 +6460,7 @@ install-fastjar: installdirs
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd fastjar && $(MAKE) $(FLAGS_TO_PASS) install)
+       (cd fastjar && $(MAKE) $(FLAGS_TO_PASS)  install)
 
 @endif fastjar
 
@@ -6491,7 +6487,7 @@ info-fastjar: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
          || exit 1
 
 @endif fastjar
@@ -6517,7 +6513,7 @@ dvi-fastjar: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  dvi) \
          || exit 1
 
 @endif fastjar
@@ -6543,7 +6539,7 @@ TAGS-fastjar: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  TAGS) \
          || exit 1
 
 @endif fastjar
@@ -6570,7 +6566,7 @@ install-info-fastjar: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  install-info) \
          || exit 1
 
 @endif fastjar
@@ -6596,7 +6592,7 @@ installcheck-fastjar: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
          || exit 1
 
 @endif fastjar
@@ -6621,7 +6617,7 @@ mostlyclean-fastjar:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  mostlyclean) \
          || exit 1
 
 @endif fastjar
@@ -6646,7 +6642,7 @@ clean-fastjar:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  clean) \
          || exit 1
 
 @endif fastjar
@@ -6671,7 +6667,7 @@ distclean-fastjar:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  distclean) \
          || exit 1
 
 @endif fastjar
@@ -6696,7 +6692,7 @@ maintainer-clean-fastjar:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  maintainer-clean) \
          || exit 1
 
 @endif fastjar
@@ -6726,7 +6722,7 @@ configure-fileutils:
            libsrcdir="$$s/fileutils";; \
        esac; \
        $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
          || exit 1
 @endif fileutils
 
@@ -6739,7 +6735,7 @@ all-fileutils: configure-fileutils
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd fileutils && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd fileutils && $(MAKE) $(FLAGS_TO_PASS)  all)
 @endif fileutils
 
 .PHONY: check-fileutils maybe-check-fileutils
@@ -6752,7 +6748,7 @@ check-fileutils:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd fileutils && $(MAKE) $(FLAGS_TO_PASS) check)
+       (cd fileutils && $(MAKE) $(FLAGS_TO_PASS)  check)
 
 @endif fileutils
 
@@ -6766,7 +6762,7 @@ install-fileutils: installdirs
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd fileutils && $(MAKE) $(FLAGS_TO_PASS) install)
+       (cd fileutils && $(MAKE) $(FLAGS_TO_PASS)  install)
 
 @endif fileutils
 
@@ -6793,7 +6789,7 @@ info-fileutils: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
          || exit 1
 
 @endif fileutils
@@ -6819,7 +6815,7 @@ dvi-fileutils: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  dvi) \
          || exit 1
 
 @endif fileutils
@@ -6845,7 +6841,7 @@ TAGS-fileutils: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  TAGS) \
          || exit 1
 
 @endif fileutils
@@ -6872,7 +6868,7 @@ install-info-fileutils: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  install-info) \
          || exit 1
 
 @endif fileutils
@@ -6898,7 +6894,7 @@ installcheck-fileutils: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
          || exit 1
 
 @endif fileutils
@@ -6923,7 +6919,7 @@ mostlyclean-fileutils:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  mostlyclean) \
          || exit 1
 
 @endif fileutils
@@ -6948,7 +6944,7 @@ clean-fileutils:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  clean) \
          || exit 1
 
 @endif fileutils
@@ -6973,7 +6969,7 @@ distclean-fileutils:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  distclean) \
          || exit 1
 
 @endif fileutils
@@ -6998,7 +6994,7 @@ maintainer-clean-fileutils:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  maintainer-clean) \
          || exit 1
 
 @endif fileutils
@@ -7028,7 +7024,7 @@ configure-findutils:
            libsrcdir="$$s/findutils";; \
        esac; \
        $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
          || exit 1
 @endif findutils
 
@@ -7041,7 +7037,7 @@ all-findutils: configure-findutils
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd findutils && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd findutils && $(MAKE) $(FLAGS_TO_PASS)  all)
 @endif findutils
 
 .PHONY: check-findutils maybe-check-findutils
@@ -7054,7 +7050,7 @@ check-findutils:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd findutils && $(MAKE) $(FLAGS_TO_PASS) check)
+       (cd findutils && $(MAKE) $(FLAGS_TO_PASS)  check)
 
 @endif findutils
 
@@ -7068,7 +7064,7 @@ install-findutils: installdirs
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd findutils && $(MAKE) $(FLAGS_TO_PASS) install)
+       (cd findutils && $(MAKE) $(FLAGS_TO_PASS)  install)
 
 @endif findutils
 
@@ -7095,7 +7091,7 @@ info-findutils: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
          || exit 1
 
 @endif findutils
@@ -7121,7 +7117,7 @@ dvi-findutils: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  dvi) \
          || exit 1
 
 @endif findutils
@@ -7147,7 +7143,7 @@ TAGS-findutils: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  TAGS) \
          || exit 1
 
 @endif findutils
@@ -7174,7 +7170,7 @@ install-info-findutils: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  install-info) \
          || exit 1
 
 @endif findutils
@@ -7200,7 +7196,7 @@ installcheck-findutils: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
          || exit 1
 
 @endif findutils
@@ -7225,7 +7221,7 @@ mostlyclean-findutils:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  mostlyclean) \
          || exit 1
 
 @endif findutils
@@ -7250,7 +7246,7 @@ clean-findutils:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  clean) \
          || exit 1
 
 @endif findutils
@@ -7275,7 +7271,7 @@ distclean-findutils:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  distclean) \
          || exit 1
 
 @endif findutils
@@ -7300,7 +7296,7 @@ maintainer-clean-findutils:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  maintainer-clean) \
          || exit 1
 
 @endif findutils
@@ -7330,7 +7326,7 @@ configure-find:
            libsrcdir="$$s/find";; \
        esac; \
        $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
          || exit 1
 @endif find
 
@@ -7343,7 +7339,7 @@ all-find: configure-find
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd find && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd find && $(MAKE) $(FLAGS_TO_PASS)  all)
 @endif find
 
 .PHONY: check-find maybe-check-find
@@ -7356,7 +7352,7 @@ check-find:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd find && $(MAKE) $(FLAGS_TO_PASS) check)
+       (cd find && $(MAKE) $(FLAGS_TO_PASS)  check)
 
 @endif find
 
@@ -7370,7 +7366,7 @@ install-find: installdirs
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd find && $(MAKE) $(FLAGS_TO_PASS) install)
+       (cd find && $(MAKE) $(FLAGS_TO_PASS)  install)
 
 @endif find
 
@@ -7397,7 +7393,7 @@ info-find: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
          || exit 1
 
 @endif find
@@ -7423,7 +7419,7 @@ dvi-find: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  dvi) \
          || exit 1
 
 @endif find
@@ -7449,7 +7445,7 @@ TAGS-find: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  TAGS) \
          || exit 1
 
 @endif find
@@ -7476,7 +7472,7 @@ install-info-find: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  install-info) \
          || exit 1
 
 @endif find
@@ -7502,7 +7498,7 @@ installcheck-find: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
          || exit 1
 
 @endif find
@@ -7527,7 +7523,7 @@ mostlyclean-find:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  mostlyclean) \
          || exit 1
 
 @endif find
@@ -7552,7 +7548,7 @@ clean-find:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  clean) \
          || exit 1
 
 @endif find
@@ -7577,7 +7573,7 @@ distclean-find:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  distclean) \
          || exit 1
 
 @endif find
@@ -7602,7 +7598,7 @@ maintainer-clean-find:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  maintainer-clean) \
          || exit 1
 
 @endif find
@@ -7632,7 +7628,7 @@ configure-flex:
            libsrcdir="$$s/flex";; \
        esac; \
        $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
          || exit 1
 @endif flex
 
@@ -7645,7 +7641,7 @@ all-flex: configure-flex
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd flex && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd flex && $(MAKE) $(FLAGS_TO_PASS)  all)
 @endif flex
 
 .PHONY: check-flex maybe-check-flex
@@ -7660,7 +7656,7 @@ check-flex:
          s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
          $(SET_LIB_PATH) \
          $(HOST_EXPORTS) \
-         (cd flex && $(MAKE) $(FLAGS_TO_PASS) check); \
+         (cd flex && $(MAKE) $(FLAGS_TO_PASS)  check); \
        fi
 
 @endif flex
@@ -7675,7 +7671,7 @@ install-flex: installdirs
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd flex && $(MAKE) $(FLAGS_TO_PASS) install)
+       (cd flex && $(MAKE) $(FLAGS_TO_PASS)  install)
 
 @endif flex
 
@@ -7702,7 +7698,7 @@ info-flex: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
          || exit 1
 
 @endif flex
@@ -7728,7 +7724,7 @@ dvi-flex: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  dvi) \
          || exit 1
 
 @endif flex
@@ -7754,7 +7750,7 @@ TAGS-flex: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  TAGS) \
          || exit 1
 
 @endif flex
@@ -7781,7 +7777,7 @@ install-info-flex: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  install-info) \
          || exit 1
 
 @endif flex
@@ -7807,7 +7803,7 @@ installcheck-flex: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
          || exit 1
 
 @endif flex
@@ -7832,7 +7828,7 @@ mostlyclean-flex:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  mostlyclean) \
          || exit 1
 
 @endif flex
@@ -7857,7 +7853,7 @@ clean-flex:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  clean) \
          || exit 1
 
 @endif flex
@@ -7882,7 +7878,7 @@ distclean-flex:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  distclean) \
          || exit 1
 
 @endif flex
@@ -7907,7 +7903,7 @@ maintainer-clean-flex:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  maintainer-clean) \
          || exit 1
 
 @endif flex
@@ -7937,7 +7933,7 @@ configure-gas:
            libsrcdir="$$s/gas";; \
        esac; \
        $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
          || exit 1
 @endif gas
 
@@ -7950,7 +7946,7 @@ all-gas: configure-gas
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd gas && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd gas && $(MAKE) $(FLAGS_TO_PASS)  all)
 @endif gas
 
 .PHONY: check-gas maybe-check-gas
@@ -7963,7 +7959,7 @@ check-gas:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd gas && $(MAKE) $(FLAGS_TO_PASS) check)
+       (cd gas && $(MAKE) $(FLAGS_TO_PASS)  check)
 
 @endif gas
 
@@ -7977,7 +7973,7 @@ install-gas: installdirs
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd gas && $(MAKE) $(FLAGS_TO_PASS) install)
+       (cd gas && $(MAKE) $(FLAGS_TO_PASS)  install)
 
 @endif gas
 
@@ -8004,7 +8000,7 @@ info-gas: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
          || exit 1
 
 @endif gas
@@ -8030,7 +8026,7 @@ dvi-gas: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  dvi) \
          || exit 1
 
 @endif gas
@@ -8056,7 +8052,7 @@ TAGS-gas: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  TAGS) \
          || exit 1
 
 @endif gas
@@ -8083,7 +8079,7 @@ install-info-gas: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  install-info) \
          || exit 1
 
 @endif gas
@@ -8109,7 +8105,7 @@ installcheck-gas: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
          || exit 1
 
 @endif gas
@@ -8134,7 +8130,7 @@ mostlyclean-gas:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  mostlyclean) \
          || exit 1
 
 @endif gas
@@ -8159,7 +8155,7 @@ clean-gas:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  clean) \
          || exit 1
 
 @endif gas
@@ -8184,7 +8180,7 @@ distclean-gas:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  distclean) \
          || exit 1
 
 @endif gas
@@ -8209,7 +8205,7 @@ maintainer-clean-gas:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  maintainer-clean) \
          || exit 1
 
 @endif gas
@@ -8239,7 +8235,7 @@ configure-gawk:
            libsrcdir="$$s/gawk";; \
        esac; \
        $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
          || exit 1
 @endif gawk
 
@@ -8252,7 +8248,7 @@ all-gawk: configure-gawk
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd gawk && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd gawk && $(MAKE) $(FLAGS_TO_PASS)  all)
 @endif gawk
 
 .PHONY: check-gawk maybe-check-gawk
@@ -8265,7 +8261,7 @@ check-gawk:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd gawk && $(MAKE) $(FLAGS_TO_PASS) check)
+       (cd gawk && $(MAKE) $(FLAGS_TO_PASS)  check)
 
 @endif gawk
 
@@ -8279,7 +8275,7 @@ install-gawk: installdirs
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd gawk && $(MAKE) $(FLAGS_TO_PASS) install)
+       (cd gawk && $(MAKE) $(FLAGS_TO_PASS)  install)
 
 @endif gawk
 
@@ -8306,7 +8302,7 @@ info-gawk: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
          || exit 1
 
 @endif gawk
@@ -8332,7 +8328,7 @@ dvi-gawk: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  dvi) \
          || exit 1
 
 @endif gawk
@@ -8358,7 +8354,7 @@ TAGS-gawk: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  TAGS) \
          || exit 1
 
 @endif gawk
@@ -8385,7 +8381,7 @@ install-info-gawk: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  install-info) \
          || exit 1
 
 @endif gawk
@@ -8411,7 +8407,7 @@ installcheck-gawk: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
          || exit 1
 
 @endif gawk
@@ -8436,7 +8432,7 @@ mostlyclean-gawk:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  mostlyclean) \
          || exit 1
 
 @endif gawk
@@ -8461,7 +8457,7 @@ clean-gawk:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  clean) \
          || exit 1
 
 @endif gawk
@@ -8486,7 +8482,7 @@ distclean-gawk:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  distclean) \
          || exit 1
 
 @endif gawk
@@ -8511,7 +8507,7 @@ maintainer-clean-gawk:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  maintainer-clean) \
          || exit 1
 
 @endif gawk
@@ -8541,7 +8537,7 @@ configure-gettext:
            libsrcdir="$$s/gettext";; \
        esac; \
        $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
          || exit 1
 @endif gettext
 
@@ -8554,7 +8550,7 @@ all-gettext: configure-gettext
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd gettext && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd gettext && $(MAKE) $(FLAGS_TO_PASS)  all)
 @endif gettext
 
 .PHONY: check-gettext maybe-check-gettext
@@ -8567,7 +8563,7 @@ check-gettext:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd gettext && $(MAKE) $(FLAGS_TO_PASS) check)
+       (cd gettext && $(MAKE) $(FLAGS_TO_PASS)  check)
 
 @endif gettext
 
@@ -8581,7 +8577,7 @@ install-gettext: installdirs
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd gettext && $(MAKE) $(FLAGS_TO_PASS) install)
+       (cd gettext && $(MAKE) $(FLAGS_TO_PASS)  install)
 
 @endif gettext
 
@@ -8608,7 +8604,7 @@ info-gettext: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
          || exit 1
 
 @endif gettext
@@ -8634,7 +8630,7 @@ dvi-gettext: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  dvi) \
          || exit 1
 
 @endif gettext
@@ -8660,7 +8656,7 @@ TAGS-gettext: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  TAGS) \
          || exit 1
 
 @endif gettext
@@ -8687,7 +8683,7 @@ install-info-gettext: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  install-info) \
          || exit 1
 
 @endif gettext
@@ -8713,7 +8709,7 @@ installcheck-gettext: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
          || exit 1
 
 @endif gettext
@@ -8738,7 +8734,7 @@ mostlyclean-gettext:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  mostlyclean) \
          || exit 1
 
 @endif gettext
@@ -8763,7 +8759,7 @@ clean-gettext:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  clean) \
          || exit 1
 
 @endif gettext
@@ -8788,7 +8784,7 @@ distclean-gettext:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  distclean) \
          || exit 1
 
 @endif gettext
@@ -8813,7 +8809,7 @@ maintainer-clean-gettext:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  maintainer-clean) \
          || exit 1
 
 @endif gettext
@@ -8843,7 +8839,7 @@ configure-gnuserv:
            libsrcdir="$$s/gnuserv";; \
        esac; \
        $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
          || exit 1
 @endif gnuserv
 
@@ -8856,7 +8852,7 @@ all-gnuserv: configure-gnuserv
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd gnuserv && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd gnuserv && $(MAKE) $(FLAGS_TO_PASS)  all)
 @endif gnuserv
 
 .PHONY: check-gnuserv maybe-check-gnuserv
@@ -8869,7 +8865,7 @@ check-gnuserv:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd gnuserv && $(MAKE) $(FLAGS_TO_PASS) check)
+       (cd gnuserv && $(MAKE) $(FLAGS_TO_PASS)  check)
 
 @endif gnuserv
 
@@ -8883,7 +8879,7 @@ install-gnuserv: installdirs
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd gnuserv && $(MAKE) $(FLAGS_TO_PASS) install)
+       (cd gnuserv && $(MAKE) $(FLAGS_TO_PASS)  install)
 
 @endif gnuserv
 
@@ -8910,7 +8906,7 @@ info-gnuserv: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
          || exit 1
 
 @endif gnuserv
@@ -8936,7 +8932,7 @@ dvi-gnuserv: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  dvi) \
          || exit 1
 
 @endif gnuserv
@@ -8962,7 +8958,7 @@ TAGS-gnuserv: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  TAGS) \
          || exit 1
 
 @endif gnuserv
@@ -8989,7 +8985,7 @@ install-info-gnuserv: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  install-info) \
          || exit 1
 
 @endif gnuserv
@@ -9015,7 +9011,7 @@ installcheck-gnuserv: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
          || exit 1
 
 @endif gnuserv
@@ -9040,7 +9036,7 @@ mostlyclean-gnuserv:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  mostlyclean) \
          || exit 1
 
 @endif gnuserv
@@ -9065,7 +9061,7 @@ clean-gnuserv:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  clean) \
          || exit 1
 
 @endif gnuserv
@@ -9090,7 +9086,7 @@ distclean-gnuserv:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  distclean) \
          || exit 1
 
 @endif gnuserv
@@ -9115,7 +9111,7 @@ maintainer-clean-gnuserv:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  maintainer-clean) \
          || exit 1
 
 @endif gnuserv
@@ -9145,7 +9141,7 @@ configure-gprof:
            libsrcdir="$$s/gprof";; \
        esac; \
        $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
          || exit 1
 @endif gprof
 
@@ -9158,7 +9154,7 @@ all-gprof: configure-gprof
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd gprof && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd gprof && $(MAKE) $(FLAGS_TO_PASS)  all)
 @endif gprof
 
 .PHONY: check-gprof maybe-check-gprof
@@ -9171,7 +9167,7 @@ check-gprof:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd gprof && $(MAKE) $(FLAGS_TO_PASS) check)
+       (cd gprof && $(MAKE) $(FLAGS_TO_PASS)  check)
 
 @endif gprof
 
@@ -9185,7 +9181,7 @@ install-gprof: installdirs
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd gprof && $(MAKE) $(FLAGS_TO_PASS) install)
+       (cd gprof && $(MAKE) $(FLAGS_TO_PASS)  install)
 
 @endif gprof
 
@@ -9212,7 +9208,7 @@ info-gprof: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
          || exit 1
 
 @endif gprof
@@ -9238,7 +9234,7 @@ dvi-gprof: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  dvi) \
          || exit 1
 
 @endif gprof
@@ -9264,7 +9260,7 @@ TAGS-gprof: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  TAGS) \
          || exit 1
 
 @endif gprof
@@ -9291,7 +9287,7 @@ install-info-gprof: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  install-info) \
          || exit 1
 
 @endif gprof
@@ -9317,7 +9313,7 @@ installcheck-gprof: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
          || exit 1
 
 @endif gprof
@@ -9342,7 +9338,7 @@ mostlyclean-gprof:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  mostlyclean) \
          || exit 1
 
 @endif gprof
@@ -9367,7 +9363,7 @@ clean-gprof:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  clean) \
          || exit 1
 
 @endif gprof
@@ -9392,7 +9388,7 @@ distclean-gprof:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  distclean) \
          || exit 1
 
 @endif gprof
@@ -9417,7 +9413,7 @@ maintainer-clean-gprof:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  maintainer-clean) \
          || exit 1
 
 @endif gprof
@@ -9447,7 +9443,7 @@ configure-gzip:
            libsrcdir="$$s/gzip";; \
        esac; \
        $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
          || exit 1
 @endif gzip
 
@@ -9460,7 +9456,7 @@ all-gzip: configure-gzip
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd gzip && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd gzip && $(MAKE) $(FLAGS_TO_PASS)  all)
 @endif gzip
 
 .PHONY: check-gzip maybe-check-gzip
@@ -9473,7 +9469,7 @@ check-gzip:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd gzip && $(MAKE) $(FLAGS_TO_PASS) check)
+       (cd gzip && $(MAKE) $(FLAGS_TO_PASS)  check)
 
 @endif gzip
 
@@ -9487,7 +9483,7 @@ install-gzip: installdirs
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd gzip && $(MAKE) $(FLAGS_TO_PASS) install)
+       (cd gzip && $(MAKE) $(FLAGS_TO_PASS)  install)
 
 @endif gzip
 
@@ -9514,7 +9510,7 @@ info-gzip: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
          || exit 1
 
 @endif gzip
@@ -9540,7 +9536,7 @@ dvi-gzip: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  dvi) \
          || exit 1
 
 @endif gzip
@@ -9566,7 +9562,7 @@ TAGS-gzip: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  TAGS) \
          || exit 1
 
 @endif gzip
@@ -9593,7 +9589,7 @@ install-info-gzip: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  install-info) \
          || exit 1
 
 @endif gzip
@@ -9619,7 +9615,7 @@ installcheck-gzip: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
          || exit 1
 
 @endif gzip
@@ -9644,7 +9640,7 @@ mostlyclean-gzip:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  mostlyclean) \
          || exit 1
 
 @endif gzip
@@ -9669,7 +9665,7 @@ clean-gzip:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  clean) \
          || exit 1
 
 @endif gzip
@@ -9694,7 +9690,7 @@ distclean-gzip:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  distclean) \
          || exit 1
 
 @endif gzip
@@ -9719,7 +9715,7 @@ maintainer-clean-gzip:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  maintainer-clean) \
          || exit 1
 
 @endif gzip
@@ -9749,7 +9745,7 @@ configure-hello:
            libsrcdir="$$s/hello";; \
        esac; \
        $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
          || exit 1
 @endif hello
 
@@ -9762,7 +9758,7 @@ all-hello: configure-hello
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd hello && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd hello && $(MAKE) $(FLAGS_TO_PASS)  all)
 @endif hello
 
 .PHONY: check-hello maybe-check-hello
@@ -9775,7 +9771,7 @@ check-hello:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd hello && $(MAKE) $(FLAGS_TO_PASS) check)
+       (cd hello && $(MAKE) $(FLAGS_TO_PASS)  check)
 
 @endif hello
 
@@ -9789,7 +9785,7 @@ install-hello: installdirs
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd hello && $(MAKE) $(FLAGS_TO_PASS) install)
+       (cd hello && $(MAKE) $(FLAGS_TO_PASS)  install)
 
 @endif hello
 
@@ -9816,7 +9812,7 @@ info-hello: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
          || exit 1
 
 @endif hello
@@ -9842,7 +9838,7 @@ dvi-hello: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  dvi) \
          || exit 1
 
 @endif hello
@@ -9868,7 +9864,7 @@ TAGS-hello: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  TAGS) \
          || exit 1
 
 @endif hello
@@ -9895,7 +9891,7 @@ install-info-hello: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  install-info) \
          || exit 1
 
 @endif hello
@@ -9921,7 +9917,7 @@ installcheck-hello: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
          || exit 1
 
 @endif hello
@@ -9946,7 +9942,7 @@ mostlyclean-hello:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  mostlyclean) \
          || exit 1
 
 @endif hello
@@ -9971,7 +9967,7 @@ clean-hello:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  clean) \
          || exit 1
 
 @endif hello
@@ -9996,7 +9992,7 @@ distclean-hello:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  distclean) \
          || exit 1
 
 @endif hello
@@ -10021,7 +10017,7 @@ maintainer-clean-hello:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  maintainer-clean) \
          || exit 1
 
 @endif hello
@@ -10051,7 +10047,7 @@ configure-indent:
            libsrcdir="$$s/indent";; \
        esac; \
        $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
          || exit 1
 @endif indent
 
@@ -10064,7 +10060,7 @@ all-indent: configure-indent
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd indent && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd indent && $(MAKE) $(FLAGS_TO_PASS)  all)
 @endif indent
 
 .PHONY: check-indent maybe-check-indent
@@ -10077,7 +10073,7 @@ check-indent:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd indent && $(MAKE) $(FLAGS_TO_PASS) check)
+       (cd indent && $(MAKE) $(FLAGS_TO_PASS)  check)
 
 @endif indent
 
@@ -10091,7 +10087,7 @@ install-indent: installdirs
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd indent && $(MAKE) $(FLAGS_TO_PASS) install)
+       (cd indent && $(MAKE) $(FLAGS_TO_PASS)  install)
 
 @endif indent
 
@@ -10118,7 +10114,7 @@ info-indent: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
          || exit 1
 
 @endif indent
@@ -10144,7 +10140,7 @@ dvi-indent: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  dvi) \
          || exit 1
 
 @endif indent
@@ -10170,7 +10166,7 @@ TAGS-indent: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  TAGS) \
          || exit 1
 
 @endif indent
@@ -10197,7 +10193,7 @@ install-info-indent: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  install-info) \
          || exit 1
 
 @endif indent
@@ -10223,7 +10219,7 @@ installcheck-indent: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
          || exit 1
 
 @endif indent
@@ -10248,7 +10244,7 @@ mostlyclean-indent:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  mostlyclean) \
          || exit 1
 
 @endif indent
@@ -10273,7 +10269,7 @@ clean-indent:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  clean) \
          || exit 1
 
 @endif indent
@@ -10298,7 +10294,7 @@ distclean-indent:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  distclean) \
          || exit 1
 
 @endif indent
@@ -10323,7 +10319,7 @@ maintainer-clean-indent:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  maintainer-clean) \
          || exit 1
 
 @endif indent
@@ -10353,7 +10349,7 @@ configure-intl:
            libsrcdir="$$s/intl";; \
        esac; \
        $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
          || exit 1
 @endif intl
 
@@ -10366,7 +10362,7 @@ all-intl: configure-intl
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd intl && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd intl && $(MAKE) $(FLAGS_TO_PASS)  all)
 @endif intl
 
 .PHONY: check-intl maybe-check-intl
@@ -10379,7 +10375,7 @@ check-intl:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd intl && $(MAKE) $(FLAGS_TO_PASS) check)
+       (cd intl && $(MAKE) $(FLAGS_TO_PASS)  check)
 
 @endif intl
 
@@ -10393,7 +10389,7 @@ install-intl: installdirs
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd intl && $(MAKE) $(FLAGS_TO_PASS) install)
+       (cd intl && $(MAKE) $(FLAGS_TO_PASS)  install)
 
 @endif intl
 
@@ -10420,7 +10416,7 @@ info-intl: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
          || exit 1
 
 @endif intl
@@ -10446,7 +10442,7 @@ dvi-intl: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  dvi) \
          || exit 1
 
 @endif intl
@@ -10472,7 +10468,7 @@ TAGS-intl: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  TAGS) \
          || exit 1
 
 @endif intl
@@ -10499,7 +10495,7 @@ install-info-intl: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  install-info) \
          || exit 1
 
 @endif intl
@@ -10525,7 +10521,7 @@ installcheck-intl: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
          || exit 1
 
 @endif intl
@@ -10550,7 +10546,7 @@ mostlyclean-intl:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  mostlyclean) \
          || exit 1
 
 @endif intl
@@ -10575,7 +10571,7 @@ clean-intl:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  clean) \
          || exit 1
 
 @endif intl
@@ -10600,7 +10596,7 @@ distclean-intl:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  distclean) \
          || exit 1
 
 @endif intl
@@ -10625,7 +10621,7 @@ maintainer-clean-intl:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  maintainer-clean) \
          || exit 1
 
 @endif intl
@@ -10655,7 +10651,7 @@ configure-tcl:
            libsrcdir="$$s/tcl";; \
        esac; \
        $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
          || exit 1
 @endif tcl
 
@@ -10668,7 +10664,7 @@ all-tcl: configure-tcl
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd tcl && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd tcl && $(MAKE) $(FLAGS_TO_PASS)  all)
 @endif tcl
 
 .PHONY: check-tcl maybe-check-tcl
@@ -10681,7 +10677,7 @@ check-tcl:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd tcl && $(MAKE) $(FLAGS_TO_PASS) check)
+       (cd tcl && $(MAKE) $(FLAGS_TO_PASS)  check)
 
 @endif tcl
 
@@ -10695,7 +10691,7 @@ install-tcl: installdirs
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd tcl && $(MAKE) $(FLAGS_TO_PASS) install)
+       (cd tcl && $(MAKE) $(FLAGS_TO_PASS)  install)
 
 @endif tcl
 
@@ -10722,7 +10718,7 @@ info-tcl: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
          || exit 1
 
 @endif tcl
@@ -10748,7 +10744,7 @@ dvi-tcl: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  dvi) \
          || exit 1
 
 @endif tcl
@@ -10774,7 +10770,7 @@ TAGS-tcl: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  TAGS) \
          || exit 1
 
 @endif tcl
@@ -10801,7 +10797,7 @@ install-info-tcl: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  install-info) \
          || exit 1
 
 @endif tcl
@@ -10827,7 +10823,7 @@ installcheck-tcl: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
          || exit 1
 
 @endif tcl
@@ -10862,7 +10858,7 @@ clean-tcl:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  clean) \
          || exit 1
 
 @endif tcl
@@ -10887,7 +10883,7 @@ distclean-tcl:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  distclean) \
          || exit 1
 
 @endif tcl
@@ -10912,7 +10908,7 @@ maintainer-clean-tcl:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  maintainer-clean) \
          || exit 1
 
 @endif tcl
@@ -10942,7 +10938,7 @@ configure-itcl:
            libsrcdir="$$s/itcl";; \
        esac; \
        $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
          || exit 1
 @endif itcl
 
@@ -10955,7 +10951,7 @@ all-itcl: configure-itcl
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd itcl && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd itcl && $(MAKE) $(FLAGS_TO_PASS)  all)
 @endif itcl
 
 .PHONY: check-itcl maybe-check-itcl
@@ -10968,7 +10964,7 @@ check-itcl:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd itcl && $(MAKE) $(FLAGS_TO_PASS) check)
+       (cd itcl && $(MAKE) $(FLAGS_TO_PASS)  check)
 
 @endif itcl
 
@@ -10982,7 +10978,7 @@ install-itcl: installdirs
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd itcl && $(MAKE) $(FLAGS_TO_PASS) install)
+       (cd itcl && $(MAKE) $(FLAGS_TO_PASS)  install)
 
 @endif itcl
 
@@ -11009,7 +11005,7 @@ info-itcl: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
          || exit 1
 
 @endif itcl
@@ -11035,7 +11031,7 @@ dvi-itcl: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  dvi) \
          || exit 1
 
 @endif itcl
@@ -11061,7 +11057,7 @@ TAGS-itcl: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  TAGS) \
          || exit 1
 
 @endif itcl
@@ -11088,7 +11084,7 @@ install-info-itcl: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  install-info) \
          || exit 1
 
 @endif itcl
@@ -11114,7 +11110,7 @@ installcheck-itcl: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
          || exit 1
 
 @endif itcl
@@ -11139,7 +11135,7 @@ mostlyclean-itcl:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  mostlyclean) \
          || exit 1
 
 @endif itcl
@@ -11164,7 +11160,7 @@ clean-itcl:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  clean) \
          || exit 1
 
 @endif itcl
@@ -11189,7 +11185,7 @@ distclean-itcl:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  distclean) \
          || exit 1
 
 @endif itcl
@@ -11214,7 +11210,7 @@ maintainer-clean-itcl:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  maintainer-clean) \
          || exit 1
 
 @endif itcl
@@ -11244,7 +11240,7 @@ configure-ld:
            libsrcdir="$$s/ld";; \
        esac; \
        $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
          || exit 1
 @endif ld
 
@@ -11257,7 +11253,7 @@ all-ld: configure-ld
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd ld && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd ld && $(MAKE) $(FLAGS_TO_PASS)  all)
 @endif ld
 
 .PHONY: check-ld maybe-check-ld
@@ -11270,7 +11266,7 @@ check-ld:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd ld && $(MAKE) $(FLAGS_TO_PASS) check)
+       (cd ld && $(MAKE) $(FLAGS_TO_PASS)  check)
 
 @endif ld
 
@@ -11284,7 +11280,7 @@ install-ld: installdirs
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd ld && $(MAKE) $(FLAGS_TO_PASS) install)
+       (cd ld && $(MAKE) $(FLAGS_TO_PASS)  install)
 
 @endif ld
 
@@ -11311,7 +11307,7 @@ info-ld: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
          || exit 1
 
 @endif ld
@@ -11337,7 +11333,7 @@ dvi-ld: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  dvi) \
          || exit 1
 
 @endif ld
@@ -11363,7 +11359,7 @@ TAGS-ld: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  TAGS) \
          || exit 1
 
 @endif ld
@@ -11390,7 +11386,7 @@ install-info-ld: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  install-info) \
          || exit 1
 
 @endif ld
@@ -11416,7 +11412,7 @@ installcheck-ld: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
          || exit 1
 
 @endif ld
@@ -11441,7 +11437,7 @@ mostlyclean-ld:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  mostlyclean) \
          || exit 1
 
 @endif ld
@@ -11466,7 +11462,7 @@ clean-ld:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  clean) \
          || exit 1
 
 @endif ld
@@ -11491,7 +11487,7 @@ distclean-ld:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  distclean) \
          || exit 1
 
 @endif ld
@@ -11516,7 +11512,7 @@ maintainer-clean-ld:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  maintainer-clean) \
          || exit 1
 
 @endif ld
@@ -11546,7 +11542,7 @@ configure-libcpp:
            libsrcdir="$$s/libcpp";; \
        esac; \
        $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
          || exit 1
 @endif libcpp
 
@@ -11559,7 +11555,7 @@ all-libcpp: configure-libcpp
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd libcpp && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd libcpp && $(MAKE) $(FLAGS_TO_PASS)  all)
 @endif libcpp
 
 .PHONY: check-libcpp maybe-check-libcpp
@@ -11572,7 +11568,7 @@ check-libcpp:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd libcpp && $(MAKE) $(FLAGS_TO_PASS) check)
+       (cd libcpp && $(MAKE) $(FLAGS_TO_PASS)  check)
 
 @endif libcpp
 
@@ -11586,7 +11582,7 @@ install-libcpp: installdirs
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd libcpp && $(MAKE) $(FLAGS_TO_PASS) install)
+       (cd libcpp && $(MAKE) $(FLAGS_TO_PASS)  install)
 
 @endif libcpp
 
@@ -11613,7 +11609,7 @@ info-libcpp: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
          || exit 1
 
 @endif libcpp
@@ -11639,7 +11635,7 @@ dvi-libcpp: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  dvi) \
          || exit 1
 
 @endif libcpp
@@ -11665,7 +11661,7 @@ TAGS-libcpp: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  TAGS) \
          || exit 1
 
 @endif libcpp
@@ -11692,7 +11688,7 @@ install-info-libcpp: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  install-info) \
          || exit 1
 
 @endif libcpp
@@ -11718,7 +11714,7 @@ installcheck-libcpp: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
          || exit 1
 
 @endif libcpp
@@ -11743,7 +11739,7 @@ mostlyclean-libcpp:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  mostlyclean) \
          || exit 1
 
 @endif libcpp
@@ -11768,7 +11764,7 @@ clean-libcpp:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  clean) \
          || exit 1
 
 @endif libcpp
@@ -11793,7 +11789,7 @@ distclean-libcpp:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  distclean) \
          || exit 1
 
 @endif libcpp
@@ -11818,7 +11814,7 @@ maintainer-clean-libcpp:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  maintainer-clean) \
          || exit 1
 
 @endif libcpp
@@ -11848,7 +11844,7 @@ configure-libgui:
            libsrcdir="$$s/libgui";; \
        esac; \
        $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
          || exit 1
 @endif libgui
 
@@ -11861,7 +11857,7 @@ all-libgui: configure-libgui
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd libgui && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd libgui && $(MAKE) $(FLAGS_TO_PASS)  all)
 @endif libgui
 
 .PHONY: check-libgui maybe-check-libgui
@@ -11874,7 +11870,7 @@ check-libgui:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd libgui && $(MAKE) $(FLAGS_TO_PASS) check)
+       (cd libgui && $(MAKE) $(FLAGS_TO_PASS)  check)
 
 @endif libgui
 
@@ -11888,7 +11884,7 @@ install-libgui: installdirs
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd libgui && $(MAKE) $(FLAGS_TO_PASS) install)
+       (cd libgui && $(MAKE) $(FLAGS_TO_PASS)  install)
 
 @endif libgui
 
@@ -11915,7 +11911,7 @@ info-libgui: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
          || exit 1
 
 @endif libgui
@@ -11941,7 +11937,7 @@ dvi-libgui: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  dvi) \
          || exit 1
 
 @endif libgui
@@ -11967,7 +11963,7 @@ TAGS-libgui: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  TAGS) \
          || exit 1
 
 @endif libgui
@@ -11994,7 +11990,7 @@ install-info-libgui: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  install-info) \
          || exit 1
 
 @endif libgui
@@ -12020,7 +12016,7 @@ installcheck-libgui: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
          || exit 1
 
 @endif libgui
@@ -12045,7 +12041,7 @@ mostlyclean-libgui:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  mostlyclean) \
          || exit 1
 
 @endif libgui
@@ -12070,7 +12066,7 @@ clean-libgui:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  clean) \
          || exit 1
 
 @endif libgui
@@ -12095,7 +12091,7 @@ distclean-libgui:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  distclean) \
          || exit 1
 
 @endif libgui
@@ -12120,7 +12116,7 @@ maintainer-clean-libgui:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  maintainer-clean) \
          || exit 1
 
 @endif libgui
@@ -12150,7 +12146,7 @@ configure-libbanshee:
            libsrcdir="$$s/libbanshee";; \
        esac; \
        $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
          || exit 1
 @endif libbanshee
 
@@ -12163,7 +12159,7 @@ all-libbanshee: configure-libbanshee
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd libbanshee && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd libbanshee && $(MAKE) $(FLAGS_TO_PASS)  all)
 @endif libbanshee
 
 .PHONY: check-libbanshee maybe-check-libbanshee
@@ -12176,7 +12172,7 @@ check-libbanshee:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd libbanshee && $(MAKE) $(FLAGS_TO_PASS) check)
+       (cd libbanshee && $(MAKE) $(FLAGS_TO_PASS)  check)
 
 @endif libbanshee
 
@@ -12212,7 +12208,7 @@ info-libbanshee: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
          || exit 1
 
 @endif libbanshee
@@ -12238,7 +12234,7 @@ dvi-libbanshee: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  dvi) \
          || exit 1
 
 @endif libbanshee
@@ -12264,7 +12260,7 @@ TAGS-libbanshee: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  TAGS) \
          || exit 1
 
 @endif libbanshee
@@ -12291,7 +12287,7 @@ install-info-libbanshee: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  install-info) \
          || exit 1
 
 @endif libbanshee
@@ -12317,7 +12313,7 @@ installcheck-libbanshee: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
          || exit 1
 
 @endif libbanshee
@@ -12342,7 +12338,7 @@ mostlyclean-libbanshee:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  mostlyclean) \
          || exit 1
 
 @endif libbanshee
@@ -12367,7 +12363,7 @@ clean-libbanshee:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  clean) \
          || exit 1
 
 @endif libbanshee
@@ -12392,7 +12388,7 @@ distclean-libbanshee:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  distclean) \
          || exit 1
 
 @endif libbanshee
@@ -12417,7 +12413,7 @@ maintainer-clean-libbanshee:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  maintainer-clean) \
          || exit 1
 
 @endif libbanshee
@@ -12447,7 +12443,7 @@ configure-libiberty:
            libsrcdir="$$s/libiberty";; \
        esac; \
        $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
          || exit 1
 @endif libiberty
 
@@ -12460,7 +12456,7 @@ all-libiberty: configure-libiberty
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd libiberty && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd libiberty && $(MAKE) $(FLAGS_TO_PASS)  all)
 @endif libiberty
 
 .PHONY: check-libiberty maybe-check-libiberty
@@ -12473,7 +12469,7 @@ check-libiberty:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd libiberty && $(MAKE) $(FLAGS_TO_PASS) check)
+       (cd libiberty && $(MAKE) $(FLAGS_TO_PASS)  check)
 
 @endif libiberty
 
@@ -12487,7 +12483,7 @@ install-libiberty: installdirs
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd libiberty && $(MAKE) $(FLAGS_TO_PASS) install)
+       (cd libiberty && $(MAKE) $(FLAGS_TO_PASS)  install)
 
 @endif libiberty
 
@@ -12514,7 +12510,7 @@ info-libiberty: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
          || exit 1
 
 @endif libiberty
@@ -12540,7 +12536,7 @@ dvi-libiberty: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  dvi) \
          || exit 1
 
 @endif libiberty
@@ -12566,7 +12562,7 @@ TAGS-libiberty: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  TAGS) \
          || exit 1
 
 @endif libiberty
@@ -12593,7 +12589,7 @@ install-info-libiberty: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  install-info) \
          || exit 1
 
 @endif libiberty
@@ -12619,7 +12615,7 @@ installcheck-libiberty: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
          || exit 1
 
 @endif libiberty
@@ -12644,7 +12640,7 @@ mostlyclean-libiberty:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  mostlyclean) \
          || exit 1
 
 @endif libiberty
@@ -12669,7 +12665,7 @@ clean-libiberty:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  clean) \
          || exit 1
 
 @endif libiberty
@@ -12694,7 +12690,7 @@ distclean-libiberty:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  distclean) \
          || exit 1
 
 @endif libiberty
@@ -12719,7 +12715,7 @@ maintainer-clean-libiberty:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  maintainer-clean) \
          || exit 1
 
 @endif libiberty
@@ -12749,7 +12745,7 @@ configure-libtool:
            libsrcdir="$$s/libtool";; \
        esac; \
        $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
          || exit 1
 @endif libtool
 
@@ -12762,7 +12758,7 @@ all-libtool: configure-libtool
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd libtool && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd libtool && $(MAKE) $(FLAGS_TO_PASS)  all)
 @endif libtool
 
 .PHONY: check-libtool maybe-check-libtool
@@ -12775,7 +12771,7 @@ check-libtool:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd libtool && $(MAKE) $(FLAGS_TO_PASS) check)
+       (cd libtool && $(MAKE) $(FLAGS_TO_PASS)  check)
 
 @endif libtool
 
@@ -12789,7 +12785,7 @@ install-libtool: installdirs
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd libtool && $(MAKE) $(FLAGS_TO_PASS) install)
+       (cd libtool && $(MAKE) $(FLAGS_TO_PASS)  install)
 
 @endif libtool
 
@@ -12816,7 +12812,7 @@ info-libtool: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
          || exit 1
 
 @endif libtool
@@ -12842,7 +12838,7 @@ dvi-libtool: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  dvi) \
          || exit 1
 
 @endif libtool
@@ -12868,7 +12864,7 @@ TAGS-libtool: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  TAGS) \
          || exit 1
 
 @endif libtool
@@ -12895,7 +12891,7 @@ install-info-libtool: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  install-info) \
          || exit 1
 
 @endif libtool
@@ -12921,7 +12917,7 @@ installcheck-libtool: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
          || exit 1
 
 @endif libtool
@@ -12946,7 +12942,7 @@ mostlyclean-libtool:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  mostlyclean) \
          || exit 1
 
 @endif libtool
@@ -12971,7 +12967,7 @@ clean-libtool:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  clean) \
          || exit 1
 
 @endif libtool
@@ -12996,7 +12992,7 @@ distclean-libtool:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  distclean) \
          || exit 1
 
 @endif libtool
@@ -13021,7 +13017,7 @@ maintainer-clean-libtool:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  maintainer-clean) \
          || exit 1
 
 @endif libtool
@@ -13051,7 +13047,7 @@ configure-m4:
            libsrcdir="$$s/m4";; \
        esac; \
        $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
          || exit 1
 @endif m4
 
@@ -13064,7 +13060,7 @@ all-m4: configure-m4
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd m4 && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd m4 && $(MAKE) $(FLAGS_TO_PASS)  all)
 @endif m4
 
 .PHONY: check-m4 maybe-check-m4
@@ -13077,7 +13073,7 @@ check-m4:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd m4 && $(MAKE) $(FLAGS_TO_PASS) check)
+       (cd m4 && $(MAKE) $(FLAGS_TO_PASS)  check)
 
 @endif m4
 
@@ -13091,7 +13087,7 @@ install-m4: installdirs
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd m4 && $(MAKE) $(FLAGS_TO_PASS) install)
+       (cd m4 && $(MAKE) $(FLAGS_TO_PASS)  install)
 
 @endif m4
 
@@ -13118,7 +13114,7 @@ info-m4: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
          || exit 1
 
 @endif m4
@@ -13144,7 +13140,7 @@ dvi-m4: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  dvi) \
          || exit 1
 
 @endif m4
@@ -13170,7 +13166,7 @@ TAGS-m4: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  TAGS) \
          || exit 1
 
 @endif m4
@@ -13197,7 +13193,7 @@ install-info-m4: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  install-info) \
          || exit 1
 
 @endif m4
@@ -13223,7 +13219,7 @@ installcheck-m4: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
          || exit 1
 
 @endif m4
@@ -13248,7 +13244,7 @@ mostlyclean-m4:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  mostlyclean) \
          || exit 1
 
 @endif m4
@@ -13273,7 +13269,7 @@ clean-m4:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  clean) \
          || exit 1
 
 @endif m4
@@ -13298,7 +13294,7 @@ distclean-m4:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  distclean) \
          || exit 1
 
 @endif m4
@@ -13323,7 +13319,7 @@ maintainer-clean-m4:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  maintainer-clean) \
          || exit 1
 
 @endif m4
@@ -13353,7 +13349,7 @@ configure-make:
            libsrcdir="$$s/make";; \
        esac; \
        $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
          || exit 1
 @endif make
 
@@ -13366,7 +13362,7 @@ all-make: configure-make
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd make && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd make && $(MAKE) $(FLAGS_TO_PASS)  all)
 @endif make
 
 .PHONY: check-make maybe-check-make
@@ -13379,7 +13375,7 @@ check-make:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd make && $(MAKE) $(FLAGS_TO_PASS) check)
+       (cd make && $(MAKE) $(FLAGS_TO_PASS)  check)
 
 @endif make
 
@@ -13393,7 +13389,7 @@ install-make: installdirs
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd make && $(MAKE) $(FLAGS_TO_PASS) install)
+       (cd make && $(MAKE) $(FLAGS_TO_PASS)  install)
 
 @endif make
 
@@ -13420,7 +13416,7 @@ info-make: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
          || exit 1
 
 @endif make
@@ -13446,7 +13442,7 @@ dvi-make: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  dvi) \
          || exit 1
 
 @endif make
@@ -13472,7 +13468,7 @@ TAGS-make: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  TAGS) \
          || exit 1
 
 @endif make
@@ -13499,7 +13495,7 @@ install-info-make: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  install-info) \
          || exit 1
 
 @endif make
@@ -13525,7 +13521,7 @@ installcheck-make: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
          || exit 1
 
 @endif make
@@ -13550,7 +13546,7 @@ mostlyclean-make:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  mostlyclean) \
          || exit 1
 
 @endif make
@@ -13575,7 +13571,7 @@ clean-make:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  clean) \
          || exit 1
 
 @endif make
@@ -13600,7 +13596,7 @@ distclean-make:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  distclean) \
          || exit 1
 
 @endif make
@@ -13625,7 +13621,7 @@ maintainer-clean-make:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  maintainer-clean) \
          || exit 1
 
 @endif make
@@ -13655,7 +13651,7 @@ configure-mmalloc:
            libsrcdir="$$s/mmalloc";; \
        esac; \
        $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
          || exit 1
 @endif mmalloc
 
@@ -13668,7 +13664,7 @@ all-mmalloc: configure-mmalloc
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd mmalloc && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd mmalloc && $(MAKE) $(FLAGS_TO_PASS)  all)
 @endif mmalloc
 
 .PHONY: check-mmalloc maybe-check-mmalloc
@@ -13690,7 +13686,7 @@ install-mmalloc: installdirs
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd mmalloc && $(MAKE) $(FLAGS_TO_PASS) install)
+       (cd mmalloc && $(MAKE) $(FLAGS_TO_PASS)  install)
 
 @endif mmalloc
 
@@ -13717,7 +13713,7 @@ info-mmalloc: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
          || exit 1
 
 @endif mmalloc
@@ -13743,7 +13739,7 @@ dvi-mmalloc: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  dvi) \
          || exit 1
 
 @endif mmalloc
@@ -13769,7 +13765,7 @@ TAGS-mmalloc: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  TAGS) \
          || exit 1
 
 @endif mmalloc
@@ -13796,7 +13792,7 @@ install-info-mmalloc: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  install-info) \
          || exit 1
 
 @endif mmalloc
@@ -13822,7 +13818,7 @@ installcheck-mmalloc: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
          || exit 1
 
 @endif mmalloc
@@ -13847,7 +13843,7 @@ mostlyclean-mmalloc:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  mostlyclean) \
          || exit 1
 
 @endif mmalloc
@@ -13872,7 +13868,7 @@ clean-mmalloc:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  clean) \
          || exit 1
 
 @endif mmalloc
@@ -13897,7 +13893,7 @@ distclean-mmalloc:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  distclean) \
          || exit 1
 
 @endif mmalloc
@@ -13922,7 +13918,7 @@ maintainer-clean-mmalloc:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  maintainer-clean) \
          || exit 1
 
 @endif mmalloc
@@ -13952,7 +13948,7 @@ configure-patch:
            libsrcdir="$$s/patch";; \
        esac; \
        $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
          || exit 1
 @endif patch
 
@@ -13965,7 +13961,7 @@ all-patch: configure-patch
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd patch && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd patch && $(MAKE) $(FLAGS_TO_PASS)  all)
 @endif patch
 
 .PHONY: check-patch maybe-check-patch
@@ -13978,7 +13974,7 @@ check-patch:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd patch && $(MAKE) $(FLAGS_TO_PASS) check)
+       (cd patch && $(MAKE) $(FLAGS_TO_PASS)  check)
 
 @endif patch
 
@@ -13992,7 +13988,7 @@ install-patch: installdirs
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd patch && $(MAKE) $(FLAGS_TO_PASS) install)
+       (cd patch && $(MAKE) $(FLAGS_TO_PASS)  install)
 
 @endif patch
 
@@ -14019,7 +14015,7 @@ info-patch: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
          || exit 1
 
 @endif patch
@@ -14045,7 +14041,7 @@ dvi-patch: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  dvi) \
          || exit 1
 
 @endif patch
@@ -14071,7 +14067,7 @@ TAGS-patch: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  TAGS) \
          || exit 1
 
 @endif patch
@@ -14098,7 +14094,7 @@ install-info-patch: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  install-info) \
          || exit 1
 
 @endif patch
@@ -14124,7 +14120,7 @@ installcheck-patch: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
          || exit 1
 
 @endif patch
@@ -14149,7 +14145,7 @@ mostlyclean-patch:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  mostlyclean) \
          || exit 1
 
 @endif patch
@@ -14174,7 +14170,7 @@ clean-patch:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  clean) \
          || exit 1
 
 @endif patch
@@ -14199,7 +14195,7 @@ distclean-patch:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  distclean) \
          || exit 1
 
 @endif patch
@@ -14224,7 +14220,7 @@ maintainer-clean-patch:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  maintainer-clean) \
          || exit 1
 
 @endif patch
@@ -14254,7 +14250,7 @@ configure-perl:
            libsrcdir="$$s/perl";; \
        esac; \
        $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
          || exit 1
 @endif perl
 
@@ -14267,7 +14263,7 @@ all-perl: configure-perl
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd perl && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd perl && $(MAKE) $(FLAGS_TO_PASS)  all)
 @endif perl
 
 .PHONY: check-perl maybe-check-perl
@@ -14280,7 +14276,7 @@ check-perl:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd perl && $(MAKE) $(FLAGS_TO_PASS) check)
+       (cd perl && $(MAKE) $(FLAGS_TO_PASS)  check)
 
 @endif perl
 
@@ -14294,7 +14290,7 @@ install-perl: installdirs
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd perl && $(MAKE) $(FLAGS_TO_PASS) install)
+       (cd perl && $(MAKE) $(FLAGS_TO_PASS)  install)
 
 @endif perl
 
@@ -14321,7 +14317,7 @@ info-perl: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
          || exit 1
 
 @endif perl
@@ -14347,7 +14343,7 @@ dvi-perl: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  dvi) \
          || exit 1
 
 @endif perl
@@ -14373,7 +14369,7 @@ TAGS-perl: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  TAGS) \
          || exit 1
 
 @endif perl
@@ -14400,7 +14396,7 @@ install-info-perl: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  install-info) \
          || exit 1
 
 @endif perl
@@ -14426,7 +14422,7 @@ installcheck-perl: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
          || exit 1
 
 @endif perl
@@ -14451,7 +14447,7 @@ mostlyclean-perl:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  mostlyclean) \
          || exit 1
 
 @endif perl
@@ -14476,7 +14472,7 @@ clean-perl:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  clean) \
          || exit 1
 
 @endif perl
@@ -14501,7 +14497,7 @@ distclean-perl:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  distclean) \
          || exit 1
 
 @endif perl
@@ -14526,7 +14522,7 @@ maintainer-clean-perl:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  maintainer-clean) \
          || exit 1
 
 @endif perl
@@ -14556,7 +14552,7 @@ configure-prms:
            libsrcdir="$$s/prms";; \
        esac; \
        $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
          || exit 1
 @endif prms
 
@@ -14569,7 +14565,7 @@ all-prms: configure-prms
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd prms && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd prms && $(MAKE) $(FLAGS_TO_PASS)  all)
 @endif prms
 
 .PHONY: check-prms maybe-check-prms
@@ -14582,7 +14578,7 @@ check-prms:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd prms && $(MAKE) $(FLAGS_TO_PASS) check)
+       (cd prms && $(MAKE) $(FLAGS_TO_PASS)  check)
 
 @endif prms
 
@@ -14596,7 +14592,7 @@ install-prms: installdirs
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd prms && $(MAKE) $(FLAGS_TO_PASS) install)
+       (cd prms && $(MAKE) $(FLAGS_TO_PASS)  install)
 
 @endif prms
 
@@ -14623,7 +14619,7 @@ info-prms: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
          || exit 1
 
 @endif prms
@@ -14649,7 +14645,7 @@ dvi-prms: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  dvi) \
          || exit 1
 
 @endif prms
@@ -14675,7 +14671,7 @@ TAGS-prms: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  TAGS) \
          || exit 1
 
 @endif prms
@@ -14702,7 +14698,7 @@ install-info-prms: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  install-info) \
          || exit 1
 
 @endif prms
@@ -14728,7 +14724,7 @@ installcheck-prms: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
          || exit 1
 
 @endif prms
@@ -14753,7 +14749,7 @@ mostlyclean-prms:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  mostlyclean) \
          || exit 1
 
 @endif prms
@@ -14778,7 +14774,7 @@ clean-prms:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  clean) \
          || exit 1
 
 @endif prms
@@ -14803,7 +14799,7 @@ distclean-prms:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  distclean) \
          || exit 1
 
 @endif prms
@@ -14828,7 +14824,7 @@ maintainer-clean-prms:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  maintainer-clean) \
          || exit 1
 
 @endif prms
@@ -14858,7 +14854,7 @@ configure-rcs:
            libsrcdir="$$s/rcs";; \
        esac; \
        $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
          || exit 1
 @endif rcs
 
@@ -14871,7 +14867,7 @@ all-rcs: configure-rcs
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd rcs && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd rcs && $(MAKE) $(FLAGS_TO_PASS)  all)
 @endif rcs
 
 .PHONY: check-rcs maybe-check-rcs
@@ -14884,7 +14880,7 @@ check-rcs:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd rcs && $(MAKE) $(FLAGS_TO_PASS) check)
+       (cd rcs && $(MAKE) $(FLAGS_TO_PASS)  check)
 
 @endif rcs
 
@@ -14898,7 +14894,7 @@ install-rcs: installdirs
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd rcs && $(MAKE) $(FLAGS_TO_PASS) install)
+       (cd rcs && $(MAKE) $(FLAGS_TO_PASS)  install)
 
 @endif rcs
 
@@ -14925,7 +14921,7 @@ info-rcs: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
          || exit 1
 
 @endif rcs
@@ -14951,7 +14947,7 @@ dvi-rcs: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  dvi) \
          || exit 1
 
 @endif rcs
@@ -14977,7 +14973,7 @@ TAGS-rcs: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  TAGS) \
          || exit 1
 
 @endif rcs
@@ -15004,7 +15000,7 @@ install-info-rcs: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  install-info) \
          || exit 1
 
 @endif rcs
@@ -15030,7 +15026,7 @@ installcheck-rcs: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
          || exit 1
 
 @endif rcs
@@ -15055,7 +15051,7 @@ mostlyclean-rcs:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  mostlyclean) \
          || exit 1
 
 @endif rcs
@@ -15080,7 +15076,7 @@ clean-rcs:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  clean) \
          || exit 1
 
 @endif rcs
@@ -15105,7 +15101,7 @@ distclean-rcs:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  distclean) \
          || exit 1
 
 @endif rcs
@@ -15130,7 +15126,7 @@ maintainer-clean-rcs:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  maintainer-clean) \
          || exit 1
 
 @endif rcs
@@ -15160,7 +15156,7 @@ configure-readline:
            libsrcdir="$$s/readline";; \
        esac; \
        $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
          || exit 1
 @endif readline
 
@@ -15173,7 +15169,7 @@ all-readline: configure-readline
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd readline && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd readline && $(MAKE) $(FLAGS_TO_PASS)  all)
 @endif readline
 
 .PHONY: check-readline maybe-check-readline
@@ -15186,7 +15182,7 @@ check-readline:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd readline && $(MAKE) $(FLAGS_TO_PASS) check)
+       (cd readline && $(MAKE) $(FLAGS_TO_PASS)  check)
 
 @endif readline
 
@@ -15200,7 +15196,7 @@ install-readline: installdirs
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd readline && $(MAKE) $(FLAGS_TO_PASS) install)
+       (cd readline && $(MAKE) $(FLAGS_TO_PASS)  install)
 
 @endif readline
 
@@ -15227,7 +15223,7 @@ info-readline: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
          || exit 1
 
 @endif readline
@@ -15253,7 +15249,7 @@ dvi-readline: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  dvi) \
          || exit 1
 
 @endif readline
@@ -15279,7 +15275,7 @@ TAGS-readline: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  TAGS) \
          || exit 1
 
 @endif readline
@@ -15306,7 +15302,7 @@ install-info-readline: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  install-info) \
          || exit 1
 
 @endif readline
@@ -15332,7 +15328,7 @@ installcheck-readline: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
          || exit 1
 
 @endif readline
@@ -15357,7 +15353,7 @@ mostlyclean-readline:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  mostlyclean) \
          || exit 1
 
 @endif readline
@@ -15382,7 +15378,7 @@ clean-readline:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  clean) \
          || exit 1
 
 @endif readline
@@ -15407,7 +15403,7 @@ distclean-readline:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  distclean) \
          || exit 1
 
 @endif readline
@@ -15432,7 +15428,7 @@ maintainer-clean-readline:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  maintainer-clean) \
          || exit 1
 
 @endif readline
@@ -15462,7 +15458,7 @@ configure-release:
            libsrcdir="$$s/release";; \
        esac; \
        $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
          || exit 1
 @endif release
 
@@ -15475,7 +15471,7 @@ all-release: configure-release
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd release && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd release && $(MAKE) $(FLAGS_TO_PASS)  all)
 @endif release
 
 .PHONY: check-release maybe-check-release
@@ -15519,7 +15515,7 @@ info-release: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
          || exit 1
 
 @endif release
@@ -15545,7 +15541,7 @@ dvi-release: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  dvi) \
          || exit 1
 
 @endif release
@@ -15571,7 +15567,7 @@ TAGS-release: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  TAGS) \
          || exit 1
 
 @endif release
@@ -15598,7 +15594,7 @@ install-info-release: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  install-info) \
          || exit 1
 
 @endif release
@@ -15624,7 +15620,7 @@ installcheck-release: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
          || exit 1
 
 @endif release
@@ -15649,7 +15645,7 @@ mostlyclean-release:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  mostlyclean) \
          || exit 1
 
 @endif release
@@ -15674,7 +15670,7 @@ clean-release:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  clean) \
          || exit 1
 
 @endif release
@@ -15699,7 +15695,7 @@ distclean-release:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  distclean) \
          || exit 1
 
 @endif release
@@ -15724,7 +15720,7 @@ maintainer-clean-release:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  maintainer-clean) \
          || exit 1
 
 @endif release
@@ -15754,7 +15750,7 @@ configure-recode:
            libsrcdir="$$s/recode";; \
        esac; \
        $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
          || exit 1
 @endif recode
 
@@ -15767,7 +15763,7 @@ all-recode: configure-recode
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd recode && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd recode && $(MAKE) $(FLAGS_TO_PASS)  all)
 @endif recode
 
 .PHONY: check-recode maybe-check-recode
@@ -15780,7 +15776,7 @@ check-recode:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd recode && $(MAKE) $(FLAGS_TO_PASS) check)
+       (cd recode && $(MAKE) $(FLAGS_TO_PASS)  check)
 
 @endif recode
 
@@ -15794,7 +15790,7 @@ install-recode: installdirs
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd recode && $(MAKE) $(FLAGS_TO_PASS) install)
+       (cd recode && $(MAKE) $(FLAGS_TO_PASS)  install)
 
 @endif recode
 
@@ -15821,7 +15817,7 @@ info-recode: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
          || exit 1
 
 @endif recode
@@ -15847,7 +15843,7 @@ dvi-recode: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  dvi) \
          || exit 1
 
 @endif recode
@@ -15873,7 +15869,7 @@ TAGS-recode: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  TAGS) \
          || exit 1
 
 @endif recode
@@ -15900,7 +15896,7 @@ install-info-recode: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  install-info) \
          || exit 1
 
 @endif recode
@@ -15926,7 +15922,7 @@ installcheck-recode: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
          || exit 1
 
 @endif recode
@@ -15951,7 +15947,7 @@ mostlyclean-recode:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  mostlyclean) \
          || exit 1
 
 @endif recode
@@ -15976,7 +15972,7 @@ clean-recode:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  clean) \
          || exit 1
 
 @endif recode
@@ -16001,7 +15997,7 @@ distclean-recode:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  distclean) \
          || exit 1
 
 @endif recode
@@ -16026,7 +16022,7 @@ maintainer-clean-recode:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  maintainer-clean) \
          || exit 1
 
 @endif recode
@@ -16056,7 +16052,7 @@ configure-sed:
            libsrcdir="$$s/sed";; \
        esac; \
        $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
          || exit 1
 @endif sed
 
@@ -16069,7 +16065,7 @@ all-sed: configure-sed
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd sed && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd sed && $(MAKE) $(FLAGS_TO_PASS)  all)
 @endif sed
 
 .PHONY: check-sed maybe-check-sed
@@ -16082,7 +16078,7 @@ check-sed:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd sed && $(MAKE) $(FLAGS_TO_PASS) check)
+       (cd sed && $(MAKE) $(FLAGS_TO_PASS)  check)
 
 @endif sed
 
@@ -16096,7 +16092,7 @@ install-sed: installdirs
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd sed && $(MAKE) $(FLAGS_TO_PASS) install)
+       (cd sed && $(MAKE) $(FLAGS_TO_PASS)  install)
 
 @endif sed
 
@@ -16123,7 +16119,7 @@ info-sed: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
          || exit 1
 
 @endif sed
@@ -16149,7 +16145,7 @@ dvi-sed: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  dvi) \
          || exit 1
 
 @endif sed
@@ -16175,7 +16171,7 @@ TAGS-sed: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  TAGS) \
          || exit 1
 
 @endif sed
@@ -16202,7 +16198,7 @@ install-info-sed: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  install-info) \
          || exit 1
 
 @endif sed
@@ -16228,7 +16224,7 @@ installcheck-sed: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
          || exit 1
 
 @endif sed
@@ -16253,7 +16249,7 @@ mostlyclean-sed:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  mostlyclean) \
          || exit 1
 
 @endif sed
@@ -16278,7 +16274,7 @@ clean-sed:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  clean) \
          || exit 1
 
 @endif sed
@@ -16303,7 +16299,7 @@ distclean-sed:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  distclean) \
          || exit 1
 
 @endif sed
@@ -16328,7 +16324,7 @@ maintainer-clean-sed:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  maintainer-clean) \
          || exit 1
 
 @endif sed
@@ -16358,7 +16354,7 @@ configure-send-pr:
            libsrcdir="$$s/send-pr";; \
        esac; \
        $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
          || exit 1
 @endif send-pr
 
@@ -16371,7 +16367,7 @@ all-send-pr: configure-send-pr
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd send-pr && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd send-pr && $(MAKE) $(FLAGS_TO_PASS)  all)
 @endif send-pr
 
 .PHONY: check-send-pr maybe-check-send-pr
@@ -16384,7 +16380,7 @@ check-send-pr:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd send-pr && $(MAKE) $(FLAGS_TO_PASS) check)
+       (cd send-pr && $(MAKE) $(FLAGS_TO_PASS)  check)
 
 @endif send-pr
 
@@ -16398,7 +16394,7 @@ install-send-pr: installdirs
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd send-pr && $(MAKE) $(FLAGS_TO_PASS) install)
+       (cd send-pr && $(MAKE) $(FLAGS_TO_PASS)  install)
 
 @endif send-pr
 
@@ -16425,7 +16421,7 @@ info-send-pr: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
          || exit 1
 
 @endif send-pr
@@ -16451,7 +16447,7 @@ dvi-send-pr: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  dvi) \
          || exit 1
 
 @endif send-pr
@@ -16477,7 +16473,7 @@ TAGS-send-pr: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  TAGS) \
          || exit 1
 
 @endif send-pr
@@ -16504,7 +16500,7 @@ install-info-send-pr: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  install-info) \
          || exit 1
 
 @endif send-pr
@@ -16530,7 +16526,7 @@ installcheck-send-pr: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
          || exit 1
 
 @endif send-pr
@@ -16555,7 +16551,7 @@ mostlyclean-send-pr:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  mostlyclean) \
          || exit 1
 
 @endif send-pr
@@ -16580,7 +16576,7 @@ clean-send-pr:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  clean) \
          || exit 1
 
 @endif send-pr
@@ -16605,7 +16601,7 @@ distclean-send-pr:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  distclean) \
          || exit 1
 
 @endif send-pr
@@ -16630,7 +16626,7 @@ maintainer-clean-send-pr:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  maintainer-clean) \
          || exit 1
 
 @endif send-pr
@@ -16660,7 +16656,7 @@ configure-shellutils:
            libsrcdir="$$s/shellutils";; \
        esac; \
        $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
          || exit 1
 @endif shellutils
 
@@ -16673,7 +16669,7 @@ all-shellutils: configure-shellutils
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd shellutils && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd shellutils && $(MAKE) $(FLAGS_TO_PASS)  all)
 @endif shellutils
 
 .PHONY: check-shellutils maybe-check-shellutils
@@ -16686,7 +16682,7 @@ check-shellutils:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd shellutils && $(MAKE) $(FLAGS_TO_PASS) check)
+       (cd shellutils && $(MAKE) $(FLAGS_TO_PASS)  check)
 
 @endif shellutils
 
@@ -16700,7 +16696,7 @@ install-shellutils: installdirs
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd shellutils && $(MAKE) $(FLAGS_TO_PASS) install)
+       (cd shellutils && $(MAKE) $(FLAGS_TO_PASS)  install)
 
 @endif shellutils
 
@@ -16727,7 +16723,7 @@ info-shellutils: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
          || exit 1
 
 @endif shellutils
@@ -16753,7 +16749,7 @@ dvi-shellutils: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  dvi) \
          || exit 1
 
 @endif shellutils
@@ -16779,7 +16775,7 @@ TAGS-shellutils: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  TAGS) \
          || exit 1
 
 @endif shellutils
@@ -16806,7 +16802,7 @@ install-info-shellutils: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  install-info) \
          || exit 1
 
 @endif shellutils
@@ -16832,7 +16828,7 @@ installcheck-shellutils: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
          || exit 1
 
 @endif shellutils
@@ -16857,7 +16853,7 @@ mostlyclean-shellutils:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  mostlyclean) \
          || exit 1
 
 @endif shellutils
@@ -16882,7 +16878,7 @@ clean-shellutils:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  clean) \
          || exit 1
 
 @endif shellutils
@@ -16907,7 +16903,7 @@ distclean-shellutils:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  distclean) \
          || exit 1
 
 @endif shellutils
@@ -16932,7 +16928,7 @@ maintainer-clean-shellutils:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  maintainer-clean) \
          || exit 1
 
 @endif shellutils
@@ -16962,7 +16958,7 @@ configure-sid:
            libsrcdir="$$s/sid";; \
        esac; \
        $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
          || exit 1
 @endif sid
 
@@ -16975,7 +16971,7 @@ all-sid: configure-sid
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd sid && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd sid && $(MAKE) $(FLAGS_TO_PASS)  all)
 @endif sid
 
 .PHONY: check-sid maybe-check-sid
@@ -16988,7 +16984,7 @@ check-sid:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd sid && $(MAKE) $(FLAGS_TO_PASS) check)
+       (cd sid && $(MAKE) $(FLAGS_TO_PASS)  check)
 
 @endif sid
 
@@ -17002,7 +16998,7 @@ install-sid: installdirs
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd sid && $(MAKE) $(FLAGS_TO_PASS) install)
+       (cd sid && $(MAKE) $(FLAGS_TO_PASS)  install)
 
 @endif sid
 
@@ -17029,7 +17025,7 @@ info-sid: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
          || exit 1
 
 @endif sid
@@ -17055,7 +17051,7 @@ dvi-sid: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  dvi) \
          || exit 1
 
 @endif sid
@@ -17081,7 +17077,7 @@ TAGS-sid: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  TAGS) \
          || exit 1
 
 @endif sid
@@ -17108,7 +17104,7 @@ install-info-sid: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  install-info) \
          || exit 1
 
 @endif sid
@@ -17134,7 +17130,7 @@ installcheck-sid: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
          || exit 1
 
 @endif sid
@@ -17159,7 +17155,7 @@ mostlyclean-sid:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  mostlyclean) \
          || exit 1
 
 @endif sid
@@ -17184,7 +17180,7 @@ clean-sid:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  clean) \
          || exit 1
 
 @endif sid
@@ -17209,7 +17205,7 @@ distclean-sid:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  distclean) \
          || exit 1
 
 @endif sid
@@ -17234,7 +17230,7 @@ maintainer-clean-sid:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  maintainer-clean) \
          || exit 1
 
 @endif sid
@@ -17264,7 +17260,7 @@ configure-sim:
            libsrcdir="$$s/sim";; \
        esac; \
        $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
          || exit 1
 @endif sim
 
@@ -17277,7 +17273,7 @@ all-sim: configure-sim
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd sim && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd sim && $(MAKE) $(FLAGS_TO_PASS)  all)
 @endif sim
 
 .PHONY: check-sim maybe-check-sim
@@ -17290,7 +17286,7 @@ check-sim:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd sim && $(MAKE) $(FLAGS_TO_PASS) check)
+       (cd sim && $(MAKE) $(FLAGS_TO_PASS)  check)
 
 @endif sim
 
@@ -17304,7 +17300,7 @@ install-sim: installdirs
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd sim && $(MAKE) $(FLAGS_TO_PASS) install)
+       (cd sim && $(MAKE) $(FLAGS_TO_PASS)  install)
 
 @endif sim
 
@@ -17331,7 +17327,7 @@ info-sim: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
          || exit 1
 
 @endif sim
@@ -17357,7 +17353,7 @@ dvi-sim: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  dvi) \
          || exit 1
 
 @endif sim
@@ -17383,7 +17379,7 @@ TAGS-sim: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  TAGS) \
          || exit 1
 
 @endif sim
@@ -17410,7 +17406,7 @@ install-info-sim: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  install-info) \
          || exit 1
 
 @endif sim
@@ -17436,7 +17432,7 @@ installcheck-sim: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
          || exit 1
 
 @endif sim
@@ -17461,7 +17457,7 @@ mostlyclean-sim:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  mostlyclean) \
          || exit 1
 
 @endif sim
@@ -17486,7 +17482,7 @@ clean-sim:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  clean) \
          || exit 1
 
 @endif sim
@@ -17511,7 +17507,7 @@ distclean-sim:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  distclean) \
          || exit 1
 
 @endif sim
@@ -17536,7 +17532,7 @@ maintainer-clean-sim:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  maintainer-clean) \
          || exit 1
 
 @endif sim
@@ -17566,7 +17562,7 @@ configure-tar:
            libsrcdir="$$s/tar";; \
        esac; \
        $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
          || exit 1
 @endif tar
 
@@ -17579,7 +17575,7 @@ all-tar: configure-tar
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd tar && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd tar && $(MAKE) $(FLAGS_TO_PASS)  all)
 @endif tar
 
 .PHONY: check-tar maybe-check-tar
@@ -17592,7 +17588,7 @@ check-tar:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd tar && $(MAKE) $(FLAGS_TO_PASS) check)
+       (cd tar && $(MAKE) $(FLAGS_TO_PASS)  check)
 
 @endif tar
 
@@ -17606,7 +17602,7 @@ install-tar: installdirs
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd tar && $(MAKE) $(FLAGS_TO_PASS) install)
+       (cd tar && $(MAKE) $(FLAGS_TO_PASS)  install)
 
 @endif tar
 
@@ -17633,7 +17629,7 @@ info-tar: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
          || exit 1
 
 @endif tar
@@ -17659,7 +17655,7 @@ dvi-tar: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  dvi) \
          || exit 1
 
 @endif tar
@@ -17685,7 +17681,7 @@ TAGS-tar: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  TAGS) \
          || exit 1
 
 @endif tar
@@ -17712,7 +17708,7 @@ install-info-tar: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  install-info) \
          || exit 1
 
 @endif tar
@@ -17738,7 +17734,7 @@ installcheck-tar: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
          || exit 1
 
 @endif tar
@@ -17763,7 +17759,7 @@ mostlyclean-tar:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  mostlyclean) \
          || exit 1
 
 @endif tar
@@ -17788,7 +17784,7 @@ clean-tar:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  clean) \
          || exit 1
 
 @endif tar
@@ -17813,7 +17809,7 @@ distclean-tar:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  distclean) \
          || exit 1
 
 @endif tar
@@ -17838,7 +17834,7 @@ maintainer-clean-tar:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  maintainer-clean) \
          || exit 1
 
 @endif tar
@@ -17868,7 +17864,7 @@ configure-texinfo:
            libsrcdir="$$s/texinfo";; \
        esac; \
        $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
          || exit 1
 @endif texinfo
 
@@ -17881,7 +17877,7 @@ all-texinfo: configure-texinfo
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd texinfo && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd texinfo && $(MAKE) $(FLAGS_TO_PASS)  all)
 @endif texinfo
 
 .PHONY: check-texinfo maybe-check-texinfo
@@ -17894,7 +17890,7 @@ check-texinfo:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd texinfo && $(MAKE) $(FLAGS_TO_PASS) check)
+       (cd texinfo && $(MAKE) $(FLAGS_TO_PASS)  check)
 
 @endif texinfo
 
@@ -17930,7 +17926,7 @@ info-texinfo: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
          || exit 1
 
 @endif texinfo
@@ -17956,7 +17952,7 @@ dvi-texinfo: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  dvi) \
          || exit 1
 
 @endif texinfo
@@ -17982,7 +17978,7 @@ TAGS-texinfo: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  TAGS) \
          || exit 1
 
 @endif texinfo
@@ -18009,7 +18005,7 @@ install-info-texinfo: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  install-info) \
          || exit 1
 
 @endif texinfo
@@ -18035,7 +18031,7 @@ installcheck-texinfo: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
          || exit 1
 
 @endif texinfo
@@ -18060,7 +18056,7 @@ mostlyclean-texinfo:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  mostlyclean) \
          || exit 1
 
 @endif texinfo
@@ -18085,7 +18081,7 @@ clean-texinfo:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  clean) \
          || exit 1
 
 @endif texinfo
@@ -18110,7 +18106,7 @@ distclean-texinfo:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  distclean) \
          || exit 1
 
 @endif texinfo
@@ -18135,7 +18131,7 @@ maintainer-clean-texinfo:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  maintainer-clean) \
          || exit 1
 
 @endif texinfo
@@ -18165,7 +18161,7 @@ configure-textutils:
            libsrcdir="$$s/textutils";; \
        esac; \
        $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
          || exit 1
 @endif textutils
 
@@ -18178,7 +18174,7 @@ all-textutils: configure-textutils
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd textutils && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd textutils && $(MAKE) $(FLAGS_TO_PASS)  all)
 @endif textutils
 
 .PHONY: check-textutils maybe-check-textutils
@@ -18191,7 +18187,7 @@ check-textutils:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd textutils && $(MAKE) $(FLAGS_TO_PASS) check)
+       (cd textutils && $(MAKE) $(FLAGS_TO_PASS)  check)
 
 @endif textutils
 
@@ -18205,7 +18201,7 @@ install-textutils: installdirs
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd textutils && $(MAKE) $(FLAGS_TO_PASS) install)
+       (cd textutils && $(MAKE) $(FLAGS_TO_PASS)  install)
 
 @endif textutils
 
@@ -18232,7 +18228,7 @@ info-textutils: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
          || exit 1
 
 @endif textutils
@@ -18258,7 +18254,7 @@ dvi-textutils: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  dvi) \
          || exit 1
 
 @endif textutils
@@ -18284,7 +18280,7 @@ TAGS-textutils: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  TAGS) \
          || exit 1
 
 @endif textutils
@@ -18311,7 +18307,7 @@ install-info-textutils: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  install-info) \
          || exit 1
 
 @endif textutils
@@ -18337,7 +18333,7 @@ installcheck-textutils: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
          || exit 1
 
 @endif textutils
@@ -18362,7 +18358,7 @@ mostlyclean-textutils:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  mostlyclean) \
          || exit 1
 
 @endif textutils
@@ -18387,7 +18383,7 @@ clean-textutils:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  clean) \
          || exit 1
 
 @endif textutils
@@ -18412,7 +18408,7 @@ distclean-textutils:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  distclean) \
          || exit 1
 
 @endif textutils
@@ -18437,7 +18433,7 @@ maintainer-clean-textutils:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  maintainer-clean) \
          || exit 1
 
 @endif textutils
@@ -18467,7 +18463,7 @@ configure-time:
            libsrcdir="$$s/time";; \
        esac; \
        $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
          || exit 1
 @endif time
 
@@ -18480,7 +18476,7 @@ all-time: configure-time
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd time && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd time && $(MAKE) $(FLAGS_TO_PASS)  all)
 @endif time
 
 .PHONY: check-time maybe-check-time
@@ -18493,7 +18489,7 @@ check-time:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd time && $(MAKE) $(FLAGS_TO_PASS) check)
+       (cd time && $(MAKE) $(FLAGS_TO_PASS)  check)
 
 @endif time
 
@@ -18507,7 +18503,7 @@ install-time: installdirs
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd time && $(MAKE) $(FLAGS_TO_PASS) install)
+       (cd time && $(MAKE) $(FLAGS_TO_PASS)  install)
 
 @endif time
 
@@ -18534,7 +18530,7 @@ info-time: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
          || exit 1
 
 @endif time
@@ -18560,7 +18556,7 @@ dvi-time: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  dvi) \
          || exit 1
 
 @endif time
@@ -18586,7 +18582,7 @@ TAGS-time: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  TAGS) \
          || exit 1
 
 @endif time
@@ -18613,7 +18609,7 @@ install-info-time: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  install-info) \
          || exit 1
 
 @endif time
@@ -18639,7 +18635,7 @@ installcheck-time: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
          || exit 1
 
 @endif time
@@ -18664,7 +18660,7 @@ mostlyclean-time:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  mostlyclean) \
          || exit 1
 
 @endif time
@@ -18689,7 +18685,7 @@ clean-time:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  clean) \
          || exit 1
 
 @endif time
@@ -18714,7 +18710,7 @@ distclean-time:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  distclean) \
          || exit 1
 
 @endif time
@@ -18739,7 +18735,7 @@ maintainer-clean-time:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  maintainer-clean) \
          || exit 1
 
 @endif time
@@ -18769,7 +18765,7 @@ configure-uudecode:
            libsrcdir="$$s/uudecode";; \
        esac; \
        $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
          || exit 1
 @endif uudecode
 
@@ -18782,7 +18778,7 @@ all-uudecode: configure-uudecode
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd uudecode && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd uudecode && $(MAKE) $(FLAGS_TO_PASS)  all)
 @endif uudecode
 
 .PHONY: check-uudecode maybe-check-uudecode
@@ -18795,7 +18791,7 @@ check-uudecode:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd uudecode && $(MAKE) $(FLAGS_TO_PASS) check)
+       (cd uudecode && $(MAKE) $(FLAGS_TO_PASS)  check)
 
 @endif uudecode
 
@@ -18809,7 +18805,7 @@ install-uudecode: installdirs
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd uudecode && $(MAKE) $(FLAGS_TO_PASS) install)
+       (cd uudecode && $(MAKE) $(FLAGS_TO_PASS)  install)
 
 @endif uudecode
 
@@ -18836,7 +18832,7 @@ info-uudecode: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
          || exit 1
 
 @endif uudecode
@@ -18862,7 +18858,7 @@ dvi-uudecode: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  dvi) \
          || exit 1
 
 @endif uudecode
@@ -18888,7 +18884,7 @@ TAGS-uudecode: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  TAGS) \
          || exit 1
 
 @endif uudecode
@@ -18915,7 +18911,7 @@ install-info-uudecode: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  install-info) \
          || exit 1
 
 @endif uudecode
@@ -18941,7 +18937,7 @@ installcheck-uudecode: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
          || exit 1
 
 @endif uudecode
@@ -18966,7 +18962,7 @@ mostlyclean-uudecode:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  mostlyclean) \
          || exit 1
 
 @endif uudecode
@@ -18991,7 +18987,7 @@ clean-uudecode:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  clean) \
          || exit 1
 
 @endif uudecode
@@ -19016,7 +19012,7 @@ distclean-uudecode:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  distclean) \
          || exit 1
 
 @endif uudecode
@@ -19041,7 +19037,7 @@ maintainer-clean-uudecode:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  maintainer-clean) \
          || exit 1
 
 @endif uudecode
@@ -19071,7 +19067,7 @@ configure-wdiff:
            libsrcdir="$$s/wdiff";; \
        esac; \
        $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
          || exit 1
 @endif wdiff
 
@@ -19084,7 +19080,7 @@ all-wdiff: configure-wdiff
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd wdiff && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd wdiff && $(MAKE) $(FLAGS_TO_PASS)  all)
 @endif wdiff
 
 .PHONY: check-wdiff maybe-check-wdiff
@@ -19097,7 +19093,7 @@ check-wdiff:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd wdiff && $(MAKE) $(FLAGS_TO_PASS) check)
+       (cd wdiff && $(MAKE) $(FLAGS_TO_PASS)  check)
 
 @endif wdiff
 
@@ -19111,7 +19107,7 @@ install-wdiff: installdirs
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd wdiff && $(MAKE) $(FLAGS_TO_PASS) install)
+       (cd wdiff && $(MAKE) $(FLAGS_TO_PASS)  install)
 
 @endif wdiff
 
@@ -19138,7 +19134,7 @@ info-wdiff: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
          || exit 1
 
 @endif wdiff
@@ -19164,7 +19160,7 @@ dvi-wdiff: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  dvi) \
          || exit 1
 
 @endif wdiff
@@ -19190,7 +19186,7 @@ TAGS-wdiff: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  TAGS) \
          || exit 1
 
 @endif wdiff
@@ -19217,7 +19213,7 @@ install-info-wdiff: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  install-info) \
          || exit 1
 
 @endif wdiff
@@ -19243,7 +19239,7 @@ installcheck-wdiff: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
          || exit 1
 
 @endif wdiff
@@ -19268,7 +19264,7 @@ mostlyclean-wdiff:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  mostlyclean) \
          || exit 1
 
 @endif wdiff
@@ -19293,7 +19289,7 @@ clean-wdiff:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  clean) \
          || exit 1
 
 @endif wdiff
@@ -19318,7 +19314,7 @@ distclean-wdiff:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  distclean) \
          || exit 1
 
 @endif wdiff
@@ -19343,7 +19339,7 @@ maintainer-clean-wdiff:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  maintainer-clean) \
          || exit 1
 
 @endif wdiff
@@ -19373,7 +19369,7 @@ configure-zip:
            libsrcdir="$$s/zip";; \
        esac; \
        $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
          || exit 1
 @endif zip
 
@@ -19386,7 +19382,7 @@ all-zip: configure-zip
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd zip && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd zip && $(MAKE) $(FLAGS_TO_PASS)  all)
 @endif zip
 
 .PHONY: check-zip maybe-check-zip
@@ -19401,7 +19397,7 @@ check-zip:
          s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
          $(SET_LIB_PATH) \
          $(HOST_EXPORTS) \
-         (cd zip && $(MAKE) $(FLAGS_TO_PASS) check); \
+         (cd zip && $(MAKE) $(FLAGS_TO_PASS)  check); \
        fi
 
 @endif zip
@@ -19416,7 +19412,7 @@ install-zip: installdirs
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd zip && $(MAKE) $(FLAGS_TO_PASS) install)
+       (cd zip && $(MAKE) $(FLAGS_TO_PASS)  install)
 
 @endif zip
 
@@ -19443,7 +19439,7 @@ info-zip: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
          || exit 1
 
 @endif zip
@@ -19469,7 +19465,7 @@ dvi-zip: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  dvi) \
          || exit 1
 
 @endif zip
@@ -19495,7 +19491,7 @@ TAGS-zip: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  TAGS) \
          || exit 1
 
 @endif zip
@@ -19522,7 +19518,7 @@ install-info-zip: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  install-info) \
          || exit 1
 
 @endif zip
@@ -19548,7 +19544,7 @@ installcheck-zip: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
          || exit 1
 
 @endif zip
@@ -19573,7 +19569,7 @@ mostlyclean-zip:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  mostlyclean) \
          || exit 1
 
 @endif zip
@@ -19598,7 +19594,7 @@ clean-zip:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  clean) \
          || exit 1
 
 @endif zip
@@ -19623,7 +19619,7 @@ distclean-zip:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  distclean) \
          || exit 1
 
 @endif zip
@@ -19648,7 +19644,7 @@ maintainer-clean-zip:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  maintainer-clean) \
          || exit 1
 
 @endif zip
@@ -19678,7 +19674,7 @@ configure-zlib:
            libsrcdir="$$s/zlib";; \
        esac; \
        $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
          || exit 1
 @endif zlib
 
@@ -19691,7 +19687,7 @@ all-zlib: configure-zlib
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd zlib && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd zlib && $(MAKE) $(FLAGS_TO_PASS)  all)
 @endif zlib
 
 .PHONY: check-zlib maybe-check-zlib
@@ -19735,7 +19731,7 @@ info-zlib: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
          || exit 1
 
 @endif zlib
@@ -19761,7 +19757,7 @@ dvi-zlib: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  dvi) \
          || exit 1
 
 @endif zlib
@@ -19787,7 +19783,7 @@ TAGS-zlib: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  TAGS) \
          || exit 1
 
 @endif zlib
@@ -19814,7 +19810,7 @@ install-info-zlib: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  install-info) \
          || exit 1
 
 @endif zlib
@@ -19840,7 +19836,7 @@ installcheck-zlib: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
          || exit 1
 
 @endif zlib
@@ -19865,7 +19861,7 @@ mostlyclean-zlib:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  mostlyclean) \
          || exit 1
 
 @endif zlib
@@ -19890,7 +19886,7 @@ clean-zlib:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  clean) \
          || exit 1
 
 @endif zlib
@@ -19915,7 +19911,7 @@ distclean-zlib:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  distclean) \
          || exit 1
 
 @endif zlib
@@ -19940,7 +19936,7 @@ maintainer-clean-zlib:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  maintainer-clean) \
          || exit 1
 
 @endif zlib
@@ -19970,7 +19966,7 @@ configure-gdb:
            libsrcdir="$$s/gdb";; \
        esac; \
        $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
          || exit 1
 @endif gdb
 
@@ -19983,7 +19979,7 @@ all-gdb: configure-gdb
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd gdb && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) all)
+       (cd gdb && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS)  all)
 @endif gdb
 
 .PHONY: check-gdb maybe-check-gdb
@@ -19996,7 +19992,7 @@ check-gdb:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd gdb && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) check)
+       (cd gdb && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS)  check)
 
 @endif gdb
 
@@ -20010,7 +20006,7 @@ install-gdb: installdirs
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd gdb && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) install)
+       (cd gdb && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS)  install)
 
 @endif gdb
 
@@ -20037,7 +20033,7 @@ info-gdb: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
          || exit 1
 
 @endif gdb
@@ -20063,7 +20059,7 @@ dvi-gdb: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  dvi) \
          || exit 1
 
 @endif gdb
@@ -20089,7 +20085,7 @@ TAGS-gdb: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  TAGS) \
          || exit 1
 
 @endif gdb
@@ -20116,7 +20112,7 @@ install-info-gdb: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  install-info) \
          || exit 1
 
 @endif gdb
@@ -20142,7 +20138,7 @@ installcheck-gdb: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
          || exit 1
 
 @endif gdb
@@ -20167,7 +20163,7 @@ mostlyclean-gdb:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  mostlyclean) \
          || exit 1
 
 @endif gdb
@@ -20192,7 +20188,7 @@ clean-gdb:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  clean) \
          || exit 1
 
 @endif gdb
@@ -20217,7 +20213,7 @@ distclean-gdb:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  distclean) \
          || exit 1
 
 @endif gdb
@@ -20242,7 +20238,7 @@ maintainer-clean-gdb:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  maintainer-clean) \
          || exit 1
 
 @endif gdb
@@ -20272,7 +20268,7 @@ configure-expect:
            libsrcdir="$$s/expect";; \
        esac; \
        $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
          || exit 1
 @endif expect
 
@@ -20285,7 +20281,7 @@ all-expect: configure-expect
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd expect && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) all)
+       (cd expect && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS)  all)
 @endif expect
 
 .PHONY: check-expect maybe-check-expect
@@ -20298,7 +20294,7 @@ check-expect:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd expect && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) check)
+       (cd expect && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS)  check)
 
 @endif expect
 
@@ -20312,7 +20308,7 @@ install-expect: installdirs
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd expect && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) install)
+       (cd expect && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS)  install)
 
 @endif expect
 
@@ -20339,7 +20335,7 @@ info-expect: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
          || exit 1
 
 @endif expect
@@ -20365,7 +20361,7 @@ dvi-expect: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  dvi) \
          || exit 1
 
 @endif expect
@@ -20391,7 +20387,7 @@ TAGS-expect: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  TAGS) \
          || exit 1
 
 @endif expect
@@ -20418,7 +20414,7 @@ install-info-expect: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  install-info) \
          || exit 1
 
 @endif expect
@@ -20444,7 +20440,7 @@ installcheck-expect: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
          || exit 1
 
 @endif expect
@@ -20469,7 +20465,7 @@ mostlyclean-expect:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  mostlyclean) \
          || exit 1
 
 @endif expect
@@ -20494,7 +20490,7 @@ clean-expect:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  clean) \
          || exit 1
 
 @endif expect
@@ -20519,7 +20515,7 @@ distclean-expect:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  distclean) \
          || exit 1
 
 @endif expect
@@ -20544,7 +20540,7 @@ maintainer-clean-expect:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  maintainer-clean) \
          || exit 1
 
 @endif expect
@@ -20574,7 +20570,7 @@ configure-guile:
            libsrcdir="$$s/guile";; \
        esac; \
        $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
          || exit 1
 @endif guile
 
@@ -20587,7 +20583,7 @@ all-guile: configure-guile
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd guile && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) all)
+       (cd guile && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS)  all)
 @endif guile
 
 .PHONY: check-guile maybe-check-guile
@@ -20600,7 +20596,7 @@ check-guile:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd guile && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) check)
+       (cd guile && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS)  check)
 
 @endif guile
 
@@ -20614,7 +20610,7 @@ install-guile: installdirs
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd guile && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) install)
+       (cd guile && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS)  install)
 
 @endif guile
 
@@ -20641,7 +20637,7 @@ info-guile: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
          || exit 1
 
 @endif guile
@@ -20667,7 +20663,7 @@ dvi-guile: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  dvi) \
          || exit 1
 
 @endif guile
@@ -20693,7 +20689,7 @@ TAGS-guile: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  TAGS) \
          || exit 1
 
 @endif guile
@@ -20720,7 +20716,7 @@ install-info-guile: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  install-info) \
          || exit 1
 
 @endif guile
@@ -20746,7 +20742,7 @@ installcheck-guile: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
          || exit 1
 
 @endif guile
@@ -20771,7 +20767,7 @@ mostlyclean-guile:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  mostlyclean) \
          || exit 1
 
 @endif guile
@@ -20796,7 +20792,7 @@ clean-guile:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  clean) \
          || exit 1
 
 @endif guile
@@ -20821,7 +20817,7 @@ distclean-guile:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  distclean) \
          || exit 1
 
 @endif guile
@@ -20846,7 +20842,7 @@ maintainer-clean-guile:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  maintainer-clean) \
          || exit 1
 
 @endif guile
@@ -20876,7 +20872,7 @@ configure-tk:
            libsrcdir="$$s/tk";; \
        esac; \
        $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
          || exit 1
 @endif tk
 
@@ -20889,7 +20885,7 @@ all-tk: configure-tk
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd tk && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) all)
+       (cd tk && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS)  all)
 @endif tk
 
 .PHONY: check-tk maybe-check-tk
@@ -20902,7 +20898,7 @@ check-tk:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd tk && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) check)
+       (cd tk && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS)  check)
 
 @endif tk
 
@@ -20916,7 +20912,7 @@ install-tk: installdirs
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd tk && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) install)
+       (cd tk && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS)  install)
 
 @endif tk
 
@@ -20943,7 +20939,7 @@ info-tk: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
          || exit 1
 
 @endif tk
@@ -20969,7 +20965,7 @@ dvi-tk: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  dvi) \
          || exit 1
 
 @endif tk
@@ -20995,7 +20991,7 @@ TAGS-tk: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  TAGS) \
          || exit 1
 
 @endif tk
@@ -21022,7 +21018,7 @@ install-info-tk: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  install-info) \
          || exit 1
 
 @endif tk
@@ -21048,7 +21044,7 @@ installcheck-tk: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
          || exit 1
 
 @endif tk
@@ -21073,7 +21069,7 @@ mostlyclean-tk:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  mostlyclean) \
          || exit 1
 
 @endif tk
@@ -21098,7 +21094,7 @@ clean-tk:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  clean) \
          || exit 1
 
 @endif tk
@@ -21123,7 +21119,7 @@ distclean-tk:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  distclean) \
          || exit 1
 
 @endif tk
@@ -21148,7 +21144,7 @@ maintainer-clean-tk:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  maintainer-clean) \
          || exit 1
 
 @endif tk
@@ -21178,7 +21174,7 @@ configure-tix:
            libsrcdir="$$s/tix";; \
        esac; \
        $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
          || exit 1
 @endif tix
 
@@ -21191,7 +21187,7 @@ all-tix: configure-tix
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd tix && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) all)
+       (cd tix && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS)  all)
 @endif tix
 
 .PHONY: check-tix maybe-check-tix
@@ -21204,7 +21200,7 @@ check-tix:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd tix && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) check)
+       (cd tix && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS)  check)
 
 @endif tix
 
@@ -21218,7 +21214,7 @@ install-tix: installdirs
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd tix && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) install)
+       (cd tix && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS)  install)
 
 @endif tix
 
@@ -21245,7 +21241,7 @@ info-tix: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
          || exit 1
 
 @endif tix
@@ -21271,7 +21267,7 @@ dvi-tix: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  dvi) \
          || exit 1
 
 @endif tix
@@ -21297,7 +21293,7 @@ TAGS-tix: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  TAGS) \
          || exit 1
 
 @endif tix
@@ -21324,7 +21320,7 @@ install-info-tix: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  install-info) \
          || exit 1
 
 @endif tix
@@ -21350,7 +21346,7 @@ installcheck-tix: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
          || exit 1
 
 @endif tix
@@ -21375,7 +21371,7 @@ mostlyclean-tix:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  mostlyclean) \
          || exit 1
 
 @endif tix
@@ -21400,7 +21396,7 @@ clean-tix:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  clean) \
          || exit 1
 
 @endif tix
@@ -21425,7 +21421,7 @@ distclean-tix:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  distclean) \
          || exit 1
 
 @endif tix
@@ -21450,7 +21446,7 @@ maintainer-clean-tix:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  maintainer-clean) \
          || exit 1
 
 @endif tix
@@ -21480,7 +21476,7 @@ configure-libtermcap:
            libsrcdir="$$s/libtermcap";; \
        esac; \
        $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
          || exit 1
 @endif libtermcap
 
@@ -21493,7 +21489,7 @@ all-libtermcap: configure-libtermcap
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd libtermcap && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd libtermcap && $(MAKE) $(FLAGS_TO_PASS)  all)
 @endif libtermcap
 
 .PHONY: check-libtermcap maybe-check-libtermcap
@@ -21515,7 +21511,7 @@ install-libtermcap: installdirs
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd libtermcap && $(MAKE) $(FLAGS_TO_PASS) install)
+       (cd libtermcap && $(MAKE) $(FLAGS_TO_PASS)  install)
 
 @endif libtermcap
 
@@ -21542,7 +21538,7 @@ info-libtermcap: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
          || exit 1
 
 @endif libtermcap
@@ -21568,7 +21564,7 @@ dvi-libtermcap: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  dvi) \
          || exit 1
 
 @endif libtermcap
@@ -21594,7 +21590,7 @@ TAGS-libtermcap: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  TAGS) \
          || exit 1
 
 @endif libtermcap
@@ -21621,7 +21617,7 @@ install-info-libtermcap: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  install-info) \
          || exit 1
 
 @endif libtermcap
@@ -21647,7 +21643,7 @@ installcheck-libtermcap: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
          || exit 1
 
 @endif libtermcap
@@ -21717,7 +21713,7 @@ configure-utils:
            libsrcdir="$$s/utils";; \
        esac; \
        $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
          || exit 1
 @endif utils
 
@@ -21730,7 +21726,7 @@ all-utils: configure-utils
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd utils && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd utils && $(MAKE) $(FLAGS_TO_PASS)  all)
 @endif utils
 
 .PHONY: check-utils maybe-check-utils
@@ -21752,7 +21748,7 @@ install-utils: installdirs
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd utils && $(MAKE) $(FLAGS_TO_PASS) install)
+       (cd utils && $(MAKE) $(FLAGS_TO_PASS)  install)
 
 @endif utils
 
@@ -21779,7 +21775,7 @@ info-utils: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
          || exit 1
 
 @endif utils
@@ -21805,7 +21801,7 @@ dvi-utils: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  dvi) \
          || exit 1
 
 @endif utils
@@ -21831,7 +21827,7 @@ TAGS-utils: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  TAGS) \
          || exit 1
 
 @endif utils
@@ -21858,7 +21854,7 @@ install-info-utils: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  install-info) \
          || exit 1
 
 @endif utils
@@ -21884,7 +21880,7 @@ installcheck-utils: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
          || exit 1
 
 @endif utils
@@ -21909,7 +21905,7 @@ mostlyclean-utils:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  mostlyclean) \
          || exit 1
 
 @endif utils
@@ -21934,7 +21930,7 @@ clean-utils:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  clean) \
          || exit 1
 
 @endif utils
@@ -21959,7 +21955,7 @@ distclean-utils:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  distclean) \
          || exit 1
 
 @endif utils
@@ -21984,7 +21980,7 @@ maintainer-clean-utils:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  maintainer-clean) \
          || exit 1
 
 @endif utils
@@ -22029,7 +22025,7 @@ configure-target-libstdc++-v3: $(TARGET_SUBDIR)/libstdc++-v3/multilib.out
        rm -f no-such-file || : ; \
        CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
          $(TARGET_CONFIGARGS) $${srcdiroption} \
-         --with-target-subdir="$(TARGET_SUBDIR)" \
+         --with-target-subdir="$(TARGET_SUBDIR)"  \
          || exit 1
 @endif target-libstdc++-v3
 
@@ -22043,7 +22039,7 @@ all-target-libstdc++-v3: configure-target-libstdc++-v3
        $(SET_LIB_PATH) \
        $(RAW_CXX_TARGET_EXPORTS) \
        (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)  'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'  all)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   all)
 @endif target-libstdc++-v3
 
 .PHONY: check-target-libstdc++-v3 maybe-check-target-libstdc++-v3
@@ -22057,7 +22053,7 @@ check-target-libstdc++-v3:
        $(SET_LIB_PATH) \
        $(RAW_CXX_TARGET_EXPORTS) \
        (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)  'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'  check)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   check)
 
 @endif target-libstdc++-v3
 
@@ -22072,7 +22068,7 @@ install-target-libstdc++-v3: installdirs
        $(SET_LIB_PATH) \
        $(RAW_CXX_TARGET_EXPORTS) \
        (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS) install)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
 
 @endif target-libstdc++-v3
 
@@ -22099,7 +22095,7 @@ info-target-libstdc++-v3: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
          || exit 1
 
 @endif target-libstdc++-v3
@@ -22125,7 +22121,7 @@ dvi-target-libstdc++-v3: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  dvi) \
          || exit 1
 
 @endif target-libstdc++-v3
@@ -22151,7 +22147,7 @@ TAGS-target-libstdc++-v3: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  TAGS) \
          || exit 1
 
 @endif target-libstdc++-v3
@@ -22178,7 +22174,7 @@ install-info-target-libstdc++-v3: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  install-info) \
          || exit 1
 
 @endif target-libstdc++-v3
@@ -22204,7 +22200,7 @@ installcheck-target-libstdc++-v3: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
          || exit 1
 
 @endif target-libstdc++-v3
@@ -22229,7 +22225,7 @@ mostlyclean-target-libstdc++-v3:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  mostlyclean) \
          || exit 1
 
 @endif target-libstdc++-v3
@@ -22254,7 +22250,7 @@ clean-target-libstdc++-v3:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  clean) \
          || exit 1
 
 @endif target-libstdc++-v3
@@ -22279,7 +22275,7 @@ distclean-target-libstdc++-v3:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  distclean) \
          || exit 1
 
 @endif target-libstdc++-v3
@@ -22304,7 +22300,7 @@ maintainer-clean-target-libstdc++-v3:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  maintainer-clean) \
          || exit 1
 
 @endif target-libstdc++-v3
@@ -22344,7 +22340,7 @@ configure-target-libmudflap: $(TARGET_SUBDIR)/libmudflap/multilib.out
        rm -f no-such-file || : ; \
        CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
          $(TARGET_CONFIGARGS) $${srcdiroption} \
-         --with-target-subdir="$(TARGET_SUBDIR)" \
+         --with-target-subdir="$(TARGET_SUBDIR)"  \
          || exit 1
 @endif target-libmudflap
 
@@ -22358,7 +22354,7 @@ all-target-libmudflap: configure-target-libmudflap
        $(SET_LIB_PATH) \
        $(NORMAL_TARGET_EXPORTS) \
        (cd $(TARGET_SUBDIR)/libmudflap && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)  all)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)   all)
 @endif target-libmudflap
 
 .PHONY: check-target-libmudflap maybe-check-target-libmudflap
@@ -22372,7 +22368,7 @@ check-target-libmudflap:
        $(SET_LIB_PATH) \
        $(NORMAL_TARGET_EXPORTS) \
        (cd $(TARGET_SUBDIR)/libmudflap && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)  check)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
 
 @endif target-libmudflap
 
@@ -22387,7 +22383,7 @@ install-target-libmudflap: installdirs
        $(SET_LIB_PATH) \
        $(NORMAL_TARGET_EXPORTS) \
        (cd $(TARGET_SUBDIR)/libmudflap && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS) install)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
 
 @endif target-libmudflap
 
@@ -22414,7 +22410,7 @@ info-target-libmudflap: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
          || exit 1
 
 @endif target-libmudflap
@@ -22440,7 +22436,7 @@ dvi-target-libmudflap: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  dvi) \
          || exit 1
 
 @endif target-libmudflap
@@ -22466,7 +22462,7 @@ TAGS-target-libmudflap: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  TAGS) \
          || exit 1
 
 @endif target-libmudflap
@@ -22493,7 +22489,7 @@ install-info-target-libmudflap: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  install-info) \
          || exit 1
 
 @endif target-libmudflap
@@ -22519,7 +22515,7 @@ installcheck-target-libmudflap: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
          || exit 1
 
 @endif target-libmudflap
@@ -22544,7 +22540,7 @@ mostlyclean-target-libmudflap:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  mostlyclean) \
          || exit 1
 
 @endif target-libmudflap
@@ -22569,7 +22565,7 @@ clean-target-libmudflap:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  clean) \
          || exit 1
 
 @endif target-libmudflap
@@ -22594,7 +22590,7 @@ distclean-target-libmudflap:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  distclean) \
          || exit 1
 
 @endif target-libmudflap
@@ -22619,7 +22615,7 @@ maintainer-clean-target-libmudflap:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  maintainer-clean) \
          || exit 1
 
 @endif target-libmudflap
@@ -22659,7 +22655,7 @@ configure-target-newlib: $(TARGET_SUBDIR)/newlib/multilib.out
        rm -f no-such-file || : ; \
        CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
          $(TARGET_CONFIGARGS) $${srcdiroption} \
-         --with-target-subdir="$(TARGET_SUBDIR)" \
+         --with-target-subdir="$(TARGET_SUBDIR)"  \
          || exit 1
 @endif target-newlib
 
@@ -22673,7 +22669,7 @@ all-target-newlib: configure-target-newlib
        $(SET_LIB_PATH) \
        $(NORMAL_TARGET_EXPORTS) \
        (cd $(TARGET_SUBDIR)/newlib && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)  all)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)   all)
 @endif target-newlib
 
 .PHONY: check-target-newlib maybe-check-target-newlib
@@ -22687,7 +22683,7 @@ check-target-newlib:
        $(SET_LIB_PATH) \
        $(NORMAL_TARGET_EXPORTS) \
        (cd $(TARGET_SUBDIR)/newlib && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)  check)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
 
 @endif target-newlib
 
@@ -22702,7 +22698,7 @@ install-target-newlib: installdirs
        $(SET_LIB_PATH) \
        $(NORMAL_TARGET_EXPORTS) \
        (cd $(TARGET_SUBDIR)/newlib && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS) install)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
 
 @endif target-newlib
 
@@ -22729,7 +22725,7 @@ info-target-newlib: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
          || exit 1
 
 @endif target-newlib
@@ -22755,7 +22751,7 @@ dvi-target-newlib: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  dvi) \
          || exit 1
 
 @endif target-newlib
@@ -22781,7 +22777,7 @@ TAGS-target-newlib: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  TAGS) \
          || exit 1
 
 @endif target-newlib
@@ -22808,7 +22804,7 @@ install-info-target-newlib: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  install-info) \
          || exit 1
 
 @endif target-newlib
@@ -22834,7 +22830,7 @@ installcheck-target-newlib: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
          || exit 1
 
 @endif target-newlib
@@ -22859,7 +22855,7 @@ mostlyclean-target-newlib:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  mostlyclean) \
          || exit 1
 
 @endif target-newlib
@@ -22884,7 +22880,7 @@ clean-target-newlib:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  clean) \
          || exit 1
 
 @endif target-newlib
@@ -22909,7 +22905,7 @@ distclean-target-newlib:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  distclean) \
          || exit 1
 
 @endif target-newlib
@@ -22934,7 +22930,7 @@ maintainer-clean-target-newlib:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  maintainer-clean) \
          || exit 1
 
 @endif target-newlib
@@ -22974,7 +22970,7 @@ configure-target-libgfortran: $(TARGET_SUBDIR)/libgfortran/multilib.out
        rm -f no-such-file || : ; \
        CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
          $(TARGET_CONFIGARGS) $${srcdiroption} \
-         --with-target-subdir="$(TARGET_SUBDIR)" \
+         --with-target-subdir="$(TARGET_SUBDIR)"  \
          || exit 1
 @endif target-libgfortran
 
@@ -22988,7 +22984,7 @@ all-target-libgfortran: configure-target-libgfortran
        $(SET_LIB_PATH) \
        $(NORMAL_TARGET_EXPORTS) \
        (cd $(TARGET_SUBDIR)/libgfortran && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)  all)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)   all)
 @endif target-libgfortran
 
 .PHONY: check-target-libgfortran maybe-check-target-libgfortran
@@ -23002,7 +22998,7 @@ check-target-libgfortran:
        $(SET_LIB_PATH) \
        $(NORMAL_TARGET_EXPORTS) \
        (cd $(TARGET_SUBDIR)/libgfortran && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)  check)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
 
 @endif target-libgfortran
 
@@ -23017,7 +23013,7 @@ install-target-libgfortran: installdirs
        $(SET_LIB_PATH) \
        $(NORMAL_TARGET_EXPORTS) \
        (cd $(TARGET_SUBDIR)/libgfortran && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS) install)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
 
 @endif target-libgfortran
 
@@ -23044,7 +23040,7 @@ info-target-libgfortran: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
          || exit 1
 
 @endif target-libgfortran
@@ -23070,7 +23066,7 @@ dvi-target-libgfortran: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  dvi) \
          || exit 1
 
 @endif target-libgfortran
@@ -23096,7 +23092,7 @@ TAGS-target-libgfortran: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  TAGS) \
          || exit 1
 
 @endif target-libgfortran
@@ -23123,7 +23119,7 @@ install-info-target-libgfortran: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  install-info) \
          || exit 1
 
 @endif target-libgfortran
@@ -23149,7 +23145,7 @@ installcheck-target-libgfortran: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
          || exit 1
 
 @endif target-libgfortran
@@ -23174,7 +23170,7 @@ mostlyclean-target-libgfortran:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  mostlyclean) \
          || exit 1
 
 @endif target-libgfortran
@@ -23199,7 +23195,7 @@ clean-target-libgfortran:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  clean) \
          || exit 1
 
 @endif target-libgfortran
@@ -23224,7 +23220,7 @@ distclean-target-libgfortran:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  distclean) \
          || exit 1
 
 @endif target-libgfortran
@@ -23249,7 +23245,7 @@ maintainer-clean-target-libgfortran:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  maintainer-clean) \
          || exit 1
 
 @endif target-libgfortran
@@ -23289,7 +23285,7 @@ configure-target-libobjc: $(TARGET_SUBDIR)/libobjc/multilib.out
        rm -f no-such-file || : ; \
        CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
          $(TARGET_CONFIGARGS) $${srcdiroption} \
-         --with-target-subdir="$(TARGET_SUBDIR)" \
+         --with-target-subdir="$(TARGET_SUBDIR)"  \
          || exit 1
 @endif target-libobjc
 
@@ -23303,7 +23299,7 @@ all-target-libobjc: configure-target-libobjc
        $(SET_LIB_PATH) \
        $(NORMAL_TARGET_EXPORTS) \
        (cd $(TARGET_SUBDIR)/libobjc && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)  all)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)   all)
 @endif target-libobjc
 
 .PHONY: check-target-libobjc maybe-check-target-libobjc
@@ -23317,7 +23313,7 @@ check-target-libobjc:
        $(SET_LIB_PATH) \
        $(NORMAL_TARGET_EXPORTS) \
        (cd $(TARGET_SUBDIR)/libobjc && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)  check)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
 
 @endif target-libobjc
 
@@ -23332,7 +23328,7 @@ install-target-libobjc: installdirs
        $(SET_LIB_PATH) \
        $(NORMAL_TARGET_EXPORTS) \
        (cd $(TARGET_SUBDIR)/libobjc && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS) install)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
 
 @endif target-libobjc
 
@@ -23359,7 +23355,7 @@ info-target-libobjc: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
          || exit 1
 
 @endif target-libobjc
@@ -23385,7 +23381,7 @@ dvi-target-libobjc: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  dvi) \
          || exit 1
 
 @endif target-libobjc
@@ -23411,7 +23407,7 @@ TAGS-target-libobjc: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  TAGS) \
          || exit 1
 
 @endif target-libobjc
@@ -23438,7 +23434,7 @@ install-info-target-libobjc: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  install-info) \
          || exit 1
 
 @endif target-libobjc
@@ -23464,7 +23460,7 @@ installcheck-target-libobjc: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
          || exit 1
 
 @endif target-libobjc
@@ -23489,7 +23485,7 @@ mostlyclean-target-libobjc:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  mostlyclean) \
          || exit 1
 
 @endif target-libobjc
@@ -23514,7 +23510,7 @@ clean-target-libobjc:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  clean) \
          || exit 1
 
 @endif target-libobjc
@@ -23539,7 +23535,7 @@ distclean-target-libobjc:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  distclean) \
          || exit 1
 
 @endif target-libobjc
@@ -23564,7 +23560,7 @@ maintainer-clean-target-libobjc:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  maintainer-clean) \
          || exit 1
 
 @endif target-libobjc
@@ -23626,7 +23622,7 @@ configure-target-libtermcap: $(TARGET_SUBDIR)/libtermcap/multilib.out
        rm -f no-such-file || : ; \
        CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
          $(TARGET_CONFIGARGS) $${srcdiroption} \
-         --with-target-subdir="$(TARGET_SUBDIR)" \
+         --with-target-subdir="$(TARGET_SUBDIR)"  \
          || exit 1
 @endif target-libtermcap
 
@@ -23640,7 +23636,7 @@ all-target-libtermcap: configure-target-libtermcap
        $(SET_LIB_PATH) \
        $(NORMAL_TARGET_EXPORTS) \
        (cd $(TARGET_SUBDIR)/libtermcap && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)  all)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)   all)
 @endif target-libtermcap
 
 .PHONY: check-target-libtermcap maybe-check-target-libtermcap
@@ -23664,7 +23660,7 @@ install-target-libtermcap: installdirs
        $(SET_LIB_PATH) \
        $(NORMAL_TARGET_EXPORTS) \
        (cd $(TARGET_SUBDIR)/libtermcap && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS) install)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
 
 @endif target-libtermcap
 
@@ -23691,7 +23687,7 @@ info-target-libtermcap: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
          || exit 1
 
 @endif target-libtermcap
@@ -23717,7 +23713,7 @@ dvi-target-libtermcap: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  dvi) \
          || exit 1
 
 @endif target-libtermcap
@@ -23743,7 +23739,7 @@ TAGS-target-libtermcap: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  TAGS) \
          || exit 1
 
 @endif target-libtermcap
@@ -23770,7 +23766,7 @@ install-info-target-libtermcap: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  install-info) \
          || exit 1
 
 @endif target-libtermcap
@@ -23796,7 +23792,7 @@ installcheck-target-libtermcap: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
          || exit 1
 
 @endif target-libtermcap
@@ -23876,7 +23872,7 @@ configure-target-winsup: $(TARGET_SUBDIR)/winsup/multilib.out
        rm -f no-such-file || : ; \
        CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
          $(TARGET_CONFIGARGS) $${srcdiroption} \
-         --with-target-subdir="$(TARGET_SUBDIR)" \
+         --with-target-subdir="$(TARGET_SUBDIR)"  \
          || exit 1
 @endif target-winsup
 
@@ -23890,7 +23886,7 @@ all-target-winsup: configure-target-winsup
        $(SET_LIB_PATH) \
        $(NORMAL_TARGET_EXPORTS) \
        (cd $(TARGET_SUBDIR)/winsup && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)  all)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)   all)
 @endif target-winsup
 
 .PHONY: check-target-winsup maybe-check-target-winsup
@@ -23904,7 +23900,7 @@ check-target-winsup:
        $(SET_LIB_PATH) \
        $(NORMAL_TARGET_EXPORTS) \
        (cd $(TARGET_SUBDIR)/winsup && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)  check)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
 
 @endif target-winsup
 
@@ -23919,7 +23915,7 @@ install-target-winsup: installdirs
        $(SET_LIB_PATH) \
        $(NORMAL_TARGET_EXPORTS) \
        (cd $(TARGET_SUBDIR)/winsup && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS) install)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
 
 @endif target-winsup
 
@@ -23946,7 +23942,7 @@ info-target-winsup: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
          || exit 1
 
 @endif target-winsup
@@ -23972,7 +23968,7 @@ dvi-target-winsup: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  dvi) \
          || exit 1
 
 @endif target-winsup
@@ -23998,7 +23994,7 @@ TAGS-target-winsup: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  TAGS) \
          || exit 1
 
 @endif target-winsup
@@ -24025,7 +24021,7 @@ install-info-target-winsup: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  install-info) \
          || exit 1
 
 @endif target-winsup
@@ -24051,7 +24047,7 @@ installcheck-target-winsup: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
          || exit 1
 
 @endif target-winsup
@@ -24076,7 +24072,7 @@ mostlyclean-target-winsup:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  mostlyclean) \
          || exit 1
 
 @endif target-winsup
@@ -24101,7 +24097,7 @@ clean-target-winsup:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  clean) \
          || exit 1
 
 @endif target-winsup
@@ -24126,7 +24122,7 @@ distclean-target-winsup:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  distclean) \
          || exit 1
 
 @endif target-winsup
@@ -24151,7 +24147,7 @@ maintainer-clean-target-winsup:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  maintainer-clean) \
          || exit 1
 
 @endif target-winsup
@@ -24191,7 +24187,7 @@ configure-target-libgloss: $(TARGET_SUBDIR)/libgloss/multilib.out
        rm -f no-such-file || : ; \
        CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
          $(TARGET_CONFIGARGS) $${srcdiroption} \
-         --with-target-subdir="$(TARGET_SUBDIR)" \
+         --with-target-subdir="$(TARGET_SUBDIR)"  \
          || exit 1
 @endif target-libgloss
 
@@ -24205,7 +24201,7 @@ all-target-libgloss: configure-target-libgloss
        $(SET_LIB_PATH) \
        $(NORMAL_TARGET_EXPORTS) \
        (cd $(TARGET_SUBDIR)/libgloss && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)  all)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)   all)
 @endif target-libgloss
 
 .PHONY: check-target-libgloss maybe-check-target-libgloss
@@ -24229,7 +24225,7 @@ install-target-libgloss: installdirs
        $(SET_LIB_PATH) \
        $(NORMAL_TARGET_EXPORTS) \
        (cd $(TARGET_SUBDIR)/libgloss && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS) install)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
 
 @endif target-libgloss
 
@@ -24256,7 +24252,7 @@ info-target-libgloss: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
          || exit 1
 
 @endif target-libgloss
@@ -24282,7 +24278,7 @@ dvi-target-libgloss: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  dvi) \
          || exit 1
 
 @endif target-libgloss
@@ -24308,7 +24304,7 @@ TAGS-target-libgloss: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  TAGS) \
          || exit 1
 
 @endif target-libgloss
@@ -24335,7 +24331,7 @@ install-info-target-libgloss: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  install-info) \
          || exit 1
 
 @endif target-libgloss
@@ -24361,7 +24357,7 @@ installcheck-target-libgloss: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
          || exit 1
 
 @endif target-libgloss
@@ -24386,7 +24382,7 @@ mostlyclean-target-libgloss:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  mostlyclean) \
          || exit 1
 
 @endif target-libgloss
@@ -24411,7 +24407,7 @@ clean-target-libgloss:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  clean) \
          || exit 1
 
 @endif target-libgloss
@@ -24436,7 +24432,7 @@ distclean-target-libgloss:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  distclean) \
          || exit 1
 
 @endif target-libgloss
@@ -24461,7 +24457,7 @@ maintainer-clean-target-libgloss:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  maintainer-clean) \
          || exit 1
 
 @endif target-libgloss
@@ -24501,7 +24497,7 @@ configure-target-libiberty: $(TARGET_SUBDIR)/libiberty/multilib.out
        rm -f no-such-file || : ; \
        CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
          $(TARGET_CONFIGARGS) $${srcdiroption} \
-         --with-target-subdir="$(TARGET_SUBDIR)" \
+         --with-target-subdir="$(TARGET_SUBDIR)"  \
          || exit 1
 @endif target-libiberty
 
@@ -24515,7 +24511,7 @@ all-target-libiberty: configure-target-libiberty
        $(SET_LIB_PATH) \
        $(NORMAL_TARGET_EXPORTS) \
        (cd $(TARGET_SUBDIR)/libiberty && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)  all)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)   all)
 @endif target-libiberty
 
 .PHONY: check-target-libiberty maybe-check-target-libiberty
@@ -24529,7 +24525,7 @@ check-target-libiberty:
        $(SET_LIB_PATH) \
        $(NORMAL_TARGET_EXPORTS) \
        (cd $(TARGET_SUBDIR)/libiberty && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)  check)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
 
 @endif target-libiberty
 
@@ -24544,7 +24540,7 @@ install-target-libiberty: installdirs
        $(SET_LIB_PATH) \
        $(NORMAL_TARGET_EXPORTS) \
        (cd $(TARGET_SUBDIR)/libiberty && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS) install)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
 
 @endif target-libiberty
 
@@ -24571,7 +24567,7 @@ info-target-libiberty: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
          || exit 1
 
 @endif target-libiberty
@@ -24597,7 +24593,7 @@ dvi-target-libiberty: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  dvi) \
          || exit 1
 
 @endif target-libiberty
@@ -24623,7 +24619,7 @@ TAGS-target-libiberty: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  TAGS) \
          || exit 1
 
 @endif target-libiberty
@@ -24650,7 +24646,7 @@ install-info-target-libiberty: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  install-info) \
          || exit 1
 
 @endif target-libiberty
@@ -24676,7 +24672,7 @@ installcheck-target-libiberty: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
          || exit 1
 
 @endif target-libiberty
@@ -24701,7 +24697,7 @@ mostlyclean-target-libiberty:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  mostlyclean) \
          || exit 1
 
 @endif target-libiberty
@@ -24726,7 +24722,7 @@ clean-target-libiberty:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  clean) \
          || exit 1
 
 @endif target-libiberty
@@ -24751,7 +24747,7 @@ distclean-target-libiberty:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  distclean) \
          || exit 1
 
 @endif target-libiberty
@@ -24776,7 +24772,7 @@ maintainer-clean-target-libiberty:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  maintainer-clean) \
          || exit 1
 
 @endif target-libiberty
@@ -24816,7 +24812,7 @@ configure-target-gperf: $(TARGET_SUBDIR)/gperf/multilib.out
        rm -f no-such-file || : ; \
        CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
          $(TARGET_CONFIGARGS) $${srcdiroption} \
-         --with-target-subdir="$(TARGET_SUBDIR)" \
+         --with-target-subdir="$(TARGET_SUBDIR)"  \
          || exit 1
 @endif target-gperf
 
@@ -24830,7 +24826,7 @@ all-target-gperf: configure-target-gperf
        $(SET_LIB_PATH) \
        $(NORMAL_TARGET_EXPORTS) \
        (cd $(TARGET_SUBDIR)/gperf && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)  all)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)   all)
 @endif target-gperf
 
 .PHONY: check-target-gperf maybe-check-target-gperf
@@ -24844,7 +24840,7 @@ check-target-gperf:
        $(SET_LIB_PATH) \
        $(NORMAL_TARGET_EXPORTS) \
        (cd $(TARGET_SUBDIR)/gperf && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)  check)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
 
 @endif target-gperf
 
@@ -24859,7 +24855,7 @@ install-target-gperf: installdirs
        $(SET_LIB_PATH) \
        $(NORMAL_TARGET_EXPORTS) \
        (cd $(TARGET_SUBDIR)/gperf && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS) install)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
 
 @endif target-gperf
 
@@ -24886,7 +24882,7 @@ info-target-gperf: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
          || exit 1
 
 @endif target-gperf
@@ -24912,7 +24908,7 @@ dvi-target-gperf: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  dvi) \
          || exit 1
 
 @endif target-gperf
@@ -24938,7 +24934,7 @@ TAGS-target-gperf: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  TAGS) \
          || exit 1
 
 @endif target-gperf
@@ -24965,7 +24961,7 @@ install-info-target-gperf: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  install-info) \
          || exit 1
 
 @endif target-gperf
@@ -24991,7 +24987,7 @@ installcheck-target-gperf: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
          || exit 1
 
 @endif target-gperf
@@ -25016,7 +25012,7 @@ mostlyclean-target-gperf:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  mostlyclean) \
          || exit 1
 
 @endif target-gperf
@@ -25041,7 +25037,7 @@ clean-target-gperf:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  clean) \
          || exit 1
 
 @endif target-gperf
@@ -25066,7 +25062,7 @@ distclean-target-gperf:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  distclean) \
          || exit 1
 
 @endif target-gperf
@@ -25091,7 +25087,7 @@ maintainer-clean-target-gperf:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  maintainer-clean) \
          || exit 1
 
 @endif target-gperf
@@ -25131,7 +25127,7 @@ configure-target-examples: $(TARGET_SUBDIR)/examples/multilib.out
        rm -f no-such-file || : ; \
        CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
          $(TARGET_CONFIGARGS) $${srcdiroption} \
-         --with-target-subdir="$(TARGET_SUBDIR)" \
+         --with-target-subdir="$(TARGET_SUBDIR)"  \
          || exit 1
 @endif target-examples
 
@@ -25145,7 +25141,7 @@ all-target-examples: configure-target-examples
        $(SET_LIB_PATH) \
        $(NORMAL_TARGET_EXPORTS) \
        (cd $(TARGET_SUBDIR)/examples && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)  all)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)   all)
 @endif target-examples
 
 .PHONY: check-target-examples maybe-check-target-examples
@@ -25191,7 +25187,7 @@ info-target-examples: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
          || exit 1
 
 @endif target-examples
@@ -25217,7 +25213,7 @@ dvi-target-examples: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  dvi) \
          || exit 1
 
 @endif target-examples
@@ -25243,7 +25239,7 @@ TAGS-target-examples: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  TAGS) \
          || exit 1
 
 @endif target-examples
@@ -25270,7 +25266,7 @@ install-info-target-examples: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  install-info) \
          || exit 1
 
 @endif target-examples
@@ -25296,7 +25292,7 @@ installcheck-target-examples: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
          || exit 1
 
 @endif target-examples
@@ -25321,7 +25317,7 @@ mostlyclean-target-examples:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  mostlyclean) \
          || exit 1
 
 @endif target-examples
@@ -25346,7 +25342,7 @@ clean-target-examples:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  clean) \
          || exit 1
 
 @endif target-examples
@@ -25371,7 +25367,7 @@ distclean-target-examples:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  distclean) \
          || exit 1
 
 @endif target-examples
@@ -25396,7 +25392,7 @@ maintainer-clean-target-examples:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  maintainer-clean) \
          || exit 1
 
 @endif target-examples
@@ -25436,7 +25432,7 @@ configure-target-libffi: $(TARGET_SUBDIR)/libffi/multilib.out
        rm -f no-such-file || : ; \
        CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
          $(TARGET_CONFIGARGS) $${srcdiroption} \
-         --with-target-subdir="$(TARGET_SUBDIR)" \
+         --with-target-subdir="$(TARGET_SUBDIR)"  \
          || exit 1
 @endif target-libffi
 
@@ -25450,7 +25446,7 @@ all-target-libffi: configure-target-libffi
        $(SET_LIB_PATH) \
        $(NORMAL_TARGET_EXPORTS) \
        (cd $(TARGET_SUBDIR)/libffi && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)  all)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)   all)
 @endif target-libffi
 
 .PHONY: check-target-libffi maybe-check-target-libffi
@@ -25464,7 +25460,7 @@ check-target-libffi:
        $(SET_LIB_PATH) \
        $(NORMAL_TARGET_EXPORTS) \
        (cd $(TARGET_SUBDIR)/libffi && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)  check)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
 
 @endif target-libffi
 
@@ -25479,7 +25475,7 @@ install-target-libffi: installdirs
        $(SET_LIB_PATH) \
        $(NORMAL_TARGET_EXPORTS) \
        (cd $(TARGET_SUBDIR)/libffi && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS) install)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
 
 @endif target-libffi
 
@@ -25506,7 +25502,7 @@ info-target-libffi: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
          || exit 1
 
 @endif target-libffi
@@ -25532,7 +25528,7 @@ dvi-target-libffi: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  dvi) \
          || exit 1
 
 @endif target-libffi
@@ -25558,7 +25554,7 @@ TAGS-target-libffi: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  TAGS) \
          || exit 1
 
 @endif target-libffi
@@ -25585,7 +25581,7 @@ install-info-target-libffi: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  install-info) \
          || exit 1
 
 @endif target-libffi
@@ -25611,7 +25607,7 @@ installcheck-target-libffi: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
          || exit 1
 
 @endif target-libffi
@@ -25636,7 +25632,7 @@ mostlyclean-target-libffi:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  mostlyclean) \
          || exit 1
 
 @endif target-libffi
@@ -25661,7 +25657,7 @@ clean-target-libffi:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  clean) \
          || exit 1
 
 @endif target-libffi
@@ -25686,7 +25682,7 @@ distclean-target-libffi:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  distclean) \
          || exit 1
 
 @endif target-libffi
@@ -25711,7 +25707,7 @@ maintainer-clean-target-libffi:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  maintainer-clean) \
          || exit 1
 
 @endif target-libffi
@@ -25751,7 +25747,7 @@ configure-target-libjava: $(TARGET_SUBDIR)/libjava/multilib.out
        rm -f no-such-file || : ; \
        CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
          $(TARGET_CONFIGARGS) $${srcdiroption} \
-         --with-target-subdir="$(TARGET_SUBDIR)" \
+         --with-target-subdir="$(TARGET_SUBDIR)"  \
          || exit 1
 @endif target-libjava
 
@@ -25765,7 +25761,7 @@ all-target-libjava: configure-target-libjava
        $(SET_LIB_PATH) \
        $(RAW_CXX_TARGET_EXPORTS) \
        (cd $(TARGET_SUBDIR)/libjava && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)  'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'  all)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   all)
 @endif target-libjava
 
 .PHONY: check-target-libjava maybe-check-target-libjava
@@ -25779,7 +25775,7 @@ check-target-libjava:
        $(SET_LIB_PATH) \
        $(RAW_CXX_TARGET_EXPORTS) \
        (cd $(TARGET_SUBDIR)/libjava && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)  'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'  check)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   check)
 
 @endif target-libjava
 
@@ -25794,7 +25790,7 @@ install-target-libjava: installdirs
        $(SET_LIB_PATH) \
        $(RAW_CXX_TARGET_EXPORTS) \
        (cd $(TARGET_SUBDIR)/libjava && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS) install)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
 
 @endif target-libjava
 
@@ -25821,7 +25817,7 @@ info-target-libjava: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
          || exit 1
 
 @endif target-libjava
@@ -25847,7 +25843,7 @@ dvi-target-libjava: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  dvi) \
          || exit 1
 
 @endif target-libjava
@@ -25873,7 +25869,7 @@ TAGS-target-libjava: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  TAGS) \
          || exit 1
 
 @endif target-libjava
@@ -25900,7 +25896,7 @@ install-info-target-libjava: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  install-info) \
          || exit 1
 
 @endif target-libjava
@@ -25926,7 +25922,7 @@ installcheck-target-libjava: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
          || exit 1
 
 @endif target-libjava
@@ -25951,7 +25947,7 @@ mostlyclean-target-libjava:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  mostlyclean) \
          || exit 1
 
 @endif target-libjava
@@ -25976,7 +25972,7 @@ clean-target-libjava:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  clean) \
          || exit 1
 
 @endif target-libjava
@@ -26001,7 +25997,7 @@ distclean-target-libjava:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  distclean) \
          || exit 1
 
 @endif target-libjava
@@ -26026,7 +26022,7 @@ maintainer-clean-target-libjava:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  maintainer-clean) \
          || exit 1
 
 @endif target-libjava
@@ -26088,7 +26084,7 @@ configure-target-zlib: $(TARGET_SUBDIR)/zlib/multilib.out
        rm -f no-such-file || : ; \
        CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
          $(TARGET_CONFIGARGS) $${srcdiroption} \
-         --with-target-subdir="$(TARGET_SUBDIR)" \
+         --with-target-subdir="$(TARGET_SUBDIR)"  \
          || exit 1
 @endif target-zlib
 
@@ -26102,7 +26098,7 @@ all-target-zlib: configure-target-zlib
        $(SET_LIB_PATH) \
        $(NORMAL_TARGET_EXPORTS) \
        (cd $(TARGET_SUBDIR)/zlib && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)  all)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)   all)
 @endif target-zlib
 
 .PHONY: check-target-zlib maybe-check-target-zlib
@@ -26116,7 +26112,7 @@ check-target-zlib:
        $(SET_LIB_PATH) \
        $(NORMAL_TARGET_EXPORTS) \
        (cd $(TARGET_SUBDIR)/zlib && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)  check)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
 
 @endif target-zlib
 
@@ -26131,7 +26127,7 @@ install-target-zlib: installdirs
        $(SET_LIB_PATH) \
        $(NORMAL_TARGET_EXPORTS) \
        (cd $(TARGET_SUBDIR)/zlib && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS) install)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
 
 @endif target-zlib
 
@@ -26158,7 +26154,7 @@ info-target-zlib: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
          || exit 1
 
 @endif target-zlib
@@ -26184,7 +26180,7 @@ dvi-target-zlib: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  dvi) \
          || exit 1
 
 @endif target-zlib
@@ -26210,7 +26206,7 @@ TAGS-target-zlib: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  TAGS) \
          || exit 1
 
 @endif target-zlib
@@ -26237,7 +26233,7 @@ install-info-target-zlib: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  install-info) \
          || exit 1
 
 @endif target-zlib
@@ -26263,7 +26259,7 @@ installcheck-target-zlib: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
          || exit 1
 
 @endif target-zlib
@@ -26288,7 +26284,7 @@ mostlyclean-target-zlib:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  mostlyclean) \
          || exit 1
 
 @endif target-zlib
@@ -26313,7 +26309,7 @@ clean-target-zlib:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  clean) \
          || exit 1
 
 @endif target-zlib
@@ -26338,7 +26334,7 @@ distclean-target-zlib:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  distclean) \
          || exit 1
 
 @endif target-zlib
@@ -26363,7 +26359,7 @@ maintainer-clean-target-zlib:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  maintainer-clean) \
          || exit 1
 
 @endif target-zlib
@@ -26403,7 +26399,7 @@ configure-target-boehm-gc: $(TARGET_SUBDIR)/boehm-gc/multilib.out
        rm -f no-such-file || : ; \
        CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
          $(TARGET_CONFIGARGS) $${srcdiroption} \
-         --with-target-subdir="$(TARGET_SUBDIR)" \
+         --with-target-subdir="$(TARGET_SUBDIR)"  \
          || exit 1
 @endif target-boehm-gc
 
@@ -26417,7 +26413,7 @@ all-target-boehm-gc: configure-target-boehm-gc
        $(SET_LIB_PATH) \
        $(NORMAL_TARGET_EXPORTS) \
        (cd $(TARGET_SUBDIR)/boehm-gc && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)  all)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)   all)
 @endif target-boehm-gc
 
 .PHONY: check-target-boehm-gc maybe-check-target-boehm-gc
@@ -26431,7 +26427,7 @@ check-target-boehm-gc:
        $(SET_LIB_PATH) \
        $(NORMAL_TARGET_EXPORTS) \
        (cd $(TARGET_SUBDIR)/boehm-gc && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)  check)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
 
 @endif target-boehm-gc
 
@@ -26446,7 +26442,7 @@ install-target-boehm-gc: installdirs
        $(SET_LIB_PATH) \
        $(NORMAL_TARGET_EXPORTS) \
        (cd $(TARGET_SUBDIR)/boehm-gc && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS) install)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
 
 @endif target-boehm-gc
 
@@ -26473,7 +26469,7 @@ info-target-boehm-gc: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
          || exit 1
 
 @endif target-boehm-gc
@@ -26499,7 +26495,7 @@ dvi-target-boehm-gc: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  dvi) \
          || exit 1
 
 @endif target-boehm-gc
@@ -26525,7 +26521,7 @@ TAGS-target-boehm-gc: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  TAGS) \
          || exit 1
 
 @endif target-boehm-gc
@@ -26552,7 +26548,7 @@ install-info-target-boehm-gc: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  install-info) \
          || exit 1
 
 @endif target-boehm-gc
@@ -26578,7 +26574,7 @@ installcheck-target-boehm-gc: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
          || exit 1
 
 @endif target-boehm-gc
@@ -26603,7 +26599,7 @@ mostlyclean-target-boehm-gc:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  mostlyclean) \
          || exit 1
 
 @endif target-boehm-gc
@@ -26628,7 +26624,7 @@ clean-target-boehm-gc:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  clean) \
          || exit 1
 
 @endif target-boehm-gc
@@ -26653,7 +26649,7 @@ distclean-target-boehm-gc:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  distclean) \
          || exit 1
 
 @endif target-boehm-gc
@@ -26678,7 +26674,7 @@ maintainer-clean-target-boehm-gc:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  maintainer-clean) \
          || exit 1
 
 @endif target-boehm-gc
@@ -26718,7 +26714,7 @@ configure-target-qthreads: $(TARGET_SUBDIR)/qthreads/multilib.out
        rm -f no-such-file || : ; \
        CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
          $(TARGET_CONFIGARGS) $${srcdiroption} \
-         --with-target-subdir="$(TARGET_SUBDIR)" \
+         --with-target-subdir="$(TARGET_SUBDIR)"  \
          || exit 1
 @endif target-qthreads
 
@@ -26732,7 +26728,7 @@ all-target-qthreads: configure-target-qthreads
        $(SET_LIB_PATH) \
        $(NORMAL_TARGET_EXPORTS) \
        (cd $(TARGET_SUBDIR)/qthreads && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)  all)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)   all)
 @endif target-qthreads
 
 .PHONY: check-target-qthreads maybe-check-target-qthreads
@@ -26746,7 +26742,7 @@ check-target-qthreads:
        $(SET_LIB_PATH) \
        $(NORMAL_TARGET_EXPORTS) \
        (cd $(TARGET_SUBDIR)/qthreads && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)  check)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
 
 @endif target-qthreads
 
@@ -26761,7 +26757,7 @@ install-target-qthreads: installdirs
        $(SET_LIB_PATH) \
        $(NORMAL_TARGET_EXPORTS) \
        (cd $(TARGET_SUBDIR)/qthreads && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS) install)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
 
 @endif target-qthreads
 
@@ -26788,7 +26784,7 @@ info-target-qthreads: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
          || exit 1
 
 @endif target-qthreads
@@ -26814,7 +26810,7 @@ dvi-target-qthreads: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  dvi) \
          || exit 1
 
 @endif target-qthreads
@@ -26840,7 +26836,7 @@ TAGS-target-qthreads: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  TAGS) \
          || exit 1
 
 @endif target-qthreads
@@ -26867,7 +26863,7 @@ install-info-target-qthreads: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  install-info) \
          || exit 1
 
 @endif target-qthreads
@@ -26893,7 +26889,7 @@ installcheck-target-qthreads: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
          || exit 1
 
 @endif target-qthreads
@@ -26918,7 +26914,7 @@ mostlyclean-target-qthreads:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  mostlyclean) \
          || exit 1
 
 @endif target-qthreads
@@ -26943,7 +26939,7 @@ clean-target-qthreads:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  clean) \
          || exit 1
 
 @endif target-qthreads
@@ -26968,7 +26964,7 @@ distclean-target-qthreads:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  distclean) \
          || exit 1
 
 @endif target-qthreads
@@ -26993,7 +26989,7 @@ maintainer-clean-target-qthreads:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  maintainer-clean) \
          || exit 1
 
 @endif target-qthreads
@@ -27033,7 +27029,7 @@ configure-target-rda: $(TARGET_SUBDIR)/rda/multilib.out
        rm -f no-such-file || : ; \
        CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
          $(TARGET_CONFIGARGS) $${srcdiroption} \
-         --with-target-subdir="$(TARGET_SUBDIR)" \
+         --with-target-subdir="$(TARGET_SUBDIR)"  \
          || exit 1
 @endif target-rda
 
@@ -27047,7 +27043,7 @@ all-target-rda: configure-target-rda
        $(SET_LIB_PATH) \
        $(NORMAL_TARGET_EXPORTS) \
        (cd $(TARGET_SUBDIR)/rda && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)  all)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)   all)
 @endif target-rda
 
 .PHONY: check-target-rda maybe-check-target-rda
@@ -27061,7 +27057,7 @@ check-target-rda:
        $(SET_LIB_PATH) \
        $(NORMAL_TARGET_EXPORTS) \
        (cd $(TARGET_SUBDIR)/rda && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)  check)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
 
 @endif target-rda
 
@@ -27076,7 +27072,7 @@ install-target-rda: installdirs
        $(SET_LIB_PATH) \
        $(NORMAL_TARGET_EXPORTS) \
        (cd $(TARGET_SUBDIR)/rda && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS) install)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
 
 @endif target-rda
 
@@ -27103,7 +27099,7 @@ info-target-rda: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
          || exit 1
 
 @endif target-rda
@@ -27129,7 +27125,7 @@ dvi-target-rda: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  dvi) \
          || exit 1
 
 @endif target-rda
@@ -27155,7 +27151,7 @@ TAGS-target-rda: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  TAGS) \
          || exit 1
 
 @endif target-rda
@@ -27182,7 +27178,7 @@ install-info-target-rda: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  install-info) \
          || exit 1
 
 @endif target-rda
@@ -27208,7 +27204,7 @@ installcheck-target-rda: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
          || exit 1
 
 @endif target-rda
@@ -27233,7 +27229,7 @@ mostlyclean-target-rda:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  mostlyclean) \
          || exit 1
 
 @endif target-rda
@@ -27258,7 +27254,7 @@ clean-target-rda:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  clean) \
          || exit 1
 
 @endif target-rda
@@ -27283,7 +27279,7 @@ distclean-target-rda:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  distclean) \
          || exit 1
 
 @endif target-rda
@@ -27308,7 +27304,7 @@ maintainer-clean-target-rda:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  maintainer-clean) \
          || exit 1
 
 @endif target-rda
@@ -27348,7 +27344,7 @@ configure-target-libada: $(TARGET_SUBDIR)/libada/multilib.out
        rm -f no-such-file || : ; \
        CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
          $(TARGET_CONFIGARGS) $${srcdiroption} \
-         --with-target-subdir="$(TARGET_SUBDIR)" \
+         --with-target-subdir="$(TARGET_SUBDIR)"  \
          || exit 1
 @endif target-libada
 
@@ -27362,7 +27358,7 @@ all-target-libada: configure-target-libada
        $(SET_LIB_PATH) \
        $(NORMAL_TARGET_EXPORTS) \
        (cd $(TARGET_SUBDIR)/libada && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)  all)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)   all)
 @endif target-libada
 
 .PHONY: check-target-libada maybe-check-target-libada
@@ -27376,7 +27372,7 @@ check-target-libada:
        $(SET_LIB_PATH) \
        $(NORMAL_TARGET_EXPORTS) \
        (cd $(TARGET_SUBDIR)/libada && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)  check)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
 
 @endif target-libada
 
@@ -27391,7 +27387,7 @@ install-target-libada: installdirs
        $(SET_LIB_PATH) \
        $(NORMAL_TARGET_EXPORTS) \
        (cd $(TARGET_SUBDIR)/libada && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS) install)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
 
 @endif target-libada
 
@@ -27418,7 +27414,7 @@ info-target-libada: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
          || exit 1
 
 @endif target-libada
@@ -27444,7 +27440,7 @@ dvi-target-libada: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  dvi) \
          || exit 1
 
 @endif target-libada
@@ -27470,7 +27466,7 @@ TAGS-target-libada: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  TAGS) \
          || exit 1
 
 @endif target-libada
@@ -27497,7 +27493,7 @@ install-info-target-libada: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  install-info) \
          || exit 1
 
 @endif target-libada
@@ -27523,7 +27519,7 @@ installcheck-target-libada: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
          || exit 1
 
 @endif target-libada
@@ -27548,7 +27544,7 @@ mostlyclean-target-libada:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  mostlyclean) \
          || exit 1
 
 @endif target-libada
@@ -27573,7 +27569,7 @@ clean-target-libada:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  clean) \
          || exit 1
 
 @endif target-libada
@@ -27598,7 +27594,7 @@ distclean-target-libada:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  distclean) \
          || exit 1
 
 @endif target-libada
@@ -27623,7 +27619,7 @@ maintainer-clean-target-libada:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  maintainer-clean) \
          || exit 1
 
 @endif target-libada
@@ -27655,7 +27651,7 @@ configure-gcc:
        [ -d gcc ] || mkdir gcc; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(GCC_HOST_EXPORTS) \
+       $(HOST_EXPORTS) \
        echo Configuring in gcc; \
        cd gcc || exit 1; \
        case $(srcdir) in \
@@ -27687,7 +27683,7 @@ all-gcc: configure-gcc
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
-       $(GCC_HOST_EXPORTS) \
+       $(HOST_EXPORTS) \
        if [ -f gcc/stage_last ] ; then \
          (cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) quickstrap); \
        else \
@@ -27710,7 +27706,7 @@ $(GCC_STRAP_TARGETS): all-bootstrap configure-gcc
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
-       $(GCC_HOST_EXPORTS) \
+       $(HOST_EXPORTS) \
        echo "Bootstrapping the compiler"; \
        cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) $@
        @r=`${PWD_COMMAND}`; export r; \
@@ -27730,7 +27726,7 @@ $(GCC_STRAP_TARGETS): all-bootstrap configure-gcc
            compare=compare ;; \
        esac; \
        $(SET_LIB_PATH) \
-       $(GCC_HOST_EXPORTS) \
+       $(HOST_EXPORTS) \
        echo "$$msg"; \
        cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) $$compare
        @r=`${PWD_COMMAND}`; export r; \
@@ -27743,7 +27739,7 @@ profiledbootstrap: all-bootstrap configure-gcc
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
-       $(GCC_HOST_EXPORTS) \
+       $(HOST_EXPORTS) \
        echo "Bootstrapping the compiler"; \
        cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) stageprofile_build
        @r=`${PWD_COMMAND}`; export r; \
@@ -27754,7 +27750,7 @@ profiledbootstrap: all-bootstrap configure-gcc
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
-       $(GCC_HOST_EXPORTS) \
+       $(HOST_EXPORTS) \
        echo "Building feedback based compiler"; \
        cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) stagefeedback_build
 
@@ -27763,7 +27759,7 @@ cross: all-texinfo all-bison all-byacc all-binutils all-gas all-ld
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
-       $(GCC_HOST_EXPORTS) \
+       $(HOST_EXPORTS) \
        echo "Building the C and C++ compiler"; \
        cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) LANGUAGES="c c++"
        @r=`${PWD_COMMAND}`; export r; \
@@ -27782,7 +27778,7 @@ check-gcc:
          r=`${PWD_COMMAND}`; export r; \
          s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
          $(SET_LIB_PATH) \
-         $(GCC_HOST_EXPORTS) \
+         $(HOST_EXPORTS) \
          (cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) check); \
        else \
          true; \
@@ -27794,7 +27790,7 @@ check-gcc-c++:
          r=`${PWD_COMMAND}`; export r; \
          s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
          $(SET_LIB_PATH) \
-         $(GCC_HOST_EXPORTS) \
+         $(HOST_EXPORTS) \
          (cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) check-c++); \
        else \
          true; \
@@ -27813,7 +27809,7 @@ install-gcc:
          r=`${PWD_COMMAND}`; export r; \
          s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
          $(SET_LIB_PATH) \
-         $(GCC_HOST_EXPORTS) \
+         $(HOST_EXPORTS) \
          (cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) install); \
        else \
          true; \
@@ -27835,7 +27831,7 @@ gcc-no-fixedincludes:
          r=`${PWD_COMMAND}`; export r; \
          s=`cd $(srcdir); ${PWD_COMMAND}` ; export s; \
          $(SET_LIB_PATH) \
-         $(GCC_HOST_EXPORTS) \
+         $(HOST_EXPORTS) \
          (cd ./gcc && \
           $(MAKE) $(GCC_FLAGS_TO_PASS) install); \
          rm -rf gcc/include; \
@@ -27857,7 +27853,7 @@ info-gcc: \
        for flag in $(EXTRA_GCC_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       $(GCC_HOST_EXPORTS) \
+       $(HOST_EXPORTS) \
        echo "Doing info in gcc" ; \
        (cd gcc && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
@@ -27882,7 +27878,7 @@ dvi-gcc: \
        for flag in $(EXTRA_GCC_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       $(GCC_HOST_EXPORTS) \
+       $(HOST_EXPORTS) \
        echo "Doing dvi in gcc" ; \
        (cd gcc && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
@@ -27907,7 +27903,7 @@ TAGS-gcc: \
        for flag in $(EXTRA_GCC_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       $(GCC_HOST_EXPORTS) \
+       $(HOST_EXPORTS) \
        echo "Doing TAGS in gcc" ; \
        (cd gcc && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
@@ -27933,7 +27929,7 @@ install-info-gcc: \
        for flag in $(EXTRA_GCC_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       $(GCC_HOST_EXPORTS) \
+       $(HOST_EXPORTS) \
        echo "Doing install-info in gcc" ; \
        (cd gcc && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
@@ -27958,7 +27954,7 @@ installcheck-gcc: \
        for flag in $(EXTRA_GCC_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       $(GCC_HOST_EXPORTS) \
+       $(HOST_EXPORTS) \
        echo "Doing installcheck in gcc" ; \
        (cd gcc && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
@@ -27982,7 +27978,7 @@ mostlyclean-gcc:
        for flag in $(EXTRA_GCC_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       $(GCC_HOST_EXPORTS) \
+       $(HOST_EXPORTS) \
        echo "Doing mostlyclean in gcc" ; \
        (cd gcc && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
@@ -28006,7 +28002,7 @@ clean-gcc:
        for flag in $(EXTRA_GCC_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       $(GCC_HOST_EXPORTS) \
+       $(HOST_EXPORTS) \
        echo "Doing clean in gcc" ; \
        (cd gcc && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
@@ -28030,7 +28026,7 @@ distclean-gcc:
        for flag in $(EXTRA_GCC_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       $(GCC_HOST_EXPORTS) \
+       $(HOST_EXPORTS) \
        echo "Doing distclean in gcc" ; \
        (cd gcc && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
@@ -28054,7 +28050,7 @@ maintainer-clean-gcc:
        for flag in $(EXTRA_GCC_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       $(GCC_HOST_EXPORTS) \
+       $(HOST_EXPORTS) \
        echo "Doing maintainer-clean in gcc" ; \
        (cd gcc && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
@@ -28169,7 +28165,7 @@ configure-stage1-gcc:  prebootstrap
        fi ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-       $(GCC_HOST_EXPORTS)  \
+       $(HOST_EXPORTS)  \
        echo Configuring stage 1 in gcc ; \
        cd gcc || exit 1; \
        case $(srcdir) in \
@@ -28192,7 +28188,7 @@ all-stage1-gcc: configure-stage1-gcc
        $(MAKE) stage1-start
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-       $(GCC_HOST_EXPORTS)  \
+       $(HOST_EXPORTS)  \
        cd gcc && \
        $(MAKE) $(GCC_FLAGS_TO_PASS)  \
                CFLAGS="$(STAGE1_CFLAGS)" && $(STAMP) ../all-stage1-gcc
@@ -28818,7 +28814,7 @@ profiledbootstrap: all-bootstrap configure-gcc
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
-       $(GCC_HOST_EXPORTS) \
+       $(HOST_EXPORTS) \
        echo "Bootstrapping the compiler"; \
        $(MAKE) stageprofile-bubble distclean-stagefeedback stageprofile-start
        @r=`${PWD_COMMAND}`; export r; \
@@ -28829,7 +28825,7 @@ profiledbootstrap: all-bootstrap configure-gcc
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
-       $(GCC_HOST_EXPORTS) \
+       $(HOST_EXPORTS) \
        echo "Building feedback based compiler"; \
        $(MAKE) stagefeedback-bubble stagefeedback-end
 
diff --git a/Makefile.tpl b/Makefile.tpl
index ac15895db123375999a362ec4e0f16859078f473..323cee2c0e39a74a4fe936a996e6454d11201d18 100644 (file)
--- a/Makefile.tpl
+++ b/Makefile.tpl
@@ -160,17 +160,13 @@ HOST_EXPORTS = \
        WINDRES="$(WINDRES)"; export WINDRES; \
        OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
        OBJDUMP="$(OBJDUMP)"; export OBJDUMP;
-
-# Similar, for the gcc directory.
-GCC_HOST_EXPORTS = \
-       $(HOST_EXPORTS) \
        TOPLEVEL_CONFIGURE_ARGUMENTS="$(TOPLEVEL_CONFIGURE_ARGUMENTS)"; export TOPLEVEL_CONFIGURE_ARGUMENTS; \
        GMPLIBS="$(HOST_GMPLIBS)"; export GMPLIBS; \
        GMPINC="$(HOST_GMPINC)"; export GMPINC;
 
 # Similar, for later GCC stages.
 STAGE_HOST_EXPORTS = \
-       $(GCC_HOST_EXPORTS) \
+       $(HOST_EXPORTS) \
        CC="$(STAGE_CC_WRAPPER) $$r/prev-gcc/xgcc$(exeext) -B$$r/prev-gcc/ -B$(build_tooldir)/bin/"; export CC; \
        CC_FOR_BUILD="$(STAGE_CC_WRAPPER) $$r/prev-gcc/xgcc$(exeext) -B$$r/prev-gcc/ -B$(build_tooldir)/bin/"; export CC_FOR_BUILD;
 
@@ -735,7 +731,7 @@ install.all: install-no-fixedincludes
        @if [ -f ./gcc/Makefile ] ; then \
                r=`${PWD_COMMAND}` ; export r ; \
                $(SET_LIB_PATH) \
-               $(GCC_HOST_EXPORTS) \
+               $(HOST_EXPORTS) \
                (cd ./gcc && \
                $(MAKE) $(FLAGS_TO_PASS) install-headers) ; \
        else \
@@ -830,7 +826,7 @@ configure-build-[+module+]:
        rm -f no-such-file || : ; \
        CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
          $(BUILD_CONFIGARGS) $${srcdiroption} \
-         --with-build-subdir="$(BUILD_SUBDIR)" \
+         --with-build-subdir="$(BUILD_SUBDIR)" [+extra_configure_flags+] \
          || exit 1
 @endif build-[+module+]
 
@@ -842,7 +838,7 @@ all-build-[+module+]: configure-build-[+module+]
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(BUILD_EXPORTS) \
-       (cd $(BUILD_SUBDIR)/[+module+] && $(MAKE) all)
+       (cd $(BUILD_SUBDIR)/[+module+] && $(MAKE) [+extra_make_flags+] all)
 @endif build-[+module+]
 [+ ENDFOR build_modules +]
 
@@ -874,7 +870,7 @@ configure-[+module+]:
            libsrcdir="$$s/[+module+]";; \
        esac; \
        $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption} [+extra_configure_flags+] \
          || exit 1
 @endif [+module+]
 
@@ -890,7 +886,7 @@ all-[+module+]: configure-[+module+]
        (cd [+module+] && $(MAKE) $(FLAGS_TO_PASS)[+ 
          IF with_x 
            +] $(X11_FLAGS_TO_PASS)[+ 
-         ENDIF with_x +] all)
+         ENDIF with_x +] [+extra_make_flags+] all)
 @endif [+module+]
 
 .PHONY: check-[+module+] maybe-check-[+module+]
@@ -910,7 +906,7 @@ check-[+module+]:
          (cd [+module+] && $(MAKE) $(FLAGS_TO_PASS)[+ 
            IF with_x 
              +] $(X11_FLAGS_TO_PASS)[+ 
-           ENDIF with_x +] check); \
+           ENDIF with_x +] [+extra_make_flags+] check); \
        fi
 [+ ELSE check +]
 check-[+module+]:
@@ -921,7 +917,7 @@ check-[+module+]:
        (cd [+module+] && $(MAKE) $(FLAGS_TO_PASS)[+ 
          IF with_x 
            +] $(X11_FLAGS_TO_PASS)[+ 
-         ENDIF with_x +] check)
+         ENDIF with_x +] [+extra_make_flags+] check)
 [+ ENDIF no_check +]
 @endif [+module+]
 
@@ -940,7 +936,7 @@ install-[+module+]: installdirs
        (cd [+module+] && $(MAKE) $(FLAGS_TO_PASS)[+ 
          IF with_x 
            +] $(X11_FLAGS_TO_PASS)[+ 
-         ENDIF with_x +] install)
+         ENDIF with_x +] [+extra_make_flags+] install)
 [+ ENDIF no_install +]
 @endif [+module+]
 
@@ -972,7 +968,7 @@ maybe-[+make_target+]-[+module+]: [+make_target+]-[+module+]
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 [+make_target+]) \
+                 [+extra_make_flags+] [+make_target+]) \
          || exit 1
 [+ ENDIF +]
 @endif [+module+]
@@ -1043,7 +1039,7 @@ ENDIF raw_cxx +]
        rm -f no-such-file || : ; \
        CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
          $(TARGET_CONFIGARGS) $${srcdiroption} \
-         --with-target-subdir="$(TARGET_SUBDIR)" \
+         --with-target-subdir="$(TARGET_SUBDIR)" [+extra_configure_flags+] \
          || exit 1
 @endif target-[+module+]
 
@@ -1065,7 +1061,7 @@ ENDIF raw_cxx +]
            IF raw_cxx 
          +] 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)' [+ 
            ENDIF raw_cxx 
-         +] all)
+         +] [+extra_make_flags+] all)
 @endif target-[+module+]
 
 .PHONY: check-target-[+module+] maybe-check-target-[+module+]
@@ -1090,7 +1086,7 @@ ENDIF raw_cxx +]
            IF raw_cxx 
              +] 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)' [+ 
            ENDIF raw_cxx 
-         +] check)
+         +] [+extra_make_flags+] check)
 [+ ENDIF no_check +]
 @endif target-[+module+]
 
@@ -1112,7 +1108,7 @@ ELSE normal_cxx +]
        $(NORMAL_TARGET_EXPORTS) \[+
 ENDIF raw_cxx +]
        (cd $(TARGET_SUBDIR)/[+module+] && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS) install)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS) [+extra_make_flags+] install)
 [+ ENDIF no_install +]
 @endif target-[+module+]
 
@@ -1148,7 +1144,7 @@ ENDIF raw_cxx +]
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 [+make_target+]) \
+                 [+extra_make_flags+] [+make_target+]) \
          || exit 1
 [+ ENDIF +]
 @endif target-[+module+]
@@ -1180,7 +1176,7 @@ configure-gcc:
        [ -d gcc ] || mkdir gcc; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(GCC_HOST_EXPORTS) \
+       $(HOST_EXPORTS) \
        echo Configuring in gcc; \
        cd gcc || exit 1; \
        case $(srcdir) in \
@@ -1212,7 +1208,7 @@ all-gcc: configure-gcc
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
-       $(GCC_HOST_EXPORTS) \
+       $(HOST_EXPORTS) \
        if [ -f gcc/stage_last ] ; then \
          (cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) quickstrap); \
        else \
@@ -1235,7 +1231,7 @@ $(GCC_STRAP_TARGETS): all-bootstrap configure-gcc
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
-       $(GCC_HOST_EXPORTS) \
+       $(HOST_EXPORTS) \
        echo "Bootstrapping the compiler"; \
        cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) $@
        @r=`${PWD_COMMAND}`; export r; \
@@ -1255,7 +1251,7 @@ $(GCC_STRAP_TARGETS): all-bootstrap configure-gcc
            compare=compare ;; \
        esac; \
        $(SET_LIB_PATH) \
-       $(GCC_HOST_EXPORTS) \
+       $(HOST_EXPORTS) \
        echo "$$msg"; \
        cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) $$compare
        @r=`${PWD_COMMAND}`; export r; \
@@ -1268,7 +1264,7 @@ profiledbootstrap: all-bootstrap configure-gcc
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
-       $(GCC_HOST_EXPORTS) \
+       $(HOST_EXPORTS) \
        echo "Bootstrapping the compiler"; \
        cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) stageprofile_build
        @r=`${PWD_COMMAND}`; export r; \
@@ -1279,7 +1275,7 @@ profiledbootstrap: all-bootstrap configure-gcc
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
-       $(GCC_HOST_EXPORTS) \
+       $(HOST_EXPORTS) \
        echo "Building feedback based compiler"; \
        cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) stagefeedback_build
 
@@ -1288,7 +1284,7 @@ cross: all-texinfo all-bison all-byacc all-binutils all-gas all-ld
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
-       $(GCC_HOST_EXPORTS) \
+       $(HOST_EXPORTS) \
        echo "Building the C and C++ compiler"; \
        cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) LANGUAGES="c c++"
        @r=`${PWD_COMMAND}`; export r; \
@@ -1307,7 +1303,7 @@ check-gcc:
          r=`${PWD_COMMAND}`; export r; \
          s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
          $(SET_LIB_PATH) \
-         $(GCC_HOST_EXPORTS) \
+         $(HOST_EXPORTS) \
          (cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) check); \
        else \
          true; \
@@ -1319,7 +1315,7 @@ check-gcc-c++:
          r=`${PWD_COMMAND}`; export r; \
          s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
          $(SET_LIB_PATH) \
-         $(GCC_HOST_EXPORTS) \
+         $(HOST_EXPORTS) \
          (cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) check-c++); \
        else \
          true; \
@@ -1338,7 +1334,7 @@ install-gcc:
          r=`${PWD_COMMAND}`; export r; \
          s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
          $(SET_LIB_PATH) \
-         $(GCC_HOST_EXPORTS) \
+         $(HOST_EXPORTS) \
          (cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) install); \
        else \
          true; \
@@ -1360,7 +1356,7 @@ gcc-no-fixedincludes:
          r=`${PWD_COMMAND}`; export r; \
          s=`cd $(srcdir); ${PWD_COMMAND}` ; export s; \
          $(SET_LIB_PATH) \
-         $(GCC_HOST_EXPORTS) \
+         $(HOST_EXPORTS) \
          (cd ./gcc && \
           $(MAKE) $(GCC_FLAGS_TO_PASS) install); \
          rm -rf gcc/include; \
@@ -1384,7 +1380,7 @@ maybe-[+make_target+]-gcc: [+make_target+]-gcc
        for flag in $(EXTRA_GCC_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       $(GCC_HOST_EXPORTS) \
+       $(HOST_EXPORTS) \
        echo "Doing [+make_target+] in gcc" ; \
        (cd gcc && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
@@ -1508,7 +1504,7 @@ configure-stage[+id+]-gcc: [+ IF prev +] all-stage[+prev+]-gcc [+
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; [+ IF prev +] \
        $(STAGE_HOST_EXPORTS) [+ ELSE prev +] \
-       $(GCC_HOST_EXPORTS) [+ ENDIF prev +] \
+       $(HOST_EXPORTS) [+ ENDIF prev +] \
        echo Configuring stage [+id+] in gcc ; \
        cd gcc || exit 1; \
        case $(srcdir) in \
@@ -1532,7 +1528,7 @@ all-stage[+id+]-gcc: configure-stage[+id+]-gcc
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; [+ IF prev +] \
        $(STAGE_HOST_EXPORTS) [+ ELSE prev +] \
-       $(GCC_HOST_EXPORTS) [+ ENDIF prev +] \
+       $(HOST_EXPORTS) [+ ENDIF prev +] \
        cd gcc && \
        $(MAKE) $(GCC_FLAGS_TO_PASS) [+ IF prev +] \
                $(POSTSTAGE1_FLAGS_TO_PASS) [+ ENDIF prev +] \
@@ -1618,7 +1614,7 @@ profiledbootstrap: all-bootstrap configure-gcc
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
-       $(GCC_HOST_EXPORTS) \
+       $(HOST_EXPORTS) \
        echo "Bootstrapping the compiler"; \
        $(MAKE) stageprofile-bubble distclean-stagefeedback stageprofile-start
        @r=`${PWD_COMMAND}`; export r; \
@@ -1629,7 +1625,7 @@ profiledbootstrap: all-bootstrap configure-gcc
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
-       $(GCC_HOST_EXPORTS) \
+       $(HOST_EXPORTS) \
        echo "Building feedback based compiler"; \
        $(MAKE) stagefeedback-bubble stagefeedback-end