diff options
Diffstat (limited to 'libgloss/arm/configure')
-rwxr-xr-x | libgloss/arm/configure | 19 |
1 files changed, 4 insertions, 15 deletions
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 |