libgloss: hardcode AC_CONFIG_AUX_DIR path

In order to transition to automake, we have to use hardcoded paths in
the AC_CONFIG_AUX_DIR macro call (since automake evaluates the path
itself, and doesn't expand vars), so simplify all the calls here.

106 files changed, 260 insertions, 1543 deletions

diff --git a/libgloss/aarch64/configure b/libgloss/aarch64/configure
index bb91e66..b660ebd 100755
--- a/libgloss/aarch64/configure
+++ b/libgloss/aarch64/configure
@@ -1765,17 +1765,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
-if test "$srcdir" = "." ; then
-  if test "${with_target_subdir}" != "." ; then
-    libgloss_topdir="${srcdir}/${with_multisrctop}../../.."
-  else
-    libgloss_topdir="${srcdir}/${with_multisrctop}../.."
-  fi
-else
-  libgloss_topdir="${srcdir}/../.."
-fi
 ac_aux_dir=
-for ac_dir in $libgloss_topdir "$srcdir"/$libgloss_topdir; do
+for ac_dir in ../.. "$srcdir"/../..; do
   if test -f "$ac_dir/install-sh"; then
     ac_aux_dir=$ac_dir
     ac_install_sh="$ac_aux_dir/install-sh -c"
@@ -1791,7 +1782,7 @@ for ac_dir in $libgloss_topdir "$srcdir"/$libgloss_topdir; do
   fi
 done
 if test -z "$ac_aux_dir"; then
-  as_fn_error $? "cannot find install-sh, install.sh, or shtool in $libgloss_topdir \"$srcdir\"/$libgloss_topdir" "$LINENO" 5
+  as_fn_error $? "cannot find install-sh, install.sh, or shtool in ../.. \"$srcdir\"/../.." "$LINENO" 5
 fi
 
 # These three variables are undocumented and unsupported,
@@ -3288,7 +3279,6 @@ target=${target}
 with_multisubdir=${with_multisubdir}
 ac_configure_args="${ac_configure_args} --enable-multilib"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-libgloss_topdir=${libgloss_topdir}
 
 
 _ACEOF
@@ -3856,7 +3846,7 @@ $as_echo X"$file" |
   done
 }
  ;;
-    "Makefile":F) . ${libgloss_topdir}/config-ml.in ;;
+    "Makefile":F) . ${srcdir}/../../config-ml.in ;;
 
   esac
 done # for ac_tag
diff --git a/libgloss/aarch64/configure.ac b/libgloss/aarch64/configure.ac
index 88acc0f..da932e5 100644
--- a/libgloss/aarch64/configure.ac
+++ b/libgloss/aarch64/configure.ac
@@ -2,16 +2,7 @@ dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.69)dnl
 AC_INIT(crt0.S)
 
-if test "$srcdir" = "." ; then
-  if test "${with_target_subdir}" != "." ; then
-    libgloss_topdir="${srcdir}/${with_multisrctop}../../.."
-  else
-    libgloss_topdir="${srcdir}/${with_multisrctop}../.."
-  fi
-else
-  libgloss_topdir="${srcdir}/../.."
-fi
-AC_CONFIG_AUX_DIR($libgloss_topdir)
+AC_CONFIG_AUX_DIR(../..)
 
 AC_CANONICAL_SYSTEM
 AC_ARG_PROGRAM
@@ -54,12 +45,11 @@ if test -d "${srcdir}/cpu-init"; then
 fi
 
 AC_CONFIG_FILES(Makefile,
-. ${libgloss_topdir}/config-ml.in,
+. ${srcdir}/../../config-ml.in,
 srcdir=${srcdir}
 target=${target}
 with_multisubdir=${with_multisubdir}
 ac_configure_args="${ac_configure_args} --enable-multilib"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-libgloss_topdir=${libgloss_topdir}
 )
 AC_OUTPUT
diff --git a/libgloss/aarch64/cpu-init/configure b/libgloss/aarch64/cpu-init/configure
index 2a1f602..bc5df10 100755
--- a/libgloss/aarch64/cpu-init/configure
+++ b/libgloss/aarch64/cpu-init/configure
@@ -1762,17 +1762,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
-if test "$srcdir" = "." ; then
-  if test "${with_target_subdir}" != "." ; then
-    libgloss_topdir="${srcdir}/${with_multisrctop}../../.."
-  else
-    libgloss_topdir="${srcdir}/${with_multisrctop}../.."
-  fi
-else
-  libgloss_topdir="${srcdir}/../../.."
-fi
 ac_aux_dir=
-for ac_dir in $libgloss_topdir "$srcdir"/$libgloss_topdir; do
+for ac_dir in ../../.. "$srcdir"/../../..; do
   if test -f "$ac_dir/install-sh"; then
     ac_aux_dir=$ac_dir
     ac_install_sh="$ac_aux_dir/install-sh -c"
@@ -1788,7 +1779,7 @@ for ac_dir in $libgloss_topdir "$srcdir"/$libgloss_topdir; do
   fi
 done
 if test -z "$ac_aux_dir"; then
-  as_fn_error $? "cannot find install-sh, install.sh, or shtool in $libgloss_topdir \"$srcdir\"/$libgloss_topdir" "$LINENO" 5
+  as_fn_error $? "cannot find install-sh, install.sh, or shtool in ../../.. \"$srcdir\"/../../.." "$LINENO" 5
 fi
 
 # These three variables are undocumented and unsupported,
@@ -3267,7 +3258,6 @@ target=${target}
 with_multisubdir=${with_multisubdir}
 ac_configure_args="${ac_configure_args} --enable-multilib"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-libgloss_topdir=${libgloss_topdir}
 
 
 _ACEOF
@@ -3835,7 +3825,7 @@ $as_echo X"$file" |
   done
 }
  ;;
-    "Makefile":F) . ${libgloss_topdir}/config-ml.in ;;
+    "Makefile":F) . ${srcdir}/../../../config-ml.in ;;
 
   esac
 done # for ac_tag
diff --git a/libgloss/aarch64/cpu-init/configure.ac b/libgloss/aarch64/cpu-init/configure.ac
index e93b823..40a33c0 100644
--- a/libgloss/aarch64/cpu-init/configure.ac
+++ b/libgloss/aarch64/cpu-init/configure.ac
@@ -2,16 +2,7 @@ dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.69)dnl
 AC_INIT(Makefile.in)
 
-if test "$srcdir" = "." ; then
-  if test "${with_target_subdir}" != "." ; then
-    libgloss_topdir="${srcdir}/${with_multisrctop}../../.."
-  else
-    libgloss_topdir="${srcdir}/${with_multisrctop}../.."
-  fi
-else
-  libgloss_topdir="${srcdir}/../../.."
-fi
-AC_CONFIG_AUX_DIR($libgloss_topdir)
+AC_CONFIG_AUX_DIR(../../..)
 
 AC_CANONICAL_SYSTEM
 AC_ARG_PROGRAM
@@ -39,12 +30,11 @@ AC_SUBST(host_makefile_frag_path)
 AC_SUBST_FILE(host_makefile_frag)
 
 AC_CONFIG_FILES(Makefile,
-. ${libgloss_topdir}/config-ml.in,
+. ${srcdir}/../../../config-ml.in,
 srcdir=${srcdir}
 target=${target}
 with_multisubdir=${with_multisubdir}
 ac_configure_args="${ac_configure_args} --enable-multilib"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-libgloss_topdir=${libgloss_topdir}
 )
 AC_OUTPUT
diff --git a/libgloss/arc/configure b/libgloss/arc/configure
index 532fe27..3d6919d 100755
--- a/libgloss/arc/configure
+++ b/libgloss/arc/configure
@@ -1766,17 +1766,8 @@ if test "${enable_shared}" = "yes" ; then
     echo "Shared libraries not supported for cross compiling, ignored"
 fi
 
-if test "$srcdir" = "." ; then
-  if test "${with_target_subdir}" != "." ; then
-    libgloss_topdir="${srcdir}/${with_multisrctop}../../.."
-  else
-    libgloss_topdir="${srcdir}/${with_multisrctop}../.."
-  fi
-else
-  libgloss_topdir="${srcdir}/../.."
-fi
 ac_aux_dir=
-for ac_dir in $libgloss_topdir "$srcdir"/$libgloss_topdir; do
+for ac_dir in ../.. "$srcdir"/../..; do
   if test -f "$ac_dir/install-sh"; then
     ac_aux_dir=$ac_dir
     ac_install_sh="$ac_aux_dir/install-sh -c"
@@ -1792,7 +1783,7 @@ for ac_dir in $libgloss_topdir "$srcdir"/$libgloss_topdir; do
   fi
 done
 if test -z "$ac_aux_dir"; then
-  as_fn_error $? "cannot find install-sh, install.sh, or shtool in $libgloss_topdir \"$srcdir\"/$libgloss_topdir" "$LINENO" 5
+  as_fn_error $? "cannot find install-sh, install.sh, or shtool in ../.. \"$srcdir\"/../.." "$LINENO" 5
 fi
 
 # These three variables are undocumented and unsupported,
@@ -3272,7 +3263,6 @@ target=${target}
 with_multisubdir=${with_multisubdir}
 ac_configure_args="${ac_configure_args} --enable-multilib"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-libgloss_topdir=${libgloss_topdir}
 
 
 _ACEOF
@@ -3840,7 +3830,7 @@ $as_echo X"$file" |
   done
 }
  ;;
-    "Makefile":F) . ${libgloss_topdir}/config-ml.in ;;
+    "Makefile":F) . ${srcdir}/../../config-ml.in ;;
 
   esac
 done # for ac_tag
diff --git a/libgloss/arc/configure.ac b/libgloss/arc/configure.ac
index fee6c45..23d5fb4 100644
--- a/libgloss/arc/configure.ac
+++ b/libgloss/arc/configure.ac
@@ -6,16 +6,7 @@ if test "${enable_shared}" = "yes" ; then
     echo "Shared libraries not supported for cross compiling, ignored"
 fi
 
-if test "$srcdir" = "." ; then
-  if test "${with_target_subdir}" != "." ; then
-    libgloss_topdir="${srcdir}/${with_multisrctop}../../.."
-  else
-    libgloss_topdir="${srcdir}/${with_multisrctop}../.."
-  fi
-else
-  libgloss_topdir="${srcdir}/../.."
-fi
-AC_CONFIG_AUX_DIR($libgloss_topdir)
+AC_CONFIG_AUX_DIR(../..)
 
 AC_CANONICAL_SYSTEM
 AC_ARG_PROGRAM
@@ -44,12 +35,11 @@ AC_SUBST(host_makefile_frag_path)
 AC_SUBST_FILE(host_makefile_frag)
 
 AC_CONFIG_FILES(Makefile,
-. ${libgloss_topdir}/config-ml.in,
+. ${srcdir}/../../config-ml.in,
 srcdir=${srcdir}
 target=${target}
 with_multisubdir=${with_multisubdir}
 ac_configure_args="${ac_configure_args} --enable-multilib"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-libgloss_topdir=${libgloss_topdir}
 )
 AC_OUTPUT
diff --git a/libgloss/arm/configure b/libgloss/arm/configure
index 5be6272..700a750 100755
--- a/libgloss/arm/configure
+++ b/libgloss/arm/configure
@@ -1790,17 +1790,8 @@ fi
 
 
 
-if test "$srcdir" = "." ; then
-  if test "${with_target_subdir}" != "." ; then
-    libgloss_topdir="${srcdir}/${with_multisrctop}../../.."
-  else
-    libgloss_topdir="${srcdir}/${with_multisrctop}../.."
-  fi
-else
-  libgloss_topdir="${srcdir}/../.."
-fi
 ac_aux_dir=
-for ac_dir in $libgloss_topdir "$srcdir"/$libgloss_topdir; do
+for ac_dir in ../.. "$srcdir"/../..; do
   if test -f "$ac_dir/install-sh"; then
     ac_aux_dir=$ac_dir
     ac_install_sh="$ac_aux_dir/install-sh -c"
@@ -1816,7 +1807,7 @@ for ac_dir in $libgloss_topdir "$srcdir"/$libgloss_topdir; do
   fi
 done
 if test -z "$ac_aux_dir"; then
-  as_fn_error $? "cannot find install-sh, install.sh, or shtool in $libgloss_topdir \"$srcdir\"/$libgloss_topdir" "$LINENO" 5
+  as_fn_error $? "cannot find install-sh, install.sh, or shtool in ../.. \"$srcdir\"/../.." "$LINENO" 5
 fi
 
 # These three variables are undocumented and unsupported,
@@ -3314,14 +3305,12 @@ srcdir=${srcdir}
   with_multisubdir=${with_multisubdir}
   ac_configure_args="${ac_configure_args} --enable-multilib"
   CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-  libgloss_topdir=${libgloss_topdir}
 
 srcdir=${srcdir}
 target=${target}
 with_multisubdir=${with_multisubdir}
 ac_configure_args="${ac_configure_args} --enable-multilib"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-libgloss_topdir=${libgloss_topdir}
 
 
 _ACEOF
@@ -3890,8 +3879,8 @@ $as_echo X"$file" |
   done
 }
  ;;
-    "cpu-init/Makefile":F) . ${libgloss_topdir}/config-ml.in ;;
-    "Makefile":F) . ${libgloss_topdir}/config-ml.in ;;
+    "cpu-init/Makefile":F) . ${srcdir}/../../config-ml.in ;;
+    "Makefile":F) . ${srcdir}/../../config-ml.in ;;
 
   esac
 done # for ac_tag
diff --git a/libgloss/arm/configure.ac b/libgloss/arm/configure.ac
index 59b580d..316889c 100644
--- a/libgloss/arm/configure.ac
+++ b/libgloss/arm/configure.ac
@@ -22,16 +22,7 @@ fi
 AC_SUBST(BUILD_CRT0_TRUE)
 AC_SUBST(BUILD_CRT0_FALSE)
 
-if test "$srcdir" = "." ; then
-  if test "${with_target_subdir}" != "." ; then
-    libgloss_topdir="${srcdir}/${with_multisrctop}../../.."
-  else
-    libgloss_topdir="${srcdir}/${with_multisrctop}../.."
-  fi
-else
-  libgloss_topdir="${srcdir}/../.."
-fi
-AC_CONFIG_AUX_DIR($libgloss_topdir)
+AC_CONFIG_AUX_DIR(../..)
 
 AC_CANONICAL_SYSTEM
 AC_ARG_PROGRAM
@@ -73,25 +64,23 @@ AC_SUBST_FILE(host_makefile_frag)
 if test -d "${srcdir}/cpu-init"; then
   subdirs="${subdirs} cpu-init"
   AC_CONFIG_FILES(cpu-init/Makefile,
-  . ${libgloss_topdir}/config-ml.in,
+  . ${srcdir}/../../config-ml.in,
   srcdir=${srcdir}
   target=${target}
   with_multisubdir=${with_multisubdir}
   ac_configure_args="${ac_configure_args} --enable-multilib"
   CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-  libgloss_topdir=${libgloss_topdir}
   )
   AC_SUBST(subdirs)
 fi
 
 AC_CONFIG_FILES(Makefile,
-. ${libgloss_topdir}/config-ml.in,
+. ${srcdir}/../../config-ml.in,
 srcdir=${srcdir}
 target=${target}
 with_multisubdir=${with_multisubdir}
 ac_configure_args="${ac_configure_args} --enable-multilib"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-libgloss_topdir=${libgloss_topdir}
 )
 AC_OUTPUT
 
diff --git a/libgloss/bfin/configure b/libgloss/bfin/configure
index 99457d7..6467495 100755
--- a/libgloss/bfin/configure
+++ b/libgloss/bfin/configure
@@ -1766,17 +1766,8 @@ if test "${enable_shared}" = "yes" ; then
     echo "Shared libraries not supported for cross compiling, ignored"
 fi
 
-if test "$srcdir" = "." ; then
-  if test "${with_target_subdir}" != "." ; then
-    libgloss_topdir="${srcdir}/${with_multisrctop}../../.."
-  else
-    libgloss_topdir="${srcdir}/${with_multisrctop}../.."
-  fi
-else
-  libgloss_topdir="${srcdir}/../.."
-fi
 ac_aux_dir=
-for ac_dir in $libgloss_topdir "$srcdir"/$libgloss_topdir; do
+for ac_dir in ../.. "$srcdir"/../..; do
   if test -f "$ac_dir/install-sh"; then
     ac_aux_dir=$ac_dir
     ac_install_sh="$ac_aux_dir/install-sh -c"
@@ -1792,7 +1783,7 @@ for ac_dir in $libgloss_topdir "$srcdir"/$libgloss_topdir; do
   fi
 done
 if test -z "$ac_aux_dir"; then
-  as_fn_error $? "cannot find install-sh, install.sh, or shtool in $libgloss_topdir \"$srcdir\"/$libgloss_topdir" "$LINENO" 5
+  as_fn_error $? "cannot find install-sh, install.sh, or shtool in ../.. \"$srcdir\"/../.." "$LINENO" 5
 fi
 
 # These three variables are undocumented and unsupported,
@@ -3271,7 +3262,6 @@ target=${target}
 with_multisubdir=${with_multisubdir}
 ac_configure_args="${ac_configure_args} --enable-multilib"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-libgloss_topdir=${libgloss_topdir}
 
 
 _ACEOF
@@ -3839,7 +3829,7 @@ $as_echo X"$file" |
   done
 }
  ;;
-    "Makefile":F) . ${libgloss_topdir}/config-ml.in ;;
+    "Makefile":F) . ${srcdir}/../../config-ml.in ;;
 
   esac
 done # for ac_tag
diff --git a/libgloss/bfin/configure.ac b/libgloss/bfin/configure.ac
index 2cfb82d..562d6a2 100644
--- a/libgloss/bfin/configure.ac
+++ b/libgloss/bfin/configure.ac
@@ -6,16 +6,7 @@ if test "${enable_shared}" = "yes" ; then
     echo "Shared libraries not supported for cross compiling, ignored"
 fi
 
-if test "$srcdir" = "." ; then
-  if test "${with_target_subdir}" != "." ; then
-    libgloss_topdir="${srcdir}/${with_multisrctop}../../.."
-  else
-    libgloss_topdir="${srcdir}/${with_multisrctop}../.."
-  fi
-else
-  libgloss_topdir="${srcdir}/../.."
-fi
-AC_CONFIG_AUX_DIR($libgloss_topdir)
+AC_CONFIG_AUX_DIR(../..)
 
 AC_CANONICAL_SYSTEM
 AC_ARG_PROGRAM
@@ -43,12 +34,11 @@ AC_SUBST(host_makefile_frag_path)
 AC_SUBST_FILE(host_makefile_frag)
 
 AC_CONFIG_FILES(Makefile,
-. ${libgloss_topdir}/config-ml.in,
+. ${srcdir}/../../config-ml.in,
 srcdir=${srcdir}
 target=${target}
 with_multisubdir=${with_multisubdir}
 ac_configure_args="${ac_configure_args} --enable-multilib"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-libgloss_topdir=${libgloss_topdir}
 )
 AC_OUTPUT
diff --git a/libgloss/configure b/libgloss/configure
index e70c57d..f39de1c 100755
--- a/libgloss/configure
+++ b/libgloss/configure
@@ -1846,17 +1846,8 @@ if test "${enable_shared}" = "yes" ; then
     echo "Shared libraries not supported for cross compiling, ignored"
 fi
 
-if test "${srcdir}" = "." ; then
-  if test "${with_target_subdir}" != "." ; then
-    libgloss_topdir="${srcdir}/${with_multisrctop}../.."
-  else
-    libgloss_topdir="${srcdir}/${with_multisrctop}.."
-  fi
-else
-  libgloss_topdir="${srcdir}/.."
-fi
 ac_aux_dir=
-for ac_dir in $libgloss_topdir "$srcdir"/$libgloss_topdir; do
+for ac_dir in .. "$srcdir"/..; do
   if test -f "$ac_dir/install-sh"; then
     ac_aux_dir=$ac_dir
     ac_install_sh="$ac_aux_dir/install-sh -c"
@@ -1872,7 +1863,7 @@ for ac_dir in $libgloss_topdir "$srcdir"/$libgloss_topdir; do
   fi
 done
 if test -z "$ac_aux_dir"; then
-  as_fn_error $? "cannot find install-sh, install.sh, or shtool in $libgloss_topdir \"$srcdir\"/$libgloss_topdir" "$LINENO" 5
+  as_fn_error $? "cannot find install-sh, install.sh, or shtool in .. \"$srcdir\"/.." "$LINENO" 5
 fi
 
 # These three variables are undocumented and unsupported,
@@ -4085,7 +4076,6 @@ host=${host}
 with_multisubdir=${with_multisubdir}
 ac_configure_args="--enable-multilib ${ac_configure_args}"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-libgloss_topdir=${libgloss_topdir}
 CC="${CC}"
 LDFLAGS=${LDFLAGS}
 
@@ -4663,7 +4653,7 @@ $as_echo X"$file" |
  ;;
     "Makefile":F) if test -n "$CONFIG_FILES"; then
   unset ac_file
-  . ${libgloss_topdir}/config-ml.in
+  . ${srcdir}/../config-ml.in
 fi ;;
 
   esac
diff --git a/libgloss/configure.ac b/libgloss/configure.ac
index 0fbe995..ae8a26d 100644
--- a/libgloss/configure.ac
+++ b/libgloss/configure.ac
@@ -7,16 +7,7 @@ if test "${enable_shared}" = "yes" ; then
     echo "Shared libraries not supported for cross compiling, ignored"
 fi
 
-if test "${srcdir}" = "." ; then
-  if test "${with_target_subdir}" != "." ; then
-    libgloss_topdir="${srcdir}/${with_multisrctop}../.."
-  else
-    libgloss_topdir="${srcdir}/${with_multisrctop}.."
-  fi
-else
-  libgloss_topdir="${srcdir}/.."
-fi
-AC_CONFIG_AUX_DIR($libgloss_topdir)
+AC_CONFIG_AUX_DIR(..)
 
 AC_PROG_INSTALL
 
@@ -228,7 +219,7 @@ fi
 AC_CONFIG_FILES([Makefile],
 [if test -n "$CONFIG_FILES"; then
   unset ac_file
-  . ${libgloss_topdir}/config-ml.in
+  . ${srcdir}/../config-ml.in
 fi],
 srcdir=${srcdir}
 target=${target}
@@ -236,7 +227,6 @@ host=${host}
 with_multisubdir=${with_multisubdir}
 ac_configure_args="--enable-multilib ${ac_configure_args}"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-libgloss_topdir=${libgloss_topdir}
 CC="${CC}"
 LDFLAGS=${LDFLAGS}
 )
diff --git a/libgloss/cr16/configure b/libgloss/cr16/configure
index 5cc00fc..88e0599 100755
--- a/libgloss/cr16/configure
+++ b/libgloss/cr16/configure
@@ -1766,17 +1766,8 @@ if test "${enable_shared}" = "yes" ; then
     echo "Shared libraries not supported for cross compiling, ignored"
 fi
 
-if test "$srcdir" = "." ; then
-  if test "${with_target_subdir}" != "." ; then
-    libgloss_topdir="${srcdir}/${with_multisrctop}../../.."
-  else
-    libgloss_topdir="${srcdir}/${with_multisrctop}../.."
-  fi
-else
-  libgloss_topdir="${srcdir}/../.."
-fi
 ac_aux_dir=
-for ac_dir in $libgloss_topdir "$srcdir"/$libgloss_topdir; do
+for ac_dir in ../.. "$srcdir"/../..; do
   if test -f "$ac_dir/install-sh"; then
     ac_aux_dir=$ac_dir
     ac_install_sh="$ac_aux_dir/install-sh -c"
