From 60f37021f14c64ce44403990b58c3c9ec09e561a Mon Sep 17 00:00:00 2001
From: Ralf Corsepius <ralf.corsepius@rtems.org>
Date: Wed, 17 Jul 2002 22:28:20 +0000
Subject: 2002-07-17	Ralf Corsepius <corsepiu@faw.uni-ulm.de>

	* aclocal/rtems-top.m4: Reflect relocation of c/src/exec to cpukit.
	* aclocal/check-cpu.m4: Ditto.
	* aclocal/check-bsps.m4: Ditto.
---
 cpukit/ChangeLog             | 6 ++++++
 cpukit/aclocal/check-bsps.m4 | 2 +-
 cpukit/aclocal/check-cpu.m4  | 2 +-
 cpukit/aclocal/rtems-top.m4  | 6 +++---
 4 files changed, 11 insertions(+), 5 deletions(-)

(limited to 'cpukit')

diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog
index c17f70c470..3f52491449 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -1,3 +1,9 @@
+2002-07-17	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* aclocal/rtems-top.m4: Reflect relocation of c/src/exec to cpukit.
+	* aclocal/check-cpu.m4: Ditto.
+	* aclocal/check-bsps.m4: Ditto.
+
 2002-07-05	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* automake/multilib.am: Add install-multi.
diff --git a/cpukit/aclocal/check-bsps.m4 b/cpukit/aclocal/check-bsps.m4
index b5f66bb4c1..7c450e783f 100644
--- a/cpukit/aclocal/check-bsps.m4
+++ b/cpukit/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/cpukit/aclocal/check-cpu.m4 b/cpukit/aclocal/check-cpu.m4
index ad16ae4e66..146987ec49 100644
--- a/cpukit/aclocal/check-cpu.m4
+++ b/cpukit/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/exec/score/cpu/$RTEMS_CPU"; then
+if test -d "$srcdir/$RTEMS_TOPdir/cpukit/score/cpu/$RTEMS_CPU"; then
   AC_MSG_RESULT(yes)
 else
   AC_MSG_ERROR(no)
diff --git a/cpukit/aclocal/rtems-top.m4 b/cpukit/aclocal/rtems-top.m4
index c49a6f4a95..c174c36467 100644
--- a/cpukit/aclocal/rtems-top.m4
+++ b/cpukit/aclocal/rtems-top.m4
@@ -37,12 +37,12 @@ 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="${RTEMS_TOPdir}/\$(top_builddir)"])
 AC_SUBST(PROJECT_ROOT)
 
 AC_MSG_CHECKING([for RTEMS Version])
-AS_IF([test -r "${srcdir}/${RTEMS_TOPdir}/exec/aclocal/version.m4"],
+AS_IF([test -r "${srcdir}/${RTEMS_TOPdir}/cpukit/aclocal/version.m4"],
 [],
-[AC_MSG_ERROR([Unable to find ${RTEMS_TOPdir}/exec/aclocal/version.m4])])
+[AC_MSG_ERROR([Unable to find ${RTEMS_TOPdir}/cpukit/aclocal/version.m4])])
 AC_MSG_RESULT([_RTEMS_VERSION])
 ])dnl
-- 
cgit v1.2.3