diff options
author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2003-03-24 10:23:16 +0000 |
---|---|---|
committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2003-03-24 10:23:16 +0000 |
commit | dbe9b0ca1cc2ff7376cdf564b49928c5173c41d9 (patch) | |
tree | 8f2d8f9ec6702e24a1f909e789a483058a22edb0 /cpukit/aclocal/env-rtemscpu.m4 | |
parent | Merger from rtems-4-6-branch. (diff) | |
download | rtems-dbe9b0ca1cc2ff7376cdf564b49928c5173c41d9.tar.bz2 |
Merger from rtems-4-6-branch.
Diffstat (limited to 'cpukit/aclocal/env-rtemscpu.m4')
-rw-r--r-- | cpukit/aclocal/env-rtemscpu.m4 | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/cpukit/aclocal/env-rtemscpu.m4 b/cpukit/aclocal/env-rtemscpu.m4 index 0ea77438b6..c6635aa611 100644 --- a/cpukit/aclocal/env-rtemscpu.m4 +++ b/cpukit/aclocal/env-rtemscpu.m4 @@ -4,7 +4,6 @@ AC_DEFUN(RTEMS_ENV_RTEMSCPU, [AC_REQUIRE([RTEMS_ENABLE_MULTILIB]) if test x"$multilib" = x"yes"; then -## FIXME: There is no multilib BSP AS_IF([test -n "$with_multisubdir"], [MULTIBUILDTOP=`echo "/$with_multisubdir" | sed 's,/[[^\\/]]*,../,g'`]) AC_SUBST(MULTIBUILDTOP) @@ -16,12 +15,9 @@ if test x"$multilib" = x"yes"; then PROJECT_INCLUDE="\$(PROJECT_ROOT)/lib/include" AC_SUBST(PROJECT_INCLUDE) - project_libdir="\$(PROJECT_ROOT)/lib" + project_libdir="\$(PROJECT_ROOT)/lib/\$(MULTISUBDIR)" AC_SUBST(project_libdir) - RTEMS_ROOT="${PROJECT_ROOT}" - AC_SUBST(RTEMS_ROOT) - includedir="\${exec_prefix}/lib/include" libdir="${libdir}\$(MULTISUBDIR)" else |