@@ -1792,7 +1783,7 @@ for ac_dir in $libgloss_topdir "$srcdir"/$libgloss_topdir; do
   fi
 done
 if test -z "$ac_aux_dir"; then
-  as_fn_error $? "cannot find install-sh, install.sh, or shtool in $libgloss_topdir \"$srcdir\"/$libgloss_topdir" "$LINENO" 5
+  as_fn_error $? "cannot find install-sh, install.sh, or shtool in ../.. \"$srcdir\"/../.." "$LINENO" 5
 fi
 
 # These three variables are undocumented and unsupported,
@@ -3272,7 +3263,6 @@ target=${target}
 with_multisubdir=${with_multisubdir}
 ac_configure_args="${ac_configure_args} --enable-multilib"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-libgloss_topdir=${libgloss_topdir}
 
 
 _ACEOF
@@ -3840,7 +3830,7 @@ $as_echo X"$file" |
   done
 }
  ;;
-    "Makefile":F) . ${libgloss_topdir}/config-ml.in ;;
+    "Makefile":F) . ${srcdir}/../../config-ml.in ;;
 
   esac
 done # for ac_tag
diff --git a/libgloss/cr16/configure.ac b/libgloss/cr16/configure.ac
index da46354..28b3065 100644
--- a/libgloss/cr16/configure.ac
+++ b/libgloss/cr16/configure.ac
@@ -6,16 +6,7 @@ if test "${enable_shared}" = "yes" ; then
     echo "Shared libraries not supported for cross compiling, ignored"
 fi
 
-if test "$srcdir" = "." ; then
-  if test "${with_target_subdir}" != "." ; then
-    libgloss_topdir="${srcdir}/${with_multisrctop}../../.."
-  else
-    libgloss_topdir="${srcdir}/${with_multisrctop}../.."
-  fi
-else
-  libgloss_topdir="${srcdir}/../.."
-fi
-AC_CONFIG_AUX_DIR($libgloss_topdir)
+AC_CONFIG_AUX_DIR(../..)
 
 AC_CANONICAL_SYSTEM
 AC_ARG_PROGRAM
@@ -44,12 +35,11 @@ AC_SUBST(host_makefile_frag_path)
 AC_SUBST_FILE(host_makefile_frag)
 
 AC_CONFIG_FILES(Makefile,
-. ${libgloss_topdir}/config-ml.in,
+. ${srcdir}/../../config-ml.in,
 srcdir=${srcdir}
 target=${target}
 with_multisubdir=${with_multisubdir}
 ac_configure_args="${ac_configure_args} --enable-multilib"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-libgloss_topdir=${libgloss_topdir}
 )
 AC_OUTPUT
diff --git a/libgloss/cris/configure b/libgloss/cris/configure
index 929cd86..25752ac 100755
--- a/libgloss/cris/configure
+++ b/libgloss/cris/configure
@@ -1766,17 +1766,8 @@ if test "${enable_shared}" = "yes" ; then
     echo "Shared libraries not supported for cross compiling, ignored"
 fi
 
-if test "$srcdir" = "." ; then
-  if test "${with_target_subdir}" != "." ; then
-    libgloss_topdir="${srcdir}/${with_multisrctop}../../.."
-  else
-    libgloss_topdir="${srcdir}/${with_multisrctop}../.."
-  fi
-else
-  libgloss_topdir="${srcdir}/../.."
-fi
 ac_aux_dir=
-for ac_dir in $libgloss_topdir "$srcdir"/$libgloss_topdir; do
+for ac_dir in ../.. "$srcdir"/../..; do
   if test -f "$ac_dir/install-sh"; then
     ac_aux_dir=$ac_dir
     ac_install_sh="$ac_aux_dir/install-sh -c"
@@ -1792,7 +1783,7 @@ for ac_dir in $libgloss_topdir "$srcdir"/$libgloss_topdir; do
   fi
 done
 if test -z "$ac_aux_dir"; then
-  as_fn_error $? "cannot find install-sh, install.sh, or shtool in $libgloss_topdir \"$srcdir\"/$libgloss_topdir" "$LINENO" 5
+  as_fn_error $? "cannot find install-sh, install.sh, or shtool in ../.. \"$srcdir\"/../.." "$LINENO" 5
 fi
 
 # These three variables are undocumented and unsupported,
@@ -3271,7 +3262,6 @@ target=${target}
 with_multisubdir=${with_multisubdir}
 ac_configure_args="${ac_configure_args} --enable-multilib"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-libgloss_topdir=${libgloss_topdir}
 
 
 _ACEOF
@@ -3839,7 +3829,7 @@ $as_echo X"$file" |
   done
 }
  ;;
-    "Makefile":F) . ${libgloss_topdir}/config-ml.in ;;
+    "Makefile":F) . ${srcdir}/../../config-ml.in ;;
 
   esac
 done # for ac_tag
diff --git a/libgloss/cris/configure.ac b/libgloss/cris/configure.ac
index c35612f..7d32377 100644
--- a/libgloss/cris/configure.ac
+++ b/libgloss/cris/configure.ac
@@ -7,16 +7,7 @@ if test "${enable_shared}" = "yes" ; then
     echo "Shared libraries not supported for cross compiling, ignored"
 fi
 
-if test "$srcdir" = "." ; then
-  if test "${with_target_subdir}" != "." ; then
-    libgloss_topdir="${srcdir}/${with_multisrctop}../../.."
-  else
-    libgloss_topdir="${srcdir}/${with_multisrctop}../.."
-  fi
-else
-  libgloss_topdir="${srcdir}/../.."
-fi
-AC_CONFIG_AUX_DIR($libgloss_topdir)
+AC_CONFIG_AUX_DIR(../..)
 
 AC_CANONICAL_SYSTEM
 AC_ARG_PROGRAM
@@ -44,12 +35,11 @@ AC_SUBST(host_makefile_frag_path)
 AC_SUBST_FILE(host_makefile_frag)
 
 AC_CONFIG_FILES(Makefile,
-. ${libgloss_topdir}/config-ml.in,
+. ${srcdir}/../../config-ml.in,
 srcdir=${srcdir}
 target=${target}
 with_multisubdir=${with_multisubdir}
 ac_configure_args="${ac_configure_args} --enable-multilib"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-libgloss_topdir=${libgloss_topdir}
 )
 AC_OUTPUT
diff --git a/libgloss/crx/configure b/libgloss/crx/configure
index 8f81af3..025ef95 100755
--- a/libgloss/crx/configure
+++ b/libgloss/crx/configure
@@ -1913,41 +1913,8 @@ ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
 program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
 
 
-if test "$srcdir" = "." ; then
-  mdir=`echo "${with_multisubdir}/" \
-    | sed -e 's,\([^/][^/]*\),..,g' -e 's,^/$,,'`
-  ac_aux_dir=
-for ac_dir in ${mdir}../../.. "$srcdir"/${mdir}../../..; do
-  if test -f "$ac_dir/install-sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f "$ac_dir/install.sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  elif test -f "$ac_dir/shtool"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/shtool install -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  as_fn_error $? "cannot find install-sh, install.sh, or shtool in ${mdir}../../.. \"$srcdir\"/${mdir}../../.." "$LINENO" 5
-fi
-
-# These three variables are undocumented and unsupported,
-# and are intended to be withdrawn in a future Autoconf release.
-# They can cause serious problems if a builder's source tree is in a directory
-# whose full name contains unusual characters.
-ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
-ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
-ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
-
-
-else
-  ac_aux_dir=
-for ac_dir in ${srcdir}/../.. "$srcdir"/${srcdir}/../..; do
+ac_aux_dir=
+for ac_dir in ../.. "$srcdir"/../..; do
   if test -f "$ac_dir/install-sh"; then
     ac_aux_dir=$ac_dir
     ac_install_sh="$ac_aux_dir/install-sh -c"
@@ -1963,7 +1930,7 @@ for ac_dir in ${srcdir}/../.. "$srcdir"/${srcdir}/../..; do
   fi
 done
 if test -z "$ac_aux_dir"; then
-  as_fn_error $? "cannot find install-sh, install.sh, or shtool in ${srcdir}/../.. \"$srcdir\"/${srcdir}/../.." "$LINENO" 5
+  as_fn_error $? "cannot find install-sh, install.sh, or shtool in ../.. \"$srcdir\"/../.." "$LINENO" 5
 fi
 
 # These three variables are undocumented and unsupported,
@@ -1975,7 +1942,6 @@ ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
 ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 
 
-fi
 
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
diff --git a/libgloss/crx/configure.ac b/libgloss/crx/configure.ac
index 7badc19..eb88aab 100644
--- a/libgloss/crx/configure.ac
+++ b/libgloss/crx/configure.ac
@@ -5,13 +5,7 @@ AC_INIT(intable.c)
 AC_CANONICAL_SYSTEM
 AC_ARG_PROGRAM
 
-if test "$srcdir" = "." ; then
-  mdir=`echo "${with_multisubdir}/" \
-    | sed -e 's,\([[^/]][[^/]]*\),..,g' -e 's,^/$,,'`
-  AC_CONFIG_AUX_DIR(${mdir}../../..)
-else
-  AC_CONFIG_AUX_DIR(${srcdir}/../..)
-fi
+AC_CONFIG_AUX_DIR(../..)
 
 AC_PROG_INSTALL
 
diff --git a/libgloss/csky/configure b/libgloss/csky/configure
index f1aeefd..0f72296 100755
--- a/libgloss/csky/configure
+++ b/libgloss/csky/configure
@@ -1827,18 +1827,8 @@ if test "${enable_shared}" = "yes" ; then
     echo "Shared libraries not supported for cross compiling, ignored"
 fi
 
-if test "$srcdir" = "." ; then
-  if test "${with_target_subdir}" != "." ; then
-    libgloss_topdir="${with_multisrctop}../../.."
-  else
-    libgloss_topdir="${with_multisrctop}../.."
-  fi
-else
-  libgloss_topdir="${srcdir}/../.."
-fi
-
 ac_aux_dir=
-for ac_dir in $libgloss_topdir "$srcdir"/$libgloss_topdir; do
+for ac_dir in ../.. "$srcdir"/../..; do
   if test -f "$ac_dir/install-sh"; then
     ac_aux_dir=$ac_dir
     ac_install_sh="$ac_aux_dir/install-sh -c"
@@ -1854,7 +1844,7 @@ for ac_dir in $libgloss_topdir "$srcdir"/$libgloss_topdir; do
   fi
 done
 if test -z "$ac_aux_dir"; then
-  as_fn_error $? "cannot find install-sh, install.sh, or shtool in $libgloss_topdir \"$srcdir\"/$libgloss_topdir" "$LINENO" 5
+  as_fn_error $? "cannot find install-sh, install.sh, or shtool in ../.. \"$srcdir\"/../.." "$LINENO" 5
 fi
 
 # These three variables are undocumented and unsupported,
@@ -4309,7 +4299,6 @@ target=${target}
 with_multisubdir=${with_multisubdir}
 ac_configure_args="${ac_configure_args} --enable-multilib"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-libgloss_topdir=${libgloss_topdir}
 
 
 _ACEOF
@@ -4877,7 +4866,7 @@ $as_echo X"$file" |
   done
 }
  ;;
-    "Makefile":F) . ${libgloss_topdir}/config-ml.in ;;
+    "Makefile":F) . ${srcdir}/../../config-ml.in ;;
 
   esac
 done # for ac_tag
diff --git a/libgloss/csky/configure.ac b/libgloss/csky/configure.ac
index 9b03c68..88b1110 100644
--- a/libgloss/csky/configure.ac
+++ b/libgloss/csky/configure.ac
@@ -18,17 +18,7 @@ if test "${enable_shared}" = "yes" ; then
     echo "Shared libraries not supported for cross compiling, ignored"
 fi
 
-if test "$srcdir" = "." ; then
-  if test "${with_target_subdir}" != "." ; then
-    libgloss_topdir="${with_multisrctop}../../.."
-  else
-    libgloss_topdir="${with_multisrctop}../.."
-  fi
-else
-  libgloss_topdir="${srcdir}/../.."
-fi
-
-AC_CONFIG_AUX_DIR($libgloss_topdir)
+AC_CONFIG_AUX_DIR(../..)
 AC_CANONICAL_SYSTEM
 AC_ARG_PROGRAM
 
@@ -81,13 +71,12 @@ AC_SUBST(target_makefile_frag_path)
 AC_SUBST_FILE(target_makefile_frag)
 
 AC_CONFIG_FILES(Makefile,
-. ${libgloss_topdir}/config-ml.in,
+. ${srcdir}/../../config-ml.in,
 srcdir=${srcdir}
 target=${target}
 with_multisubdir=${with_multisubdir}
 ac_configure_args="${ac_configure_args} --enable-multilib"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-libgloss_topdir=${libgloss_topdir}
 )
 AC_OUTPUT
 
diff --git a/libgloss/d30v/configure b/libgloss/d30v/configure
index 532fe27..3d6919d 100755
--- a/libgloss/d30v/configure
+++ b/libgloss/d30v/configure
@@ -1766,17 +1766,8 @@ if test "${enable_shared}" = "yes" ; then
     echo "Shared libraries not supported for cross compiling, ignored"
 fi
 
-if test "$srcdir" = "." ; then
-  if test "${with_target_subdir}" != "." ; then
-    libgloss_topdir="${srcdir}/${with_multisrctop}../../.."
-  else
-    libgloss_topdir="${srcdir}/${with_multisrctop}../.."
-  fi
-else
-  libgloss_topdir="${srcdir}/../.."
-fi
 ac_aux_dir=
-for ac_dir in $libgloss_topdir "$srcdir"/$libgloss_topdir; do
+for ac_dir in ../.. "$srcdir"/../..; do
   if test -f "$ac_dir/install-sh"; then
     ac_aux_dir=$ac_dir
     ac_install_sh="$ac_aux_dir/install-sh -c"
@@ -1792,7 +1783,7 @@ for ac_dir in $libgloss_topdir "$srcdir"/$libgloss_topdir; do
   fi
 done
 if test -z "$ac_aux_dir"; then
-  as_fn_error $? "cannot find install-sh, install.sh, or shtool in $libgloss_topdir \"$srcdir\"/$libgloss_topdir" "$LINENO" 5
+  as_fn_error $? "cannot find install-sh, install.sh, or shtool in ../.. \"$srcdir\"/../.." "$LINENO" 5
 fi
 
 # These three variables are undocumented and unsupported,
@@ -3272,7 +3263,6 @@ target=${target}
 with_multisubdir=${with_multisubdir}
 ac_configure_args="${ac_configure_args} --enable-multilib"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-libgloss_topdir=${libgloss_topdir}
 
 
 _ACEOF
@@ -3840,7 +3830,7 @@ $as_echo X"$file" |
   done
 }
  ;;
-    "Makefile":F) . ${libgloss_topdir}/config-ml.in ;;
+    "Makefile":F) . ${srcdir}/../../config-ml.in ;;
 
   esac
 done # for ac_tag
diff --git a/libgloss/d30v/configure.ac b/libgloss/d30v/configure.ac
index fee6c45..23d5fb4 100644
--- a/libgloss/d30v/configure.ac
+++ b/libgloss/d30v/configure.ac
@@ -6,16 +6,7 @@ if test "${enable_shared}" = "yes" ; then
     echo "Shared libraries not supported for cross compiling, ignored"
 fi
 
-if test "$srcdir" = "." ; then
-  if test "${with_target_subdir}" != "." ; then
-    libgloss_topdir="${srcdir}/${with_multisrctop}../../.."
-  else
-    libgloss_topdir="${srcdir}/${with_multisrctop}../.."
-  fi
-else
-  libgloss_topdir="${srcdir}/../.."
-fi
-AC_CONFIG_AUX_DIR($libgloss_topdir)
+AC_CONFIG_AUX_DIR(../..)
 
 AC_CANONICAL_SYSTEM
 AC_ARG_PROGRAM
@@ -44,12 +35,11 @@ AC_SUBST(host_makefile_frag_path)
 AC_SUBST_FILE(host_makefile_frag)
 
 AC_CONFIG_FILES(Makefile,
-. ${libgloss_topdir}/config-ml.in,
+. ${srcdir}/../../config-ml.in,
 srcdir=${srcdir}
 target=${target}
 with_multisubdir=${with_multisubdir}
 ac_configure_args="${ac_configure_args} --enable-multilib"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-libgloss_topdir=${libgloss_topdir}
 )
 AC_OUTPUT
diff --git a/libgloss/doc/configure b/libgloss/doc/configure
index a5ed667..098220b 100755
--- a/libgloss/doc/configure
+++ b/libgloss/doc/configure
@@ -1664,11 +1664,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
-if test "$srcdir" = "." ; then
-  mdir=`echo "${with_multisubdir}/" \
-    | sed -e 's,\([^/][^/]*\),..,g' -e 's,^/$,,'`
-  ac_aux_dir=
-for ac_dir in ${mdir}../../.. "$srcdir"/${mdir}../../..; do
+ac_aux_dir=
+for ac_dir in ../.. "$srcdir"/../..; do
   if test -f "$ac_dir/install-sh"; then
     ac_aux_dir=$ac_dir
     ac_install_sh="$ac_aux_dir/install-sh -c"
@@ -1684,7 +1681,7 @@ for ac_dir in ${mdir}../../.. "$srcdir"/${mdir}../../..; do
   fi
 done
 if test -z "$ac_aux_dir"; then
-  as_fn_error $? "cannot find install-sh, install.sh, or shtool in ${mdir}../../.. \"$srcdir\"/${mdir}../../.." "$LINENO" 5
+  as_fn_error $? "cannot find install-sh, install.sh, or shtool in ../.. \"$srcdir\"/../.." "$LINENO" 5
 fi
 
 # These three variables are undocumented and unsupported,
@@ -1696,37 +1693,6 @@ ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
 ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 
 
-else
-  ac_aux_dir=
-for ac_dir in ${srcdir}/../.. "$srcdir"/${srcdir}/../..; do
-  if test -f "$ac_dir/install-sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f "$ac_dir/install.sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  elif test -f "$ac_dir/shtool"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/shtool install -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  as_fn_error $? "cannot find install-sh, install.sh, or shtool in ${srcdir}/../.. \"$srcdir\"/${srcdir}/../.." "$LINENO" 5
-fi
-
-# These three variables are undocumented and unsupported,
-# and are intended to be withdrawn in a future Autoconf release.
-# They can cause serious problems if a builder's source tree is in a directory
-# whose full name contains unusual characters.
-ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
-ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
-ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
-
-
-fi
 
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
diff --git a/libgloss/doc/configure.ac b/libgloss/doc/configure.ac
index 99d1d17..a12099b 100644
--- a/libgloss/doc/configure.ac
+++ b/libgloss/doc/configure.ac
@@ -2,13 +2,7 @@ dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.69)dnl
 AC_INIT(porting.texi)
 
-if test "$srcdir" = "." ; then
-  mdir=`echo "${with_multisubdir}/" \
-    | sed -e 's,\([[^/]][[^/]]*\),..,g' -e 's,^/$,,'`
-  AC_CONFIG_AUX_DIR(${mdir}../../..)
-else
-  AC_CONFIG_AUX_DIR(${srcdir}/../..)
-fi
+AC_CONFIG_AUX_DIR(../..)
 
 AC_PROG_INSTALL
 
diff --git a/libgloss/epiphany/configure b/libgloss/epiphany/configure
index 8f8ed04..82f7d27 100755
--- a/libgloss/epiphany/configure
+++ b/libgloss/epiphany/configure
@@ -1770,18 +1770,8 @@ if test "${enable_shared}" = "yes" ; then
     echo "Shared libraries not supported for cross compiling, ignored"
 fi
 
-# Where are the auxillary tools (confg.sub etc)?
-if test "$srcdir" = "." ; then
-  if test "${with_target_subdir}" != "." ; then
-    libgloss_topdir="${srcdir}/${with_multisrctop}../../.."
-  else
-    libgloss_topdir="${srcdir}/${with_multisrctop}../.."
-  fi
-else
-  libgloss_topdir="${srcdir}/../.."
-fi
 ac_aux_dir=
-for ac_dir in $libgloss_topdir "$srcdir"/$libgloss_topdir; do
+for ac_dir in ../.. "$srcdir"/../..; do
   if test -f "$ac_dir/install-sh"; then
     ac_aux_dir=$ac_dir
     ac_install_sh="$ac_aux_dir/install-sh -c"
@@ -1797,7 +1787,7 @@ for ac_dir in $libgloss_topdir "$srcdir"/$libgloss_topdir; do
   fi
 done
 if test -z "$ac_aux_dir"; then
-  as_fn_error $? "cannot find install-sh, install.sh, or shtool in $libgloss_topdir \"$srcdir\"/$libgloss_topdir" "$LINENO" 5
+  as_fn_error $? "cannot find install-sh, install.sh, or shtool in ../.. \"$srcdir\"/../.." "$LINENO" 5
 fi
 
 # These three variables are undocumented and unsupported,
@@ -3328,7 +3318,6 @@ target=${target}
 with_multisubdir=${with_multisubdir}
 ac_configure_args="${ac_configure_args} --enable-multilib"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-libgloss_topdir=${libgloss_topdir}
 
 
 _ACEOF
@@ -4029,7 +4018,7 @@ $as_echo X"$file" |
   done
 }
  ;;
-    "Makefile":F) ac_file=Makefile . ${libgloss_topdir}/config-ml.in ;;
+    "Makefile":F) ac_file=Makefile . ${srcdir}/../../config-ml.in ;;
 
   esac
 done # for ac_tag
diff --git a/libgloss/epiphany/configure.ac b/libgloss/epiphany/configure.ac
index d1bdcb2..31acdea 100644
--- a/libgloss/epiphany/configure.ac
+++ b/libgloss/epiphany/configure.ac
@@ -39,17 +39,7 @@ if test "${enable_shared}" = "yes" ; then
     echo "Shared libraries not supported for cross compiling, ignored"
 fi
 
-# Where are the auxillary tools (confg.sub etc)?
-if test "$srcdir" = "." ; then
-  if test "${with_target_subdir}" != "." ; then
-    libgloss_topdir="${srcdir}/${with_multisrctop}../../.."
-  else
-    libgloss_topdir="${srcdir}/${with_multisrctop}../.."
-  fi
-else
-  libgloss_topdir="${srcdir}/../.."
-fi
-AC_CONFIG_AUX_DIR($libgloss_topdir)
+AC_CONFIG_AUX_DIR(../..)
 
 AC_CANONICAL_SYSTEM
 AC_ARG_PROGRAM
@@ -116,12 +106,11 @@ AC_SUBST(host_makefile_frag_path)
 AC_SUBST_FILE(host_makefile_frag)
 
 AC_CONFIG_FILES(Makefile,
-ac_file=Makefile . ${libgloss_topdir}/config-ml.in,
+ac_file=Makefile . ${srcdir}/../../config-ml.in,
 srcdir=${srcdir}
 target=${target}
 with_multisubdir=${with_multisubdir}
 ac_configure_args="${ac_configure_args} --enable-multilib"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-libgloss_topdir=${libgloss_topdir}
 )
 AC_OUTPUT
diff --git a/libgloss/fr30/configure b/libgloss/fr30/configure
index 7beda07..7f0e888 100755
--- a/libgloss/fr30/configure
+++ b/libgloss/fr30/configure
@@ -1913,41 +1913,8 @@ ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
 program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
 
 
