Changeset dbe9b0c in rtems


Ignore:
Timestamp:
Mar 24, 2003, 10:23:16 AM (17 years ago)
Author:
Ralf Corsepius <ralf.corsepius@…>
Branches:
4.10, 4.11, 4.8, 4.9, master
Children:
0b882b7
Parents:
6285bc8
Message:

Merger from rtems-4-6-branch.

Location:
cpukit/aclocal
Files:
1 deleted
2 edited

Legend:

Unmodified
Added
Removed
  • cpukit/aclocal/env-rtemsbsp.m4

    r6285bc8 rdbe9b0c  
    66[dnl
    77AC_BEFORE([$0], [RTEMS_ENABLE_RTEMSBSP])dnl
    8 AC_BEFORE([$0], [RTEMS_PROJECT_ROOT])dnl
    98
    109AC_ARG_VAR([CPU_CFLAGS],[])
     
    3231AC_SUBST(project_libdir)
    3332
    34 RTEMS_ROOT="$PROJECT_ROOT/c/$RTEMS_BSP"
    35 AC_SUBST(RTEMS_ROOT)
    36 
    3733RTEMS_ENABLE_BARE
    3834AC_SUBST(BARE_CPU_MODEL)
  • cpukit/aclocal/env-rtemscpu.m4

    r6285bc8 rdbe9b0c  
    55
    66if test x"$multilib" = x"yes"; then
    7 ## FIXME: There is no multilib BSP
    87  AS_IF([test -n "$with_multisubdir"],
    98    [MULTIBUILDTOP=`echo "/$with_multisubdir" | sed 's,/[[^\\/]]*,../,g'`])
     
    1716  AC_SUBST(PROJECT_INCLUDE)
    1817
    19   project_libdir="\$(PROJECT_ROOT)/lib"
     18  project_libdir="\$(PROJECT_ROOT)/lib/\$(MULTISUBDIR)"
    2019  AC_SUBST(project_libdir)
    21 
    22   RTEMS_ROOT="${PROJECT_ROOT}"
    23   AC_SUBST(RTEMS_ROOT)
    2420
    2521  includedir="\${exec_prefix}/lib/include"
Note: See TracChangeset for help on using the changeset viewer.