2004-02-20 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

* aclocal/rtems-top.m4: Sync with c/src/aclocal/rtems-top.m4
	* Makefile.am: Cosmetics.

Makefile.am

@@ -28,7 +28,6 @@ EXTRA_DIST = README.configure SUPPORT VERSION LICENSE $(noinst_SCRIPTS)
 EXTRA_DIST += $(ACLOCAL_FILES)
 EXTRA_DIST += config-ml.in
 
-
 dist-hook:
 	@files=`(cd $(srcdir); find doc cpukit c scripts testsuites tools \
 	   -name configure.ac -print | sed 's,/configure.ac,,' | sort)`; \

aclocal/rtems-top.m4

@@ -26,15 +26,9 @@ AC_SUBST(RTEMS_TOPdir)
 ## with_target_subdirs is handled implicitly by autoconf
 test -n "$with_target_subdir" || with_target_subdir="."
 
-if test "$with_target_subdir" = "." ; then
-# Native
-PROJECT_TOPdir=${RTEMS_TOPdir}/'$(top_builddir)'
-else
-# Cross
 dots=`echo $with_target_subdir|\
-sed -e 's%^\./%%' -e 's%[[^/]]$%&/%' -e 's%[[^/]]*/%../%g'`
+sed -e 's,^\.$,,' -e 's%^\./%%' -e 's%[[^/]]$%&/%' -e 's%[[^/]]*/%../%g'`
 PROJECT_TOPdir=${dots}${RTEMS_TOPdir}/'$(top_builddir)'
-fi
 AC_SUBST(PROJECT_TOPdir)
 
 PROJECT_ROOT="${RTEMS_TOPdir}/\$(top_builddir)"