2003-05-06 Eric Botcazou <ebotcazou@libertysurf.fr>

[pf3gnuchains/gcc-fork.git] / config-ml.in

diff --git a/config-ml.in b/config-ml.in
index 5692fb3..b6b61ed 100644 (file)
--- a/config-ml.in
+++ b/config-ml.in
@@ -64,11 +64,6 @@
 # newlib.  It is up to each target to turn on multilib support for the other
 # libraries as desired.
 
-# We have to handle being invoked by both Cygnus configure and Autoconf.
-#
-# Cygnus configure incoming variables:
-# srcdir, subdir, host, arguments
-#
 # Autoconf incoming variables:
 # srcdir, host, ac_configure_args
 #
@@ -78,21 +73,10 @@
 # Note that `host' in this case is GCC's `target'.  Target libraries are
 # configured for a particular host.
 
-if [ -n "${ac_configure_args}" ]; then
-  Makefile=${ac_file-Makefile}
-  ml_config_shell=${CONFIG_SHELL-/bin/sh}
-  ml_arguments="${ac_configure_args}"
-  ml_realsrcdir=${srcdir}
-else
-  Makefile=${Makefile-Makefile}
-  ml_config_shell=${config_shell-/bin/sh}
-  ml_arguments="${arguments}"
-  if [ -n "${subdir}" -a "${subdir}" != "." ] ; then
-    ml_realsrcdir=${srcdir}/${subdir}
-  else
-    ml_realsrcdir=${srcdir}
-  fi
-fi
+Makefile=${ac_file-Makefile}
+ml_config_shell=${CONFIG_SHELL-/bin/sh}
+ml_arguments="${ac_configure_args}"
+ml_realsrcdir=${srcdir}
 
 # Scan all the arguments and set all the ones we need.
 
@@ -480,17 +464,6 @@ powerpc*-*-* | rs6000*-*-*)
            esac
          done
        fi
-       if [ x$enable_aix = xno ]
-       then
-         old_multidirs="${multidirs}"
-         multidirs=""
-         for x in ${old_multidirs}; do
-           case "$x" in
-             *mcall-aix* ) : ;;
-             *) multidirs="${multidirs} ${x}" ;;
-           esac
-         done
-       fi
        ;;
 sparc*-*-*)
        case " $multidirs " in
@@ -556,6 +529,10 @@ multi-do:
                                LIBCXXFLAGS="$(LIBCXXFLAGS) $${flags}" \
                                LDFLAGS="$(LDFLAGS) $${flags}" \
                                DESTDIR="$(DESTDIR)" \
+                               INSTALL="$(INSTALL)" \
+                               INSTALL_DATA="$(INSTALL_DATA)" \
+                               INSTALL_PROGRAM="$(INSTALL_PROGRAM)" \
+                               INSTALL_SCRIPT="$(INSTALL_SCRIPT)" \
                                $(DO)); then \
                  true; \
                else \