diff options
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | aclocal/project-root.m4 | 26 |
2 files changed, 27 insertions, 3 deletions
@@ -1,3 +1,7 @@ +2000-09-06 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + * aclocal/project-root.m4: Introduce PROJECT_TOPdir, add comments. + 2000-09-04 Ralf Corsepius <corsepiu@faw.uni-ulm.de> * automake/compile.am: New file diff --git a/aclocal/project-root.m4 b/aclocal/project-root.m4 index aa58b1a553..35fd15b7aa 100644 --- a/aclocal/project-root.m4 +++ b/aclocal/project-root.m4 @@ -2,20 +2,40 @@ dnl dnl $Id$ dnl +dnl +dnl PROJECT_TOPdir .. relative path to the top of the build-tree +dnl PROJECT_ROOT .. relative path to the top of the temporary +dnl installation directory inside the build-tree +dnl RTEMS_TOPdir .. relative path of a subpackage's configure.in to the +dnl toplevel configure.in of the source-tree +dnl RTEMS_ROOT .. path to the top of a bsp's build directory +dnl [Applied by custom/*.cfg, depredicated otherwise] +dnl + AC_DEFUN(RTEMS_PROJECT_ROOT, [dnl AC_REQUIRE([RTEMS_TOP]) if test "$TARGET_SUBDIR" = "." ; then -PROJECT_ROOT=$RTEMS_TOPdir/'$(top_builddir)'; +# Native +PROJECT_TOPdir=${RTEMS_TOPdir}/'$(top_builddir)' +PROJECT_ROOT=${RTEMS_TOPdir}/'$(top_builddir)'; else -PROJECT_ROOT=../$RTEMS_TOPdir/'$(top_builddir)' +# FIXME: Moving the build-tree +# PROJECT_TOPdir=../${RTEMS_TOPdir}/'$(top_builddir)' +# PROJECT_ROOT=${RTEMS_TOPdir}/'$(top_builddir)' + +# FIXME: Old, per-bsp building style +PROJECT_TOPdir=../${RTEMS_TOPdir}/'$(top_builddir)' +PROJECT_ROOT=../${RTEMS_TOPdir}/'$(top_builddir)' fi AC_SUBST(PROJECT_ROOT) +AC_SUBST(PROJECT_TOPdir) +# FIXME: This should not be here RTEMS_ROOT=$RTEMS_TOPdir/'$(top_builddir)'/c/$RTEMS_BSP AC_SUBST(RTEMS_ROOT) -PACKHEX="\$(PROJECT_ROOT)/tools/build/packhex" +PACKHEX="\$(PROJECT_TOPdir)/tools/build/packhex" AC_SUBST(PACKHEX) PROJECT_INCLUDE="\$(PROJECT_ROOT)/$RTEMS_BSP/lib/include" |