summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--aclocal/check-custom-bsp.m43
-rw-r--r--c/src/ChangeLog5
-rw-r--r--c/src/aclocal/check-custom-bsp.m44
4 files changed, 15 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 551d52a875..37270b9170 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-10-15 Ralf Corsépius <ralf.corsepius@rtems.org>
+
+ * aclocal/check-custom-bsp.m4: Let _RTEMS_CHECK_CUSTOM_BSP look for
+ *.cfg into c/src/lib/libbsp/<cpu>/<bsp_family>/make/custom.
+
2009-10-14 Ralf Corsepius <ralf.corsepius@rtems.org>
* aclocal/canonical-target-name.m4, aclocal/enable-posix.m4:
diff --git a/aclocal/check-custom-bsp.m4 b/aclocal/check-custom-bsp.m4
index d62b5fa77f..2ddea34e0e 100644
--- a/aclocal/check-custom-bsp.m4
+++ b/aclocal/check-custom-bsp.m4
@@ -5,7 +5,8 @@ AC_REQUIRE([RTEMS_CANONICAL_TARGET_CPU])dnl sets RTEMS_CPU, target
AC_REQUIRE([RTEMS_TOP])dnl sets RTEMS_TOPdir
$2=
AC_MSG_CHECKING([for $1])
- for i in "${srcdir}/${RTEMS_TOPdir}/bspkit/${RTEMS_CPU}"/*/cfg/"$1" \
+ for i in "${srcdir}/$RTEMS_TOPdir/c/src/lib/libbsp/$RTEMS_CPU"/*/make/custom/"$1" \
+ "${srcdir}/${RTEMS_TOPdir}/bspkit/${RTEMS_CPU}"/*/cfg/"$1" \
"${srcdir}/${RTEMS_TOPdir}/make/custom/$1";
do
AS_IF([test -r $i],[
diff --git a/c/src/ChangeLog b/c/src/ChangeLog
index df59818e19..f5931d8a20 100644
--- a/c/src/ChangeLog
+++ b/c/src/ChangeLog
@@ -1,3 +1,8 @@
+2009-10-15 Ralf Corsépius <ralf.corsepius@rtems.org>
+
+ * aclocal/check-custom-bsp.m4: Let _RTEMS_CHECK_CUSTOM_BSP look for
+ *.cfg into c/src/lib/libbsp/<cpu>/<bsp_family>/make/custom.
+
2009-10-14 Ralf Corsépius <ralf.corsepius@rtems.org>
* aclocal/canonical-target-name.m4, aclocal/check-networking.m4,
diff --git a/c/src/aclocal/check-custom-bsp.m4 b/c/src/aclocal/check-custom-bsp.m4
index 469fbec901..850ba2237e 100644
--- a/c/src/aclocal/check-custom-bsp.m4
+++ b/c/src/aclocal/check-custom-bsp.m4
@@ -1,7 +1,9 @@
dnl $Id$
AC_DEFUN([_RTEMS_CHECK_CUSTOM_BSP],[
- for i in "${srcdir}/${RTEMS_TOPdir}/bspkit/${RTEMS_CPU}"/*/cfg/$1.cfg \
+ $2=
+ for i in \
+ "${srcdir}/${RTEMS_TOPdir}/c/src/lib/libbsp/${RTEMS_CPU}"/*/make/custom/$1.cfg \
"${srcdir}/${RTEMS_TOPdir}/make/custom/"$1.cfg;
do
AC_MSG_CHECKING([for $i])