Changeset 93a0f2b in rtems


Ignore:
Timestamp:
Mar 25, 2004, 8:22:14 AM (16 years ago)
Author:
Ralf Corsepius <ralf.corsepius@…>
Branches:
4.10, 4.11, 4.8, 4.9, master
Children:
d04abc83
Parents:
e84c2a46
Message:

2004-03-25 Ralf Corsepius <corsepiu@…>

  • 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.
Location:
testsuites
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • testsuites/ChangeLog

    re84c2a46 r93a0f2b  
     12004-03-25      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
     2
     3        * aclocal/rtems-top.m4: Add 2nd arg to RTEMS_TOP.
     4        Rework with_project_root/PROJECT_ROOT and with_project_top/PROJECT_TOPdir.
     5        Add --enable-rtems-root. Rework RTEMS_ROOT.
     6
    172004-03-25      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
    28
  • testsuites/aclocal/rtems-top.m4

    re84c2a46 r93a0f2b  
    2222AC_SUBST(ENDIF)
    2323
    24 RTEMS_TOPdir="$1";
    25 AC_SUBST(RTEMS_TOPdir)
     24AC_SUBST([RTEMS_TOPdir],["$1"])
    2625
    27 ## with_target_subdirs is handled implicitly by autoconf
    28 dots=`echo $with_target_subdir|\
    29 sed -e 's,^\.$,,' -e 's%^\./%%' -e 's%[[^/]]$%&/%' -e 's%[[^/]]*/%../%g'`
    30 PROJECT_TOPdir=${dots}${RTEMS_TOPdir}/'$(top_builddir)'
    31 AC_SUBST([PROJECT_TOPdir])
     26rtems_updir=m4_if([$2],[],[],[$2/])
    3227
    33 RTEMS_ROOT=$with_rtems_root`echo "$1/" | sed 's,^../,,'`'$(top_builddir)'
    34 AC_SUBST(RTEMS_ROOT)
     28AC_ARG_ENABLE([rtems-root],[
     29AS_HELP_STRING(--enable-rtems-root,directory containing make/custom)],
     30[case ${enable_rtems_root} in
     31  [[\\/$]]* | ?:[[\\/]]* ) # absolute directory
     32   RTEMS_ROOT=${enable_rtems_root}
     33   ;;
     34  *) # relative directory
     35   RTEMS_ROOT=${enable_rtems_root}${rtems_updir}'$(top_builddir)'
     36   ;;
     37esac],
     38[RTEMS_ROOT=${rtems_updir}'$(top_builddir)'])
     39AC_SUBST([RTEMS_ROOT])
    3540
    36 PROJECT_ROOT=$with_project_root`echo "$1/" | sed 's,^../,,'`'$(top_builddir)'
    37 AC_SUBST(PROJECT_ROOT)
     41AC_SUBST([PROJECT_TOPdir],[${with_project_top}${rtems_updir}'$(top_builddir)'])
     42AC_SUBST([PROJECT_ROOT],[${with_project_root}${rtems_updir}'$(top_builddir)'])
    3843
    3944AC_SUBST([dirstamp],[\${am__leading_dot}dirstamp])
Note: See TracChangeset for help on using the changeset viewer.