summaryrefslogtreecommitdiffstats
path: root/c
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2004-04-14 13:27:39 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2004-04-14 13:27:39 +0000
commit0d0528d369108d87e3a5fe1e4803abffd069979d (patch)
treed62ab795fe8febeeeb9bf69af4b16f301618ce32 /c
parent2004-04-14 Ralf Corsepius <ralf_corsepius@rtems.org> (diff)
downloadrtems-0d0528d369108d87e3a5fe1e4803abffd069979d.tar.bz2
2004-04-14 Ralf Corsepius <ralf_corsepius@rtems.org>
* aclocal/rtems-top.m4: Add project_top/with_project_top processing.
Diffstat (limited to 'c')
-rw-r--r--c/src/ChangeLog4
-rw-r--r--c/src/aclocal/rtems-top.m46
2 files changed, 9 insertions, 1 deletions
diff --git a/c/src/ChangeLog b/c/src/ChangeLog
index a4dba1575c..1a160264fd 100644
--- a/c/src/ChangeLog
+++ b/c/src/ChangeLog
@@ -1,3 +1,7 @@
+2004-04-14 Ralf Corsepius <ralf_corsepius@rtems.org>
+
+ * aclocal/rtems-top.m4: Add project_top/with_project_top processing.
+
2004-04-09 Ralf Corsepius <ralf_corsepius@rtems.org>
* optman/Makefile.am: Set EXEEXT = <empty> (Work around to a bug in
diff --git a/c/src/aclocal/rtems-top.m4 b/c/src/aclocal/rtems-top.m4
index 0482d89fe9..186b57770d 100644
--- a/c/src/aclocal/rtems-top.m4
+++ b/c/src/aclocal/rtems-top.m4
@@ -24,7 +24,11 @@ rtems_updir=m4_if([$2],[],[`echo "$1/" | sed s,^\.\.\/\.\.\/,,`],[$2/])
AC_SUBST([RTEMS_ROOT],[${rtems_updir}'$(top_builddir)'])
-AC_SUBST([PROJECT_TOPdir],[${with_project_top}${rtems_updir}'$(top_builddir)'])
+AS_IF([test -n "${with_target_subdir}"],
+ [project_top="../${with_project_top}"],
+ [project_top="${with_project_top}"])
+AC_SUBST([PROJECT_TOPdir],[${project_top}${rtems_updir}'$(top_builddir)'])
+
AC_SUBST([PROJECT_ROOT],[${with_project_root}${rtems_updir}'$(top_builddir)'])
AC_SUBST([dirstamp],[\${am__leading_dot}dirstamp])