From adb85dd473af5c9a72e9da9b7fe013d1b216abc3 Mon Sep 17 00:00:00 2001
From: Sebastian Huber <sebastian.huber@embedded-brains.de>
Date: Sat, 21 Apr 2018 10:22:08 +0200
Subject: bsps: Move make/custom/* files to bsps

Adjust various build files.  Remove automatic generation of the
c/src/lib/libbsp/*/acinclude.m4 files from bootstrap script.

This patch is a part of the BSP source reorganization.

Update #3285.
---
 aclocal/bsp-alias.m4 | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'aclocal/bsp-alias.m4')

diff --git a/aclocal/bsp-alias.m4 b/aclocal/bsp-alias.m4
index 9aafbccee0..77d8205aba 100644
--- a/aclocal/bsp-alias.m4
+++ b/aclocal/bsp-alias.m4
@@ -1,11 +1,13 @@
 dnl _RTEMS_BSP_ALIAS(BSP_ALIAS,RTEMS_BSP_FAMILY)
 dnl Internal subroutine to RTEMS_BSP_ALIAS
-AC_DEFUN([_RTEMS_BSP_ALIAS],
-[# account for "aliased" bsps which share source code
-      for bsp_cfgs in `ls "$srcdir"/"$RTEMS_TOPdir"/c/src/lib/libbsp/"$RTEMS_CPU"/*/"make/custom/$1.cfg" 2>/dev/null`; do
+AC_DEFUN([_RTEMS_BSP_ALIAS],[
+AC_REQUIRE([RTEMS_CANONICAL_TARGET_CPU])
+AC_REQUIRE([RTEMS_SOURCE_TOP])
+# account for "aliased" bsps which share source code
+      for bsp_cfgs in `ls "${RTEMS_SOURCE_ROOT}/bsps/${RTEMS_CPU}"/*/"config/$1.cfg" 2>/dev/null`; do
         $2=`echo "$bsp_cfgs" | sed \
-          -e "s,^$srcdir/$RTEMS_TOPdir/c/src/lib/libbsp/$RTEMS_CPU/,," \
-          -e "s,/make/custom/.*\.cfg$,,"`
+          -e "s,^${RTEMS_SOURCE_ROOT}/bsps/$RTEMS_CPU/,," \
+          -e "s,/config/.*\.cfg$,,"`
         break
       done
 ])
-- 
cgit v1.2.3