-if test "$srcdir" = "." ; then
-  mdir=`echo "${with_multisubdir}/" \
-    | sed -e 's,\([^/][^/]*\),..,g' -e 's,^/$,,'`
-  ac_aux_dir=
-for ac_dir in ${mdir}../../.. "$srcdir"/${mdir}../../..; do
-  if test -f "$ac_dir/install-sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f "$ac_dir/install.sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  elif test -f "$ac_dir/shtool"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/shtool install -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  as_fn_error $? "cannot find install-sh, install.sh, or shtool in ${mdir}../../.. \"$srcdir\"/${mdir}../../.." "$LINENO" 5
-fi
-
-# These three variables are undocumented and unsupported,
-# and are intended to be withdrawn in a future Autoconf release.
-# They can cause serious problems if a builder's source tree is in a directory
-# whose full name contains unusual characters.
-ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
-ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
-ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
-
-
-else
-  ac_aux_dir=
-for ac_dir in ${srcdir}/../.. "$srcdir"/${srcdir}/../..; do
+ac_aux_dir=
+for ac_dir in ../.. "$srcdir"/../..; do
   if test -f "$ac_dir/install-sh"; then
     ac_aux_dir=$ac_dir
     ac_install_sh="$ac_aux_dir/install-sh -c"
@@ -1963,7 +1930,7 @@ for ac_dir in ${srcdir}/../.. "$srcdir"/${srcdir}/../..; do
   fi
 done
 if test -z "$ac_aux_dir"; then
-  as_fn_error $? "cannot find install-sh, install.sh, or shtool in ${srcdir}/../.. \"$srcdir\"/${srcdir}/../.." "$LINENO" 5
+  as_fn_error $? "cannot find install-sh, install.sh, or shtool in ../.. \"$srcdir\"/../.." "$LINENO" 5
 fi
 
 # These three variables are undocumented and unsupported,
@@ -1975,7 +1942,6 @@ ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
 ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 
 
-fi
 
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
diff --git a/libgloss/fr30/configure.ac b/libgloss/fr30/configure.ac
index 8ac12e4..f76fc6e 100644
--- a/libgloss/fr30/configure.ac
+++ b/libgloss/fr30/configure.ac
@@ -5,13 +5,7 @@ AC_INIT(crt0.s)
 AC_CANONICAL_SYSTEM
 AC_ARG_PROGRAM
 
-if test "$srcdir" = "." ; then
-  mdir=`echo "${with_multisubdir}/" \
-    | sed -e 's,\([[^/]][[^/]]*\),..,g' -e 's,^/$,,'`
-  AC_CONFIG_AUX_DIR(${mdir}../../..)
-else
-  AC_CONFIG_AUX_DIR(${srcdir}/../..)
-fi
+AC_CONFIG_AUX_DIR(../..)
 
 AC_PROG_INSTALL
 
diff --git a/libgloss/frv/configure b/libgloss/frv/configure
index 532fe27..3d6919d 100755
--- a/libgloss/frv/configure
+++ b/libgloss/frv/configure
@@ -1766,17 +1766,8 @@ if test "${enable_shared}" = "yes" ; then
     echo "Shared libraries not supported for cross compiling, ignored"
 fi
 
-if test "$srcdir" = "." ; then
-  if test "${with_target_subdir}" != "." ; then
-    libgloss_topdir="${srcdir}/${with_multisrctop}../../.."
-  else
-    libgloss_topdir="${srcdir}/${with_multisrctop}../.."
-  fi
-else
-  libgloss_topdir="${srcdir}/../.."
-fi
 ac_aux_dir=
-for ac_dir in $libgloss_topdir "$srcdir"/$libgloss_topdir; do
+for ac_dir in ../.. "$srcdir"/../..; do
   if test -f "$ac_dir/install-sh"; then
     ac_aux_dir=$ac_dir
     ac_install_sh="$ac_aux_dir/install-sh -c"
@@ -1792,7 +1783,7 @@ for ac_dir in $libgloss_topdir "$srcdir"/$libgloss_topdir; do
   fi
 done
 if test -z "$ac_aux_dir"; then
-  as_fn_error $? "cannot find install-sh, install.sh, or shtool in $libgloss_topdir \"$srcdir\"/$libgloss_topdir" "$LINENO" 5
+  as_fn_error $? "cannot find install-sh, install.sh, or shtool in ../.. \"$srcdir\"/../.." "$LINENO" 5
 fi
 
 # These three variables are undocumented and unsupported,
@@ -3272,7 +3263,6 @@ target=${target}
 with_multisubdir=${with_multisubdir}
 ac_configure_args="${ac_configure_args} --enable-multilib"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-libgloss_topdir=${libgloss_topdir}
 
 
 _ACEOF
@@ -3840,7 +3830,7 @@ $as_echo X"$file" |
   done
 }
  ;;
-    "Makefile":F) . ${libgloss_topdir}/config-ml.in ;;
+    "Makefile":F) . ${srcdir}/../../config-ml.in ;;
 
   esac
 done # for ac_tag
diff --git a/libgloss/frv/configure.ac b/libgloss/frv/configure.ac
index fee6c45..23d5fb4 100644
--- a/libgloss/frv/configure.ac
+++ b/libgloss/frv/configure.ac
@@ -6,16 +6,7 @@ if test "${enable_shared}" = "yes" ; then
     echo "Shared libraries not supported for cross compiling, ignored"
 fi
 
-if test "$srcdir" = "." ; then
-  if test "${with_target_subdir}" != "." ; then
-    libgloss_topdir="${srcdir}/${with_multisrctop}../../.."
-  else
-    libgloss_topdir="${srcdir}/${with_multisrctop}../.."
-  fi
-else
-  libgloss_topdir="${srcdir}/../.."
-fi
-AC_CONFIG_AUX_DIR($libgloss_topdir)
+AC_CONFIG_AUX_DIR(../..)
 
 AC_CANONICAL_SYSTEM
 AC_ARG_PROGRAM
@@ -44,12 +35,11 @@ AC_SUBST(host_makefile_frag_path)
 AC_SUBST_FILE(host_makefile_frag)
 
 AC_CONFIG_FILES(Makefile,
-. ${libgloss_topdir}/config-ml.in,
+. ${srcdir}/../../config-ml.in,
 srcdir=${srcdir}
 target=${target}
 with_multisubdir=${with_multisubdir}
 ac_configure_args="${ac_configure_args} --enable-multilib"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-libgloss_topdir=${libgloss_topdir}
 )
 AC_OUTPUT
diff --git a/libgloss/ft32/configure b/libgloss/ft32/configure
index 532fe27..3d6919d 100755
--- a/libgloss/ft32/configure
+++ b/libgloss/ft32/configure
@@ -1766,17 +1766,8 @@ if test "${enable_shared}" = "yes" ; then
     echo "Shared libraries not supported for cross compiling, ignored"
 fi
 
-if test "$srcdir" = "." ; then
-  if test "${with_target_subdir}" != "." ; then
-    libgloss_topdir="${srcdir}/${with_multisrctop}../../.."
-  else
-    libgloss_topdir="${srcdir}/${with_multisrctop}../.."
-  fi
-else
-  libgloss_topdir="${srcdir}/../.."
-fi
 ac_aux_dir=
-for ac_dir in $libgloss_topdir "$srcdir"/$libgloss_topdir; do
+for ac_dir in ../.. "$srcdir"/../..; do
   if test -f "$ac_dir/install-sh"; then
     ac_aux_dir=$ac_dir
     ac_install_sh="$ac_aux_dir/install-sh -c"
@@ -1792,7 +1783,7 @@ for ac_dir in $libgloss_topdir "$srcdir"/$libgloss_topdir; do
   fi
 done
 if test -z "$ac_aux_dir"; then
-  as_fn_error $? "cannot find install-sh, install.sh, or shtool in $libgloss_topdir \"$srcdir\"/$libgloss_topdir" "$LINENO" 5
+  as_fn_error $? "cannot find install-sh, install.sh, or shtool in ../.. \"$srcdir\"/../.." "$LINENO" 5
 fi
 
 # These three variables are undocumented and unsupported,
@@ -3272,7 +3263,6 @@ target=${target}
 with_multisubdir=${with_multisubdir}
 ac_configure_args="${ac_configure_args} --enable-multilib"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-libgloss_topdir=${libgloss_topdir}
 
 
 _ACEOF
@@ -3840,7 +3830,7 @@ $as_echo X"$file" |
   done
 }
  ;;
-    "Makefile":F) . ${libgloss_topdir}/config-ml.in ;;
+    "Makefile":F) . ${srcdir}/../../config-ml.in ;;
 
   esac
 done # for ac_tag
diff --git a/libgloss/ft32/configure.ac b/libgloss/ft32/configure.ac
index fee6c45..23d5fb4 100644
--- a/libgloss/ft32/configure.ac
+++ b/libgloss/ft32/configure.ac
@@ -6,16 +6,7 @@ if test "${enable_shared}" = "yes" ; then
     echo "Shared libraries not supported for cross compiling, ignored"
 fi
 
-if test "$srcdir" = "." ; then
-  if test "${with_target_subdir}" != "." ; then
-    libgloss_topdir="${srcdir}/${with_multisrctop}../../.."
-  else
-    libgloss_topdir="${srcdir}/${with_multisrctop}../.."
-  fi
-else
-  libgloss_topdir="${srcdir}/../.."
-fi
-AC_CONFIG_AUX_DIR($libgloss_topdir)
+AC_CONFIG_AUX_DIR(../..)
 
 AC_CANONICAL_SYSTEM
 AC_ARG_PROGRAM
@@ -44,12 +35,11 @@ AC_SUBST(host_makefile_frag_path)
 AC_SUBST_FILE(host_makefile_frag)
 
 AC_CONFIG_FILES(Makefile,
-. ${libgloss_topdir}/config-ml.in,
+. ${srcdir}/../../config-ml.in,
 srcdir=${srcdir}
 target=${target}
 with_multisubdir=${with_multisubdir}
 ac_configure_args="${ac_configure_args} --enable-multilib"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-libgloss_topdir=${libgloss_topdir}
 )
 AC_OUTPUT
diff --git a/libgloss/hp74x/configure b/libgloss/hp74x/configure
index f308d31..5430752 100755
--- a/libgloss/hp74x/configure
+++ b/libgloss/hp74x/configure
@@ -1740,11 +1740,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
-if test "$srcdir" = "." ; then
-  mdir=`echo "${with_multisubdir}/" \
-    | sed -e 's,\([^/][^/]*\),..,g' -e 's,^/$,,'`
-  ac_aux_dir=
-for ac_dir in ${mdir}../../.. "$srcdir"/${mdir}../../..; do
+ac_aux_dir=
+for ac_dir in ../.. "$srcdir"/../..; do
   if test -f "$ac_dir/install-sh"; then
     ac_aux_dir=$ac_dir
     ac_install_sh="$ac_aux_dir/install-sh -c"
@@ -1760,7 +1757,7 @@ for ac_dir in ${mdir}../../.. "$srcdir"/${mdir}../../..; do
   fi
 done
 if test -z "$ac_aux_dir"; then
-  as_fn_error $? "cannot find install-sh, install.sh, or shtool in ${mdir}../../.. \"$srcdir\"/${mdir}../../.." "$LINENO" 5
+  as_fn_error $? "cannot find install-sh, install.sh, or shtool in ../.. \"$srcdir\"/../.." "$LINENO" 5
 fi
 
 # These three variables are undocumented and unsupported,
@@ -1772,37 +1769,6 @@ ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
 ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 
 
-else
-  ac_aux_dir=
-for ac_dir in ${srcdir}/../.. "$srcdir"/${srcdir}/../..; do
-  if test -f "$ac_dir/install-sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f "$ac_dir/install.sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  elif test -f "$ac_dir/shtool"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/shtool install -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  as_fn_error $? "cannot find install-sh, install.sh, or shtool in ${srcdir}/../.. \"$srcdir\"/${srcdir}/../.." "$LINENO" 5
-fi
-
-# These three variables are undocumented and unsupported,
-# and are intended to be withdrawn in a future Autoconf release.
-# They can cause serious problems if a builder's source tree is in a directory
-# whose full name contains unusual characters.
-ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
-ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
-ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
-
-
-fi
 
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
diff --git a/libgloss/hp74x/configure.ac b/libgloss/hp74x/configure.ac
index 9066409..27564f9 100644
--- a/libgloss/hp74x/configure.ac
+++ b/libgloss/hp74x/configure.ac
@@ -2,13 +2,7 @@ dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.69)dnl
 AC_INIT(crt0.s)
 
-if test "$srcdir" = "." ; then
-  mdir=`echo "${with_multisubdir}/" \
-    | sed -e 's,\([[^/]][[^/]]*\),..,g' -e 's,^/$,,'`
-  AC_CONFIG_AUX_DIR(${mdir}../../..)
-else
-  AC_CONFIG_AUX_DIR(${srcdir}/../..)
-fi
+AC_CONFIG_AUX_DIR(../..)
 
 AC_PROG_INSTALL
 
diff --git a/libgloss/i386/configure b/libgloss/i386/configure
index c2df9cd..f661ab8 100755
--- a/libgloss/i386/configure
+++ b/libgloss/i386/configure
@@ -1769,17 +1769,8 @@ if test "${enable_shared}" = "yes" ; then
     echo "Shared libraries not supported for cross compiling, ignored"
 fi
 
-if test "$srcdir" = "." ; then
-  if test "${with_target_subdir}" != "." ; then
-    libgloss_topdir="${srcdir}/${with_multisrctop}../../.."
-  else
-    libgloss_topdir="${srcdir}/${with_multisrctop}../.."
-  fi
-else
-  libgloss_topdir="${srcdir}/../.."
-fi
 ac_aux_dir=
-for ac_dir in $libgloss_topdir "$srcdir"/$libgloss_topdir; do
+for ac_dir in ../.. "$srcdir"/../..; do
   if test -f "$ac_dir/install-sh"; then
     ac_aux_dir=$ac_dir
     ac_install_sh="$ac_aux_dir/install-sh -c"
@@ -1795,7 +1786,7 @@ for ac_dir in $libgloss_topdir "$srcdir"/$libgloss_topdir; do
   fi
 done
 if test -z "$ac_aux_dir"; then
-  as_fn_error $? "cannot find install-sh, install.sh, or shtool in $libgloss_topdir \"$srcdir\"/$libgloss_topdir" "$LINENO" 5
+  as_fn_error $? "cannot find install-sh, install.sh, or shtool in ../.. \"$srcdir\"/../.." "$LINENO" 5
 fi
 
 # These three variables are undocumented and unsupported,
@@ -3286,7 +3277,6 @@ target=${target}
 with_multisubdir=${with_multisubdir}
 ac_configure_args="${ac_configure_args} --enable-multilib"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-libgloss_topdir=${libgloss_topdir}
 
 
 _ACEOF
@@ -3854,7 +3844,7 @@ $as_echo X"$file" |
   done
 }
  ;;
-    "Makefile":F) . ${libgloss_topdir}/config-ml.in ;;
+    "Makefile":F) . ${srcdir}/../../config-ml.in ;;
 
   esac
 done # for ac_tag
diff --git a/libgloss/i386/configure.ac b/libgloss/i386/configure.ac
index dcb85a9..3ebf64b 100644
--- a/libgloss/i386/configure.ac
+++ b/libgloss/i386/configure.ac
@@ -19,16 +19,7 @@ if test "${enable_shared}" = "yes" ; then
     echo "Shared libraries not supported for cross compiling, ignored"
 fi
 
-if test "$srcdir" = "." ; then
-  if test "${with_target_subdir}" != "." ; then
-    libgloss_topdir="${srcdir}/${with_multisrctop}../../.."
-  else
-    libgloss_topdir="${srcdir}/${with_multisrctop}../.."
-  fi
-else
-  libgloss_topdir="${srcdir}/../.."
-fi
-AC_CONFIG_AUX_DIR($libgloss_topdir)
+AC_CONFIG_AUX_DIR(../..)
 
 AC_CANONICAL_SYSTEM
 AC_ARG_PROGRAM
@@ -68,12 +59,11 @@ AC_SUBST(host_makefile_frag_path)
 AC_SUBST_FILE(host_makefile_frag)
 
 AC_CONFIG_FILES(Makefile,
-. ${libgloss_topdir}/config-ml.in,
+. ${srcdir}/../../config-ml.in,
 srcdir=${srcdir}
 target=${target}
 with_multisubdir=${with_multisubdir}
 ac_configure_args="${ac_configure_args} --enable-multilib"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-libgloss_topdir=${libgloss_topdir}
 )
 AC_OUTPUT
diff --git a/libgloss/i960/configure b/libgloss/i960/configure
index b27daa5..39e8e57 100755
--- a/libgloss/i960/configure
+++ b/libgloss/i960/configure
@@ -1913,41 +1913,8 @@ ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
 program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
 
 
-if test "$srcdir" = "." ; then
-  mdir=`echo "${with_multisubdir}/" \
-    | sed -e 's,\([^/][^/]*\),..,g' -e 's,^/$,,'`
-  ac_aux_dir=
-for ac_dir in ${mdir}../../.. "$srcdir"/${mdir}../../..; do
-  if test -f "$ac_dir/install-sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f "$ac_dir/install.sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  elif test -f "$ac_dir/shtool"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/shtool install -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  as_fn_error $? "cannot find install-sh, install.sh, or shtool in ${mdir}../../.. \"$srcdir\"/${mdir}../../.." "$LINENO" 5
-fi
-
-# These three variables are undocumented and unsupported,
-# and are intended to be withdrawn in a future Autoconf release.
-# They can cause serious problems if a builder's source tree is in a directory
-# whose full name contains unusual characters.
-ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
-ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
-ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
-
-
-else
-  ac_aux_dir=
-for ac_dir in ${srcdir}/../.. "$srcdir"/${srcdir}/../..; do
+ac_aux_dir=
+for ac_dir in ../.. "$srcdir"/../..; do
   if test -f "$ac_dir/install-sh"; then
     ac_aux_dir=$ac_dir
     ac_install_sh="$ac_aux_dir/install-sh -c"
@@ -1963,7 +1930,7 @@ for ac_dir in ${srcdir}/../.. "$srcdir"/${srcdir}/../..; do
   fi
 done
 if test -z "$ac_aux_dir"; then
-  as_fn_error $? "cannot find install-sh, install.sh, or shtool in ${srcdir}/../.. \"$srcdir\"/${srcdir}/../.." "$LINENO" 5
+  as_fn_error $? "cannot find install-sh, install.sh, or shtool in ../.. \"$srcdir\"/../.." "$LINENO" 5
 fi
 
 # These three variables are undocumented and unsupported,
@@ -1975,7 +1942,6 @@ ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
 ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 
 
-fi
 
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
diff --git a/libgloss/i960/configure.ac b/libgloss/i960/configure.ac
index 5ea4518..76a5a1a 100644
--- a/libgloss/i960/configure.ac
+++ b/libgloss/i960/configure.ac
@@ -5,13 +5,7 @@ AC_INIT(crt0.c)
 AC_CANONICAL_SYSTEM
 AC_ARG_PROGRAM
 
-if test "$srcdir" = "." ; then
-  mdir=`echo "${with_multisubdir}/" \
-    | sed -e 's,\([[^/]][[^/]]*\),..,g' -e 's,^/$,,'`
-  AC_CONFIG_AUX_DIR(${mdir}../../..)
-else
-  AC_CONFIG_AUX_DIR(${srcdir}/../..)
-fi
+AC_CONFIG_AUX_DIR(../..)
 
 AC_PROG_INSTALL
 
diff --git a/libgloss/iq2000/configure b/libgloss/iq2000/configure
index 548575f..54deab9 100755
--- a/libgloss/iq2000/configure
+++ b/libgloss/iq2000/configure
@@ -1770,17 +1770,8 @@ if test "${enable_shared}" = "yes" ; then
     echo "Shared libraries not supported for cross compiling, ignored"
 fi
 
-if test "$srcdir" = "." ; then
-  if test "${with_target_subdir}" != "." ; then
-    libgloss_topdir="${srcdir}/${with_multisrctop}../../.."
-  else
-    libgloss_topdir="${srcdir}/${with_multisrctop}../.."
-  fi
-else
-  libgloss_topdir="${srcdir}/../.."
-fi
 ac_aux_dir=
-for ac_dir in $libgloss_topdir "$srcdir"/$libgloss_topdir; do
+for ac_dir in ../.. "$srcdir"/../..; do
   if test -f "$ac_dir/install-sh"; then
     ac_aux_dir=$ac_dir
     ac_install_sh="$ac_aux_dir/install-sh -c"
@@ -1796,7 +1787,7 @@ for ac_dir in $libgloss_topdir "$srcdir"/$libgloss_topdir; do
   fi
 done
 if test -z "$ac_aux_dir"; then
-  as_fn_error $? "cannot find install-sh, install.sh, or shtool in $libgloss_topdir \"$srcdir\"/$libgloss_topdir" "$LINENO" 5
+  as_fn_error $? "cannot find install-sh, install.sh, or shtool in ../.. \"$srcdir\"/../.." "$LINENO" 5
 fi
 
 # These three variables are undocumented and unsupported,
@@ -3287,7 +3278,6 @@ target=${target}
 with_multisubdir=${with_multisubdir}
 ac_configure_args="${ac_configure_args} --enable-multilib"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-libgloss_topdir=${libgloss_topdir}
 
 
 _ACEOF
@@ -3855,7 +3845,7 @@ $as_echo X"$file" |
   done
 }
  ;;
-    "Makefile":F) . ${libgloss_topdir}/config-ml.in ;;
+    "Makefile":F) . ${srcdir}/../../config-ml.in ;;
 
   esac
 done # for ac_tag
diff --git a/libgloss/iq2000/configure.ac b/libgloss/iq2000/configure.ac
index 8ae56ae..169db65 100644
--- a/libgloss/iq2000/configure.ac
+++ b/libgloss/iq2000/configure.ac
@@ -19,16 +19,7 @@ if test "${enable_shared}" = "yes" ; then
     echo "Shared libraries not supported for cross compiling, ignored"
 fi
 
-if test "$srcdir" = "." ; then
-  if test "${with_target_subdir}" != "." ; then
-    libgloss_topdir="${srcdir}/${with_multisrctop}../../.."
-  else
-    libgloss_topdir="${srcdir}/${with_multisrctop}../.."
-  fi
-else
-  libgloss_topdir="${srcdir}/../.."
-fi
-AC_CONFIG_AUX_DIR($libgloss_topdir)
+AC_CONFIG_AUX_DIR(../..)
 
 AC_CANONICAL_SYSTEM
 AC_ARG_PROGRAM
@@ -68,13 +59,12 @@ AC_SUBST_FILE(target_makefile_frag)
 AC_SUBST(part_specific_obj)
 
 AC_CONFIG_FILES(Makefile,
-. ${libgloss_topdir}/config-ml.in,
+. ${srcdir}/../../config-ml.in,
 srcdir=${srcdir}
 target=${target}
 with_multisubdir=${with_multisubdir}
 ac_configure_args="${ac_configure_args} --enable-multilib"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-libgloss_topdir=${libgloss_topdir}
 )
 AC_OUTPUT
 
diff --git a/libgloss/libnosys/configure b/libgloss/libnosys/configure
index fe82447..a28de39 100755
--- a/libgloss/libnosys/configure
+++ b/libgloss/libnosys/configure
@@ -1768,17 +1768,8 @@ if test "${enable_shared}" = "yes" ; then
     echo "Shared libraries not supported for cross compiling, ignored"
 fi
 
-if test "$srcdir" = "." ; then
-  if test "${with_target_subdir}" != "." ; then
-    libgloss_topdir="${srcdir}/${with_multisrctop}../../.."
-  else
-    libgloss_topdir="${srcdir}/${with_multisrctop}../.."
-  fi
-else
-  libgloss_topdir="${srcdir}/../.."
-fi
 ac_aux_dir=
