3 files changed, 12 insertions, 20 deletions
diff --git a/cpukit/aclocal/env-rtemsbsp.m4 b/cpukit/aclocal/env-rtemsbsp.m4
index 6caec5a3d4..830e3c8d51 100644
--- a/cpukit/aclocal/env-rtemsbsp.m4
+++ b/cpukit/aclocal/env-rtemsbsp.m4
@@ -21,21 +21,18 @@ RTEMS_BSP="$rtems_cv_RTEMS_BSP"
 AC_MSG_RESULT(${RTEMS_BSP})
 AC_SUBST(RTEMS_BSP)
 
-RTEMS_BSP_SPECS="-specs bsp_specs -qrtems"
-AC_SUBST(RTEMS_BSP_SPECS)
-
-GCC_SPECS="-B\$(PROJECT_ROOT)/lib/ -B\$(PROJECT_ROOT)/$RTEMS_BSP/lib/"
-AC_SUBST(GCC_SPECS)
-
 PROJECT_INCLUDE="\$(PROJECT_ROOT)/$RTEMS_BSP/lib/include"
 AC_SUBST(PROJECT_INCLUDE)
 
-PROJECT_RELEASE="\$(PROJECT_ROOT)/$RTEMS_BSP"   
-AC_SUBST(PROJECT_RELEASE)
+project_libdir="${PROJECT_ROOT}/$RTEMS_BSP/lib"   
+AC_SUBST(project_libdir)
 
-RTEMS_ROOT=$PROJECT_ROOT/c/$RTEMS_BSP
+RTEMS_ROOT="$PROJECT_ROOT/c/$RTEMS_BSP"
 AC_SUBST(RTEMS_ROOT)
 
+GCC_SPECS="-isystem \$(PROJECT_INCLUDE)"
+AC_SUBST(GCC_SPECS)
+
 RTEMS_ENABLE_BARE
 AC_SUBST(BARE_CPU_MODEL)
 AC_SUBST(BARE_CPU_CFLAGS)
@@ -44,4 +41,5 @@ AM_CONDITIONAL([RTEMS_CONFIG_PER_BSP],[true])
 AM_CONDITIONAL([MULTILIB],[false])
 
 includedir="\${exec_prefix}/${RTEMS_BSP}/lib/include"
+libdir="\${exec_prefix}/${RTEMS_BSP}/lib"
 ])
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"
diff --git a/cpukit/aclocal/rtems-top.m4 b/cpukit/aclocal/rtems-top.m4
index c174c36467..ba055115ef 100644
--- a/cpukit/aclocal/rtems-top.m4
+++ b/cpukit/aclocal/rtems-top.m4
@@ -35,9 +35,7 @@ PROJECT_TOPdir=${dots}${RTEMS_TOPdir}/'$(top_builddir)'
 fi
 AC_SUBST(PROJECT_TOPdir)
 
-AS_IF([test "${with_project_root+set}" = set],
-  [PROJECT_ROOT="${with_project_root}${RTEMS_TOPdir}/\$(top_builddir)"],
-  [PROJECT_ROOT="${RTEMS_TOPdir}/\$(top_builddir)"])
+PROJECT_ROOT="${with_project_root}${RTEMS_TOPdir}/\$(MULTIBUILDTOP)\$(top_builddir)"
 AC_SUBST(PROJECT_ROOT)
 
 AC_MSG_CHECKING([for RTEMS Version])