Changeset 1b16e63c in rtems for cpukit/aclocal


Ignore:
Timestamp:
Jul 5, 2002, 4:13:07 PM (18 years ago)
Author:
Ralf Corsepius <ralf.corsepius@…>
Branches:
4.10, 4.11, 4.8, 4.9, master
Children:
02ccf4a
Parents:
51b4875
Message:

2002-07-05 Ralf Corsepius <corsepiu@…>

  • automake/multilib.am: Add install-multi.
  • aclocal/rtems-top.m4: Reflect new RTEMS_TOPdir to detecting version.m4. Add --with-project-root. Reflect --with-project-root to setting up PROJECT_ROOT.
  • aclocal/env-rtemscpu.m4: Reflect new RTEMS_TOPdir (HACK).
  • aclocal/check-cpu.m4: Reflect new RTEMS_TOPdir.
  • aclocal/check-bsps.m4: Reflect new RTEMS_TOPdir.
Location:
cpukit/aclocal
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • cpukit/aclocal/check-bsps.m4

    r51b4875 r1b16e63c  
    66
    77AC_MSG_CHECKING([for make/custom/[$]$1.cfg])
    8 if test -r "$srcdir/$RTEMS_TOPdir/make/custom/[$]$1.cfg"; then
     8if test -r "$srcdir/$RTEMS_TOPdir/../../make/custom/[$]$1.cfg"; then
    99  AC_MSG_RESULT([yes])
    1010else
  • cpukit/aclocal/check-cpu.m4

    r51b4875 r1b16e63c  
    99# Is this a supported CPU?
    1010AC_MSG_CHECKING([if cpu $RTEMS_CPU is supported])
    11 if test -d "$srcdir/$RTEMS_TOPdir/c/src/exec/score/cpu/$RTEMS_CPU"; then
     11if test -d "$srcdir/$RTEMS_TOPdir/exec/score/cpu/$RTEMS_CPU"; then
    1212  AC_MSG_RESULT(yes)
    1313else
  • cpukit/aclocal/env-rtemscpu.m4

    r51b4875 r1b16e63c  
    1919  AC_SUBST(MULTISUBDIR)
    2020
    21   PROJECT_ROOT="${RTEMS_TOPdir}/\$(MULTIBUILDTOP)\$(top_builddir)"
     21  PROJECT_ROOT="../../${RTEMS_TOPdir}/\$(MULTIBUILDTOP)\$(top_builddir)"
    2222  GCC_SPECS="-isystem \$(PROJECT_ROOT)/lib/include"
    2323  AC_SUBST(GCC_SPECS)
  • cpukit/aclocal/rtems-top.m4

    r51b4875 r1b16e63c  
    3636AC_SUBST(PROJECT_TOPdir)
    3737
    38 if test "$with_target_subdir" = "." ; then
    39 # Native
    40 PROJECT_ROOT="${RTEMS_TOPdir}/\$(top_builddir)"
    41 else
    42 # Cross
    43 PROJECT_ROOT="${RTEMS_TOPdir}/\$(top_builddir)"
    44 fi
     38AS_IF([test "${with_project_root+set}" = set],
     39  [PROJECT_ROOT="${with_project_root}${RTEMS_TOPdir}/\$(top_builddir)"],
     40  [PROJECT_ROOT="../../${RTEMS_TOPdir}/\$(top_builddir)"])
    4541AC_SUBST(PROJECT_ROOT)
    4642
    4743AC_MSG_CHECKING([for RTEMS Version])
    48 AS_IF([test -r "${srcdir}/${RTEMS_TOPdir}/aclocal/version.m4"],
     44AS_IF([test -r "${srcdir}/${RTEMS_TOPdir}/exec/aclocal/version.m4"],
    4945[],
    50 [AC_MSG_ERROR([Unable to find ${RTEMS_TOPdir}/aclocal/version.m4])])
     46[AC_MSG_ERROR([Unable to find ${RTEMS_TOPdir}/exec/aclocal/version.m4])])
    5147AC_MSG_RESULT([_RTEMS_VERSION])
    5248])dnl
Note: See TracChangeset for help on using the changeset viewer.