-for ac_dir in $libgloss_topdir "$srcdir"/$libgloss_topdir; do
+for ac_dir in ../.. "$srcdir"/../..; do
   if test -f "$ac_dir/install-sh"; then
     ac_aux_dir=$ac_dir
     ac_install_sh="$ac_aux_dir/install-sh -c"
@@ -1794,7 +1785,7 @@ for ac_dir in $libgloss_topdir "$srcdir"/$libgloss_topdir; do
   fi
 done
 if test -z "$ac_aux_dir"; then
-  as_fn_error $? "cannot find install-sh, install.sh, or shtool in $libgloss_topdir \"$srcdir\"/$libgloss_topdir" "$LINENO" 5
+  as_fn_error $? "cannot find install-sh, install.sh, or shtool in ../.. \"$srcdir\"/../.." "$LINENO" 5
 fi
 
 # These three variables are undocumented and unsupported,
@@ -3446,7 +3437,6 @@ target=${target}
 with_multisubdir=${with_multisubdir}
 ac_configure_args="${ac_configure_args} --enable-multilib"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-libgloss_topdir=${libgloss_topdir}
 
 
 _ACEOF
@@ -4147,7 +4137,7 @@ $as_echo X"$file" |
   done
 }
  ;;
-    "Makefile":F) ac_file=Makefile . ${libgloss_topdir}/config-ml.in ;;
+    "Makefile":F) ac_file=Makefile . ${srcdir}/../../config-ml.in ;;
 
   esac
 done # for ac_tag
diff --git a/libgloss/libnosys/configure.ac b/libgloss/libnosys/configure.ac
index 28b4945..0d4830d 100644
--- a/libgloss/libnosys/configure.ac
+++ b/libgloss/libnosys/configure.ac
@@ -20,16 +20,7 @@ if test "${enable_shared}" = "yes" ; then
     echo "Shared libraries not supported for cross compiling, ignored"
 fi
 
-if test "$srcdir" = "." ; then
-  if test "${with_target_subdir}" != "." ; then
-    libgloss_topdir="${srcdir}/${with_multisrctop}../../.."
-  else
-    libgloss_topdir="${srcdir}/${with_multisrctop}../.."
-  fi
-else
-  libgloss_topdir="${srcdir}/../.."
-fi
-AC_CONFIG_AUX_DIR($libgloss_topdir)
+AC_CONFIG_AUX_DIR(../..)
 
 AC_CANONICAL_SYSTEM
 AC_ARG_PROGRAM
@@ -183,13 +174,12 @@ AC_SUBST(host_makefile_frag_path)
 AC_SUBST_FILE(host_makefile_frag)
 
 AC_CONFIG_FILES(Makefile,
-ac_file=Makefile . ${libgloss_topdir}/config-ml.in,
+ac_file=Makefile . ${srcdir}/../../config-ml.in,
 srcdir=${srcdir}
 target=${target}
 with_multisubdir=${with_multisubdir}
 ac_configure_args="${ac_configure_args} --enable-multilib"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-libgloss_topdir=${libgloss_topdir}
 )
 AC_OUTPUT
 
diff --git a/libgloss/lm32/configure b/libgloss/lm32/configure
index c50f7e6..b8a2bb0 100755
--- a/libgloss/lm32/configure
+++ b/libgloss/lm32/configure
@@ -1766,17 +1766,8 @@ if test "${enable_shared}" = "yes" ; then
     echo "Shared libraries not supported for cross compiling, ignored"
 fi
 
-if test "$srcdir" = "." ; then
-  if test "${with_target_subdir}" != "." ; then
-    libgloss_topdir="${srcdir}/${with_multisrctop}../../.."
-  else
-    libgloss_topdir="${srcdir}/${with_multisrctop}../.."
-  fi
-else
-  libgloss_topdir="${srcdir}/../.."
-fi
 ac_aux_dir=
-for ac_dir in $libgloss_topdir "$srcdir"/$libgloss_topdir; do
+for ac_dir in ../.. "$srcdir"/../..; do
   if test -f "$ac_dir/install-sh"; then
     ac_aux_dir=$ac_dir
     ac_install_sh="$ac_aux_dir/install-sh -c"
@@ -1792,7 +1783,7 @@ for ac_dir in $libgloss_topdir "$srcdir"/$libgloss_topdir; do
   fi
 done
 if test -z "$ac_aux_dir"; then
-  as_fn_error $? "cannot find install-sh, install.sh, or shtool in $libgloss_topdir \"$srcdir\"/$libgloss_topdir" "$LINENO" 5
+  as_fn_error $? "cannot find install-sh, install.sh, or shtool in ../.. \"$srcdir\"/../.." "$LINENO" 5
 fi
 
 # These three variables are undocumented and unsupported,
@@ -3271,7 +3262,6 @@ target=${target}
 with_multisubdir=${with_multisubdir}
 ac_configure_args="${ac_configure_args} --enable-multilib"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-libgloss_topdir=${libgloss_topdir}
 
 
 _ACEOF
@@ -3839,7 +3829,7 @@ $as_echo X"$file" |
   done
 }
  ;;
-    "Makefile":F) . ${libgloss_topdir}/config-ml.in ;;
+    "Makefile":F) . ${srcdir}/../../config-ml.in ;;
 
   esac
 done # for ac_tag
diff --git a/libgloss/lm32/configure.ac b/libgloss/lm32/configure.ac
index a0a2822..81e304a 100644
--- a/libgloss/lm32/configure.ac
+++ b/libgloss/lm32/configure.ac
@@ -6,16 +6,7 @@ if test "${enable_shared}" = "yes" ; then
     echo "Shared libraries not supported for cross compiling, ignored"
 fi
 
-if test "$srcdir" = "." ; then
-  if test "${with_target_subdir}" != "." ; then
-    libgloss_topdir="${srcdir}/${with_multisrctop}../../.."
-  else
-    libgloss_topdir="${srcdir}/${with_multisrctop}../.."
-  fi
-else
-  libgloss_topdir="${srcdir}/../.."
-fi
-AC_CONFIG_AUX_DIR($libgloss_topdir)
+AC_CONFIG_AUX_DIR(../..)
 
 AC_CANONICAL_SYSTEM
 AC_ARG_PROGRAM
@@ -43,13 +34,12 @@ AC_SUBST(host_makefile_frag_path)
 AC_SUBST_FILE(host_makefile_frag)
 
 AC_CONFIG_FILES(Makefile,
-. ${libgloss_topdir}/config-ml.in,
+. ${srcdir}/../../config-ml.in,
 srcdir=${srcdir}
 target=${target}
 with_multisubdir=${with_multisubdir}
 ac_configure_args="${ac_configure_args} --enable-multilib"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-libgloss_topdir=${libgloss_topdir}
 )
 AC_OUTPUT
 
diff --git a/libgloss/m32c/configure b/libgloss/m32c/configure
index 532fe27..3d6919d 100755
--- a/libgloss/m32c/configure
+++ b/libgloss/m32c/configure
@@ -1766,17 +1766,8 @@ if test "${enable_shared}" = "yes" ; then
     echo "Shared libraries not supported for cross compiling, ignored"
 fi
 
-if test "$srcdir" = "." ; then
-  if test "${with_target_subdir}" != "." ; then
-    libgloss_topdir="${srcdir}/${with_multisrctop}../../.."
-  else
-    libgloss_topdir="${srcdir}/${with_multisrctop}../.."
-  fi
-else
-  libgloss_topdir="${srcdir}/../.."
-fi
 ac_aux_dir=
-for ac_dir in $libgloss_topdir "$srcdir"/$libgloss_topdir; do
+for ac_dir in ../.. "$srcdir"/../..; do
   if test -f "$ac_dir/install-sh"; then
     ac_aux_dir=$ac_dir
     ac_install_sh="$ac_aux_dir/install-sh -c"
@@ -1792,7 +1783,7 @@ for ac_dir in $libgloss_topdir "$srcdir"/$libgloss_topdir; do
   fi
 done
 if test -z "$ac_aux_dir"; then
-  as_fn_error $? "cannot find install-sh, install.sh, or shtool in $libgloss_topdir \"$srcdir\"/$libgloss_topdir" "$LINENO" 5
+  as_fn_error $? "cannot find install-sh, install.sh, or shtool in ../.. \"$srcdir\"/../.." "$LINENO" 5
 fi
 
 # These three variables are undocumented and unsupported,
@@ -3272,7 +3263,6 @@ target=${target}
 with_multisubdir=${with_multisubdir}
 ac_configure_args="${ac_configure_args} --enable-multilib"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-libgloss_topdir=${libgloss_topdir}
 
 
 _ACEOF
@@ -3840,7 +3830,7 @@ $as_echo X"$file" |
   done
 }
  ;;
-    "Makefile":F) . ${libgloss_topdir}/config-ml.in ;;
+    "Makefile":F) . ${srcdir}/../../config-ml.in ;;
 
   esac
 done # for ac_tag
diff --git a/libgloss/m32c/configure.ac b/libgloss/m32c/configure.ac
index fee6c45..23d5fb4 100644
--- a/libgloss/m32c/configure.ac
+++ b/libgloss/m32c/configure.ac
@@ -6,16 +6,7 @@ if test "${enable_shared}" = "yes" ; then
     echo "Shared libraries not supported for cross compiling, ignored"
 fi
 
-if test "$srcdir" = "." ; then
-  if test "${with_target_subdir}" != "." ; then
-    libgloss_topdir="${srcdir}/${with_multisrctop}../../.."
-  else
-    libgloss_topdir="${srcdir}/${with_multisrctop}../.."
-  fi
-else
-  libgloss_topdir="${srcdir}/../.."
-fi
-AC_CONFIG_AUX_DIR($libgloss_topdir)
+AC_CONFIG_AUX_DIR(../..)
 
 AC_CANONICAL_SYSTEM
 AC_ARG_PROGRAM
@@ -44,12 +35,11 @@ AC_SUBST(host_makefile_frag_path)
 AC_SUBST_FILE(host_makefile_frag)
 
 AC_CONFIG_FILES(Makefile,
-. ${libgloss_topdir}/config-ml.in,
+. ${srcdir}/../../config-ml.in,
 srcdir=${srcdir}
 target=${target}
 with_multisubdir=${with_multisubdir}
 ac_configure_args="${ac_configure_args} --enable-multilib"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-libgloss_topdir=${libgloss_topdir}
 )
 AC_OUTPUT
diff --git a/libgloss/m32r/configure b/libgloss/m32r/configure
index 4c57f7a..01e3010 100755
--- a/libgloss/m32r/configure
+++ b/libgloss/m32r/configure
@@ -1913,41 +1913,8 @@ ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
 program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
 
 
-if test "$srcdir" = "." ; then
-  mdir=`echo "${with_multisubdir}/" \
-    | sed -e 's,\([^/][^/]*\),..,g' -e 's,^/$,,'`
-  ac_aux_dir=
-for ac_dir in ${mdir}../../.. "$srcdir"/${mdir}../../..; do
-  if test -f "$ac_dir/install-sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f "$ac_dir/install.sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  elif test -f "$ac_dir/shtool"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/shtool install -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  as_fn_error $? "cannot find install-sh, install.sh, or shtool in ${mdir}../../.. \"$srcdir\"/${mdir}../../.." "$LINENO" 5
-fi
-
-# These three variables are undocumented and unsupported,
-# and are intended to be withdrawn in a future Autoconf release.
-# They can cause serious problems if a builder's source tree is in a directory
-# whose full name contains unusual characters.
-ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
-ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
-ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
-
-
-else
-  ac_aux_dir=
-for ac_dir in ${srcdir}/../.. "$srcdir"/${srcdir}/../..; do
+ac_aux_dir=
+for ac_dir in ../.. "$srcdir"/../..; do
   if test -f "$ac_dir/install-sh"; then
     ac_aux_dir=$ac_dir
     ac_install_sh="$ac_aux_dir/install-sh -c"
@@ -1963,7 +1930,7 @@ for ac_dir in ${srcdir}/../.. "$srcdir"/${srcdir}/../..; do
   fi
 done
 if test -z "$ac_aux_dir"; then
-  as_fn_error $? "cannot find install-sh, install.sh, or shtool in ${srcdir}/../.. \"$srcdir\"/${srcdir}/../.." "$LINENO" 5
+  as_fn_error $? "cannot find install-sh, install.sh, or shtool in ../.. \"$srcdir\"/../.." "$LINENO" 5
 fi
 
 # These three variables are undocumented and unsupported,
@@ -1975,7 +1942,6 @@ ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
 ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 
 
-fi
 
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
@@ -3321,7 +3287,6 @@ target=${target}
 with_multisubdir=${with_multisubdir}
 ac_configure_args="${ac_configure_args} --enable-multilib"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-libgloss_topdir=${srcdir}/../..
 
 
 _ACEOF
diff --git a/libgloss/m32r/configure.ac b/libgloss/m32r/configure.ac
index f4ab6dc..c5fd568 100644
--- a/libgloss/m32r/configure.ac
+++ b/libgloss/m32r/configure.ac
@@ -5,13 +5,7 @@ AC_INIT(crt0.S)
 AC_CANONICAL_SYSTEM
 AC_ARG_PROGRAM
 
-if test "$srcdir" = "." ; then
-  mdir=`echo "${with_multisubdir}/" \
-    | sed -e 's,\([[^/]][[^/]]*\),..,g' -e 's,^/$,,'`
-  AC_CONFIG_AUX_DIR(${mdir}../../..)
-else
-  AC_CONFIG_AUX_DIR(${srcdir}/../..)
-fi
+AC_CONFIG_AUX_DIR(../..)
 
 AC_PROG_INSTALL
 
@@ -42,6 +36,5 @@ target=${target}
 with_multisubdir=${with_multisubdir}
 ac_configure_args="${ac_configure_args} --enable-multilib"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-libgloss_topdir=${srcdir}/../..
 )
 AC_OUTPUT
diff --git a/libgloss/m68hc11/configure b/libgloss/m68hc11/configure
index bcad614..5ec8238 100755
--- a/libgloss/m68hc11/configure
+++ b/libgloss/m68hc11/configure
@@ -1766,17 +1766,8 @@ if test "${enable_shared}" = "yes" ; then
     echo "Shared libraries not supported for cross compiling, ignored"
 fi
 
-if test "$srcdir" = "." ; then
-  if test "${with_target_subdir}" != "." ; then
-    libgloss_topdir="${srcdir}/${with_multisrctop}../../.."
-  else
-    libgloss_topdir="${srcdir}/${with_multisrctop}../.."
-  fi
-else
-  libgloss_topdir="${srcdir}/../.."
-fi
 ac_aux_dir=
-for ac_dir in $libgloss_topdir "$srcdir"/$libgloss_topdir; do
+for ac_dir in ../.. "$srcdir"/../..; do
   if test -f "$ac_dir/install-sh"; then
     ac_aux_dir=$ac_dir
     ac_install_sh="$ac_aux_dir/install-sh -c"
@@ -1792,7 +1783,7 @@ for ac_dir in $libgloss_topdir "$srcdir"/$libgloss_topdir; do
   fi
 done
 if test -z "$ac_aux_dir"; then
-  as_fn_error $? "cannot find install-sh, install.sh, or shtool in $libgloss_topdir \"$srcdir\"/$libgloss_topdir" "$LINENO" 5
+  as_fn_error $? "cannot find install-sh, install.sh, or shtool in ../.. \"$srcdir\"/../.." "$LINENO" 5
 fi
 
 # These three variables are undocumented and unsupported,
@@ -3272,7 +3263,6 @@ target=${target}
 with_multisubdir=${with_multisubdir}
 ac_configure_args="${ac_configure_args} --enable-multilib"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-libgloss_topdir=${libgloss_topdir}
 
 
 _ACEOF
@@ -3840,7 +3830,7 @@ $as_echo X"$file" |
   done
 }
  ;;
-    "Makefile":F) . ${libgloss_topdir}/config-ml.in ;;
+    "Makefile":F) . ${srcdir}/../../config-ml.in ;;
 
   esac
 done # for ac_tag
diff --git a/libgloss/m68hc11/configure.ac b/libgloss/m68hc11/configure.ac
index 227fff6..2e2ce36 100644
--- a/libgloss/m68hc11/configure.ac
+++ b/libgloss/m68hc11/configure.ac
@@ -6,16 +6,7 @@ if test "${enable_shared}" = "yes" ; then
     echo "Shared libraries not supported for cross compiling, ignored"
 fi
 
-if test "$srcdir" = "." ; then
-  if test "${with_target_subdir}" != "." ; then
-    libgloss_topdir="${srcdir}/${with_multisrctop}../../.."
-  else
-    libgloss_topdir="${srcdir}/${with_multisrctop}../.."
-  fi
-else
-  libgloss_topdir="${srcdir}/../.."
-fi
-AC_CONFIG_AUX_DIR($libgloss_topdir)
+AC_CONFIG_AUX_DIR(../..)
 
 AC_CANONICAL_SYSTEM
 AC_ARG_PROGRAM
@@ -44,13 +35,12 @@ AC_SUBST(host_makefile_frag_path)
 AC_SUBST_FILE(host_makefile_frag)
 
 AC_CONFIG_FILES(Makefile,
-. ${libgloss_topdir}/config-ml.in,
+. ${srcdir}/../../config-ml.in,
 srcdir=${srcdir}
 target=${target}
 with_multisubdir=${with_multisubdir}
 ac_configure_args="${ac_configure_args} --enable-multilib"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-libgloss_topdir=${libgloss_topdir}
 )
 AC_OUTPUT
 
diff --git a/libgloss/m68k/configure b/libgloss/m68k/configure
index 992ff3c..ef5bf94 100755
--- a/libgloss/m68k/configure
+++ b/libgloss/m68k/configure
@@ -1827,18 +1827,8 @@ if test "${enable_shared}" = "yes" ; then
     echo "Shared libraries not supported for cross compiling, ignored"
 fi
 
-if test "$srcdir" = "." ; then
-  if test "${with_target_subdir}" != "." ; then
-    libgloss_topdir="${with_multisrctop}../../.."
-  else
-    libgloss_topdir="${with_multisrctop}../.."
-  fi
-else
-  libgloss_topdir="${srcdir}/../.."
-fi
-
 ac_aux_dir=
-for ac_dir in $libgloss_topdir "$srcdir"/$libgloss_topdir; do
+for ac_dir in ../.. "$srcdir"/../..; do
   if test -f "$ac_dir/install-sh"; then
     ac_aux_dir=$ac_dir
     ac_install_sh="$ac_aux_dir/install-sh -c"
@@ -1854,7 +1844,7 @@ for ac_dir in $libgloss_topdir "$srcdir"/$libgloss_topdir; do
   fi
 done
 if test -z "$ac_aux_dir"; then
-  as_fn_error $? "cannot find install-sh, install.sh, or shtool in $libgloss_topdir \"$srcdir\"/$libgloss_topdir" "$LINENO" 5
+  as_fn_error $? "cannot find install-sh, install.sh, or shtool in ../.. \"$srcdir\"/../.." "$LINENO" 5
 fi
 
 # These three variables are undocumented and unsupported,
@@ -4309,7 +4299,6 @@ target=${target}
 with_multisubdir=${with_multisubdir}
 ac_configure_args="${ac_configure_args} --enable-multilib"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-libgloss_topdir=${libgloss_topdir}
 
 
 _ACEOF
@@ -4877,7 +4866,7 @@ $as_echo X"$file" |
   done
 }
  ;;
-    "Makefile":F) . ${libgloss_topdir}/config-ml.in ;;
+    "Makefile":F) . ${srcdir}/../../config-ml.in ;;
 
   esac
 done # for ac_tag
diff --git a/libgloss/m68k/configure.ac b/libgloss/m68k/configure.ac
index 62b28bd..48cc6a5 100644
--- a/libgloss/m68k/configure.ac
+++ b/libgloss/m68k/configure.ac
@@ -18,17 +18,7 @@ if test "${enable_shared}" = "yes" ; then
     echo "Shared libraries not supported for cross compiling, ignored"
 fi
 
-if test "$srcdir" = "." ; then
-  if test "${with_target_subdir}" != "." ; then
-    libgloss_topdir="${with_multisrctop}../../.."
-  else
-    libgloss_topdir="${with_multisrctop}../.."
-  fi
-else
-  libgloss_topdir="${srcdir}/../.."
-fi
-
-AC_CONFIG_AUX_DIR($libgloss_topdir)
+AC_CONFIG_AUX_DIR(../..)
 AC_CANONICAL_SYSTEM
 AC_ARG_PROGRAM
 
@@ -81,13 +71,12 @@ AC_SUBST(target_makefile_frag_path)
 AC_SUBST_FILE(target_makefile_frag)
 
 AC_CONFIG_FILES(Makefile,
-. ${libgloss_topdir}/config-ml.in,
+. ${srcdir}/../../config-ml.in,
 srcdir=${srcdir}
 target=${target}
 with_multisubdir=${with_multisubdir}
 ac_configure_args="${ac_configure_args} --enable-multilib"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-libgloss_topdir=${libgloss_topdir}
 )
 AC_OUTPUT
 
diff --git a/libgloss/mcore/configure b/libgloss/mcore/configure
index 006118e..e15bd87 100755
--- a/libgloss/mcore/configure
+++ b/libgloss/mcore/configure
@@ -1767,17 +1767,8 @@ if test "${enable_shared}" = "yes" ; then
     echo "Shared libraries not supported for cross compiling, ignored"
 fi
 
-if test "$srcdir" = "." ; then
-  if test "${with_target_subdir}" != "." ; then
-    libgloss_topdir="${srcdir}/${with_multisrctop}../../.."
-  else
-    libgloss_topdir="${srcdir}/${with_multisrctop}../.."
-  fi
-else
-  libgloss_topdir="${srcdir}/../.."
-fi
 ac_aux_dir=
-for ac_dir in $libgloss_topdir "$srcdir"/$libgloss_topdir; do
+for ac_dir in ../.. "$srcdir"/../..; do
   if test -f "$ac_dir/install-sh"; then
     ac_aux_dir=$ac_dir
     ac_install_sh="$ac_aux_dir/install-sh -c"
@@ -1793,7 +1784,7 @@ for ac_dir in $libgloss_topdir "$srcdir"/$libgloss_topdir; do
   fi
 done
 if test -z "$ac_aux_dir"; then
-  as_fn_error $? "cannot find install-sh, install.sh, or shtool in $libgloss_topdir \"$srcdir\"/$libgloss_topdir" "$LINENO" 5
+  as_fn_error $? "cannot find install-sh, install.sh, or shtool in ../.. \"$srcdir\"/../.." "$LINENO" 5
 fi
 
 # These three variables are undocumented and unsupported,
@@ -3283,7 +3274,6 @@ target=${target}
 with_multisubdir=${with_multisubdir}
 ac_configure_args="${ac_configure_args} --enable-multilib"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-libgloss_topdir=${libgloss_topdir}
 
 
 _ACEOF
@@ -3851,7 +3841,7 @@ $as_echo X"$file" |
   done
 }
  ;;
-    "Makefile":F) . ${libgloss_topdir}/config-ml.in ;;
+    "Makefile":F) . ${srcdir}/../../config-ml.in ;;
 
   esac
 done # for ac_tag
diff --git a/libgloss/mcore/configure.ac b/libgloss/mcore/configure.ac
index df7c86d..a7cba66 100644
--- a/libgloss/mcore/configure.ac
+++ b/libgloss/mcore/configure.ac
@@ -6,16 +6,7 @@ if test "${enable_shared}" = "yes" ; then
     echo "Shared libraries not supported for cross compiling, ignored"
 fi
 
