diff options
author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2002-08-06 07:31:26 +0000 |
---|---|---|
committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2002-08-06 07:31:26 +0000 |
commit | 0aa6384673adb01df4c00d2b305a130ed6b0980e (patch) | |
tree | c2352d079d8ed137019bacb7fd05094122738048 /cpukit | |
parent | 2002-08-05 Eric Norum <eric.norum@usask.ca> (diff) | |
download | rtems-0aa6384673adb01df4c00d2b305a130ed6b0980e.tar.bz2 |
2002-08-06 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* aclocal/env-rtemscpu.m4: Remove RTEMS_CONFIG_PER_BSP.
Use AS_IF instead of if/then/else/fi.
Diffstat (limited to 'cpukit')
-rw-r--r-- | cpukit/ChangeLog | 5 | ||||
-rw-r--r-- | cpukit/aclocal/env-rtemscpu.m4 | 11 |
2 files changed, 9 insertions, 7 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index b510cce8f2..7d38995f6d 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,3 +1,8 @@ +2002-08-06 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + * aclocal/env-rtemscpu.m4: Remove RTEMS_CONFIG_PER_BSP. + Use AS_IF instead of if/then/else/fi. + 2002-08-01 Ralf Corsepius <corsepiu@faw.uni-ulm.de> * wrapup/Makefile.am: Use librtems.a. diff --git a/cpukit/aclocal/env-rtemscpu.m4 b/cpukit/aclocal/env-rtemscpu.m4 index 7cb53a1307..cce38011a5 100644 --- a/cpukit/aclocal/env-rtemscpu.m4 +++ b/cpukit/aclocal/env-rtemscpu.m4 @@ -5,14 +5,12 @@ AC_DEFUN(RTEMS_ENV_RTEMSCPU, if test x"$multilib" = x"yes"; then ## FIXME: There is no multilib BSP - if test -n "$with_multisubdir"; then - MULTIBUILDTOP=`echo "/$with_multisubdir" | sed 's,/[[^\\/]]*,../,g'` - fi + AS_IF([test -n "$with_multisubdir"], + [MULTIBUILDTOP=`echo "/$with_multisubdir" | sed 's,/[[^\\/]]*,../,g'`]) AC_SUBST(MULTIBUILDTOP) - if test -n "$with_multisubdir"; then - MULTISUBDIR="/$with_multisubdir" - fi + AS_IF([test -n "$with_multisubdir"], + [MULTISUBDIR="/$with_multisubdir"]) AC_SUBST(MULTISUBDIR) GCC_SPECS="-isystem \$(PROJECT_INCLUDE)" @@ -29,7 +27,6 @@ if test x"$multilib" = x"yes"; then includedir="\${exec_prefix}/lib/include" libdir="${libdir}\$(MULTISUBDIR)" - AM_CONDITIONAL([RTEMS_CONFIG_PER_BSP],[false]) else RTEMS_ENV_RTEMSBSP RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP) |