diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2004-02-20 01:22:04 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2004-02-20 01:22:04 +0000 |
| commit | 789694a1417d66be04dfea4e4cf18c7d1293cc44 (patch) | |
| tree | 1c32887c311052e0002b603b83f7794411ab9ec2 /c/src/aclocal/rtems-top.m4 | |
| parent | 2004-02-20 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff) | |
| download | rtems-789694a1417d66be04dfea4e4cf18c7d1293cc44.tar.bz2 | |
2004-02-20 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* acinclude.m4: Fix loosing arguments when configuring cpukit and
testsuites (Was exposed with --enable-multilib, only).
Remove RTEMS_SUBCONFIGURE_ARGS_QUOTE. RTEMS_CONFIG_SUBDIR.
Add RTEMS_BSP_CONFIG_SUBDIR.
* configure.ac: Reflect changes to acinclude.m4. Reflect new args to
testsuites's configure.
* aclocal/rtems-top.m4: Remove ENDIF hack.
Rework and fix setting up PROJECT_TOPdir (PACKHEX wasn't found).
Diffstat (limited to 'c/src/aclocal/rtems-top.m4')
| -rw-r--r-- | c/src/aclocal/rtems-top.m4 | 23 |
1 files changed, 7 insertions, 16 deletions
diff --git a/c/src/aclocal/rtems-top.m4 b/c/src/aclocal/rtems-top.m4 index 78e95c9d6d..0ada2648e1 100644 --- a/c/src/aclocal/rtems-top.m4 +++ b/c/src/aclocal/rtems-top.m4 @@ -17,26 +17,17 @@ AC_BEFORE([$0], [AM_INIT_AUTOMAKE])dnl AC_PREFIX_DEFAULT([/opt/rtems-][RTEMS_API]) -## HACK to allow gnu-make conditionals in automake-Makefiles. -ENDIF=endif -AC_SUBST(ENDIF) - -RTEMS_TOPdir="$1"; -AC_SUBST(RTEMS_TOPdir) +AC_SUBST([RTEMS_TOPdir],["$1"]) ## with_target_subdirs is handled implicitly by autoconf -test -n "$with_target_subdir" || with_target_subdir="." - -if test "$with_target_subdir" = "." ; then -# Native -PROJECT_TOPdir=${RTEMS_TOPdir}/'$(top_builddir)' -else -# Cross dots=`echo $with_target_subdir|\ -sed -e 's%^\./%%' -e 's%[[^/]]$%&/%' -e 's%[[^/]]*/%../%g'` +sed -e 's,^\.$,,' -e 's%^\./%%' -e 's%[[^/]]$%&/%' -e 's%[[^/]]*/%../%g'` + PROJECT_TOPdir=${dots}${RTEMS_TOPdir}/'$(top_builddir)' -fi -AC_SUBST(PROJECT_TOPdir) +AC_SUBST([PROJECT_TOPdir]) + +RTEMS_ROOT=`echo "$1/" | sed -e 's,^../../,,'`'$(top_builddir)' +AC_SUBST([RTEMS_ROOT]) PROJECT_ROOT="${RTEMS_TOPdir}/\$(top_builddir)" AC_SUBST(PROJECT_ROOT) |