-if test "$srcdir" = "." ; then
-  if test "${with_target_subdir}" != "." ; then
-    libgloss_topdir="${srcdir}/${with_multisrctop}../../.."
-  else
-    libgloss_topdir="${srcdir}/${with_multisrctop}../.."
-  fi
-else
-  libgloss_topdir="${srcdir}/../.."
-fi
-AC_CONFIG_AUX_DIR($libgloss_topdir)
+AC_CONFIG_AUX_DIR(../..)
 
 AC_CANONICAL_SYSTEM
 AC_ARG_PROGRAM
@@ -54,12 +45,11 @@ AC_SUBST(host_makefile_frag_path)
 AC_SUBST_FILE(host_makefile_frag)
 
 AC_CONFIG_FILES(Makefile,
-. ${libgloss_topdir}/config-ml.in,
+. ${srcdir}/../../config-ml.in,
 srcdir=${srcdir}
 target=${target}
 with_multisubdir=${with_multisubdir}
 ac_configure_args="${ac_configure_args} --enable-multilib"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-libgloss_topdir=${libgloss_topdir}
 )
 AC_OUTPUT
diff --git a/libgloss/mep/configure b/libgloss/mep/configure
index 79e06e5..532eb0d 100755
--- a/libgloss/mep/configure
+++ b/libgloss/mep/configure
@@ -1755,17 +1755,8 @@ if test "${enable_shared}" = "yes" ; then
     echo "Shared libraries not supported for cross compiling, ignored"
 fi
 
-if test "$srcdir" = "." ; then
-  if test "${with_target_subdir}" != "." ; then
-    libgloss_topdir="${srcdir}/${with_multisrctop}../../.."
-  else
-    libgloss_topdir="${srcdir}/${with_multisrctop}../.."
-  fi
-else
-  libgloss_topdir="${srcdir}/../.."
-fi
 ac_aux_dir=
-for ac_dir in $libgloss_topdir "$srcdir"/$libgloss_topdir; do
+for ac_dir in ../.. "$srcdir"/../..; do
   if test -f "$ac_dir/install-sh"; then
     ac_aux_dir=$ac_dir
     ac_install_sh="$ac_aux_dir/install-sh -c"
@@ -1781,7 +1772,7 @@ for ac_dir in $libgloss_topdir "$srcdir"/$libgloss_topdir; do
   fi
 done
 if test -z "$ac_aux_dir"; then
-  as_fn_error $? "cannot find install-sh, install.sh, or shtool in $libgloss_topdir \"$srcdir\"/$libgloss_topdir" "$LINENO" 5
+  as_fn_error $? "cannot find install-sh, install.sh, or shtool in ../.. \"$srcdir\"/../.." "$LINENO" 5
 fi
 
 # These three variables are undocumented and unsupported,
@@ -3253,7 +3244,6 @@ target=${target}
 with_multisubdir=${with_multisubdir}
 ac_configure_args="${ac_configure_args} --enable-multilib"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-libgloss_topdir=${libgloss_topdir}
 
 
 _ACEOF
@@ -3821,7 +3811,7 @@ $as_echo X"$file" |
   done
 }
  ;;
-    "Makefile":F) . ${libgloss_topdir}/config-ml.in ;;
+    "Makefile":F) . ${srcdir}/../../config-ml.in ;;
 
   esac
 done # for ac_tag
diff --git a/libgloss/mep/configure.ac b/libgloss/mep/configure.ac
index dcfb0ad..5418a0a 100644
--- a/libgloss/mep/configure.ac
+++ b/libgloss/mep/configure.ac
@@ -19,16 +19,7 @@ if test "${enable_shared}" = "yes" ; then
     echo "Shared libraries not supported for cross compiling, ignored"
 fi
 
-if test "$srcdir" = "." ; then
-  if test "${with_target_subdir}" != "." ; then
-    libgloss_topdir="${srcdir}/${with_multisrctop}../../.."
-  else
-    libgloss_topdir="${srcdir}/${with_multisrctop}../.."
-  fi
-else
-  libgloss_topdir="${srcdir}/../.."
-fi
-AC_CONFIG_AUX_DIR($libgloss_topdir)
+AC_CONFIG_AUX_DIR(../..)
 
 AC_CANONICAL_SYSTEM
 AC_ARG_PROGRAM
@@ -55,12 +46,11 @@ AC_SUBST(host_makefile_frag_path)
 AC_SUBST_FILE(host_makefile_frag)
 
 AC_CONFIG_FILES([Makefile],
-. ${libgloss_topdir}/config-ml.in,
+. ${srcdir}/../../config-ml.in,
 srcdir=${srcdir}
 target=${target}
 with_multisubdir=${with_multisubdir}
 ac_configure_args="${ac_configure_args} --enable-multilib"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-libgloss_topdir=${libgloss_topdir}
 )
 AC_OUTPUT
diff --git a/libgloss/microblaze/configure b/libgloss/microblaze/configure
index 05f6868..4a98637 100755
--- a/libgloss/microblaze/configure
+++ b/libgloss/microblaze/configure
@@ -1769,17 +1769,8 @@ if test "${enable_shared}" = "yes" ; then
     echo "Shared libraries not supported for cross compiling, ignored"
 fi
 
-if test "$srcdir" = "." ; then
-  if test "${with_target_subdir}" != "." ; then
-    libgloss_topdir="${srcdir}/${with_multisrctop}../../.."
-  else
-    libgloss_topdir="${srcdir}/${with_multisrctop}../.."
-  fi
-else
-  libgloss_topdir="${srcdir}/../.."
-fi
 ac_aux_dir=
-for ac_dir in $libgloss_topdir "$srcdir"/$libgloss_topdir; do
+for ac_dir in ../.. "$srcdir"/../..; do
   if test -f "$ac_dir/install-sh"; then
     ac_aux_dir=$ac_dir
     ac_install_sh="$ac_aux_dir/install-sh -c"
@@ -1795,7 +1786,7 @@ for ac_dir in $libgloss_topdir "$srcdir"/$libgloss_topdir; do
   fi
 done
 if test -z "$ac_aux_dir"; then
-  as_fn_error $? "cannot find install-sh, install.sh, or shtool in $libgloss_topdir \"$srcdir\"/$libgloss_topdir" "$LINENO" 5
+  as_fn_error $? "cannot find install-sh, install.sh, or shtool in ../.. \"$srcdir\"/../.." "$LINENO" 5
 fi
 
 # These three variables are undocumented and unsupported,
@@ -3280,7 +3271,6 @@ target=${target}
 with_multisubdir=${with_multisubdir}
 ac_configure_args="${ac_configure_args} --enable-multilib"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-libgloss_topdir=${libgloss_topdir}
 
 
 _ACEOF
@@ -3848,7 +3838,7 @@ $as_echo X"$file" |
   done
 }
  ;;
-    "Makefile":F) . ${libgloss_topdir}/config-ml.in ;;
+    "Makefile":F) . ${srcdir}/../../config-ml.in ;;
 
   esac
 done # for ac_tag
diff --git a/libgloss/microblaze/configure.ac b/libgloss/microblaze/configure.ac
index 5eda42e..59ad99e 100644
--- a/libgloss/microblaze/configure.ac
+++ b/libgloss/microblaze/configure.ac
@@ -6,16 +6,7 @@ if test "${enable_shared}" = "yes" ; then
     echo "Shared libraries not supported for cross compiling, ignored"
 fi
 
-if test "$srcdir" = "." ; then
-  if test "${with_target_subdir}" != "." ; then
-    libgloss_topdir="${srcdir}/${with_multisrctop}../../.."
-  else
-    libgloss_topdir="${srcdir}/${with_multisrctop}../.."
-  fi
-else
-  libgloss_topdir="${srcdir}/../.."
-fi
-AC_CONFIG_AUX_DIR($libgloss_topdir)
+AC_CONFIG_AUX_DIR(../..)
 
 AC_CANONICAL_SYSTEM
 AC_ARG_PROGRAM
@@ -49,12 +40,11 @@ AC_SUBST(target_makefile_frag_path)
 AC_SUBST_FILE(target_makefile_frag)
 
 AC_CONFIG_FILES(Makefile,
-. ${libgloss_topdir}/config-ml.in,
+. ${srcdir}/../../config-ml.in,
 srcdir=${srcdir}
 target=${target}
 with_multisubdir=${with_multisubdir}
 ac_configure_args="${ac_configure_args} --enable-multilib"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-libgloss_topdir=${libgloss_topdir}
 )
 AC_OUTPUT
diff --git a/libgloss/mips/configure b/libgloss/mips/configure
index 78c680e..0361a8f 100755
--- a/libgloss/mips/configure
+++ b/libgloss/mips/configure
@@ -1774,17 +1774,8 @@ if test "${enable_shared}" = "yes" ; then
     echo "Shared libraries not supported for cross compiling, ignored"
 fi
 
-if test "$srcdir" = "." ; then
-  if test "${with_target_subdir}" != "." ; then
-    libgloss_topdir="${srcdir}/${with_multisrctop}../../.."
-  else
-    libgloss_topdir="${srcdir}/${with_multisrctop}../.."
-  fi
-else
-  libgloss_topdir="${srcdir}/../.."
-fi
 ac_aux_dir=
-for ac_dir in $libgloss_topdir "$srcdir"/$libgloss_topdir; do
+for ac_dir in ../.. "$srcdir"/../..; do
   if test -f "$ac_dir/install-sh"; then
     ac_aux_dir=$ac_dir
     ac_install_sh="$ac_aux_dir/install-sh -c"
@@ -1800,7 +1791,7 @@ for ac_dir in $libgloss_topdir "$srcdir"/$libgloss_topdir; do
   fi
 done
 if test -z "$ac_aux_dir"; then
-  as_fn_error $? "cannot find install-sh, install.sh, or shtool in $libgloss_topdir \"$srcdir\"/$libgloss_topdir" "$LINENO" 5
+  as_fn_error $? "cannot find install-sh, install.sh, or shtool in ../.. \"$srcdir\"/../.." "$LINENO" 5
 fi
 
 # These three variables are undocumented and unsupported,
@@ -3335,7 +3326,6 @@ target=${target}
 with_multisubdir=${with_multisubdir}
 ac_configure_args="${ac_configure_args} --enable-multilib"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-libgloss_topdir=${libgloss_topdir}
 
 
 _ACEOF
@@ -3903,7 +3893,7 @@ $as_echo X"$file" |
   done
 }
  ;;
-    "Makefile":F) . ${libgloss_topdir}/config-ml.in ;;
+    "Makefile":F) . ${srcdir}/../../config-ml.in ;;
 
   esac
 done # for ac_tag
diff --git a/libgloss/mips/configure.ac b/libgloss/mips/configure.ac
index 2fc286c..3e3d08b 100644
--- a/libgloss/mips/configure.ac
+++ b/libgloss/mips/configure.ac
@@ -19,16 +19,7 @@ if test "${enable_shared}" = "yes" ; then
     echo "Shared libraries not supported for cross compiling, ignored"
 fi
 
-if test "$srcdir" = "." ; then
-  if test "${with_target_subdir}" != "." ; then
-    libgloss_topdir="${srcdir}/${with_multisrctop}../../.."
-  else
-    libgloss_topdir="${srcdir}/${with_multisrctop}../.."
-  fi
-else
-  libgloss_topdir="${srcdir}/../.."
-fi
-AC_CONFIG_AUX_DIR($libgloss_topdir)
+AC_CONFIG_AUX_DIR(../..)
 
 AC_CANONICAL_SYSTEM
 AC_ARG_PROGRAM
@@ -112,12 +103,11 @@ AC_SUBST(crt0)
 AC_SUBST(pcrt0)
 
 AC_CONFIG_FILES(Makefile,
-. ${libgloss_topdir}/config-ml.in,
+. ${srcdir}/../../config-ml.in,
 srcdir=${srcdir}
 target=${target}
 with_multisubdir=${with_multisubdir}
 ac_configure_args="${ac_configure_args} --enable-multilib"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-libgloss_topdir=${libgloss_topdir}
 )
 AC_OUTPUT
diff --git a/libgloss/mn10200/configure b/libgloss/mn10200/configure
index d65e402..98a6fca 100755
--- a/libgloss/mn10200/configure
+++ b/libgloss/mn10200/configure
@@ -1769,17 +1769,8 @@ if test "${enable_shared}" = "yes" ; then
     echo "Shared libraries not supported for cross compiling, ignored"
 fi
 
-if test "$srcdir" = "." ; then
-  if test "${with_target_subdir}" != "." ; then
-    libgloss_topdir="${srcdir}/${with_multisrctop}../../.."
-  else
-    libgloss_topdir="${srcdir}/${with_multisrctop}../.."
-  fi
-else
-  libgloss_topdir="${srcdir}/../.."
-fi
 ac_aux_dir=
-for ac_dir in $libgloss_topdir "$srcdir"/$libgloss_topdir; do
+for ac_dir in ../.. "$srcdir"/../..; do
   if test -f "$ac_dir/install-sh"; then
     ac_aux_dir=$ac_dir
     ac_install_sh="$ac_aux_dir/install-sh -c"
@@ -1795,7 +1786,7 @@ for ac_dir in $libgloss_topdir "$srcdir"/$libgloss_topdir; do
   fi
 done
 if test -z "$ac_aux_dir"; then
-  as_fn_error $? "cannot find install-sh, install.sh, or shtool in $libgloss_topdir \"$srcdir\"/$libgloss_topdir" "$LINENO" 5
+  as_fn_error $? "cannot find install-sh, install.sh, or shtool in ../.. \"$srcdir\"/../.." "$LINENO" 5
 fi
 
 # These three variables are undocumented and unsupported,
@@ -3285,7 +3276,6 @@ target=${target}
 with_multisubdir=${with_multisubdir}
 ac_configure_args="${ac_configure_args} --enable-multilib"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-libgloss_topdir=${libgloss_topdir}
 
 
 _ACEOF
@@ -3853,7 +3843,7 @@ $as_echo X"$file" |
   done
 }
  ;;
-    "Makefile":F) . ${libgloss_topdir}/config-ml.in ;;
+    "Makefile":F) . ${srcdir}/../../config-ml.in ;;
 
   esac
 done # for ac_tag
diff --git a/libgloss/mn10200/configure.ac b/libgloss/mn10200/configure.ac
index af53545..8cd0e71 100644
--- a/libgloss/mn10200/configure.ac
+++ b/libgloss/mn10200/configure.ac
@@ -19,16 +19,7 @@ if test "${enable_shared}" = "yes" ; then
     echo "Shared libraries not supported for cross compiling, ignored"
 fi
 
-if test "$srcdir" = "." ; then
-  if test "${with_target_subdir}" != "." ; then
-    libgloss_topdir="${srcdir}/${with_multisrctop}../../.."
-  else
-    libgloss_topdir="${srcdir}/${with_multisrctop}../.."
-  fi
-else
-  libgloss_topdir="${srcdir}/../.."
-fi
-AC_CONFIG_AUX_DIR($libgloss_topdir)
+AC_CONFIG_AUX_DIR(../..)
 
 AC_CANONICAL_SYSTEM
 AC_ARG_PROGRAM
@@ -67,13 +58,12 @@ AC_SUBST_FILE(target_makefile_frag)
 AC_SUBST(part_specific_obj)
 
 AC_CONFIG_FILES(Makefile,
-. ${libgloss_topdir}/config-ml.in,
+. ${srcdir}/../../config-ml.in,
 srcdir=${srcdir}
 target=${target}
 with_multisubdir=${with_multisubdir}
 ac_configure_args="${ac_configure_args} --enable-multilib"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-libgloss_topdir=${libgloss_topdir}
 )
 AC_OUTPUT
 
diff --git a/libgloss/mn10300/configure b/libgloss/mn10300/configure
index 1a86f4d..ff6786e 100755
--- a/libgloss/mn10300/configure
+++ b/libgloss/mn10300/configure
@@ -1771,17 +1771,8 @@ if test "${enable_shared}" = "yes" ; then
     echo "Shared libraries not supported for cross compiling, ignored"
 fi
 
-if test "$srcdir" = "." ; then
-  if test "${with_target_subdir}" != "." ; then
-    libgloss_topdir="${srcdir}/${with_multisrctop}../../.."
-  else
-    libgloss_topdir="${srcdir}/${with_multisrctop}../.."
-  fi
-else
-  libgloss_topdir="${srcdir}/../.."
-fi
 ac_aux_dir=
-for ac_dir in $libgloss_topdir "$srcdir"/$libgloss_topdir; do
+for ac_dir in ../.. "$srcdir"/../..; do
   if test -f "$ac_dir/install-sh"; then
     ac_aux_dir=$ac_dir
     ac_install_sh="$ac_aux_dir/install-sh -c"
@@ -1797,7 +1788,7 @@ for ac_dir in $libgloss_topdir "$srcdir"/$libgloss_topdir; do
   fi
 done
 if test -z "$ac_aux_dir"; then
-  as_fn_error $? "cannot find install-sh, install.sh, or shtool in $libgloss_topdir \"$srcdir\"/$libgloss_topdir" "$LINENO" 5
+  as_fn_error $? "cannot find install-sh, install.sh, or shtool in ../.. \"$srcdir\"/../.." "$LINENO" 5
 fi
 
 # These three variables are undocumented and unsupported,
@@ -3296,7 +3287,6 @@ target=${target}
 with_multisubdir=${with_multisubdir}
 ac_configure_args="${ac_configure_args} --enable-multilib"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-libgloss_topdir=${libgloss_topdir}
 
 
 _ACEOF
@@ -3866,7 +3856,7 @@ $as_echo X"$file" |
  ;;
     "Makefile":F) if test -n "$CONFIG_FILES"; then
   unset ac_file
-  . ${libgloss_topdir}/config-ml.in
+  . ${srcdir}/../../config-ml.in
 fi ;;
 
   esac
diff --git a/libgloss/mn10300/configure.ac b/libgloss/mn10300/configure.ac
index aea3383..c170cd0 100644
--- a/libgloss/mn10300/configure.ac
+++ b/libgloss/mn10300/configure.ac
@@ -19,16 +19,7 @@ if test "${enable_shared}" = "yes" ; then
     echo "Shared libraries not supported for cross compiling, ignored"
 fi
 
-if test "$srcdir" = "." ; then
-  if test "${with_target_subdir}" != "." ; then
-    libgloss_topdir="${srcdir}/${with_multisrctop}../../.."
-  else
-    libgloss_topdir="${srcdir}/${with_multisrctop}../.."
-  fi
-else
-  libgloss_topdir="${srcdir}/../.."
-fi
-AC_CONFIG_AUX_DIR($libgloss_topdir)
+AC_CONFIG_AUX_DIR(../..)
 
 AC_CANONICAL_SYSTEM
 AC_ARG_PROGRAM
@@ -78,14 +69,13 @@ AC_SUBST(bsp_list)
 AC_CONFIG_FILES([Makefile],
 [if test -n "$CONFIG_FILES"; then
   unset ac_file
-  . ${libgloss_topdir}/config-ml.in
+  . ${srcdir}/../../config-ml.in
 fi],
 srcdir=${srcdir}
 target=${target}
 with_multisubdir=${with_multisubdir}
 ac_configure_args="${ac_configure_args} --enable-multilib"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-libgloss_topdir=${libgloss_topdir}
 )
 AC_OUTPUT
 
diff --git a/libgloss/moxie/configure b/libgloss/moxie/configure
index b8a538e..f966c2b 100755
--- a/libgloss/moxie/configure
+++ b/libgloss/moxie/configure
@@ -1768,17 +1768,8 @@ if test "${enable_shared}" = "yes" ; then
     echo "Shared libraries not supported for cross compiling, ignored"
 fi
 
-if test "$srcdir" = "." ; then
-  if test "${with_target_subdir}" != "." ; then
-    libgloss_topdir="${srcdir}/${with_multisrctop}../../.."
-  else
-    libgloss_topdir="${srcdir}/${with_multisrctop}../.."
-  fi
-else
-  libgloss_topdir="${srcdir}/../.."
-fi
 ac_aux_dir=
-for ac_dir in $libgloss_topdir "$srcdir"/$libgloss_topdir; do
+for ac_dir in ../.. "$srcdir"/../..; do
   if test -f "$ac_dir/install-sh"; then
     ac_aux_dir=$ac_dir
     ac_install_sh="$ac_aux_dir/install-sh -c"
@@ -1794,7 +1785,7 @@ for ac_dir in $libgloss_topdir "$srcdir"/$libgloss_topdir; do
   fi
 done
 if test -z "$ac_aux_dir"; then
-  as_fn_error $? "cannot find install-sh, install.sh, or shtool in $libgloss_topdir \"$srcdir\"/$libgloss_topdir" "$LINENO" 5
+  as_fn_error $? "cannot find install-sh, install.sh, or shtool in ../.. \"$srcdir\"/../.." "$LINENO" 5
 fi
 
 # These three variables are undocumented and unsupported,
@@ -3288,7 +3279,6 @@ target=${target}
 with_multisubdir=${with_multisubdir}
 ac_configure_args="${ac_configure_args} --enable-multilib"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-libgloss_topdir=${libgloss_topdir}
 
 
 _ACEOF
@@ -3856,7 +3846,7 @@ $as_echo X"$file" |
   done
 }
  ;;
-    "Makefile":F) . ${libgloss_topdir}/config-ml.in ;;
+    "Makefile":F) . ${srcdir}/../../config-ml.in ;;
 
   esac
 done # for ac_tag
diff --git a/libgloss/moxie/configure.ac b/libgloss/moxie/configure.ac
index fa29406..17a4058 100644
--- a/libgloss/moxie/configure.ac
+++ b/libgloss/moxie/configure.ac
@@ -6,16 +6,7 @@ if test "${enable_shared}" = "yes" ; then
     echo "Shared libraries not supported for cross compiling, ignored"
 fi
 
-if test "$srcdir" = "." ; then
-  if test "${with_target_subdir}" != "." ; then
-    libgloss_topdir="${srcdir}/${with_multisrctop}../../.."
-  else
-    libgloss_topdir="${srcdir}/${with_multisrctop}../.."
-  fi
-else
-  libgloss_topdir="${srcdir}/../.."
-fi
-AC_CONFIG_AUX_DIR($libgloss_topdir)
+AC_CONFIG_AUX_DIR(../..)
 
 AC_CANONICAL_SYSTEM
 AC_ARG_PROGRAM
@@ -59,12 +50,11 @@ AC_SUBST(host_makefile_frag_path)
 AC_SUBST_FILE(host_makefile_frag)
 
 AC_CONFIG_FILES(Makefile,
-. ${libgloss_topdir}/config-ml.in,
+. ${srcdir}/../../config-ml.in,
 srcdir=${srcdir}
 target=${target}
 with_multisubdir=${with_multisubdir}
 ac_configure_args="${ac_configure_args} --enable-multilib"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-libgloss_topdir=${libgloss_topdir}
 )
 AC_OUTPUT
diff --git a/libgloss/msp430/configure b/libgloss/msp430/configure
index 532fe27..3d6919d 100755
--- a/libgloss/msp430/configure
+++ b/libgloss/msp430/configure
@@ -1766,17 +1766,8 @@ if test "${enable_shared}" = "yes" ; then
     echo "Shared libraries not supported for cross compiling, ignored"
 fi
 
-if test "$srcdir" = "." ; then
-  if test "${with_target_subdir}" != "." ; then
-    libgloss_topdir="${srcdir}/${with_multisrctop}../../.."
-  else
-    libgloss_topdir="${srcdir}/${with_multisrctop}../.."
-  fi
-else
-  libgloss_topdir="${srcdir}/../.."
-fi
 ac_aux_dir=
