diff options
author | Mike Frysinger <vapier@gentoo.org> | 2022-01-07 08:53:26 +0300 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2022-01-11 03:50:35 +0300 |
commit | 7f8fa1de4fd35c96b61d2f80155bc1aa09367e3d (patch) | |
tree | d8c8561110289afe1b5cc5b43de5d893874613f4 /libgloss/arm | |
parent | cf8aa432844d912d0a0d2d6bebe2c3de22be0914 (diff) |
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.
Diffstat (limited to 'libgloss/arm')
-rwxr-xr-x | libgloss/arm/configure | 19 | ||||
-rw-r--r-- | libgloss/arm/configure.ac | 17 |
2 files changed, 7 insertions, 29 deletions
diff --git a/libgloss/arm/configure b/libgloss/arm/configure index 5be62727e..700a75062 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 59b580d7a..316889cf7 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 |