summaryrefslogtreecommitdiffstats
path: root/cpukit
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2002-07-31 14:40:48 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2002-07-31 14:40:48 +0000
commit4bfe1352438550b9de838077bf5d2cd0c262901c (patch)
tree5039516e681fd7528e5fb1f70ea22bc881dfade9 /cpukit
parent2002-07-31 Joel Sherrill <joel@OARcorp.com> (diff)
downloadrtems-4bfe1352438550b9de838077bf5d2cd0c262901c.tar.bz2
2002-07-31 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* aclocal/rtems-top.m4: Use with_project_root and MULTIBUILDTOP to compose PROJECT_TOPdir (Fixes hppa1.1/genoffset problem).
Diffstat (limited to 'cpukit')
-rw-r--r--cpukit/ChangeLog5
-rw-r--r--cpukit/aclocal/rtems-top.m44
2 files changed, 7 insertions, 2 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog
index 531d414350..efe43a6a2e 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -1,3 +1,8 @@
+2002-07-31 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * aclocal/rtems-top.m4: Use with_project_root and MULTIBUILDTOP to
+ compose PROJECT_TOPdir (Fixes hppa1.1/genoffset problem).
+
2002-07-31 Joel Sherrill <joel@OARcorp.com>
* aclocal/rtems-cpu-subdirs.m4: Removed the or16 port
diff --git a/cpukit/aclocal/rtems-top.m4 b/cpukit/aclocal/rtems-top.m4
index ba055115ef..25572244d3 100644
--- a/cpukit/aclocal/rtems-top.m4
+++ b/cpukit/aclocal/rtems-top.m4
@@ -26,12 +26,12 @@ test -n "$with_target_subdir" || with_target_subdir="."
if test "$with_target_subdir" = "." ; then
# Native
-PROJECT_TOPdir=${RTEMS_TOPdir}/'$(top_builddir)'
+PROJECT_TOPdir="${with_project_root}${RTEMS_TOPdir}/\$(MULTIBUILDTOP)\$(top_builddir)"
else
# Cross
dots=`echo $with_target_subdir|\
sed -e 's%^\./%%' -e 's%[[^/]]$%&/%' -e 's%[[^/]]*/%../%g'`
-PROJECT_TOPdir=${dots}${RTEMS_TOPdir}/'$(top_builddir)'
+PROJECT_TOPdir="${dots}${with_project_root}${RTEMS_TOPdir}/\$(MULTIBUILDTOP)\$(top_builddir)"
fi
AC_SUBST(PROJECT_TOPdir)