diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2002-07-22 09:17:11 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2002-07-22 09:17:11 +0000 |
| commit | 1462016612c05a752f9e261d64d0c04db1d9ceca (patch) | |
| tree | 99331e2de24371d1889e3289a422fd5afa77a47f /cpukit/aclocal/env-rtemscpu.m4 | |
| parent | 2002-07-22 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff) | |
| download | rtems-1462016612c05a752f9e261d64d0c04db1d9ceca.tar.bz2 | |
2002-07-22 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* aclocal/env-rtemsbsp.m4: Remove RTEMS_BSP_SPECS, PROJECT_RELEASE.
Add project_libdir, libdir. New GCC_SPECS. Various cleanups.
* aclocal/env-rtemscpu.m4: Remove RTEMS_BSP_SPECS, PROJECT_RELEASE.
Add project_libdir, libdir. New GCC_SPECS. Various cleanups.
* aclocal/rtems-top.m4: New PROJECT_ROOT handling.
* automake/compile.am: Remove RTEMS_BSP_SPECS, LD* flags, LINK,
references to bsp_specs. Use project_libdir instead of
$(PROJECT_RELEASE)/lib.
Diffstat (limited to 'cpukit/aclocal/env-rtemscpu.m4')
| -rw-r--r-- | cpukit/aclocal/env-rtemscpu.m4 | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/cpukit/aclocal/env-rtemscpu.m4 b/cpukit/aclocal/env-rtemscpu.m4 index 42fd06b23f..7cb53a1307 100644 --- a/cpukit/aclocal/env-rtemscpu.m4 +++ b/cpukit/aclocal/env-rtemscpu.m4 @@ -5,9 +5,6 @@ AC_DEFUN(RTEMS_ENV_RTEMSCPU, if test x"$multilib" = x"yes"; then ## FIXME: There is no multilib BSP - RTEMS_BSP_SPECS="" - AC_SUBST(RTEMS_BSP_SPECS) - if test -n "$with_multisubdir"; then MULTIBUILDTOP=`echo "/$with_multisubdir" | sed 's,/[[^\\/]]*,../,g'` fi @@ -18,17 +15,16 @@ if test x"$multilib" = x"yes"; then fi AC_SUBST(MULTISUBDIR) - PROJECT_ROOT="../../${RTEMS_TOPdir}/\$(MULTIBUILDTOP)\$(top_builddir)" - GCC_SPECS="-isystem \$(PROJECT_ROOT)/lib/include" + GCC_SPECS="-isystem \$(PROJECT_INCLUDE)" AC_SUBST(GCC_SPECS) PROJECT_INCLUDE="\$(PROJECT_ROOT)/lib/include" AC_SUBST(PROJECT_INCLUDE) - PROJECT_RELEASE="\$(PROJECT_ROOT)" - AC_SUBST(PROJECT_RELEASE) + project_libdir="\$(PROJECT_ROOT)/lib" + AC_SUBST(project_libdir) - RTEMS_ROOT=${PROJECT_ROOT} + RTEMS_ROOT="${PROJECT_ROOT}" AC_SUBST(RTEMS_ROOT) includedir="\${exec_prefix}/lib/include" |