From 89b51f479583a97de7ed67b61231f05ae1360408 Mon Sep 17 00:00:00 2001
From: Ralf Corsepius <ralf.corsepius@rtems.org>
Date: Mon, 10 Mar 2003 16:46:32 +0000
Subject: Merger from rtems-4-6-branch

---
 aclocal/rtems-top.m4 | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

(limited to 'aclocal')

diff --git a/aclocal/rtems-top.m4 b/aclocal/rtems-top.m4
index 82da20edd5..bdb79ed5e6 100644
--- a/aclocal/rtems-top.m4
+++ b/aclocal/rtems-top.m4
@@ -8,8 +8,8 @@ dnl
 AC_DEFUN(RTEMS_TOP,
 [dnl
 AC_REQUIRE([RTEMS_VERSIONING])
+AC_CONFIG_AUX_DIR([$1])
 AC_CHECK_PROGS(MAKE, gmake make)
-AC_BEFORE([$0], [AC_CONFIG_AUX_DIR])dnl
 AC_BEFORE([$0], [AM_INIT_AUTOMAKE])dnl
 
 AC_PREFIX_DEFAULT([/opt/rtems])
@@ -35,13 +35,7 @@ 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
 AC_SUBST(PROJECT_ROOT)
 
 AC_MSG_CHECKING([for RTEMS Version])
-- 
cgit v1.2.3