* include/posix.h: .dylib is used on all Apple MACH platforms.

[pf3gnuchains/gcc-fork.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 06652d4..aeef11e 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -72,21 +72,12 @@ LN_S = @LN_S@
 # Miscellaneous non-standard autoconf-set variables
 # -------------------------------------------------
 
-# The file containing GCC's version number.
-gcc_version_trigger = @gcc_version_trigger@
-gcc_version = @gcc_version@
-
 # The gcc driver likes to know the arguments it was configured with.
 TOPLEVEL_CONFIGURE_ARGUMENTS=@TOPLEVEL_CONFIGURE_ARGUMENTS@
 
-gxx_include_dir = @gxx_include_dir@
-libstdcxx_incdir = @libstdcxx_incdir@
-
 tooldir = @tooldir@
 build_tooldir = @build_tooldir@
 
-# Directory in which the compiler finds executables, libraries, etc.
-libsubdir = $(libdir)/gcc/$(target_alias)/$(gcc_version)
 GDB_NLM_DEPS = 
 
 # This is the name of the environment variable used for the path to
@@ -520,8 +511,6 @@ BASE_FLAGS_TO_PASS = \
        "libdir=$(libdir)" \
        "libexecdir=$(libexecdir)" \
        "lispdir=$(lispdir)" \
-       "libstdcxx_incdir=$(libstdcxx_incdir)" \
-       "libsubdir=$(libsubdir)" \
        "localstatedir=$(localstatedir)" \
        "mandir=$(mandir)" \
        "oldincludedir=$(oldincludedir)" \
@@ -531,9 +520,6 @@ BASE_FLAGS_TO_PASS = \
        "sysconfdir=$(sysconfdir)" \
        "tooldir=$(tooldir)" \
        "build_tooldir=$(build_tooldir)" \
-       "gxx_include_dir=$(gxx_include_dir)" \
-       "gcc_version=$(gcc_version)" \
-       "gcc_version_trigger=$(gcc_version_trigger)" \
        "target_alias=$(target_alias)" \
        "BISON=$(BISON)" \
        "CC_FOR_BUILD=$(CC_FOR_BUILD)" \
@@ -2531,7 +2517,7 @@ install-ash: installdirs
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
        (cd $(HOST_SUBDIR)/ash && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS)  install)
 
 @endif ash
 
@@ -2859,7 +2845,7 @@ install-autoconf: installdirs
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
        (cd $(HOST_SUBDIR)/autoconf && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS)  install)
 
 @endif autoconf
 
@@ -3187,7 +3173,7 @@ install-automake: installdirs
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
        (cd $(HOST_SUBDIR)/automake && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS)  install)
 
 @endif automake
 
@@ -3515,7 +3501,7 @@ install-bash: installdirs
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
        (cd $(HOST_SUBDIR)/bash && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS)  install)
 
 @endif bash
 
@@ -3845,7 +3831,7 @@ install-bfd: installdirs
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
        (cd $(HOST_SUBDIR)/bfd && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS)  install)
 
 @endif bfd
 
@@ -4175,7 +4161,7 @@ install-opcodes: installdirs
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
        (cd $(HOST_SUBDIR)/opcodes && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS)  install)
 
 @endif opcodes
 
@@ -4505,7 +4491,7 @@ install-binutils: installdirs
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
        (cd $(HOST_SUBDIR)/binutils && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS)  install)
 
 @endif binutils
 
@@ -4820,7 +4806,7 @@ check-bison:
          $(SET_LIB_PATH) \
          $(HOST_EXPORTS) \
          (cd $(HOST_SUBDIR)/bison && \
-           $(MAKE) $(FLAGS_TO_PASS)  check)
+           $(MAKE) $(FLAGS_TO_PASS)  check); \
        fi
 
 @endif bison
@@ -4836,7 +4822,7 @@ install-bison: installdirs
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
        (cd $(HOST_SUBDIR)/bison && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS)  install)
 
 @endif bison
 
