aboutsummaryrefslogtreecommitdiff
path: root/libgloss/mn10300
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2022-01-07 00:53:26 -0500
committerMike Frysinger <vapier@gentoo.org>2022-01-10 19:50:35 -0500
commit7f8fa1de4fd35c96b61d2f80155bc1aa09367e3d (patch)
treed8c8561110289afe1b5cc5b43de5d893874613f4 /libgloss/mn10300
parentcf8aa432844d912d0a0d2d6bebe2c3de22be0914 (diff)
downloadnewlib-7f8fa1de4fd35c96b61d2f80155bc1aa09367e3d.zip
newlib-7f8fa1de4fd35c96b61d2f80155bc1aa09367e3d.tar.gz
newlib-7f8fa1de4fd35c96b61d2f80155bc1aa09367e3d.tar.bz2
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/mn10300')
-rwxr-xr-xlibgloss/mn10300/configure16
-rw-r--r--libgloss/mn10300/configure.ac14
2 files changed, 5 insertions, 25 deletions
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