From 6e2ef53f51e693e38e4823b75dd9378d20559ccd Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Fri, 20 Feb 2004 01:44:19 +0000 Subject: 2004-02-20 Ralf Corsepius * aclocal/rtems-top.m4: Sync with c/src/aclocal/rtems-top.m4 * Makefile.am: Cosmetics. --- Makefile.am | 1 - aclocal/rtems-top.m4 | 8 +------- 2 files changed, 1 insertion(+), 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)" -- cgit v1.2.3