From 1b16e63c4fd963c51bcfc536d0855eae9163f3a1 Mon Sep 17 00:00:00 2001
From: Ralf Corsepius <ralf.corsepius@rtems.org>
Date: Fri, 5 Jul 2002 16:13:07 +0000
Subject: 2002-07-05	Ralf Corsepius <corsepiu@faw.uni-ulm.de>

	* 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.
---
 c/src/exec/aclocal/check-bsps.m4   |  2 +-
 c/src/exec/aclocal/check-cpu.m4    |  2 +-
 c/src/exec/aclocal/env-rtemscpu.m4 |  2 +-
 c/src/exec/aclocal/rtems-top.m4    | 14 +++++---------
 4 files changed, 8 insertions(+), 12 deletions(-)

(limited to 'c/src/exec/aclocal')

diff --git a/c/src/exec/aclocal/check-bsps.m4 b/c/src/exec/aclocal/check-bsps.m4
index 7c450e783f..b5f66bb4c1 100644
--- a/c/src/exec/aclocal/check-bsps.m4
+++ b/c/src/exec/aclocal/check-bsps.m4
@@ -5,7 +5,7 @@ AC_DEFUN(RTEMS_CHECK_CUSTOM_BSP,
 AC_REQUIRE([RTEMS_TOP])
 
 AC_MSG_CHECKING([for make/custom/[$]$1.cfg])
-if test -r "$srcdir/$RTEMS_TOPdir/make/custom/[$]$1.cfg"; then
+if test -r "$srcdir/$RTEMS_TOPdir/../../make/custom/[$]$1.cfg"; then
   AC_MSG_RESULT([yes])
 else
   AC_MSG_ERROR([no])
diff --git a/c/src/exec/aclocal/check-cpu.m4 b/c/src/exec/aclocal/check-cpu.m4
index b0b01117d1..ad16ae4e66 100644
--- a/c/src/exec/aclocal/check-cpu.m4
+++ b/c/src/exec/aclocal/check-cpu.m4
@@ -8,7 +8,7 @@ AC_REQUIRE([RTEMS_CANONICAL_TARGET_CPU])
 
 # Is this a supported CPU?
 AC_MSG_CHECKING([if cpu $RTEMS_CPU is supported])
-if test -d "$srcdir/$RTEMS_TOPdir/c/src/exec/score/cpu/$RTEMS_CPU"; then
+if test -d "$srcdir/$RTEMS_TOPdir/exec/score/cpu/$RTEMS_CPU"; then
   AC_MSG_RESULT(yes)
 else
   AC_MSG_ERROR(no)
diff --git a/c/src/exec/aclocal/env-rtemscpu.m4 b/c/src/exec/aclocal/env-rtemscpu.m4
index e01efb12c0..42fd06b23f 100644
--- a/c/src/exec/aclocal/env-rtemscpu.m4
+++ b/c/src/exec/aclocal/env-rtemscpu.m4
@@ -18,7 +18,7 @@ if test x"$multilib" = x"yes"; then
   fi
   AC_SUBST(MULTISUBDIR)
 
-  PROJECT_ROOT="${RTEMS_TOPdir}/\$(MULTIBUILDTOP)\$(top_builddir)"
+  PROJECT_ROOT="../../${RTEMS_TOPdir}/\$(MULTIBUILDTOP)\$(top_builddir)"
   GCC_SPECS="-isystem \$(PROJECT_ROOT)/lib/include"
   AC_SUBST(GCC_SPECS)
 
diff --git a/c/src/exec/aclocal/rtems-top.m4 b/c/src/exec/aclocal/rtems-top.m4
index 82da20edd5..c49a6f4a95 100644
--- a/c/src/exec/aclocal/rtems-top.m4
+++ b/c/src/exec/aclocal/rtems-top.m4
@@ -35,18 +35,14 @@ PROJECT_TOPdir=${dots}${RTEMS_TOPdir}/'$(top_builddir)'
 fi
 AC_SUBST(PROJECT_TOPdir)
 
-if test "$with_target_subdir" = "." ; then
-# Native
-PROJECT_ROOT="${RTEMS_TOPdir}/\$(top_builddir)"
-else
-# Cross
-PROJECT_ROOT="${RTEMS_TOPdir}/\$(top_builddir)"
-fi
+AS_IF([test "${with_project_root+set}" = set],
+  [PROJECT_ROOT="${with_project_root}${RTEMS_TOPdir}/\$(top_builddir)"],
+  [PROJECT_ROOT="../../${RTEMS_TOPdir}/\$(top_builddir)"])
 AC_SUBST(PROJECT_ROOT)
 
 AC_MSG_CHECKING([for RTEMS Version])
-AS_IF([test -r "${srcdir}/${RTEMS_TOPdir}/aclocal/version.m4"],
+AS_IF([test -r "${srcdir}/${RTEMS_TOPdir}/exec/aclocal/version.m4"],
 [],
-[AC_MSG_ERROR([Unable to find ${RTEMS_TOPdir}/aclocal/version.m4])])
+[AC_MSG_ERROR([Unable to find ${RTEMS_TOPdir}/exec/aclocal/version.m4])])
 AC_MSG_RESULT([_RTEMS_VERSION])
 ])dnl
-- 
cgit v1.2.3