summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--aclocal/project-root.m46
-rw-r--r--c/src/lib/libbsp/configure.in9
2 files changed, 11 insertions, 4 deletions
diff --git a/aclocal/project-root.m4 b/aclocal/project-root.m4
index 2f795d23f0..1699736fe4 100644
--- a/aclocal/project-root.m4
+++ b/aclocal/project-root.m4
@@ -20,5 +20,11 @@ AC_SUBST(INSTALL_CHANGE)
PACKHEX="\$(PROJECT_ROOT)/tools/build/packhex"
AC_SUBST(PACKHEX)
+
+PROJECT_INCLUDE="\$(PROJECT_ROOT)/$RTEMS_BSP/lib/include"
+AC_SUBST(PROJECT_INCLUDE)
+
+PROJECT_RELEASE="\$(PROJECT_ROOT)/$RTEMS_BSP"
+AC_SUBST(PROJECT_RELEASE)
])
diff --git a/c/src/lib/libbsp/configure.in b/c/src/lib/libbsp/configure.in
index 97e14ebbad..424021eee4 100644
--- a/c/src/lib/libbsp/configure.in
+++ b/c/src/lib/libbsp/configure.in
@@ -35,10 +35,6 @@ AM_CONDITIONAL(RTEMS_GAS_CODE16,test "$RTEMS_GAS_CODE16" = "yes");
# find all the Makefiles for the BSPs
makefiles="$makefiles $RTEMS_CPU/Makefile"
-if test "${RTEMS_BSP}" = "bare"; then
-makefiles="$makefiles bare/Makefile"
-fi
-
RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
RTEMS_CHECK_MULTIPROCESSING(RTEMS_BSP)
RTEMS_CHECK_NETWORKING(RTEMS_BSP)
@@ -93,6 +89,11 @@ fi
AM_CONDITIONAL(HAS_MP,test "$HAS_MP" = "yes")
AC_CONFIG_SUBDIRS($bsptools_cfgdirs)
+if test "$RTEMS_BSP" = "bare"; then
+cfg_subdirs="bare"
+fi
+
+AC_CONFIG_SUBDIRS($cfg_subdirs)
# try to explicitly list a Makefile here
AC_OUTPUT(