@@ -5151,7 +5137,7 @@ check-byacc:
          $(SET_LIB_PATH) \
          $(HOST_EXPORTS) \
          (cd $(HOST_SUBDIR)/byacc && \
-           $(MAKE) $(FLAGS_TO_PASS)  check)
+           $(MAKE) $(FLAGS_TO_PASS)  check); \
        fi
 
 @endif byacc
@@ -5167,7 +5153,7 @@ install-byacc: installdirs
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
        (cd $(HOST_SUBDIR)/byacc && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS)  install)
 
 @endif byacc
 
@@ -5495,7 +5481,7 @@ install-bzip2: installdirs
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
        (cd $(HOST_SUBDIR)/bzip2 && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS)  install)
 
 @endif bzip2
 
@@ -5823,7 +5809,7 @@ install-dejagnu: installdirs
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
        (cd $(HOST_SUBDIR)/dejagnu && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS)  install)
 
 @endif dejagnu
 
@@ -6151,7 +6137,7 @@ install-diff: installdirs
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
        (cd $(HOST_SUBDIR)/diff && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS)  install)
 
 @endif diff
 
@@ -6473,7 +6459,7 @@ install-dosutils: installdirs
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
        (cd $(HOST_SUBDIR)/dosutils && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS)  install)
 
 @endif dosutils
 
@@ -6801,7 +6787,7 @@ install-etc: installdirs
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
        (cd $(HOST_SUBDIR)/etc && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS)  install)
 
 @endif etc
 
@@ -7116,7 +7102,7 @@ check-fastjar:
          $(SET_LIB_PATH) \
          $(HOST_EXPORTS) \
          (cd $(HOST_SUBDIR)/fastjar && \
-           $(MAKE) $(FLAGS_TO_PASS)  check)
+           $(MAKE) $(FLAGS_TO_PASS)  check); \
        fi
 
 @endif fastjar
@@ -7132,7 +7118,7 @@ install-fastjar: installdirs
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
        (cd $(HOST_SUBDIR)/fastjar && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS)  install)
 
 @endif fastjar
 
@@ -7460,7 +7446,7 @@ install-fileutils: installdirs
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
        (cd $(HOST_SUBDIR)/fileutils && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS)  install)
 
 @endif fileutils
 
@@ -7788,7 +7774,7 @@ install-findutils: installdirs
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
        (cd $(HOST_SUBDIR)/findutils && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS)  install)
 
 @endif findutils
 
@@ -8116,7 +8102,7 @@ install-find: installdirs
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
        (cd $(HOST_SUBDIR)/find && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS)  install)
 
 @endif find
 
@@ -8444,7 +8430,7 @@ install-fixincludes: installdirs
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
        (cd $(HOST_SUBDIR)/fixincludes && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS)  install)
 
 @endif fixincludes
 
@@ -8678,7 +8664,7 @@ check-flex:
          $(SET_LIB_PATH) \
          $(HOST_EXPORTS) \
          (cd $(HOST_SUBDIR)/flex && \
-           $(MAKE) $(FLAGS_TO_PASS)  check)
+           $(MAKE) $(FLAGS_TO_PASS)  check); \
        fi
 
 @endif flex
@@ -8694,7 +8680,7 @@ install-flex: installdirs
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
        (cd $(HOST_SUBDIR)/flex && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS)  install)
 
 @endif flex
 
@@ -9024,7 +9010,7 @@ install-gas: installdirs
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
        (cd $(HOST_SUBDIR)/gas && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS)  install)
 
 @endif gas
 
@@ -9354,7 +9340,7 @@ install-gcc: installdirs
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
        (cd $(HOST_SUBDIR)/gcc && \
-         $(MAKE) $(FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) check)
+         $(MAKE) $(FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) install)
 
 @endif gcc
 
@@ -9682,7 +9668,7 @@ install-gawk: installdirs
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
        (cd $(HOST_SUBDIR)/gawk && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS)  install)
 
 @endif gawk
 
@@ -10010,7 +9996,7 @@ install-gettext: installdirs
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
        (cd $(HOST_SUBDIR)/gettext && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS)  install)
 
 @endif gettext
 