-for ac_dir in $libgloss_topdir "$srcdir"/$libgloss_topdir; do
+for ac_dir in ../.. "$srcdir"/../..; do
   if test -f "$ac_dir/install-sh"; then
     ac_aux_dir=$ac_dir
     ac_install_sh="$ac_aux_dir/install-sh -c"
@@ -1792,7 +1783,7 @@ for ac_dir in $libgloss_topdir "$srcdir"/$libgloss_topdir; do
   fi
 done
 if test -z "$ac_aux_dir"; then
-  as_fn_error $? "cannot find install-sh, install.sh, or shtool in $libgloss_topdir \"$srcdir\"/$libgloss_topdir" "$LINENO" 5
+  as_fn_error $? "cannot find install-sh, install.sh, or shtool in ../.. \"$srcdir\"/../.." "$LINENO" 5
 fi
 
 # These three variables are undocumented and unsupported,
@@ -3272,7 +3263,6 @@ target=${target}
 with_multisubdir=${with_multisubdir}
 ac_configure_args="${ac_configure_args} --enable-multilib"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-libgloss_topdir=${libgloss_topdir}
 
 
 _ACEOF
@@ -3840,7 +3830,7 @@ $as_echo X"$file" |
   done
 }
  ;;
-    "Makefile":F) . ${libgloss_topdir}/config-ml.in ;;
+    "Makefile":F) . ${srcdir}/../../config-ml.in ;;
 
   esac
 done # for ac_tag
diff --git a/libgloss/msp430/configure.ac b/libgloss/msp430/configure.ac
index a90e2b5..340b39e 100644
--- a/libgloss/msp430/configure.ac
+++ b/libgloss/msp430/configure.ac
@@ -18,16 +18,7 @@ if test "${enable_shared}" = "yes" ; then
     echo "Shared libraries not supported for cross compiling, ignored"
 fi
 
-if test "$srcdir" = "." ; then
-  if test "${with_target_subdir}" != "." ; then
-    libgloss_topdir="${srcdir}/${with_multisrctop}../../.."
-  else
-    libgloss_topdir="${srcdir}/${with_multisrctop}../.."
-  fi
-else
-  libgloss_topdir="${srcdir}/../.."
-fi
-AC_CONFIG_AUX_DIR($libgloss_topdir)
+AC_CONFIG_AUX_DIR(../..)
 
 AC_CANONICAL_SYSTEM
 AC_ARG_PROGRAM
@@ -56,12 +47,11 @@ AC_SUBST(host_makefile_frag_path)
 AC_SUBST_FILE(host_makefile_frag)
 
 AC_CONFIG_FILES(Makefile,
-. ${libgloss_topdir}/config-ml.in,
+. ${srcdir}/../../config-ml.in,
 srcdir=${srcdir}
 target=${target}
 with_multisubdir=${with_multisubdir}
 ac_configure_args="${ac_configure_args} --enable-multilib"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-libgloss_topdir=${libgloss_topdir}
 )
 AC_OUTPUT
diff --git a/libgloss/mt/configure b/libgloss/mt/configure
index 532fe27..3d6919d 100755
--- a/libgloss/mt/configure
+++ b/libgloss/mt/configure
@@ -1766,17 +1766,8 @@ if test "${enable_shared}" = "yes" ; then
     echo "Shared libraries not supported for cross compiling, ignored"
 fi
 
-if test "$srcdir" = "." ; then
-  if test "${with_target_subdir}" != "." ; then
-    libgloss_topdir="${srcdir}/${with_multisrctop}../../.."
-  else
-    libgloss_topdir="${srcdir}/${with_multisrctop}../.."
-  fi
-else
-  libgloss_topdir="${srcdir}/../.."
-fi
 ac_aux_dir=
-for ac_dir in $libgloss_topdir "$srcdir"/$libgloss_topdir; do
+for ac_dir in ../.. "$srcdir"/../..; do
   if test -f "$ac_dir/install-sh"; then
     ac_aux_dir=$ac_dir
     ac_install_sh="$ac_aux_dir/install-sh -c"
@@ -1792,7 +1783,7 @@ for ac_dir in $libgloss_topdir "$srcdir"/$libgloss_topdir; do
   fi
 done
 if test -z "$ac_aux_dir"; then
-  as_fn_error $? "cannot find install-sh, install.sh, or shtool in $libgloss_topdir \"$srcdir\"/$libgloss_topdir" "$LINENO" 5
+  as_fn_error $? "cannot find install-sh, install.sh, or shtool in ../.. \"$srcdir\"/../.." "$LINENO" 5
 fi
 
 # These three variables are undocumented and unsupported,
@@ -3272,7 +3263,6 @@ target=${target}
 with_multisubdir=${with_multisubdir}
 ac_configure_args="${ac_configure_args} --enable-multilib"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-libgloss_topdir=${libgloss_topdir}
 
 
 _ACEOF
@@ -3840,7 +3830,7 @@ $as_echo X"$file" |
   done
 }
  ;;
-    "Makefile":F) . ${libgloss_topdir}/config-ml.in ;;
+    "Makefile":F) . ${srcdir}/../../config-ml.in ;;
 
   esac
 done # for ac_tag
diff --git a/libgloss/mt/configure.ac b/libgloss/mt/configure.ac
index fee6c45..23d5fb4 100644
--- a/libgloss/mt/configure.ac
+++ b/libgloss/mt/configure.ac
@@ -6,16 +6,7 @@ if test "${enable_shared}" = "yes" ; then
     echo "Shared libraries not supported for cross compiling, ignored"
 fi
 
-if test "$srcdir" = "." ; then
-  if test "${with_target_subdir}" != "." ; then
-    libgloss_topdir="${srcdir}/${with_multisrctop}../../.."
-  else
-    libgloss_topdir="${srcdir}/${with_multisrctop}../.."
-  fi
-else
-  libgloss_topdir="${srcdir}/../.."
-fi
-AC_CONFIG_AUX_DIR($libgloss_topdir)
+AC_CONFIG_AUX_DIR(../..)
 
 AC_CANONICAL_SYSTEM
 AC_ARG_PROGRAM
@@ -44,12 +35,11 @@ AC_SUBST(host_makefile_frag_path)
 AC_SUBST_FILE(host_makefile_frag)
 
 AC_CONFIG_FILES(Makefile,
-. ${libgloss_topdir}/config-ml.in,
+. ${srcdir}/../../config-ml.in,
 srcdir=${srcdir}
 target=${target}
 with_multisubdir=${with_multisubdir}
 ac_configure_args="${ac_configure_args} --enable-multilib"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-libgloss_topdir=${libgloss_topdir}
 )
 AC_OUTPUT
diff --git a/libgloss/nds32/configure b/libgloss/nds32/configure
index 4c57f7a..01e3010 100755
--- a/libgloss/nds32/configure
+++ b/libgloss/nds32/configure
@@ -1913,41 +1913,8 @@ ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
 program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
 
 
-if test "$srcdir" = "." ; then
-  mdir=`echo "${with_multisubdir}/" \
-    | sed -e 's,\([^/][^/]*\),..,g' -e 's,^/$,,'`
-  ac_aux_dir=
-for ac_dir in ${mdir}../../.. "$srcdir"/${mdir}../../..; do
-  if test -f "$ac_dir/install-sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f "$ac_dir/install.sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  elif test -f "$ac_dir/shtool"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/shtool install -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  as_fn_error $? "cannot find install-sh, install.sh, or shtool in ${mdir}../../.. \"$srcdir\"/${mdir}../../.." "$LINENO" 5
-fi
-
-# These three variables are undocumented and unsupported,
-# and are intended to be withdrawn in a future Autoconf release.
-# They can cause serious problems if a builder's source tree is in a directory
-# whose full name contains unusual characters.
-ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
-ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
-ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
-
-
-else
-  ac_aux_dir=
-for ac_dir in ${srcdir}/../.. "$srcdir"/${srcdir}/../..; do
+ac_aux_dir=
+for ac_dir in ../.. "$srcdir"/../..; do
   if test -f "$ac_dir/install-sh"; then
     ac_aux_dir=$ac_dir
     ac_install_sh="$ac_aux_dir/install-sh -c"
@@ -1963,7 +1930,7 @@ for ac_dir in ${srcdir}/../.. "$srcdir"/${srcdir}/../..; do
   fi
 done
 if test -z "$ac_aux_dir"; then
-  as_fn_error $? "cannot find install-sh, install.sh, or shtool in ${srcdir}/../.. \"$srcdir\"/${srcdir}/../.." "$LINENO" 5
+  as_fn_error $? "cannot find install-sh, install.sh, or shtool in ../.. \"$srcdir\"/../.." "$LINENO" 5
 fi
 
 # These three variables are undocumented and unsupported,
@@ -1975,7 +1942,6 @@ ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
 ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 
 
-fi
 
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
@@ -3321,7 +3287,6 @@ target=${target}
 with_multisubdir=${with_multisubdir}
 ac_configure_args="${ac_configure_args} --enable-multilib"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-libgloss_topdir=${srcdir}/../..
 
 
 _ACEOF
diff --git a/libgloss/nds32/configure.ac b/libgloss/nds32/configure.ac
index f4ab6dc..c5fd568 100644
--- a/libgloss/nds32/configure.ac
+++ b/libgloss/nds32/configure.ac
@@ -5,13 +5,7 @@ AC_INIT(crt0.S)
 AC_CANONICAL_SYSTEM
 AC_ARG_PROGRAM
 
-if test "$srcdir" = "." ; then
-  mdir=`echo "${with_multisubdir}/" \
-    | sed -e 's,\([[^/]][[^/]]*\),..,g' -e 's,^/$,,'`
-  AC_CONFIG_AUX_DIR(${mdir}../../..)
-else
-  AC_CONFIG_AUX_DIR(${srcdir}/../..)
-fi
+AC_CONFIG_AUX_DIR(../..)
 
 AC_PROG_INSTALL
 
@@ -42,6 +36,5 @@ target=${target}
 with_multisubdir=${with_multisubdir}
 ac_configure_args="${ac_configure_args} --enable-multilib"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-libgloss_topdir=${srcdir}/../..
 )
 AC_OUTPUT
diff --git a/libgloss/nios2/configure b/libgloss/nios2/configure
index 3ad8518..335a743 100755
--- a/libgloss/nios2/configure
+++ b/libgloss/nios2/configure
@@ -1768,17 +1768,8 @@ if test "${enable_shared}" = "yes" ; then
     echo "Shared libraries not supported for cross compiling, ignored"
 fi
 
-if test "$srcdir" = "." ; then
-  if test "${with_target_subdir}" != "." ; then
-    libgloss_topdir="${with_multisrctop}../../.."
-  else
-    libgloss_topdir="${with_multisrctop}../.."
-  fi
-else
-  libgloss_topdir="${srcdir}/../.."
-fi
 ac_aux_dir=
-for ac_dir in $libgloss_topdir "$srcdir"/$libgloss_topdir; do
+for ac_dir in ../.. "$srcdir"/../..; do
   if test -f "$ac_dir/install-sh"; then
     ac_aux_dir=$ac_dir
     ac_install_sh="$ac_aux_dir/install-sh -c"
@@ -1794,7 +1785,7 @@ for ac_dir in $libgloss_topdir "$srcdir"/$libgloss_topdir; do
   fi
 done
 if test -z "$ac_aux_dir"; then
-  as_fn_error $? "cannot find install-sh, install.sh, or shtool in $libgloss_topdir \"$srcdir\"/$libgloss_topdir" "$LINENO" 5
+  as_fn_error $? "cannot find install-sh, install.sh, or shtool in ../.. \"$srcdir\"/../.." "$LINENO" 5
 fi
 
 # These three variables are undocumented and unsupported,
@@ -3277,7 +3268,6 @@ target=${target}
 with_multisubdir=${with_multisubdir}
 ac_configure_args="${ac_configure_args} --enable-multilib"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-libgloss_topdir=${libgloss_topdir}
 
 
 _ACEOF
@@ -3845,7 +3835,7 @@ $as_echo X"$file" |
   done
 }
  ;;
-    "Makefile":F) . ${libgloss_topdir}/config-ml.in ;;
+    "Makefile":F) . ${srcdir}/../../config-ml.in ;;
 
   esac
 done # for ac_tag
diff --git a/libgloss/nios2/configure.ac b/libgloss/nios2/configure.ac
index 83f3069..d43fff6 100644
--- a/libgloss/nios2/configure.ac
+++ b/libgloss/nios2/configure.ac
@@ -6,16 +6,7 @@ if test "${enable_shared}" = "yes" ; then
     echo "Shared libraries not supported for cross compiling, ignored"
 fi
 
-if test "$srcdir" = "." ; then
-  if test "${with_target_subdir}" != "." ; then
-    libgloss_topdir="${with_multisrctop}../../.."
-  else
-    libgloss_topdir="${with_multisrctop}../.."
-  fi
-else
-  libgloss_topdir="${srcdir}/../.."
-fi
-AC_CONFIG_AUX_DIR($libgloss_topdir)
+AC_CONFIG_AUX_DIR(../..)
 
 AC_CANONICAL_SYSTEM
 AC_ARG_PROGRAM
@@ -47,12 +38,11 @@ AC_SUBST(target_makefile_frag_path)
 AC_SUBST_FILE(target_makefile_frag)
 
 AC_CONFIG_FILES(Makefile,
-. ${libgloss_topdir}/config-ml.in,
+. ${srcdir}/../../config-ml.in,
 srcdir=${srcdir}
 target=${target}
 with_multisubdir=${with_multisubdir}
 ac_configure_args="${ac_configure_args} --enable-multilib"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-libgloss_topdir=${libgloss_topdir}
 )
 AC_OUTPUT
diff --git a/libgloss/or1k/configure b/libgloss/or1k/configure
index 58dd895..5531bd5 100755
--- a/libgloss/or1k/configure
+++ b/libgloss/or1k/configure
@@ -1771,17 +1771,8 @@ if test "${enable_shared}" = "yes" ; then
 fi
 
 # Where are the auxillary tools (confg.sub etc)?
-if test "$srcdir" = "." ; then
-  if test "${with_target_subdir}" != "." ; then
-    libgloss_topdir="${srcdir}/${with_multisrctop}../../.."
-  else
-    libgloss_topdir="${srcdir}/${with_multisrctop}../.."
-  fi
-else
-  libgloss_topdir="${srcdir}/../.."
-fi
 ac_aux_dir=
-for ac_dir in $libgloss_topdir "$srcdir"/$libgloss_topdir; do
+for ac_dir in ../.. "$srcdir"/../..; do
   if test -f "$ac_dir/install-sh"; then
     ac_aux_dir=$ac_dir
     ac_install_sh="$ac_aux_dir/install-sh -c"
@@ -1797,7 +1788,7 @@ for ac_dir in $libgloss_topdir "$srcdir"/$libgloss_topdir; do
   fi
 done
 if test -z "$ac_aux_dir"; then
-  as_fn_error $? "cannot find install-sh, install.sh, or shtool in $libgloss_topdir \"$srcdir\"/$libgloss_topdir" "$LINENO" 5
+  as_fn_error $? "cannot find install-sh, install.sh, or shtool in ../.. \"$srcdir\"/../.." "$LINENO" 5
 fi
 
 # These three variables are undocumented and unsupported,
@@ -3290,7 +3281,6 @@ target=${target}
 with_multisubdir=${with_multisubdir}
 ac_configure_args="${ac_configure_args} --enable-multilib"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-libgloss_topdir=${libgloss_topdir}
 
 
 _ACEOF
@@ -3858,7 +3848,7 @@ $as_echo X"$file" |
   done
 }
  ;;
-    "Makefile":F) . ${libgloss_topdir}/config-ml.in ;;
+    "Makefile":F) . ${srcdir}/../../config-ml.in ;;
 
   esac
 done # for ac_tag
@@ -3896,3 +3886,4 @@ if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
 $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
 fi
+
diff --git a/libgloss/or1k/configure.ac b/libgloss/or1k/configure.ac
index 2a763fa..f34d5c9 100644
--- a/libgloss/or1k/configure.ac
+++ b/libgloss/or1k/configure.ac
@@ -23,16 +23,7 @@ if test "${enable_shared}" = "yes" ; then
 fi
 
 # Where are the auxillary tools (confg.sub etc)?
-if test "$srcdir" = "." ; then
-  if test "${with_target_subdir}" != "." ; then
-    libgloss_topdir="${srcdir}/${with_multisrctop}../../.."
-  else
-    libgloss_topdir="${srcdir}/${with_multisrctop}../.."
-  fi
-else
-  libgloss_topdir="${srcdir}/../.."
-fi
-AC_CONFIG_AUX_DIR($libgloss_topdir)
+AC_CONFIG_AUX_DIR(../..)
 
 AC_CANONICAL_SYSTEM
 AC_ARG_PROGRAM
@@ -70,12 +61,11 @@ AC_SUBST(target_makefile_frag_path)
 AC_SUBST_FILE(target_makefile_frag)
 
 AC_CONFIG_FILES(Makefile,
-. ${libgloss_topdir}/config-ml.in,
+. ${srcdir}/../../config-ml.in,
 srcdir=${srcdir}
 target=${target}
 with_multisubdir=${with_multisubdir}
 ac_configure_args="${ac_configure_args} --enable-multilib"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-libgloss_topdir=${libgloss_topdir}
 )
-AC_OUTPUT
\ No newline at end of file
+AC_OUTPUT
diff --git a/libgloss/pa/configure b/libgloss/pa/configure
index 163774f..335a743 100755
--- a/libgloss/pa/configure
+++ b/libgloss/pa/configure
@@ -1768,17 +1768,8 @@ if test "${enable_shared}" = "yes" ; then
     echo "Shared libraries not supported for cross compiling, ignored"
 fi
 
-if test "$srcdir" = "." ; then
-  if test "${with_target_subdir}" != "." ; then
-    libgloss_topdir="${srcdir}/${with_multisrctop}../../.."
-  else
-    libgloss_topdir="${srcdir}/${with_multisrctop}../.."
-  fi
-else
-  libgloss_topdir="${srcdir}/../.."
-fi
 ac_aux_dir=
-for ac_dir in $libgloss_topdir "$srcdir"/$libgloss_topdir; do
+for ac_dir in ../.. "$srcdir"/../..; do
   if test -f "$ac_dir/install-sh"; then
     ac_aux_dir=$ac_dir
     ac_install_sh="$ac_aux_dir/install-sh -c"
@@ -1794,7 +1785,7 @@ for ac_dir in $libgloss_topdir "$srcdir"/$libgloss_topdir; do
   fi
 done
 if test -z "$ac_aux_dir"; then
-  as_fn_error $? "cannot find install-sh, install.sh, or shtool in $libgloss_topdir \"$srcdir\"/$libgloss_topdir" "$LINENO" 5
+  as_fn_error $? "cannot find install-sh, install.sh, or shtool in ../.. \"$srcdir\"/../.." "$LINENO" 5
 fi
 
 # These three variables are undocumented and unsupported,
@@ -3277,7 +3268,6 @@ target=${target}
 with_multisubdir=${with_multisubdir}
 ac_configure_args="${ac_configure_args} --enable-multilib"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-libgloss_topdir=${libgloss_topdir}
 
 
 _ACEOF
@@ -3845,7 +3835,7 @@ $as_echo X"$file" |
   done
 }
  ;;
-    "Makefile":F) . ${libgloss_topdir}/config-ml.in ;;
+    "Makefile":F) . ${srcdir}/../../config-ml.in ;;
 
   esac
 done # for ac_tag
diff --git a/libgloss/pa/configure.ac b/libgloss/pa/configure.ac
index d28c55d..f7c39b5 100644
--- a/libgloss/pa/configure.ac
+++ b/libgloss/pa/configure.ac
@@ -19,16 +19,7 @@ if test "${enable_shared}" = "yes" ; then
     echo "Shared libraries not supported for cross compiling, ignored"
 fi
 
-if test "$srcdir" = "." ; then
-  if test "${with_target_subdir}" != "." ; then
-    libgloss_topdir="${srcdir}/${with_multisrctop}../../.."
-  else
-    libgloss_topdir="${srcdir}/${with_multisrctop}../.."
-  fi
-else
-  libgloss_topdir="${srcdir}/../.."
-fi
-AC_CONFIG_AUX_DIR($libgloss_topdir)
+AC_CONFIG_AUX_DIR(../..)
 
 AC_CANONICAL_SYSTEM
 AC_ARG_PROGRAM
@@ -60,12 +51,11 @@ AC_SUBST(target_makefile_frag_path)
 AC_SUBST_FILE(target_makefile_frag)
 
 AC_CONFIG_FILES(Makefile,
-. ${libgloss_topdir}/config-ml.in,
+. ${srcdir}/../../config-ml.in,
 srcdir=${srcdir}
 target=${target}
 with_multisubdir=${with_multisubdir}
 ac_configure_args="${ac_configure_args} --enable-multilib"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-libgloss_topdir=${libgloss_topdir}
 )
 AC_OUTPUT
diff --git a/libgloss/pru/configure b/libgloss/pru/configure
index 99457d7..6467495 100755
--- a/libgloss/pru/configure
+++ b/libgloss/pru/configure
@@ -1766,17 +1766,8 @@ if test "${enable_shared}" = "yes" ; then
     echo "Shared libraries not supported for cross compiling, ignored"
 fi
 
-if test "$srcdir" = "." ; then
-  if test "${with_target_subdir}" != "." ; then
-    libgloss_topdir="${srcdir}/${with_multisrctop}../../.."
-  else
-    libgloss_topdir="${srcdir}/${with_multisrctop}../.."
-  fi
-else
-  libgloss_topdir="${srcdir}/../.."
-fi
 ac_aux_dir=
-for ac_dir in $libgloss_topdir "$srcdir"/$libgloss_topdir; do
+for ac_dir in ../.. "$srcdir"/../..; do
   if test -f "$ac_dir/install-sh"; then
     ac_aux_dir=$ac_dir
     ac_install_sh="$ac_aux_dir/install-sh -c"
@@ -1792,7 +1783,7 @@ for ac_dir in $libgloss_topdir "$srcdir"/$libgloss_topdir; do
   fi
 done
 if test -z "$ac_aux_dir"; then
-  as_fn_error $? "cannot find install-sh, install.sh, or shtool in $libgloss_topdir \"$srcdir\"/$libgloss_topdir" "$LINENO" 5
+  as_fn_error $? "cannot find install-sh, install.sh, or shtool in ../.. \"$srcdir\"/../.." "$LINENO" 5
 fi
 
 # These three variables are undocumented and unsupported,
@@ -3271,7 +3262,6 @@ target=${target}
 with_multisubdir=${with_multisubdir}
 ac_configure_args="${ac_configure_args} --enable-multilib"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-libgloss_topdir=${libgloss_topdir}
 
 
 _ACEOF
@@ -3839,7 +3829,7 @@ $as_echo X"$file" |
   done
 }
  ;;
-    "Makefile":F) . ${libgloss_topdir}/config-ml.in ;;
+    "Makefile":F) . ${srcdir}/../../config-ml.in ;;
 
   esac
 done # for ac_tag
diff --git a/libgloss/pru/configure.ac b/libgloss/pru/configure.ac
index ce9e6b2..880bd9a 100644
--- a/libgloss/pru/configure.ac
+++ b/libgloss/pru/configure.ac
@@ -18,16 +18,7 @@ if test "${enable_shared}" = "yes" ; then
     echo "Shared libraries not supported for cross compiling, ignored"
 fi
 
-if test "$srcdir" = "." ; then
-  if test "${with_target_subdir}" != "." ; then
-    libgloss_topdir="${srcdir}/${with_multisrctop}../../.."
-  else
-    libgloss_topdir="${srcdir}/${with_multisrctop}../.."
-  fi
-else
-  libgloss_topdir="${srcdir}/../.."
-fi
-AC_CONFIG_AUX_DIR($libgloss_topdir)
+AC_CONFIG_AUX_DIR(../..)
 
 AC_CANONICAL_SYSTEM
 AC_ARG_PROGRAM
