From 2e0fd4273d942d48194c27530a67cd5323c80812 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Thu, 2 Nov 2000 15:44:04 +0000 Subject: 2000-11-02 Ralf Corsepius * aclocal/*: Replace with contents of macros/*.m4 * macros/: Remove. * aclocal/ar-s.m4 aclocal/tool-prefix.m4: Remove. * Makefile.am: Reflect changes to aclocal/ and macros/. --- aclocal/enable-rtemsbsp.m4 | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'aclocal/enable-rtemsbsp.m4') diff --git a/aclocal/enable-rtemsbsp.m4 b/aclocal/enable-rtemsbsp.m4 index fd31997d3c..a1fb24a335 100644 --- a/aclocal/enable-rtemsbsp.m4 +++ b/aclocal/enable-rtemsbsp.m4 @@ -38,8 +38,9 @@ RTEMS_ENABLE_BARE AC_SUBST(BARE_CPU_MODEL) AC_SUBST(BARE_CPU_CFLAGS) -## RTEMS_ROOT=$RTEMS_TOPdir/'$(top_builddir)'/c/$RTEMS_BSP -## AC_SUBST(RTEMS_ROOT) +RTEMS_ROOT=$PROJECT_ROOT/c/$RTEMS_BSP +AC_SUBST(RTEMS_ROOT) +AM_CONDITIONAL(RTEMS_CONFIG_PER_BSP, test x = x); ]) AC_DEFUN(RTEMS_ENV_RTEMSCPU, @@ -52,7 +53,7 @@ else rtems_cv_RTEMS_BSP="multilib" RTEMS_BSP="$rtems_cv_RTEMS_BSP" AC_SUBST(RTEMS_BSP) -## RTEMS_ROOT=$RTEMS_TOPdir/'$(top_builddir)'/c -## AC_SUBST(RTEMS_ROOT) + RTEMS_ROOT=$PROJECT_ROOT/c + AC_SUBST(RTEMS_ROOT) fi ]) -- cgit v1.2.3