summaryrefslogtreecommitdiffstats
path: root/macros/enable-rtemsbsp.m4
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2000-10-31 21:20:00 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2000-10-31 21:20:00 +0000
commit3174a7edaefd2d1f59af44c7f6856c69327ecf9d (patch)
tree101990c9e3421b7d76dd2a0962442005b357efab /macros/enable-rtemsbsp.m4
parent2000-10-30 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff)
downloadrtems-3174a7edaefd2d1f59af44c7f6856c69327ecf9d.tar.bz2
2000-10-30 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* configure.in: New, Cygnus/GNU style configuration. * Makefile.am: Add macros/, reflect new configure.in, ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/macros * automake/compile.am: BSP_SPECS, remove RTEMS_CANONICALIZATION. * automake/lib.am: Remove RTEMS_CANONICALIZATION. * macros/tool-prefix.m4: Remove. * macros/target.m4: Remove RTEMS_CONFIG_SUBDIRS, RTEMS_OUTPUT_SUBDIRS. * macros/enable-rtemsbsp.m4: Add RTEMS_CONFIG_PER_BSP, add setting RTEMS_ROOT. * macros/i386-gas-code16.m4: Define NEW_GAS only for 16bit mode- * macros/multilib.m4: Various minor fixes. * macros/project-root.m4: Remove setting PROJECT_TOPdir, PROJECT_ROOT, RTEMS_ROOT. * macros/rtems-top.m4: Remove RTEMS_CANONICALIZATION, TARGET_SUBDIRS; Add with_target_subdirs, PROJECT_TOPdir, PROJECT_ROOT.
Diffstat (limited to '')
-rw-r--r--macros/enable-rtemsbsp.m49
1 files changed, 5 insertions, 4 deletions
diff --git a/macros/enable-rtemsbsp.m4 b/macros/enable-rtemsbsp.m4
index fd31997d3c..a1fb24a335 100644
--- a/macros/enable-rtemsbsp.m4
+++ b/macros/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
])