@@ -10338,7 +10324,7 @@ install-gnuserv: installdirs
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
        (cd $(HOST_SUBDIR)/gnuserv && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS)  install)
 
 @endif gnuserv
 
@@ -10666,7 +10652,7 @@ install-gprof: installdirs
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
        (cd $(HOST_SUBDIR)/gprof && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS)  install)
 
 @endif gprof
 
@@ -10994,7 +10980,7 @@ install-gzip: installdirs
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
        (cd $(HOST_SUBDIR)/gzip && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS)  install)
 
 @endif gzip
 
@@ -11322,7 +11308,7 @@ install-hello: installdirs
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
        (cd $(HOST_SUBDIR)/hello && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS)  install)
 
 @endif hello
 
@@ -11650,7 +11636,7 @@ install-indent: installdirs
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
        (cd $(HOST_SUBDIR)/indent && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS)  install)
 
 @endif indent
 
@@ -11980,7 +11966,7 @@ install-intl: installdirs
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
        (cd $(HOST_SUBDIR)/intl && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS)  install)
 
 @endif intl
 
@@ -12308,7 +12294,7 @@ install-tcl: installdirs
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
        (cd $(HOST_SUBDIR)/tcl && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS)  install)
 
 @endif tcl
 
@@ -12621,7 +12607,7 @@ install-itcl: installdirs
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
        (cd $(HOST_SUBDIR)/itcl && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS)  install)
 
 @endif itcl
 
@@ -12951,7 +12937,7 @@ install-ld: installdirs
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
        (cd $(HOST_SUBDIR)/ld && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS)  install)
 
 @endif ld
 
@@ -13281,7 +13267,7 @@ install-libcpp: installdirs
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
        (cd $(HOST_SUBDIR)/libcpp && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS)  install)
 
 @endif libcpp
 
@@ -13609,7 +13595,7 @@ install-libgui: installdirs
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
        (cd $(HOST_SUBDIR)/libgui && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS)  install)
 
 @endif libgui
 
@@ -13939,7 +13925,7 @@ install-libiberty: installdirs
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
        (cd $(HOST_SUBDIR)/libiberty && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS)  install)
 
 @endif libiberty
 
@@ -14267,7 +14253,7 @@ install-libtool: installdirs
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
        (cd $(HOST_SUBDIR)/libtool && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS)  install)
 
 @endif libtool
 
@@ -14595,7 +14581,7 @@ install-m4: installdirs
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
        (cd $(HOST_SUBDIR)/m4 && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS)  install)
 
 @endif m4
 
@@ -14923,7 +14909,7 @@ install-make: installdirs
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
        (cd $(HOST_SUBDIR)/make && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS)  install)
 
 @endif make
 
@@ -15245,7 +15231,7 @@ install-mmalloc: installdirs
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
        (cd $(HOST_SUBDIR)/mmalloc && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS)  install)
 
 @endif mmalloc
 
@@ -15573,7 +15559,7 @@ install-patch: installdirs
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
        (cd $(HOST_SUBDIR)/patch && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS)  install)
 
 @endif patch
 
@@ -15901,7 +15887,7 @@ install-perl: installdirs
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
        (cd $(HOST_SUBDIR)/perl && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS)  install)
 
 @endif perl
 
@@ -16229,7 +16215,7 @@ install-prms: installdirs
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
        (cd $(HOST_SUBDIR)/prms && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS)  install)
 
 @endif prms
 
@@ -16557,7 +16543,7 @@ install-rcs: installdirs
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
        (cd $(HOST_SUBDIR)/rcs && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS)  install)
 
 @endif rcs
 
@@ -16885,7 +16871,7 @@ install-readline: installdirs
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
        (cd $(HOST_SUBDIR)/readline && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS)  install)
 
 @endif readline
 
@@ -17529,7 +17515,7 @@ install-recode: installdirs
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
        (cd $(HOST_SUBDIR)/recode && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS)  install)
 
 @endif recode
 