@@ -55,12 +46,11 @@ AC_SUBST(host_makefile_frag_path)
 AC_SUBST_FILE(host_makefile_frag)
 
 AC_CONFIG_FILES(Makefile,
-. ${libgloss_topdir}/config-ml.in,
+. ${srcdir}/../../config-ml.in,
 srcdir=${srcdir}
 target=${target}
 with_multisubdir=${with_multisubdir}
 ac_configure_args="${ac_configure_args} --enable-multilib"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-libgloss_topdir=${libgloss_topdir}
 )
 AC_OUTPUT
diff --git a/libgloss/riscv/configure b/libgloss/riscv/configure
index f73d993..4aa2d5c 100755
--- a/libgloss/riscv/configure
+++ b/libgloss/riscv/configure
@@ -1728,7 +1728,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 ac_aux_dir=
-for ac_dir in ${srcdir}/../.. "$srcdir"/${srcdir}/../..; do
+for ac_dir in ../.. "$srcdir"/../..; do
   if test -f "$ac_dir/install-sh"; then
     ac_aux_dir=$ac_dir
     ac_install_sh="$ac_aux_dir/install-sh -c"
@@ -1744,7 +1744,7 @@ for ac_dir in ${srcdir}/../.. "$srcdir"/${srcdir}/../..; do
   fi
 done
 if test -z "$ac_aux_dir"; then
-  as_fn_error $? "cannot find install-sh, install.sh, or shtool in ${srcdir}/../.. \"$srcdir\"/${srcdir}/../.." "$LINENO" 5
+  as_fn_error $? "cannot find install-sh, install.sh, or shtool in ../.. \"$srcdir\"/../.." "$LINENO" 5
 fi
 
 # These three variables are undocumented and unsupported,
@@ -2460,44 +2460,6 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 # Output
 #-------------------------------------------------------------------------
 
-if test "$srcdir" = "." ; then
-  if test "${with_target_subdir}" != "." ; then
-    libgloss_topdir="${srcdir}/${with_multisrctop}../../.."
-  else
-    libgloss_topdir="${srcdir}/${with_multisrctop}../.."
-  fi
-else
-  libgloss_topdir="${srcdir}/../.."
-fi
-ac_aux_dir=
-for ac_dir in $libgloss_topdir "$srcdir"/$libgloss_topdir; do
-  if test -f "$ac_dir/install-sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f "$ac_dir/install.sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  elif test -f "$ac_dir/shtool"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/shtool install -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  as_fn_error $? "cannot find install-sh, install.sh, or shtool in $libgloss_topdir \"$srcdir\"/$libgloss_topdir" "$LINENO" 5
-fi
-
-# These three variables are undocumented and unsupported,
-# and are intended to be withdrawn in a future Autoconf release.
-# They can cause serious problems if a builder's source tree is in a directory
-# whose full name contains unusual characters.
-ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
-ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
-ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
-
-
 ac_config_files="$ac_config_files Makefile"
 
 cat >confcache <<\_ACEOF
@@ -3219,7 +3181,6 @@ target=${target}
 with_multisubdir=${with_multisubdir}
 ac_configure_args="${ac_configure_args} --enable-multilib"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-libgloss_topdir=${libgloss_topdir}
 
 
 _ACEOF
@@ -3748,7 +3709,7 @@ $as_echo X"$file" |
   done
 }
  ;;
-    "Makefile":F) . ${libgloss_topdir}/config-ml.in ;;
+    "Makefile":F) . ${srcdir}/../../config-ml.in ;;
 
   esac
 done # for ac_tag
diff --git a/libgloss/riscv/configure.ac b/libgloss/riscv/configure.ac
index 5694013..a284d48 100644
--- a/libgloss/riscv/configure.ac
+++ b/libgloss/riscv/configure.ac
@@ -8,7 +8,7 @@
 
 AC_INIT([crt0.S])
 AC_CONFIG_SRCDIR([crt0.S])
-AC_CONFIG_AUX_DIR([${srcdir}/../..])
+AC_CONFIG_AUX_DIR(../..)
 
 #-------------------------------------------------------------------------
 # Checks for programs
@@ -23,23 +23,12 @@ AC_PROG_INSTALL
 # Output
 #-------------------------------------------------------------------------
 
-if test "$srcdir" = "." ; then
-  if test "${with_target_subdir}" != "." ; then
-    libgloss_topdir="${srcdir}/${with_multisrctop}../../.."
-  else
-    libgloss_topdir="${srcdir}/${with_multisrctop}../.."
-  fi
-else
-  libgloss_topdir="${srcdir}/../.."
-fi
-AC_CONFIG_AUX_DIR($libgloss_topdir)
 AC_CONFIG_FILES(Makefile,
-. ${libgloss_topdir}/config-ml.in,
+. ${srcdir}/../../config-ml.in,
 srcdir=${srcdir}
 target=${target}
 with_multisubdir=${with_multisubdir}
 ac_configure_args="${ac_configure_args} --enable-multilib"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-libgloss_topdir=${libgloss_topdir}
 )
 AC_OUTPUT
diff --git a/libgloss/rl78/configure b/libgloss/rl78/configure
index 532fe27..3d6919d 100755
--- a/libgloss/rl78/configure
+++ b/libgloss/rl78/configure
@@ -1766,17 +1766,8 @@ if test "${enable_shared}" = "yes" ; then
     echo "Shared libraries not supported for cross compiling, ignored"
 fi
 
-if test "$srcdir" = "." ; then
-  if test "${with_target_subdir}" != "." ; then
-    libgloss_topdir="${srcdir}/${with_multisrctop}../../.."
-  else
-    libgloss_topdir="${srcdir}/${with_multisrctop}../.."
-  fi
-else
-  libgloss_topdir="${srcdir}/../.."
-fi
 ac_aux_dir=
-for ac_dir in $libgloss_topdir "$srcdir"/$libgloss_topdir; do
+for ac_dir in ../.. "$srcdir"/../..; do
   if test -f "$ac_dir/install-sh"; then
     ac_aux_dir=$ac_dir
     ac_install_sh="$ac_aux_dir/install-sh -c"
@@ -1792,7 +1783,7 @@ for ac_dir in $libgloss_topdir "$srcdir"/$libgloss_topdir; do
   fi
 done
 if test -z "$ac_aux_dir"; then
-  as_fn_error $? "cannot find install-sh, install.sh, or shtool in $libgloss_topdir \"$srcdir\"/$libgloss_topdir" "$LINENO" 5
+  as_fn_error $? "cannot find install-sh, install.sh, or shtool in ../.. \"$srcdir\"/../.." "$LINENO" 5
 fi
 
 # These three variables are undocumented and unsupported,
@@ -3272,7 +3263,6 @@ target=${target}
 with_multisubdir=${with_multisubdir}
 ac_configure_args="${ac_configure_args} --enable-multilib"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-libgloss_topdir=${libgloss_topdir}
 
 
 _ACEOF
@@ -3840,7 +3830,7 @@ $as_echo X"$file" |
   done
 }
  ;;
-    "Makefile":F) . ${libgloss_topdir}/config-ml.in ;;
+    "Makefile":F) . ${srcdir}/../../config-ml.in ;;
 
   esac
 done # for ac_tag
diff --git a/libgloss/rl78/configure.ac b/libgloss/rl78/configure.ac
index fee6c45..23d5fb4 100644
--- a/libgloss/rl78/configure.ac
+++ b/libgloss/rl78/configure.ac
@@ -6,16 +6,7 @@ if test "${enable_shared}" = "yes" ; then
     echo "Shared libraries not supported for cross compiling, ignored"
 fi
 
-if test "$srcdir" = "." ; then
-  if test "${with_target_subdir}" != "." ; then
-    libgloss_topdir="${srcdir}/${with_multisrctop}../../.."
-  else
-    libgloss_topdir="${srcdir}/${with_multisrctop}../.."
-  fi
-else
-  libgloss_topdir="${srcdir}/../.."
-fi
-AC_CONFIG_AUX_DIR($libgloss_topdir)
+AC_CONFIG_AUX_DIR(../..)
 
 AC_CANONICAL_SYSTEM
 AC_ARG_PROGRAM
@@ -44,12 +35,11 @@ AC_SUBST(host_makefile_frag_path)
 AC_SUBST_FILE(host_makefile_frag)
 
 AC_CONFIG_FILES(Makefile,
-. ${libgloss_topdir}/config-ml.in,
+. ${srcdir}/../../config-ml.in,
 srcdir=${srcdir}
 target=${target}
 with_multisubdir=${with_multisubdir}
 ac_configure_args="${ac_configure_args} --enable-multilib"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-libgloss_topdir=${libgloss_topdir}
 )
 AC_OUTPUT
diff --git a/libgloss/rs6000/configure b/libgloss/rs6000/configure
index 1173ada..64dbbf2 100755
--- a/libgloss/rs6000/configure
+++ b/libgloss/rs6000/configure
@@ -1766,17 +1766,8 @@ if test "${enable_shared}" = "yes" ; then
     echo "Shared libraries not supported for cross compiling, ignored"
 fi
 
-if test "$srcdir" = "." ; then
-  if test "${with_target_subdir}" != "." ; then
-    libgloss_topdir="${srcdir}/${with_multisrctop}../../.."
-  else
-    libgloss_topdir="${srcdir}/${with_multisrctop}../.."
-  fi
-else
-  libgloss_topdir="${srcdir}/../.."
-fi
 ac_aux_dir=
-for ac_dir in $libgloss_topdir "$srcdir"/$libgloss_topdir; do
+for ac_dir in ../.. "$srcdir"/../..; do
   if test -f "$ac_dir/install-sh"; then
     ac_aux_dir=$ac_dir
     ac_install_sh="$ac_aux_dir/install-sh -c"
@@ -1792,7 +1783,7 @@ for ac_dir in $libgloss_topdir "$srcdir"/$libgloss_topdir; do
   fi
 done
 if test -z "$ac_aux_dir"; then
-  as_fn_error $? "cannot find install-sh, install.sh, or shtool in $libgloss_topdir \"$srcdir\"/$libgloss_topdir" "$LINENO" 5
+  as_fn_error $? "cannot find install-sh, install.sh, or shtool in ../.. \"$srcdir\"/../.." "$LINENO" 5
 fi
 
 # These three variables are undocumented and unsupported,
@@ -3272,7 +3263,6 @@ target=${target}
 with_multisubdir=${with_multisubdir}
 ac_configure_args="${ac_configure_args} --enable-multilib"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-libgloss_topdir=${libgloss_topdir}
 
 
 _ACEOF
@@ -3840,7 +3830,7 @@ $as_echo X"$file" |
   done
 }
  ;;
-    "Makefile":F) . ${libgloss_topdir}/config-ml.in ;;
+    "Makefile":F) . ${srcdir}/../../config-ml.in ;;
 
   esac
 done # for ac_tag
diff --git a/libgloss/rs6000/configure.ac b/libgloss/rs6000/configure.ac
index b896f00..e15867e 100644
--- a/libgloss/rs6000/configure.ac
+++ b/libgloss/rs6000/configure.ac
@@ -6,16 +6,7 @@ if test "${enable_shared}" = "yes" ; then
     echo "Shared libraries not supported for cross compiling, ignored"
 fi
 
-if test "$srcdir" = "." ; then
-  if test "${with_target_subdir}" != "." ; then
-    libgloss_topdir="${srcdir}/${with_multisrctop}../../.."
-  else
-    libgloss_topdir="${srcdir}/${with_multisrctop}../.."
-  fi
-else
-  libgloss_topdir="${srcdir}/../.."
-fi
-AC_CONFIG_AUX_DIR($libgloss_topdir)
+AC_CONFIG_AUX_DIR(../..)
 
 AC_CANONICAL_SYSTEM
 AC_ARG_PROGRAM
@@ -44,12 +35,11 @@ AC_SUBST(host_makefile_frag_path)
 AC_SUBST_FILE(host_makefile_frag)
 
 AC_CONFIG_FILES(Makefile,
-. ${libgloss_topdir}/config-ml.in,
+. ${srcdir}/../../config-ml.in,
 srcdir=${srcdir}
 target=${target}
 with_multisubdir=${with_multisubdir}
 ac_configure_args="${ac_configure_args} --enable-multilib"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-libgloss_topdir=${libgloss_topdir}
 )
 AC_OUTPUT
diff --git a/libgloss/rx/configure b/libgloss/rx/configure
index 532fe27..3d6919d 100755
--- a/libgloss/rx/configure
+++ b/libgloss/rx/configure
@@ -1766,17 +1766,8 @@ if test "${enable_shared}" = "yes" ; then
     echo "Shared libraries not supported for cross compiling, ignored"
 fi
 
-if test "$srcdir" = "." ; then
-  if test "${with_target_subdir}" != "." ; then
-    libgloss_topdir="${srcdir}/${with_multisrctop}../../.."
-  else
-    libgloss_topdir="${srcdir}/${with_multisrctop}../.."
-  fi
-else
-  libgloss_topdir="${srcdir}/../.."
-fi
 ac_aux_dir=
-for ac_dir in $libgloss_topdir "$srcdir"/$libgloss_topdir; do
+for ac_dir in ../.. "$srcdir"/../..; do
   if test -f "$ac_dir/install-sh"; then
     ac_aux_dir=$ac_dir
     ac_install_sh="$ac_aux_dir/install-sh -c"
@@ -1792,7 +1783,7 @@ for ac_dir in $libgloss_topdir "$srcdir"/$libgloss_topdir; do
   fi
 done
 if test -z "$ac_aux_dir"; then
-  as_fn_error $? "cannot find install-sh, install.sh, or shtool in $libgloss_topdir \"$srcdir\"/$libgloss_topdir" "$LINENO" 5
+  as_fn_error $? "cannot find install-sh, install.sh, or shtool in ../.. \"$srcdir\"/../.." "$LINENO" 5
 fi
 
 # These three variables are undocumented and unsupported,
@@ -3272,7 +3263,6 @@ target=${target}
 with_multisubdir=${with_multisubdir}
 ac_configure_args="${ac_configure_args} --enable-multilib"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-libgloss_topdir=${libgloss_topdir}
 
 
 _ACEOF
@@ -3840,7 +3830,7 @@ $as_echo X"$file" |
   done
 }
  ;;
-    "Makefile":F) . ${libgloss_topdir}/config-ml.in ;;
+    "Makefile":F) . ${srcdir}/../../config-ml.in ;;
 
   esac
 done # for ac_tag
diff --git a/libgloss/rx/configure.ac b/libgloss/rx/configure.ac
index fee6c45..23d5fb4 100644
--- a/libgloss/rx/configure.ac
+++ b/libgloss/rx/configure.ac
@@ -6,16 +6,7 @@ if test "${enable_shared}" = "yes" ; then
     echo "Shared libraries not supported for cross compiling, ignored"
 fi
 
-if test "$srcdir" = "." ; then
-  if test "${with_target_subdir}" != "." ; then
-    libgloss_topdir="${srcdir}/${with_multisrctop}../../.."
-  else
-    libgloss_topdir="${srcdir}/${with_multisrctop}../.."
-  fi
-else
-  libgloss_topdir="${srcdir}/../.."
-fi
-AC_CONFIG_AUX_DIR($libgloss_topdir)
+AC_CONFIG_AUX_DIR(../..)
 
 AC_CANONICAL_SYSTEM
 AC_ARG_PROGRAM
@@ -44,12 +35,11 @@ AC_SUBST(host_makefile_frag_path)
 AC_SUBST_FILE(host_makefile_frag)
 
 AC_CONFIG_FILES(Makefile,
-. ${libgloss_topdir}/config-ml.in,
+. ${srcdir}/../../config-ml.in,
 srcdir=${srcdir}
 target=${target}
 with_multisubdir=${with_multisubdir}
 ac_configure_args="${ac_configure_args} --enable-multilib"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-libgloss_topdir=${libgloss_topdir}
 )
 AC_OUTPUT
diff --git a/libgloss/sparc/configure b/libgloss/sparc/configure
index 6fbfb76..19f26ef 100755
--- a/libgloss/sparc/configure
+++ b/libgloss/sparc/configure
@@ -1767,18 +1767,8 @@ if test "${enable_shared}" = "yes" ; then
     echo "Shared libraries not supported for cross compiling, ignored"
 fi
 
-if test "$srcdir" = "." ; then
-  if test "${with_target_subdir}" != "." ; then
-    libgloss_topdir="${with_multisrctop}../../.."
-  else
-    libgloss_topdir="${with_multisrctop}../.."
-  fi
-else
-  libgloss_topdir="${srcdir}/../.."
-fi
-
 ac_aux_dir=
-for ac_dir in $libgloss_topdir "$srcdir"/$libgloss_topdir; do
+for ac_dir in ../.. "$srcdir"/../..; do
   if test -f "$ac_dir/install-sh"; then
     ac_aux_dir=$ac_dir
     ac_install_sh="$ac_aux_dir/install-sh -c"
@@ -1794,7 +1784,7 @@ for ac_dir in $libgloss_topdir "$srcdir"/$libgloss_topdir; do
   fi
 done
 if test -z "$ac_aux_dir"; then
-  as_fn_error $? "cannot find install-sh, install.sh, or shtool in $libgloss_topdir \"$srcdir\"/$libgloss_topdir" "$LINENO" 5
+  as_fn_error $? "cannot find install-sh, install.sh, or shtool in ../.. \"$srcdir\"/../.." "$LINENO" 5
 fi
 
 # These three variables are undocumented and unsupported,
@@ -3288,7 +3278,6 @@ target=${target}
 with_multisubdir=${with_multisubdir}
 ac_configure_args="${ac_configure_args} --enable-multilib"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-libgloss_topdir=${libgloss_topdir}
 
 
 _ACEOF
@@ -3857,7 +3846,7 @@ $as_echo X"$file" |
   done
 }
  ;;
-    "default":C) . ${libgloss_topdir}/config-ml.in ;;
+    "default":C) . ${srcdir}/../../config-ml.in ;;
 
   esac
 done # for ac_tag
diff --git a/libgloss/sparc/configure.ac b/libgloss/sparc/configure.ac
index 4e2b177..32b0db8 100644
--- a/libgloss/sparc/configure.ac
+++ b/libgloss/sparc/configure.ac
@@ -17,17 +17,7 @@ if test "${enable_shared}" = "yes" ; then
     echo "Shared libraries not supported for cross compiling, ignored"
 fi
 
-if test "$srcdir" = "." ; then
-  if test "${with_target_subdir}" != "." ; then
-    libgloss_topdir="${with_multisrctop}../../.."
-  else
-    libgloss_topdir="${with_multisrctop}../.."
-  fi
-else
-  libgloss_topdir="${srcdir}/../.."
-fi
-
-AC_CONFIG_AUX_DIR($libgloss_topdir)
+AC_CONFIG_AUX_DIR(../..)
 
 AC_PROG_INSTALL
 
@@ -74,12 +64,11 @@ AC_SUBST_FILE(target_makefile_frag)
 AC_SUBST(CYGMONLDSCRIPTTEMPL)
 
 AC_OUTPUT(Makefile,
-. ${libgloss_topdir}/config-ml.in,
+. ${srcdir}/../../config-ml.in,
 srcdir=${srcdir}
 target=${target}
 with_multisubdir=${with_multisubdir}
 ac_configure_args="${ac_configure_args} --enable-multilib"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-libgloss_topdir=${libgloss_topdir}
 )
 
diff --git a/libgloss/sparc/libsys/configure b/libgloss/sparc/libsys/configure
index 377388a..9ba58d6 100755
--- a/libgloss/sparc/libsys/configure
+++ b/libgloss/sparc/libsys/configure
@@ -1740,11 +1740,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
-if test "$srcdir" = "." ; then
-  mdir=`echo "${with_multisubdir}/" \
-    | sed -e 's,\([^/][^/]*\),..,g' -e 's,^/$,,'`
-  ac_aux_dir=
-for ac_dir in ${mdir}../../../.. "$srcdir"/${mdir}../../../..; do
+ac_aux_dir=
+for ac_dir in ../../.. "$srcdir"/../../..; do
   if test -f "$ac_dir/install-sh"; then
     ac_aux_dir=$ac_dir
     ac_install_sh="$ac_aux_dir/install-sh -c"
@@ -1760,7 +1757,7 @@ for ac_dir in ${mdir}../../../.. "$srcdir"/${mdir}../../../..; do
   fi
 done
 if test -z "$ac_aux_dir"; then
-  as_fn_error $? "cannot find install-sh, install.sh, or shtool in ${mdir}../../../.. \"$srcdir\"/${mdir}../../../.." "$LINENO" 5
+  as_fn_error $? "cannot find install-sh, install.sh, or shtool in ../../.. \"$srcdir\"/../../.." "$LINENO" 5
 fi
 
 # These three variables are undocumented and unsupported,
@@ -1772,37 +1769,6 @@ ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
 ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 
 
-else
-  ac_aux_dir=
-for ac_dir in ${srcdir}/../../.. "$srcdir"/${srcdir}/../../..; do
-  if test -f "$ac_dir/install-sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f "$ac_dir/install.sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  elif test -f "$ac_dir/shtool"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/shtool install -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  as_fn_error $? "cannot find install-sh, install.sh, or shtool in ${srcdir}/../../.. \"$srcdir\"/${srcdir}/../../.." "$LINENO" 5
-fi
-
-# These three variables are undocumented and unsupported,
-# and are intended to be withdrawn in a future Autoconf release.
-# They can cause serious problems if a builder's source tree is in a directory
-# whose full name contains unusual characters.
-ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
-ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
-ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
-
-
-fi
 
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
diff --git a/libgloss/sparc/libsys/configure.ac b/libgloss/sparc/libsys/configure.ac
index 2cbd75d..0a0be90 100644
--- a/libgloss/sparc/libsys/configure.ac
+++ b/libgloss/sparc/libsys/configure.ac
@@ -18,13 +18,7 @@ dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.69)dnl
 AC_INIT(libsys-crt0.S)
 
-if test "$srcdir" = "." ; then
-  mdir=`echo "${with_multisubdir}/" \
-    | sed -e 's,\([[^/]][[^/]]*\),..,g' -e 's,^/$,,'`
-  AC_CONFIG_AUX_DIR(${mdir}../../../..)
-else
-  AC_CONFIG_AUX_DIR(${srcdir}/../../..)
-fi
+AC_CONFIG_AUX_DIR(../../..)
 
 AC_PROG_INSTALL
 
diff --git a/libgloss/sparc_leon/configure b/libgloss/sparc_leon/configure
index 163774f..335a743 100755
--- a/libgloss/sparc_leon/configure
+++ b/libgloss/sparc_leon/configure
@@ -1768,17 +1768,8 @@ if test "${enable_shared}" = "yes" ; then
     echo "Shared libraries not supported for cross compiling, ignored"
 fi
 
-if test "$srcdir" = "." ; then
-  if test "${with_target_subdir}" != "." ; then
-    libgloss_topdir="${srcdir}/${with_multisrctop}../../.."
-  else
-    libgloss_topdir="${srcdir}/${with_multisrctop}../.."
-  fi
-else
-  libgloss_topdir="${srcdir}/../.."
-fi
 ac_aux_dir=
-for ac_dir in $libgloss_topdir "$srcdir"/$libgloss_topdir; do
+for ac_dir in ../.. "$srcdir"/../..; do
   if test -f "$ac_dir/install-sh"; then
     ac_aux_dir=$ac_dir
     ac_install_sh="$ac_aux_dir/install-sh -c"
