From 0d0528d369108d87e3a5fe1e4803abffd069979d Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Wed, 14 Apr 2004 13:27:39 +0000 Subject: [PATCH] 2004-04-14 Ralf Corsepius * aclocal/rtems-top.m4: Add project_top/with_project_top processing. --- c/src/ChangeLog | 4 ++++ c/src/aclocal/rtems-top.m4 | 6 +++++- testsuites/ChangeLog | 4 ++++ testsuites/aclocal/rtems-top.m4 | 6 +++++- 4 files changed, 18 insertions(+), 2 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 + + * aclocal/rtems-top.m4: Add project_top/with_project_top processing. + 2004-04-09 Ralf Corsepius * optman/Makefile.am: Set EXEEXT = (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]) diff --git a/testsuites/ChangeLog b/testsuites/ChangeLog index 0a9e334dbd..ce4ba27bac 100644 --- a/testsuites/ChangeLog +++ b/testsuites/ChangeLog @@ -1,3 +1,7 @@ +2004-04-14 Ralf Corsepius + + * aclocal/rtems-top.m4: Add project_top/with_project_top processing. + 2004-03-28 Ralf Corsepius * aclocal/rtems-top.m4: s/RTEMS_RTEMS/RTEMS_ROOT (typo). diff --git a/testsuites/aclocal/rtems-top.m4 b/testsuites/aclocal/rtems-top.m4 index d7efd0fc3d..51a4e95207 100644 --- a/testsuites/aclocal/rtems-top.m4 +++ b/testsuites/aclocal/rtems-top.m4 @@ -41,8 +41,12 @@ rtems_rootdir=${rtems_updir} RTEMS_ROOT=${rtems_updir}'$(top_builddir)' ]) AC_SUBST([RTEMS_ROOT]) + +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_TOPdir],[${with_project_top}${rtems_updir}'$(top_builddir)']) AC_SUBST([PROJECT_ROOT],[${with_project_root}${rtems_updir}'$(top_builddir)']) AC_SUBST([dirstamp],[\${am__leading_dot}dirstamp])