@@ -17857,7 +17843,7 @@ install-sed: installdirs
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
        (cd $(HOST_SUBDIR)/sed && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS)  install)
 
 @endif sed
 
@@ -18185,7 +18171,7 @@ install-send-pr: installdirs
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
        (cd $(HOST_SUBDIR)/send-pr && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS)  install)
 
 @endif send-pr
 
@@ -18513,7 +18499,7 @@ install-shellutils: installdirs
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
        (cd $(HOST_SUBDIR)/shellutils && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS)  install)
 
 @endif shellutils
 
@@ -18841,7 +18827,7 @@ install-sid: installdirs
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
        (cd $(HOST_SUBDIR)/sid && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS)  install)
 
 @endif sid
 
@@ -19169,7 +19155,7 @@ install-sim: installdirs
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
        (cd $(HOST_SUBDIR)/sim && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS)  install)
 
 @endif sim
 
@@ -19497,7 +19483,7 @@ install-tar: installdirs
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
        (cd $(HOST_SUBDIR)/tar && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS)  install)
 
 @endif tar
 
@@ -20147,7 +20133,7 @@ install-textutils: installdirs
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
        (cd $(HOST_SUBDIR)/textutils && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS)  install)
 
 @endif textutils
 
@@ -20475,7 +20461,7 @@ install-time: installdirs
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
        (cd $(HOST_SUBDIR)/time && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS)  install)
 
 @endif time
 
@@ -20803,7 +20789,7 @@ install-uudecode: installdirs
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
        (cd $(HOST_SUBDIR)/uudecode && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS)  install)
 
 @endif uudecode
 
@@ -21131,7 +21117,7 @@ install-wdiff: installdirs
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
        (cd $(HOST_SUBDIR)/wdiff && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS)  install)
 
 @endif wdiff
 
@@ -21446,7 +21432,7 @@ check-zip:
          $(SET_LIB_PATH) \
          $(HOST_EXPORTS) \
          (cd $(HOST_SUBDIR)/zip && \
-           $(MAKE) $(FLAGS_TO_PASS)  check)
+           $(MAKE) $(FLAGS_TO_PASS)  check); \
        fi
 
 @endif zip
@@ -21462,7 +21448,7 @@ install-zip: installdirs
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
        (cd $(HOST_SUBDIR)/zip && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS)  install)
 
 @endif zip
 
@@ -22108,7 +22094,7 @@ install-gdb: installdirs
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
        (cd $(HOST_SUBDIR)/gdb && \
-         $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) check)
+         $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) install)
 
 @endif gdb
 
@@ -22436,7 +22422,7 @@ install-expect: installdirs
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
        (cd $(HOST_SUBDIR)/expect && \
-         $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) check)
+         $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) install)
 
 @endif expect
 
@@ -22764,7 +22750,7 @@ install-guile: installdirs
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
        (cd $(HOST_SUBDIR)/guile && \
-         $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) check)
+         $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) install)
 
 @endif guile
 
@@ -23092,7 +23078,7 @@ install-tk: installdirs
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
        (cd $(HOST_SUBDIR)/tk && \
-         $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) check)
+         $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) install)
 
 @endif tk
 
@@ -23414,7 +23400,7 @@ install-libtermcap: installdirs
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
        (cd $(HOST_SUBDIR)/libtermcap && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS)  install)
 
 @endif libtermcap
 
@@ -23676,7 +23662,7 @@ install-utils: installdirs
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
        (cd $(HOST_SUBDIR)/utils && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS)  install)
 
 @endif utils
 
@@ -23945,24 +23931,20 @@ maybe-configure-gnattools:
 @if gnattools
 maybe-configure-gnattools: configure-gnattools
 configure-gnattools:
-       @test ! -f gnattools/Makefile || exit 0; \
-       [ -d gnattools ] || mkdir gnattools; \
+       @test ! -f $(HOST_SUBDIR)/gnattools/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gnattools ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
        echo Configuring in gnattools; \
-       cd gnattools || exit 1; \
+       cd $(HOST_SUBDIR)/gnattools || exit 1; \
        case $(srcdir) in \