@@ -1794,7 +1785,7 @@ for ac_dir in $libgloss_topdir "$srcdir"/$libgloss_topdir; do
   fi
 done
 if test -z "$ac_aux_dir"; then
-  as_fn_error $? "cannot find install-sh, install.sh, or shtool in $libgloss_topdir \"$srcdir\"/$libgloss_topdir" "$LINENO" 5
+  as_fn_error $? "cannot find install-sh, install.sh, or shtool in ../.. \"$srcdir\"/../.." "$LINENO" 5
 fi
 
 # These three variables are undocumented and unsupported,
@@ -3277,7 +3268,6 @@ target=${target}
 with_multisubdir=${with_multisubdir}
 ac_configure_args="${ac_configure_args} --enable-multilib"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-libgloss_topdir=${libgloss_topdir}
 
 
 _ACEOF
@@ -3845,7 +3835,7 @@ $as_echo X"$file" |
   done
 }
  ;;
-    "Makefile":F) . ${libgloss_topdir}/config-ml.in ;;
+    "Makefile":F) . ${srcdir}/../../config-ml.in ;;
 
   esac
 done # for ac_tag
diff --git a/libgloss/sparc_leon/configure.ac b/libgloss/sparc_leon/configure.ac
index 498145d..d43fff6 100644
--- a/libgloss/sparc_leon/configure.ac
+++ b/libgloss/sparc_leon/configure.ac
@@ -6,16 +6,7 @@ if test "${enable_shared}" = "yes" ; then
     echo "Shared libraries not supported for cross compiling, ignored"
 fi
 
-if test "$srcdir" = "." ; then
-  if test "${with_target_subdir}" != "." ; then
-    libgloss_topdir="${srcdir}/${with_multisrctop}../../.."
-  else
-    libgloss_topdir="${srcdir}/${with_multisrctop}../.."
-  fi
-else
-  libgloss_topdir="${srcdir}/../.."
-fi
-AC_CONFIG_AUX_DIR($libgloss_topdir)
+AC_CONFIG_AUX_DIR(../..)
 
 AC_CANONICAL_SYSTEM
 AC_ARG_PROGRAM
@@ -47,12 +38,11 @@ AC_SUBST(target_makefile_frag_path)
 AC_SUBST_FILE(target_makefile_frag)
 
 AC_CONFIG_FILES(Makefile,
-. ${libgloss_topdir}/config-ml.in,
+. ${srcdir}/../../config-ml.in,
 srcdir=${srcdir}
 target=${target}
 with_multisubdir=${with_multisubdir}
 ac_configure_args="${ac_configure_args} --enable-multilib"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-libgloss_topdir=${libgloss_topdir}
 )
 AC_OUTPUT
diff --git a/libgloss/spu/configure b/libgloss/spu/configure
index 8e3fe88..aaebf88 100755
--- a/libgloss/spu/configure
+++ b/libgloss/spu/configure
@@ -1762,17 +1762,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
-if test "$srcdir" = "." ; then
-  if test "${with_target_subdir}" != "." ; then
-    libgloss_topdir="${srcdir}/${with_multisrctop}../../.."
-  else
-    libgloss_topdir="${srcdir}/${with_multisrctop}../.."
-  fi
-else
-  libgloss_topdir="${srcdir}/../.."
-fi
 ac_aux_dir=
-for ac_dir in $libgloss_topdir "$srcdir"/$libgloss_topdir; do
+for ac_dir in ../.. "$srcdir"/../..; do
   if test -f "$ac_dir/install-sh"; then
     ac_aux_dir=$ac_dir
     ac_install_sh="$ac_aux_dir/install-sh -c"
@@ -1788,7 +1779,7 @@ for ac_dir in $libgloss_topdir "$srcdir"/$libgloss_topdir; do
   fi
 done
 if test -z "$ac_aux_dir"; then
-  as_fn_error $? "cannot find install-sh, install.sh, or shtool in $libgloss_topdir \"$srcdir\"/$libgloss_topdir" "$LINENO" 5
+  as_fn_error $? "cannot find install-sh, install.sh, or shtool in ../.. \"$srcdir\"/../.." "$LINENO" 5
 fi
 
 # These three variables are undocumented and unsupported,
@@ -3268,7 +3259,6 @@ target=${target}
 with_multisubdir=${with_multisubdir}
 ac_configure_args="${ac_configure_args} --enable-multilib"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-libgloss_topdir=${libgloss_topdir}
 
 
 _ACEOF
@@ -3836,7 +3826,7 @@ $as_echo X"$file" |
   done
 }
  ;;
-    "Makefile":F) . ${libgloss_topdir}/config-ml.in ;;
+    "Makefile":F) . ${srcdir}/../../config-ml.in ;;
 
   esac
 done # for ac_tag
diff --git a/libgloss/spu/configure.ac b/libgloss/spu/configure.ac
index ad16f7c..e4fe4a0 100644
--- a/libgloss/spu/configure.ac
+++ b/libgloss/spu/configure.ac
@@ -2,16 +2,7 @@ dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.69)dnl
 AC_INIT(crt0.S)
 
-if test "$srcdir" = "." ; then
-  if test "${with_target_subdir}" != "." ; then
-    libgloss_topdir="${srcdir}/${with_multisrctop}../../.."
-  else
-    libgloss_topdir="${srcdir}/${with_multisrctop}../.."
-  fi
-else
-  libgloss_topdir="${srcdir}/../.."
-fi
-AC_CONFIG_AUX_DIR($libgloss_topdir)
+AC_CONFIG_AUX_DIR(../..)
 
 AC_CANONICAL_SYSTEM
 AC_ARG_PROGRAM
@@ -40,12 +31,11 @@ AC_SUBST(host_makefile_frag_path)
 AC_SUBST_FILE(host_makefile_frag)
 
 AC_CONFIG_FILES(Makefile,
-. ${libgloss_topdir}/config-ml.in,
+. ${srcdir}/../../config-ml.in,
 srcdir=${srcdir}
 target=${target}
 with_multisubdir=${with_multisubdir}
 ac_configure_args="${ac_configure_args} --enable-multilib"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-libgloss_topdir=${libgloss_topdir}
 )
 AC_OUTPUT
diff --git a/libgloss/tic6x/configure b/libgloss/tic6x/configure
index 99457d7..6467495 100755
--- a/libgloss/tic6x/configure
+++ b/libgloss/tic6x/configure
@@ -1766,17 +1766,8 @@ if test "${enable_shared}" = "yes" ; then
     echo "Shared libraries not supported for cross compiling, ignored"
 fi
 
-if test "$srcdir" = "." ; then
-  if test "${with_target_subdir}" != "." ; then
-    libgloss_topdir="${srcdir}/${with_multisrctop}../../.."
-  else
-    libgloss_topdir="${srcdir}/${with_multisrctop}../.."
-  fi
-else
-  libgloss_topdir="${srcdir}/../.."
-fi
 ac_aux_dir=
-for ac_dir in $libgloss_topdir "$srcdir"/$libgloss_topdir; do
+for ac_dir in ../.. "$srcdir"/../..; do
   if test -f "$ac_dir/install-sh"; then
     ac_aux_dir=$ac_dir
     ac_install_sh="$ac_aux_dir/install-sh -c"
@@ -1792,7 +1783,7 @@ for ac_dir in $libgloss_topdir "$srcdir"/$libgloss_topdir; do
   fi
 done
 if test -z "$ac_aux_dir"; then
-  as_fn_error $? "cannot find install-sh, install.sh, or shtool in $libgloss_topdir \"$srcdir\"/$libgloss_topdir" "$LINENO" 5
+  as_fn_error $? "cannot find install-sh, install.sh, or shtool in ../.. \"$srcdir\"/../.." "$LINENO" 5
 fi
 
 # These three variables are undocumented and unsupported,
@@ -3271,7 +3262,6 @@ target=${target}
 with_multisubdir=${with_multisubdir}
 ac_configure_args="${ac_configure_args} --enable-multilib"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-libgloss_topdir=${libgloss_topdir}
 
 
 _ACEOF
@@ -3839,7 +3829,7 @@ $as_echo X"$file" |
   done
 }
  ;;
-    "Makefile":F) . ${libgloss_topdir}/config-ml.in ;;
+    "Makefile":F) . ${srcdir}/../../config-ml.in ;;
 
   esac
 done # for ac_tag
diff --git a/libgloss/tic6x/configure.ac b/libgloss/tic6x/configure.ac
index 2cfb82d..562d6a2 100644
--- a/libgloss/tic6x/configure.ac
+++ b/libgloss/tic6x/configure.ac
@@ -6,16 +6,7 @@ if test "${enable_shared}" = "yes" ; then
     echo "Shared libraries not supported for cross compiling, ignored"
 fi
 
-if test "$srcdir" = "." ; then
-  if test "${with_target_subdir}" != "." ; then
-    libgloss_topdir="${srcdir}/${with_multisrctop}../../.."
-  else
-    libgloss_topdir="${srcdir}/${with_multisrctop}../.."
-  fi
-else
-  libgloss_topdir="${srcdir}/../.."
-fi
-AC_CONFIG_AUX_DIR($libgloss_topdir)
+AC_CONFIG_AUX_DIR(../..)
 
 AC_CANONICAL_SYSTEM
 AC_ARG_PROGRAM
@@ -43,12 +34,11 @@ AC_SUBST(host_makefile_frag_path)
 AC_SUBST_FILE(host_makefile_frag)
 
 AC_CONFIG_FILES(Makefile,
-. ${libgloss_topdir}/config-ml.in,
+. ${srcdir}/../../config-ml.in,
 srcdir=${srcdir}
 target=${target}
 with_multisubdir=${with_multisubdir}
 ac_configure_args="${ac_configure_args} --enable-multilib"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-libgloss_topdir=${libgloss_topdir}
 )
 AC_OUTPUT
diff --git a/libgloss/v850/configure b/libgloss/v850/configure
index 532fe27..3d6919d 100755
--- a/libgloss/v850/configure
+++ b/libgloss/v850/configure
@@ -1766,17 +1766,8 @@ if test "${enable_shared}" = "yes" ; then
     echo "Shared libraries not supported for cross compiling, ignored"
 fi
 
-if test "$srcdir" = "." ; then
-  if test "${with_target_subdir}" != "." ; then
-    libgloss_topdir="${srcdir}/${with_multisrctop}../../.."
-  else
-    libgloss_topdir="${srcdir}/${with_multisrctop}../.."
-  fi
-else
-  libgloss_topdir="${srcdir}/../.."
-fi
 ac_aux_dir=
-for ac_dir in $libgloss_topdir "$srcdir"/$libgloss_topdir; do
+for ac_dir in ../.. "$srcdir"/../..; do
   if test -f "$ac_dir/install-sh"; then
     ac_aux_dir=$ac_dir
     ac_install_sh="$ac_aux_dir/install-sh -c"
@@ -1792,7 +1783,7 @@ for ac_dir in $libgloss_topdir "$srcdir"/$libgloss_topdir; do
   fi
 done
 if test -z "$ac_aux_dir"; then
-  as_fn_error $? "cannot find install-sh, install.sh, or shtool in $libgloss_topdir \"$srcdir\"/$libgloss_topdir" "$LINENO" 5
+  as_fn_error $? "cannot find install-sh, install.sh, or shtool in ../.. \"$srcdir\"/../.." "$LINENO" 5
 fi
 
 # These three variables are undocumented and unsupported,
@@ -3272,7 +3263,6 @@ target=${target}
 with_multisubdir=${with_multisubdir}
 ac_configure_args="${ac_configure_args} --enable-multilib"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-libgloss_topdir=${libgloss_topdir}
 
 
 _ACEOF
@@ -3840,7 +3830,7 @@ $as_echo X"$file" |
   done
 }
  ;;
-    "Makefile":F) . ${libgloss_topdir}/config-ml.in ;;
+    "Makefile":F) . ${srcdir}/../../config-ml.in ;;
 
   esac
 done # for ac_tag
diff --git a/libgloss/v850/configure.ac b/libgloss/v850/configure.ac
index fee6c45..23d5fb4 100644
--- a/libgloss/v850/configure.ac
+++ b/libgloss/v850/configure.ac
@@ -6,16 +6,7 @@ if test "${enable_shared}" = "yes" ; then
     echo "Shared libraries not supported for cross compiling, ignored"
 fi
 
-if test "$srcdir" = "." ; then
-  if test "${with_target_subdir}" != "." ; then
-    libgloss_topdir="${srcdir}/${with_multisrctop}../../.."
-  else
-    libgloss_topdir="${srcdir}/${with_multisrctop}../.."
-  fi
-else
-  libgloss_topdir="${srcdir}/../.."
-fi
-AC_CONFIG_AUX_DIR($libgloss_topdir)
+AC_CONFIG_AUX_DIR(../..)
 
 AC_CANONICAL_SYSTEM
 AC_ARG_PROGRAM
@@ -44,12 +35,11 @@ AC_SUBST(host_makefile_frag_path)
 AC_SUBST_FILE(host_makefile_frag)
 
 AC_CONFIG_FILES(Makefile,
-. ${libgloss_topdir}/config-ml.in,
+. ${srcdir}/../../config-ml.in,
 srcdir=${srcdir}
 target=${target}
 with_multisubdir=${with_multisubdir}
 ac_configure_args="${ac_configure_args} --enable-multilib"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-libgloss_topdir=${libgloss_topdir}
 )
 AC_OUTPUT
diff --git a/libgloss/visium/configure b/libgloss/visium/configure
index 25b660e..913725a 100755
--- a/libgloss/visium/configure
+++ b/libgloss/visium/configure
@@ -1769,17 +1769,8 @@ if test "${enable_shared}" = "yes" ; then
     echo "Shared libraries not supported for cross compiling, ignored"
 fi
 
-if test "$srcdir" = "." ; then
-  if test "${with_target_subdir}" != "." ; then
-    libgloss_topdir="${srcdir}/${with_multisrctop}../../.."
-  else
-    libgloss_topdir="${srcdir}/${with_multisrctop}../.."
-  fi
-else
-  libgloss_topdir="${srcdir}/../.."
-fi
 ac_aux_dir=
-for ac_dir in $libgloss_topdir "$srcdir"/$libgloss_topdir; do
+for ac_dir in ../.. "$srcdir"/../..; do
   if test -f "$ac_dir/install-sh"; then
     ac_aux_dir=$ac_dir
     ac_install_sh="$ac_aux_dir/install-sh -c"
@@ -1795,7 +1786,7 @@ for ac_dir in $libgloss_topdir "$srcdir"/$libgloss_topdir; do
   fi
 done
 if test -z "$ac_aux_dir"; then
-  as_fn_error $? "cannot find install-sh, install.sh, or shtool in $libgloss_topdir \"$srcdir\"/$libgloss_topdir" "$LINENO" 5
+  as_fn_error $? "cannot find install-sh, install.sh, or shtool in ../.. \"$srcdir\"/../.." "$LINENO" 5
 fi
 
 # These three variables are undocumented and unsupported,
@@ -3279,7 +3270,6 @@ target=${target}
 with_multisubdir=${with_multisubdir}
 ac_configure_args="${ac_configure_args} --enable-multilib"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-libgloss_topdir=${libgloss_topdir}
 
 
 _ACEOF
@@ -3847,7 +3837,7 @@ $as_echo X"$file" |
   done
 }
  ;;
-    "Makefile":F) . ${libgloss_topdir}/config-ml.in ;;
+    "Makefile":F) . ${srcdir}/../../config-ml.in ;;
 
   esac
 done # for ac_tag
diff --git a/libgloss/visium/configure.ac b/libgloss/visium/configure.ac
index fb294e1..74ed736 100644
--- a/libgloss/visium/configure.ac
+++ b/libgloss/visium/configure.ac
@@ -6,16 +6,7 @@ if test "${enable_shared}" = "yes" ; then
     echo "Shared libraries not supported for cross compiling, ignored"
 fi
 
-if test "$srcdir" = "." ; then
-  if test "${with_target_subdir}" != "." ; then
-    libgloss_topdir="${srcdir}/${with_multisrctop}../../.."
-  else
-    libgloss_topdir="${srcdir}/${with_multisrctop}../.."
-  fi
-else
-  libgloss_topdir="${srcdir}/../.."
-fi
-AC_CONFIG_AUX_DIR($libgloss_topdir)
+AC_CONFIG_AUX_DIR(../..)
 
 AC_CANONICAL_SYSTEM
 AC_ARG_PROGRAM
@@ -48,12 +39,11 @@ AC_SUBST_FILE(target_makefile_frag)
 AC_SUBST(part_specific_obj)
 
 AC_CONFIG_FILES(Makefile,
-. ${libgloss_topdir}/config-ml.in,
+. ${srcdir}/../../config-ml.in,
 srcdir=${srcdir}
 target=${target}
 with_multisubdir=${with_multisubdir}
 ac_configure_args="${ac_configure_args} --enable-multilib"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-libgloss_topdir=${libgloss_topdir}
 )
 AC_OUTPUT
diff --git a/libgloss/xc16x/configure b/libgloss/xc16x/configure
index c78cbea..d87b6b4 100755
--- a/libgloss/xc16x/configure
+++ b/libgloss/xc16x/configure
@@ -1771,17 +1771,8 @@ if test "${enable_shared}" = "yes" ; then
     echo "Shared libraries not supported for cross compiling, ignored"
 fi
 
-if test "$srcdir" = "." ; then
-  if test "${with_target_subdir}" != "." ; then
-    libgloss_topdir="${srcdir}/${with_multisrctop}../../.."
-  else
-    libgloss_topdir="${srcdir}/${with_multisrctop}../.."
-  fi
-else
-  libgloss_topdir="${srcdir}/../.."
-fi
 ac_aux_dir=
-for ac_dir in $libgloss_topdir "$srcdir"/$libgloss_topdir; do
+for ac_dir in ../.. "$srcdir"/../..; do
   if test -f "$ac_dir/install-sh"; then
     ac_aux_dir=$ac_dir
     ac_install_sh="$ac_aux_dir/install-sh -c"
@@ -1797,7 +1788,7 @@ for ac_dir in $libgloss_topdir "$srcdir"/$libgloss_topdir; do
   fi
 done
 if test -z "$ac_aux_dir"; then
-  as_fn_error $? "cannot find install-sh, install.sh, or shtool in $libgloss_topdir \"$srcdir\"/$libgloss_topdir" "$LINENO" 5
+  as_fn_error $? "cannot find install-sh, install.sh, or shtool in ../.. \"$srcdir\"/../.." "$LINENO" 5
 fi
 
 # These three variables are undocumented and unsupported,
@@ -3284,7 +3275,6 @@ target=${target}
 with_multisubdir=${with_multisubdir}
 ac_configure_args="${ac_configure_args} --enable-multilib"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-libgloss_topdir=${libgloss_topdir}
 
 
 _ACEOF
@@ -3854,7 +3844,7 @@ $as_echo X"$file" |
  ;;
     "Makefile":F) if test -n "$CONFIG_FILES"; then
   unset ac_file
-  . ${libgloss_topdir}/config-ml.in
+  . ${srcdir}/../../config-ml.in
 fi ;;
 
   esac
diff --git a/libgloss/xc16x/configure.ac b/libgloss/xc16x/configure.ac
index e2200b8..c13c4e2 100644
--- a/libgloss/xc16x/configure.ac
+++ b/libgloss/xc16x/configure.ac
@@ -20,16 +20,7 @@ if test "${enable_shared}" = "yes" ; then
     echo "Shared libraries not supported for cross compiling, ignored"
 fi
 
-if test "$srcdir" = "." ; then
-  if test "${with_target_subdir}" != "." ; then
-    libgloss_topdir="${srcdir}/${with_multisrctop}../../.."
-  else
-    libgloss_topdir="${srcdir}/${with_multisrctop}../.."
-  fi
-else
-  libgloss_topdir="${srcdir}/../.."
-fi
-AC_CONFIG_AUX_DIR($libgloss_topdir)
+AC_CONFIG_AUX_DIR(../..)
 
 AC_CANONICAL_SYSTEM
 AC_ARG_PROGRAM
@@ -67,14 +58,13 @@ AC_SUBST(bsp_list)
 AC_CONFIG_FILES([Makefile],
 [if test -n "$CONFIG_FILES"; then
   unset ac_file
-  . ${libgloss_topdir}/config-ml.in
+  . ${srcdir}/../../config-ml.in
 fi],
 srcdir=${srcdir}
 target=${target}
 with_multisubdir=${with_multisubdir}
 ac_configure_args="${ac_configure_args} --enable-multilib"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-libgloss_topdir=${libgloss_topdir}
 )
 AC_OUTPUT
 
diff --git a/libgloss/xstormy16/configure b/libgloss/xstormy16/configure
index 7beda07..7f0e888 100755
--- a/libgloss/xstormy16/configure
+++ b/libgloss/xstormy16/configure
@@ -1913,41 +1913,8 @@ ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
 program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
 
 
-if test "$srcdir" = "." ; then
-  mdir=`echo "${with_multisubdir}/" \
-    | sed -e 's,\([^/][^/]*\),..,g' -e 's,^/$,,'`
-  ac_aux_dir=
-for ac_dir in ${mdir}../../.. "$srcdir"/${mdir}../../..; do
-  if test -f "$ac_dir/install-sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f "$ac_dir/install.sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  elif test -f "$ac_dir/shtool"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/shtool install -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  as_fn_error $? "cannot find install-sh, install.sh, or shtool in ${mdir}../../.. \"$srcdir\"/${mdir}../../.." "$LINENO" 5
-fi
-
-# These three variables are undocumented and unsupported,
-# and are intended to be withdrawn in a future Autoconf release.
-# They can cause serious problems if a builder's source tree is in a directory
-# whose full name contains unusual characters.
-ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
-ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
-ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
-
-
-else
-  ac_aux_dir=
-for ac_dir in ${srcdir}/../.. "$srcdir"/${srcdir}/../..; do
+ac_aux_dir=
+for ac_dir in ../.. "$srcdir"/../..; do
   if test -f "$ac_dir/install-sh"; then
     ac_aux_dir=$ac_dir
     ac_install_sh="$ac_aux_dir/install-sh -c"
@@ -1963,7 +1930,7 @@ for ac_dir in ${srcdir}/../.. "$srcdir"/${srcdir}/../..; do
   fi
 done
 if test -z "$ac_aux_dir"; then
-  as_fn_error $? "cannot find install-sh, install.sh, or shtool in ${srcdir}/../.. \"$srcdir\"/${srcdir}/../.." "$LINENO" 5
+  as_fn_error $? "cannot find install-sh, install.sh, or shtool in ../.. \"$srcdir\"/../.." "$LINENO" 5
 fi
 
 # These three variables are undocumented and unsupported,
@@ -1975,7 +1942,6 @@ ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
 ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 
 
-fi
 
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
diff --git a/libgloss/xstormy16/configure.ac b/libgloss/xstormy16/configure.ac
index 6763184..b2eb439 100644
--- a/libgloss/xstormy16/configure.ac
+++ b/libgloss/xstormy16/configure.ac
@@ -5,13 +5,7 @@ AC_INIT(crt0.s)
 AC_CANONICAL_SYSTEM
 AC_ARG_PROGRAM
 
-if test "$srcdir" = "." ; then
-  mdir=`echo "${with_multisubdir}/" \
-    | sed -e 's,\([[^/]][[^/]]*\),..,g' -e 's,^/$,,'`
-  AC_CONFIG_AUX_DIR(${mdir}../../..)
-else
-  AC_CONFIG_AUX_DIR(${srcdir}/../..)
-fi
+AC_CONFIG_AUX_DIR(../..)
 
 AC_PROG_INSTALL