diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2004-03-25 10:36:41 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2004-03-25 10:36:41 +0000 |
| commit | d04abc83d94dbc2a948910eed6fa520f3e19d90c (patch) | |
| tree | bff51958ac48a5f282c7fb32814cbf98d02acfc9 /testsuites | |
| parent | 2004-03-25 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff) | |
| download | rtems-d04abc83d94dbc2a948910eed6fa520f3e19d90c.tar.bz2 | |
2004-03-25 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* aclocal/rtems-top.m4: Add rtems_rootdir.
* aclocal/check-custom-bsp.m4: Check for $RTEMS_BSP.cfg in $rtems_rootdir.
Diffstat (limited to 'testsuites')
| -rw-r--r-- | testsuites/ChangeLog | 5 | ||||
| -rw-r--r-- | testsuites/aclocal/check-custom-bsp.m4 | 3 | ||||
| -rw-r--r-- | testsuites/aclocal/rtems-top.m4 | 10 |
3 files changed, 13 insertions, 5 deletions
diff --git a/testsuites/ChangeLog b/testsuites/ChangeLog index 2522adc9bc..dbb7306c63 100644 --- a/testsuites/ChangeLog +++ b/testsuites/ChangeLog @@ -1,5 +1,10 @@ 2004-03-25 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + * aclocal/rtems-top.m4: Add rtems_rootdir. + * aclocal/check-custom-bsp.m4: Check for $RTEMS_BSP.cfg in $rtems_rootdir. + +2004-03-25 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + * aclocal/rtems-top.m4: Add 2nd arg to RTEMS_TOP. Rework with_project_root/PROJECT_ROOT and with_project_top/PROJECT_TOPdir. Add --enable-rtems-root. Rework RTEMS_ROOT. diff --git a/testsuites/aclocal/check-custom-bsp.m4 b/testsuites/aclocal/check-custom-bsp.m4 index 402656f3a0..54402d8e4e 100644 --- a/testsuites/aclocal/check-custom-bsp.m4 +++ b/testsuites/aclocal/check-custom-bsp.m4 @@ -1,8 +1,7 @@ dnl $Id$ AC_DEFUN([_RTEMS_CHECK_CUSTOM_BSP],[ - for i in ${srcdir}/${RTEMS_TOPdir}/bspkit/${RTEMS_CPU}/*/$1 \ - ${srcdir}/${RTEMS_TOPdir}/make/custom/$1; + for i in ${rtems_rootdir}/make/custom/$1; do AC_MSG_CHECKING([for $i]) AS_IF([test -r $i],[ diff --git a/testsuites/aclocal/rtems-top.m4 b/testsuites/aclocal/rtems-top.m4 index 9c5072f526..5ecd9c0e37 100644 --- a/testsuites/aclocal/rtems-top.m4 +++ b/testsuites/aclocal/rtems-top.m4 @@ -29,13 +29,17 @@ AC_ARG_ENABLE([rtems-root],[ AS_HELP_STRING(--enable-rtems-root,directory containing make/custom)], [case ${enable_rtems_root} in [[\\/$]]* | ?:[[\\/]]* ) # absolute directory - RTEMS_ROOT=${enable_rtems_root} + rtems_rootdir=${enable_rtems_root} + RTEMS_RTEMS=${enable_rtems_root} ;; *) # relative directory + rtems_rootdir=${enable_rtems_root}${rtems_updir} RTEMS_ROOT=${enable_rtems_root}${rtems_updir}'$(top_builddir)' ;; -esac], -[RTEMS_ROOT=${rtems_updir}'$(top_builddir)']) +esac],[ +rtems_rootdir=${rtems_updir} +RTEMS_ROOT=${rtems_updir}'$(top_builddir)' +]) AC_SUBST([RTEMS_ROOT]) AC_SUBST([PROJECT_TOPdir],[${with_project_top}${rtems_updir}'$(top_builddir)']) |