summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2004-02-20 01:44:19 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2004-02-20 01:44:19 +0000
commit6e2ef53f51e693e38e4823b75dd9378d20559ccd (patch)
tree25c11131522ba6b7bea76d357a25b835dd26309b
parent2004-02-20 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff)
downloadrtems-6e2ef53f51e693e38e4823b75dd9378d20559ccd.tar.bz2
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.
-rw-r--r--Makefile.am1
-rw-r--r--aclocal/rtems-top.m48
2 files changed, 1 insertions, 8 deletions
diff --git a/Makefile.am b/Makefile.am
index ed478fd582..50ced758de 100644
--- a/Makefile.am
+++ b/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)`; \
diff --git a/aclocal/rtems-top.m4 b/aclocal/rtems-top.m4
index aa08167290..e993a92ddb 100644
--- a/aclocal/rtems-top.m4
+++ b/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)"