-         \.) \
-           srcdiroption="--srcdir=."; \
-           libsrcdir=".";; \
-         /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/gnattools"; \
-           libsrcdir="$$s/gnattools";; \
-         *) \
-           srcdiroption="--srcdir=../$(srcdir)/gnattools"; \
-           libsrcdir="$$s/gnattools";; \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/gnattools/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
+       srcdiroption="--srcdir=$${topdir}/gnattools"; \
+       libsrcdir="$$s/gnattools"; \
        $(SHELL) $${libsrcdir}/configure \
          $(HOST_CONFIGARGS) $${srcdiroption}  \
          || exit 1
@@ -23978,8 +23960,8 @@ all-gnattools: configure-gnattools
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd gnattools && $(MAKE) $(FLAGS_TO_PASS)  \
-         $(TARGET-gnattools))
+       (cd $(HOST_SUBDIR)/gnattools && \
+         $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-gnattools))
 @endif gnattools
 
 .PHONY: check-gnattools maybe-check-gnattools
@@ -23992,7 +23974,8 @@ check-gnattools:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd gnattools && $(MAKE) $(FLAGS_TO_PASS) check)
+       (cd $(HOST_SUBDIR)/gnattools && \
+         $(MAKE) $(FLAGS_TO_PASS)  check)
 
 @endif gnattools
 
@@ -24006,7 +23989,8 @@ install-gnattools: installdirs
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd gnattools && $(MAKE) $(FLAGS_TO_PASS) install)
+       (cd $(HOST_SUBDIR)/gnattools && \
+         $(MAKE) $(FLAGS_TO_PASS)  install)
 
 @endif gnattools
 
@@ -24028,7 +24012,7 @@ info-gnattools: \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing info in gnattools" ; \
-       (cd gnattools && \
+       (cd $(HOST_SUBDIR)/gnattools && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -24054,7 +24038,7 @@ dvi-gnattools: \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing dvi in gnattools" ; \
-       (cd gnattools && \
+       (cd $(HOST_SUBDIR)/gnattools && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -24080,7 +24064,7 @@ html-gnattools: \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing html in gnattools" ; \
-       (cd gnattools && \
+       (cd $(HOST_SUBDIR)/gnattools && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -24106,7 +24090,7 @@ TAGS-gnattools: \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing TAGS in gnattools" ; \
-       (cd gnattools && \
+       (cd $(HOST_SUBDIR)/gnattools && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -24133,7 +24117,7 @@ install-info-gnattools: \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing install-info in gnattools" ; \
-       (cd gnattools && \
+       (cd $(HOST_SUBDIR)/gnattools && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -24159,7 +24143,7 @@ installcheck-gnattools: \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing installcheck in gnattools" ; \
-       (cd gnattools && \
+       (cd $(HOST_SUBDIR)/gnattools && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -24184,7 +24168,7 @@ mostlyclean-gnattools:
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing mostlyclean in gnattools" ; \
-       (cd gnattools && \
+       (cd $(HOST_SUBDIR)/gnattools && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -24209,7 +24193,7 @@ clean-gnattools:
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing clean in gnattools" ; \
-       (cd gnattools && \
+       (cd $(HOST_SUBDIR)/gnattools && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -24234,7 +24218,7 @@ distclean-gnattools:
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing distclean in gnattools" ; \
-       (cd gnattools && \
+       (cd $(HOST_SUBDIR)/gnattools && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -24259,7 +24243,7 @@ maintainer-clean-gnattools:
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing maintainer-clean in gnattools" ; \
-       (cd gnattools && \
+       (cd $(HOST_SUBDIR)/gnattools && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -35517,7 +35501,7 @@ $(srcdir)/Makefile.in: @MAINT@ $(srcdir)/Makefile.tpl $(srcdir)/Makefile.def
 Makefile: $(srcdir)/Makefile.in config.status
        CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
-config.status: configure $(gcc_version_trigger)
+config.status: configure
        CONFIG_SHELL="$(SHELL)" $(SHELL) ./config.status --recheck
 
 # Rebuilding configure.