Patch from Ralf Corsepius <corsepiu@faw.uni-ulm.de>:

    This one is an enhancement to acpolish.

    It replaces some Makefile variables by others variable in Makefile.ins
    (tries to use unique name for some variables). It therefore eases
    parsing Makefile.ins for further automatic Makefile.in conversions in
    future.

    To apply:
        cd <rtems-source-tree>
        sh <path-to>/rtems-rc-19990407-8.sh
        ./autogen

150 files changed, 150 insertions, 150 deletions

diff --git a/c/src/tests/Makefile.in b/c/src/tests/Makefile.in
index 438c72f8db..d67371d134 100644
--- a/c/src/tests/Makefile.in
+++ b/c/src/tests/Makefile.in
@@ -15,7 +15,7 @@ PROJECT_ROOT = @PROJECT_ROOT@
 
 VPATH = @srcdir@
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/directory.cfg
 
 all: README
diff --git a/c/src/tests/libtests/Makefile.in b/c/src/tests/libtests/Makefile.in
index 35c9bec91d..ba2aecfbdb 100644
--- a/c/src/tests/libtests/Makefile.in
+++ b/c/src/tests/libtests/Makefile.in
@@ -15,7 +15,7 @@ PROJECT_ROOT = @PROJECT_ROOT@
 
 VPATH = @srcdir@
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/directory.cfg
 
 # We only build the tests for the rtems++ library if HAS_CPLUSPLUS was defined
diff --git a/c/src/tests/libtests/cpuuse/Makefile.in b/c/src/tests/libtests/cpuuse/Makefile.in
index 2298ce493b..4a8b7d5425 100644
--- a/c/src/tests/libtests/cpuuse/Makefile.in
+++ b/c/src/tests/libtests/cpuuse/Makefile.in
@@ -36,7 +36,7 @@ PRINT_SRCS=$(DOCS)
 
 PGM=${ARCH}/$(TEST).exe
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
diff --git a/c/src/tests/libtests/malloctest/Makefile.in b/c/src/tests/libtests/malloctest/Makefile.in
index 7fa0cb05cb..18445496bc 100644
--- a/c/src/tests/libtests/malloctest/Makefile.in
+++ b/c/src/tests/libtests/malloctest/Makefile.in
@@ -36,7 +36,7 @@ PRINT_SRCS=$(DOCS)
 
 PGM=${ARCH}/$(TEST).exe
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
diff --git a/c/src/tests/libtests/monitor/Makefile.in b/c/src/tests/libtests/monitor/Makefile.in
index 1f033dd4db..83573d5a1c 100644
--- a/c/src/tests/libtests/monitor/Makefile.in
+++ b/c/src/tests/libtests/monitor/Makefile.in
@@ -36,7 +36,7 @@ PRINT_SRCS=$(DOCS)
 
 PGM=${ARCH}/$(TEST).exe
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
diff --git a/c/src/tests/libtests/rtems++/Makefile.in b/c/src/tests/libtests/rtems++/Makefile.in
index b0b007c998..1238ebbac6 100644
--- a/c/src/tests/libtests/rtems++/Makefile.in
+++ b/c/src/tests/libtests/rtems++/Makefile.in
@@ -36,7 +36,7 @@ PRINT_SRCS=$(DOCS)
 
 PGM=${ARCH}/$(TEST).exe
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
diff --git a/c/src/tests/libtests/rtmonuse/Makefile.in b/c/src/tests/libtests/rtmonuse/Makefile.in
index f0509f465c..8f9235f759 100644
--- a/c/src/tests/libtests/rtmonuse/Makefile.in
+++ b/c/src/tests/libtests/rtmonuse/Makefile.in
@@ -36,7 +36,7 @@ PRINT_SRCS=$(DOCS)
 
 PGM=${ARCH}/$(TEST).exe
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
diff --git a/c/src/tests/libtests/stackchk/Makefile.in b/c/src/tests/libtests/stackchk/Makefile.in
index 1ffd34b5b5..52f923bee7 100644
--- a/c/src/tests/libtests/stackchk/Makefile.in
+++ b/c/src/tests/libtests/stackchk/Makefile.in
@@ -36,7 +36,7 @@ PRINT_SRCS=$(DOCS)
 
 PGM=${ARCH}/$(TEST).exe
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
diff --git a/c/src/tests/libtests/termios/Makefile.in b/c/src/tests/libtests/termios/Makefile.in
index d203ff0154..00227be135 100644
--- a/c/src/tests/libtests/termios/Makefile.in
+++ b/c/src/tests/libtests/termios/Makefile.in
@@ -37,7 +37,7 @@ PRINT_SRCS=$(DOCS)
 
 PGM=${ARCH}/$(SAMPLE).exe
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
diff --git a/c/src/tests/mptests/Makefile.in b/c/src/tests/mptests/Makefile.in
index b894f79ff2..cc257272ef 100644
--- a/c/src/tests/mptests/Makefile.in
+++ b/c/src/tests/mptests/Makefile.in
@@ -15,7 +15,7 @@ PROJECT_ROOT = @PROJECT_ROOT@
 
 VPATH = @srcdir@
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/directory.cfg
 
 all: README
diff --git a/c/src/tests/mptests/mp01/Makefile.in b/c/src/tests/mptests/mp01/Makefile.in
index fdcae738b7..31e2f60b0e 100644
--- a/c/src/tests/mptests/mp01/Makefile.in
+++ b/c/src/tests/mptests/mp01/Makefile.in
@@ -15,7 +15,7 @@ PROJECT_ROOT = @PROJECT_ROOT@
 
 VPATH = @srcdir@
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/directory.cfg
 
 SUB_DIRS=node1 node2
diff --git a/c/src/tests/mptests/mp01/node1/Makefile.in b/c/src/tests/mptests/mp01/node1/Makefile.in
index 39a74fa687..48c3dceca8 100644
--- a/c/src/tests/mptests/mp01/node1/Makefile.in
+++ b/c/src/tests/mptests/mp01/node1/Makefile.in
@@ -36,7 +36,7 @@ OBJS=$(C_O_FILES)
 
 PRINT_SRCS=$(DOCS)
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
diff --git a/c/src/tests/mptests/mp01/node2/Makefile.in b/c/src/tests/mptests/mp01/node2/Makefile.in
index 8dfb2d7073..5fddf4436a 100644
--- a/c/src/tests/mptests/mp01/node2/Makefile.in
+++ b/c/src/tests/mptests/mp01/node2/Makefile.in
@@ -36,7 +36,7 @@ OBJS=$(C_O_FILES)
 
 PRINT_SRCS=$(DOCS)
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
diff --git a/c/src/tests/mptests/mp02/Makefile.in b/c/src/tests/mptests/mp02/Makefile.in
index 7f79ec240a..3c6532d400 100644
--- a/c/src/tests/mptests/mp02/Makefile.in
+++ b/c/src/tests/mptests/mp02/Makefile.in
@@ -15,7 +15,7 @@ PROJECT_ROOT = @PROJECT_ROOT@
 
 VPATH = @srcdir@
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/directory.cfg
 
 SUB_DIRS=node1 node2
diff --git a/c/src/tests/mptests/mp02/node1/Makefile.in b/c/src/tests/mptests/mp02/node1/Makefile.in
index 4fd089cf70..82b2a4e4c9 100644
--- a/c/src/tests/mptests/mp02/node1/Makefile.in
+++ b/c/src/tests/mptests/mp02/node1/Makefile.in
@@ -36,7 +36,7 @@ OBJS=$(C_O_FILES)
 
 PRINT_SRCS=$(DOCS)
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
diff --git a/c/src/tests/mptests/mp02/node2/Makefile.in b/c/src/tests/mptests/mp02/node2/Makefile.in
index 3492b6fd23..2dd0dbfd6e 100644
--- a/c/src/tests/mptests/mp02/node2/Makefile.in
+++ b/c/src/tests/mptests/mp02/node2/Makefile.in
@@ -36,7 +36,7 @@ OBJS=$(C_O_FILES)
 
 PRINT_SRCS=$(DOCS)
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
diff --git a/c/src/tests/mptests/mp03/Makefile.in b/c/src/tests/mptests/mp03/Makefile.in
index a06ddd532a..37ccd4a4d8 100644
--- a/c/src/tests/mptests/mp03/Makefile.in
+++ b/c/src/tests/mptests/mp03/Makefile.in
@@ -15,7 +15,7 @@ PROJECT_ROOT = @PROJECT_ROOT@
 
 VPATH = @srcdir@
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/directory.cfg
 
 SUB_DIRS=node1 node2
diff --git a/c/src/tests/mptests/mp03/node1/Makefile.in b/c/src/tests/mptests/mp03/node1/Makefile.in
index 967a7dba18..231a156cf8 100644
--- a/c/src/tests/mptests/mp03/node1/Makefile.in
+++ b/c/src/tests/mptests/mp03/node1/Makefile.in
@@ -36,7 +36,7 @@ OBJS=$(C_O_FILES)
 
 PRINT_SRCS=$(DOCS)
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
diff --git a/c/src/tests/mptests/mp03/node2/Makefile.in b/c/src/tests/mptests/mp03/node2/Makefile.in
index 5bee0f47cb..74654e5f91 100644
--- a/c/src/tests/mptests/mp03/node2/Makefile.in
+++ b/c/src/tests/mptests/mp03/node2/Makefile.in
@@ -36,7 +36,7 @@ OBJS=$(C_O_FILES)
 
 PRINT_SRCS=$(DOCS)
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
diff --git a/c/src/tests/mptests/mp04/Makefile.in b/c/src/tests/mptests/mp04/Makefile.in
index 866670eb1d..8726cc3812 100644
--- a/c/src/tests/mptests/mp04/Makefile.in
+++ b/c/src/tests/mptests/mp04/Makefile.in
@@ -15,7 +15,7 @@ PROJECT_ROOT = @PROJECT_ROOT@
 
 VPATH = @srcdir@
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/directory.cfg
 
 SUB_DIRS=node1 node2
diff --git a/c/src/tests/mptests/mp04/node1/Makefile.in b/c/src/tests/mptests/mp04/node1/Makefile.in
index cf02c87289..70175b6e43 100644
--- a/c/src/tests/mptests/mp04/node1/Makefile.in
+++ b/c/src/tests/mptests/mp04/node1/Makefile.in
@@ -36,7 +36,7 @@ OBJS=$(C_O_FILES)
 
 PRINT_SRCS=$(DOCS)
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
diff --git a/c/src/tests/mptests/mp04/node2/Makefile.in b/c/src/tests/mptests/mp04/node2/Makefile.in
index 9f4eeb1a28..8702a8eecb 100644
--- a/c/src/tests/mptests/mp04/node2/Makefile.in
+++ b/c/src/tests/mptests/mp04/node2/Makefile.in
@@ -36,7 +36,7 @@ OBJS=$(C_O_FILES)
 
 PRINT_SRCS=$(DOCS)
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
diff --git a/c/src/tests/mptests/mp05/Makefile.in b/c/src/tests/mptests/mp05/Makefile.in
index c56b9a4a7c..23304de238 100644
--- a/c/src/tests/mptests/mp05/Makefile.in
+++ b/c/src/tests/mptests/mp05/Makefile.in
@@ -15,7 +15,7 @@ PROJECT_ROOT = @PROJECT_ROOT@
 
 VPATH = @srcdir@
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/directory.cfg
 
 SUB_DIRS=node1 node2
diff --git a/c/src/tests/mptests/mp05/node1/Makefile.in b/c/src/tests/mptests/mp05/node1/Makefile.in
index b4c7ac9ed0..d49c3c513f 100644
--- a/c/src/tests/mptests/mp05/node1/Makefile.in
+++ b/c/src/tests/mptests/mp05/node1/Makefile.in
@@ -36,7 +36,7 @@ OBJS=$(C_O_FILES)
 
 PRINT_SRCS=$(DOCS)
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
diff --git a/c/src/tests/mptests/mp05/node2/Makefile.in b/c/src/tests/mptests/mp05/node2/Makefile.in
index f44e0f3a6e..3dfd863752 100644
--- a/c/src/tests/mptests/mp05/node2/Makefile.in
+++ b/c/src/tests/mptests/mp05/node2/Makefile.in
@@ -36,7 +36,7 @@ OBJS=$(C_O_FILES)
 
 PRINT_SRCS=$(DOCS)
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
diff --git a/c/src/tests/mptests/mp06/Makefile.in b/c/src/tests/mptests/mp06/Makefile.in
index fb14611ca4..07836bf615 100644
--- a/c/src/tests/mptests/mp06/Makefile.in
+++ b/c/src/tests/mptests/mp06/Makefile.in
@@ -15,7 +15,7 @@ PROJECT_ROOT = @PROJECT_ROOT@
 
 VPATH = @srcdir@
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/directory.cfg
 
 SUB_DIRS=node1 node2
diff --git a/c/src/tests/mptests/mp06/node1/Makefile.in b/c/src/tests/mptests/mp06/node1/Makefile.in
index 7bd627f53d..217dbfe31b 100644
--- a/c/src/tests/mptests/mp06/node1/Makefile.in
+++ b/c/src/tests/mptests/mp06/node1/Makefile.in
@@ -36,7 +36,7 @@ OBJS=$(C_O_FILES)
 
 PRINT_SRCS=$(DOCS)
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
diff --git a/c/src/tests/mptests/mp06/node2/Makefile.in b/c/src/tests/mptests/mp06/node2/Makefile.in
index 660a6c0af9..6bbaa8dc36 100644
--- a/c/src/tests/mptests/mp06/node2/Makefile.in
+++ b/c/src/tests/mptests/mp06/node2/Makefile.in
@@ -36,7 +36,7 @@ OBJS=$(C_O_FILES)
 
 PRINT_SRCS=$(DOCS)
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
diff --git a/c/src/tests/mptests/mp07/Makefile.in b/c/src/tests/mptests/mp07/Makefile.in
index 80d73c43ce..d05e15dd08 100644
--- a/c/src/tests/mptests/mp07/Makefile.in
+++ b/c/src/tests/mptests/mp07/Makefile.in
@@ -15,7 +15,7 @@ PROJECT_ROOT = @PROJECT_ROOT@
 
 VPATH = @srcdir@
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/directory.cfg
 
 SUB_DIRS=node1 node2
diff --git a/c/src/tests/mptests/mp07/node1/Makefile.in b/c/src/tests/mptests/mp07/node1/Makefile.in
index d9f2f6c080..1b8964e1ba 100644
--- a/c/src/tests/mptests/mp07/node1/Makefile.in
+++ b/c/src/tests/mptests/mp07/node1/Makefile.in
@@ -36,7 +36,7 @@ OBJS=$(C_O_FILES)
 
 PRINT_SRCS=$(DOCS)
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
diff --git a/c/src/tests/mptests/mp07/node2/Makefile.in b/c/src/tests/mptests/mp07/node2/Makefile.in
index 065afa6354..019f18a424 100644
--- a/c/src/tests/mptests/mp07/node2/Makefile.in
+++ b/c/src/tests/mptests/mp07/node2/Makefile.in
@@ -36,7 +36,7 @@ OBJS=$(C_O_FILES)
 
 PRINT_SRCS=$(DOCS)
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
diff --git a/c/src/tests/mptests/mp08/Makefile.in b/c/src/tests/mptests/mp08/Makefile.in
index 353bb4b0b5..cde6164d30 100644
--- a/c/src/tests/mptests/mp08/Makefile.in
+++ b/c/src/tests/mptests/mp08/Makefile.in
@@ -15,7 +15,7 @@ PROJECT_ROOT = @PROJECT_ROOT@
 
 VPATH = @srcdir@
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/directory.cfg
 
 SUB_DIRS=node1 node2
diff --git a/c/src/tests/mptests/mp08/node1/Makefile.in b/c/src/tests/mptests/mp08/node1/Makefile.in
index 99cb7f91db..f4a820792c 100644
--- a/c/src/tests/mptests/mp08/node1/Makefile.in
+++ b/c/src/tests/mptests/mp08/node1/Makefile.in
@@ -36,7 +36,7 @@ OBJS=$(C_O_FILES)
 
 PRINT_SRCS=$(DOCS)
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
diff --git a/c/src/tests/mptests/mp08/node2/Makefile.in b/c/src/tests/mptests/mp08/node2/Makefile.in
index 381a7c9a6f..25e3011035 100644
--- a/c/src/tests/mptests/mp08/node2/Makefile.in
+++ b/c/src/tests/mptests/mp08/node2/Makefile.in
@@ -36,7 +36,7 @@ OBJS=$(C_O_FILES)
 
 PRINT_SRCS=$(DOCS)
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
diff --git a/c/src/tests/mptests/mp09/Makefile.in b/c/src/tests/mptests/mp09/Makefile.in
index 25a313087b..fefe9d29aa 100644
--- a/c/src/tests/mptests/mp09/Makefile.in
+++ b/c/src/tests/mptests/mp09/Makefile.in
@@ -15,7 +15,7 @@ PROJECT_ROOT = @PROJECT_ROOT@
 
 VPATH = @srcdir@
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/directory.cfg
 
 SUB_DIRS=node1 node2
diff --git a/c/src/tests/mptests/mp09/node1/Makefile.in b/c/src/tests/mptests/mp09/node1/Makefile.in
index 67c7182925..a0a67f1fcd 100644
--- a/c/src/tests/mptests/mp09/node1/Makefile.in
+++ b/c/src/tests/mptests/mp09/node1/Makefile.in
@@ -36,7 +36,7 @@ OBJS=$(C_O_FILES)
 
 PRINT_SRCS=$(DOCS)
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
diff --git a/c/src/tests/mptests/mp09/node2/Makefile.in b/c/src/tests/mptests/mp09/node2/Makefile.in
index 8033f1c0d5..88bcccef10 100644
--- a/c/src/tests/mptests/mp09/node2/Makefile.in
+++ b/c/src/tests/mptests/mp09/node2/Makefile.in
@@ -36,7 +36,7 @@ OBJS=$(C_O_FILES)
 
 PRINT_SRCS=$(DOCS)
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
diff --git a/c/src/tests/mptests/mp10/Makefile.in b/c/src/tests/mptests/mp10/Makefile.in
index e9db976d16..a3502cd090 100644
--- a/c/src/tests/mptests/mp10/Makefile.in
+++ b/c/src/tests/mptests/mp10/Makefile.in
@@ -15,7 +15,7 @@ PROJECT_ROOT = @PROJECT_ROOT@
 
 VPATH = @srcdir@
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/directory.cfg
 
 SUB_DIRS=node1 node2
diff --git a/c/src/tests/mptests/mp10/node1/Makefile.in b/c/src/tests/mptests/mp10/node1/Makefile.in
index c19ba2a19c..4eac90612e 100644
--- a/c/src/tests/mptests/mp10/node1/Makefile.in
+++ b/c/src/tests/mptests/mp10/node1/Makefile.in
@@ -36,7 +36,7 @@ OBJS=$(C_O_FILES)
 
 PRINT_SRCS=$(DOCS)
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
diff --git a/c/src/tests/mptests/mp10/node2/Makefile.in b/c/src/tests/mptests/mp10/node2/Makefile.in
index 92a6507279..b337d36658 100644
--- a/c/src/tests/mptests/mp10/node2/Makefile.in
+++ b/c/src/tests/mptests/mp10/node2/Makefile.in
@@ -36,7 +36,7 @@ OBJS=$(C_O_FILES)
 
 PRINT_SRCS=$(DOCS)
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
diff --git a/c/src/tests/mptests/mp11/Makefile.in b/c/src/tests/mptests/mp11/Makefile.in
index bf87ff6520..f61d1f416c 100644
--- a/c/src/tests/mptests/mp11/Makefile.in
+++ b/c/src/tests/mptests/mp11/Makefile.in
@@ -15,7 +15,7 @@ PROJECT_ROOT = @PROJECT_ROOT@
 
 VPATH = @srcdir@
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/directory.cfg
 
 SUB_DIRS=node1 node2
diff --git a/c/src/tests/mptests/mp11/node1/Makefile.in b/c/src/tests/mptests/mp11/node1/Makefile.in
index c25d7d38ee..7a6b55e902 100644
--- a/c/src/tests/mptests/mp11/node1/Makefile.in
+++ b/c/src/tests/mptests/mp11/node1/Makefile.in
@@ -36,7 +36,7 @@ OBJS=$(C_O_FILES)
 
 PRINT_SRCS=$(DOCS)
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
diff --git a/c/src/tests/mptests/mp11/node2/Makefile.in b/c/src/tests/mptests/mp11/node2/Makefile.in
index c4466d41c9..9b32116ccb 100644
--- a/c/src/tests/mptests/mp11/node2/Makefile.in
+++ b/c/src/tests/mptests/mp11/node2/Makefile.in
@@ -36,7 +36,7 @@ OBJS=$(C_O_FILES)
 
 PRINT_SRCS=$(DOCS)
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
diff --git a/c/src/tests/mptests/mp12/Makefile.in b/c/src/tests/mptests/mp12/Makefile.in
index b200805f6e..1f7c556366 100644
--- a/c/src/tests/mptests/mp12/Makefile.in
+++ b/c/src/tests/mptests/mp12/Makefile.in
@@ -15,7 +15,7 @@ PROJECT_ROOT = @PROJECT_ROOT@
 
 VPATH = @srcdir@
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/directory.cfg
 
 SUB_DIRS=node1 node2
diff --git a/c/src/tests/mptests/mp12/node1/Makefile.in b/c/src/tests/mptests/mp12/node1/Makefile.in
index fdcf40d76d..5b4eba2dad 100644
--- a/c/src/tests/mptests/mp12/node1/Makefile.in
+++ b/c/src/tests/mptests/mp12/node1/Makefile.in
@@ -36,7 +36,7 @@ OBJS=$(C_O_FILES)
 
 PRINT_SRCS=$(DOCS)
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
diff --git a/c/src/tests/mptests/mp12/node2/Makefile.in b/c/src/tests/mptests/mp12/node2/Makefile.in
index 9c90b0e44c..eb1e1e91cd 100644
--- a/c/src/tests/mptests/mp12/node2/Makefile.in
+++ b/c/src/tests/mptests/mp12/node2/Makefile.in
@@ -36,7 +36,7 @@ OBJS=$(C_O_FILES)
 
 PRINT_SRCS=$(DOCS)
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
diff --git a/c/src/tests/mptests/mp13/Makefile.in b/c/src/tests/mptests/mp13/Makefile.in
index 50a7e547f2..339f17ebd0 100644
--- a/c/src/tests/mptests/mp13/Makefile.in
+++ b/c/src/tests/mptests/mp13/Makefile.in
@@ -15,7 +15,7 @@ PROJECT_ROOT = @PROJECT_ROOT@
 
 VPATH = @srcdir@
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/directory.cfg
 
 SUB_DIRS=node1 node2
diff --git a/c/src/tests/mptests/mp13/node1/Makefile.in b/c/src/tests/mptests/mp13/node1/Makefile.in
index f47f0ea423..bd86c3a282 100644
--- a/c/src/tests/mptests/mp13/node1/Makefile.in
+++ b/c/src/tests/mptests/mp13/node1/Makefile.in
@@ -36,7 +36,7 @@ OBJS=$(C_O_FILES)
 
 PRINT_SRCS=$(DOCS)
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
diff --git a/c/src/tests/mptests/mp13/node2/Makefile.in b/c/src/tests/mptests/mp13/node2/Makefile.in
index 4fe7845ff8..4faf597754 100644
--- a/c/src/tests/mptests/mp13/node2/Makefile.in
+++ b/c/src/tests/mptests/mp13/node2/Makefile.in
@@ -36,7 +36,7 @@ OBJS=$(C_O_FILES)
 
 PRINT_SRCS=$(DOCS)
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
diff --git a/c/src/tests/mptests/mp14/Makefile.in b/c/src/tests/mptests/mp14/Makefile.in
index 74184b517d..b6f4931cd7 100644
--- a/c/src/tests/mptests/mp14/Makefile.in
+++ b/c/src/tests/mptests/mp14/Makefile.in
@@ -15,7 +15,7 @@ PROJECT_ROOT = @PROJECT_ROOT@
 
 VPATH = @srcdir@
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/directory.cfg
 
 SUB_DIRS=node1 node2
diff --git a/c/src/tests/mptests/mp14/node1/Makefile.in b/c/src/tests/mptests/mp14/node1/Makefile.in
index 9803073fbc..cde84a4351 100644
--- a/c/src/tests/mptests/mp14/node1/Makefile.in
+++ b/c/src/tests/mptests/mp14/node1/Makefile.in
@@ -36,7 +36,7 @@ OBJS=$(C_O_FILES)
 
 PRINT_SRCS=$(DOCS)
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
diff --git a/c/src/tests/mptests/mp14/node2/Makefile.in b/c/src/tests/mptests/mp14/node2/Makefile.in
index e547623ed2..9f902cd8a8 100644
--- a/c/src/tests/mptests/mp14/node2/Makefile.in
+++ b/c/src/tests/mptests/mp14/node2/Makefile.in
@@ -36,7 +36,7 @@ OBJS=$(C_O_FILES)
 
 PRINT_SRCS=$(DOCS)
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
diff --git a/c/src/tests/psxtests/Makefile.in b/c/src/tests/psxtests/Makefile.in
index 5a323bd08f..2aec9d53be 100644
--- a/c/src/tests/psxtests/Makefile.in
+++ b/c/src/tests/psxtests/Makefile.in
@@ -15,7 +15,7 @@ PROJECT_ROOT = @PROJECT_ROOT@
 
 VPATH = @srcdir@
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/directory.cfg
 
 POSIX_DIRS=psxhdrs psx01 psx02 psx03 psx04 psx05 psx06 psx07 psx08 \
diff --git a/c/src/tests/psxtests/psx01/Makefile.in b/c/src/tests/psxtests/psx01/Makefile.in
index 3917f1ee52..467265e8a1 100644
--- a/c/src/tests/psxtests/psx01/Makefile.in
+++ b/c/src/tests/psxtests/psx01/Makefile.in
@@ -36,7 +36,7 @@ PRINT_SRCS=$(DOCS)
 
 PGM=${ARCH}/$(TEST).exe
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
diff --git a/c/src/tests/psxtests/psx02/Makefile.in b/c/src/tests/psxtests/psx02/Makefile.in
index 97889086b3..1d1fbe4749 100644
--- a/c/src/tests/psxtests/psx02/Makefile.in
+++ b/c/src/tests/psxtests/psx02/Makefile.in
@@ -36,7 +36,7 @@ PRINT_SRCS=$(DOCS)
 
 PGM=${ARCH}/$(TEST).exe
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
diff --git a/c/src/tests/psxtests/psx03/Makefile.in b/c/src/tests/psxtests/psx03/Makefile.in
index d82f141afc..c6bcc0d18c 100644
--- a/c/src/tests/psxtests/psx03/Makefile.in
+++ b/c/src/tests/psxtests/psx03/Makefile.in
@@ -36,7 +36,7 @@ PRINT_SRCS=$(DOCS)
 
 PGM=${ARCH}/$(TEST).exe
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
diff --git a/c/src/tests/psxtests/psx04/Makefile.in b/c/src/tests/psxtests/psx04/Makefile.in
index 9f5401b692..bf3e52dc4b 100644
--- a/c/src/tests/psxtests/psx04/Makefile.in
+++ b/c/src/tests/psxtests/psx04/Makefile.in
@@ -36,7 +36,7 @@ PRINT_SRCS=$(DOCS)
 
 PGM=${ARCH}/$(TEST).exe
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
diff --git a/c/src/tests/psxtests/psx05/Makefile.in b/c/src/tests/psxtests/psx05/Makefile.in
index 031a082304..a65e70fad8 100644
--- a/c/src/tests/psxtests/psx05/Makefile.in
+++ b/c/src/tests/psxtests/psx05/Makefile.in
@@ -36,7 +36,7 @@ PRINT_SRCS=$(DOCS)
 
 PGM=${ARCH}/$(TEST).exe
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
diff --git a/c/src/tests/psxtests/psx06/Makefile.in b/c/src/tests/psxtests/psx06/Makefile.in
index f4cd8d078d..de1fda9a8d 100644
--- a/c/src/tests/psxtests/psx06/Makefile.in
+++ b/c/src/tests/psxtests/psx06/Makefile.in
@@ -36,7 +36,7 @@ PRINT_SRCS=$(DOCS)
 
 PGM=${ARCH}/$(TEST).exe
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
diff --git a/c/src/tests/psxtests/psx07/Makefile.in b/c/src/tests/psxtests/psx07/Makefile.in
index 6be9c7d299..b0a11f8e7c 100644
--- a/c/src/tests/psxtests/psx07/Makefile.in
+++ b/c/src/tests/psxtests/psx07/Makefile.in
@@ -36,7 +36,7 @@ PRINT_SRCS=$(DOCS)
 
 PGM=${ARCH}/$(TEST).exe
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
diff --git a/c/src/tests/psxtests/psx08/Makefile.in b/c/src/tests/psxtests/psx08/Makefile.in
index 952736c7de..7c4db01cd8 100644
--- a/c/src/tests/psxtests/psx08/Makefile.in
+++ b/c/src/tests/psxtests/psx08/Makefile.in
@@ -36,7 +36,7 @@ PRINT_SRCS=$(DOCS)
 
 PGM=${ARCH}/$(TEST).exe
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
diff --git a/c/src/tests/psxtests/psx09/Makefile.in b/c/src/tests/psxtests/psx09/Makefile.in
index 6e999f0659..85ed73988b 100644
--- a/c/src/tests/psxtests/psx09/Makefile.in
+++ b/c/src/tests/psxtests/psx09/Makefile.in
@@ -36,7 +36,7 @@ PRINT_SRCS=$(DOCS)
 
 PGM=${ARCH}/$(TEST).exe
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
diff --git a/c/src/tests/psxtests/psx10/Makefile.in b/c/src/tests/psxtests/psx10/Makefile.in
index 65dbe57eb5..3e6cd2586c 100644
--- a/c/src/tests/psxtests/psx10/Makefile.in
+++ b/c/src/tests/psxtests/psx10/Makefile.in
@@ -36,7 +36,7 @@ PRINT_SRCS=$(DOCS)
 
 PGM=${ARCH}/$(TEST).exe
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
diff --git a/c/src/tests/psxtests/psx11/Makefile.in b/c/src/tests/psxtests/psx11/Makefile.in
index cb65677450..caade94483 100644
--- a/c/src/tests/psxtests/psx11/Makefile.in
+++ b/c/src/tests/psxtests/psx11/Makefile.in
@@ -36,7 +36,7 @@ PRINT_SRCS=$(DOCS)
 
 PGM=${ARCH}/$(TEST).exe
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
diff --git a/c/src/tests/psxtests/psx12/Makefile.in b/c/src/tests/psxtests/psx12/Makefile.in
index 1913d99273..29197566f9 100644
--- a/c/src/tests/psxtests/psx12/Makefile.in
+++ b/c/src/tests/psxtests/psx12/Makefile.in
@@ -36,7 +36,7 @@ PRINT_SRCS=$(DOCS)
 
 PGM=${ARCH}/$(TEST).exe
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
diff --git a/c/src/tests/psxtests/psx13/Makefile.in b/c/src/tests/psxtests/psx13/Makefile.in
index 299e26f49e..353ace1979 100644
--- a/c/src/tests/psxtests/psx13/Makefile.in
+++ b/c/src/tests/psxtests/psx13/Makefile.in
@@ -36,7 +36,7 @@ PRINT_SRCS=$(DOCS)
 
 PGM=${ARCH}/$(TEST).exe
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
diff --git a/c/src/tests/psxtests/psxfile01/Makefile.in b/c/src/tests/psxtests/psxfile01/Makefile.in
index 04f6780815..0b60b33b96 100644
--- a/c/src/tests/psxtests/psxfile01/Makefile.in
+++ b/c/src/tests/psxtests/psxfile01/Makefile.in
@@ -36,7 +36,7 @@ PRINT_SRCS=$(DOCS)
 
 PGM=${ARCH}/$(TEST).exe
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
diff --git a/c/src/tests/psxtests/psxfile02/Makefile.in b/c/src/tests/psxtests/psxfile02/Makefile.in
index 3b4915a012..a344fcbe0d 100644
--- a/c/src/tests/psxtests/psxfile02/Makefile.in
+++ b/c/src/tests/psxtests/psxfile02/Makefile.in
@@ -36,7 +36,7 @@ PRINT_SRCS=$(DOCS)
 
 PGM=${ARCH}/$(TEST).exe
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
diff --git a/c/src/tests/psxtests/psxhdrs/Makefile.in b/c/src/tests/psxtests/psxhdrs/Makefile.in
index 96cc23cb56..08f51e67cb 100644
--- a/c/src/tests/psxtests/psxhdrs/Makefile.in
+++ b/c/src/tests/psxtests/psxhdrs/Makefile.in
@@ -50,7 +50,7 @@ SRCS=$(C_FILES) $(H_FILES)
 SRCS=$(C_FILES) $(H_FILES)
 OBJS=$(C_O_FILES)
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/lib.cfg
 
 #
diff --git a/c/src/tests/psxtests/psxmount/Makefile.in b/c/src/tests/psxtests/psxmount/Makefile.in
index 2f6b1f4177..c5e0c19dcf 100644
--- a/c/src/tests/psxtests/psxmount/Makefile.in
+++ b/c/src/tests/psxtests/psxmount/Makefile.in
@@ -36,7 +36,7 @@ PRINT_SRCS=$(DOCS)
 
 PGM=${ARCH}/$(TEST).exe
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
diff --git a/c/src/tests/psxtests/psxreaddir/Makefile.in b/c/src/tests/psxtests/psxreaddir/Makefile.in
index 3f3726454b..5a8f28f40e 100644
--- a/c/src/tests/psxtests/psxreaddir/Makefile.in
+++ b/c/src/tests/psxtests/psxreaddir/Makefile.in
@@ -36,7 +36,7 @@ PRINT_SRCS=$(DOCS)
 
 PGM=${ARCH}/$(TEST).exe
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
diff --git a/c/src/tests/psxtests/psxstat/Makefile.in b/c/src/tests/psxtests/psxstat/Makefile.in
index 26b2b6e2f5..64a3ca7578 100644
--- a/c/src/tests/psxtests/psxstat/Makefile.in
+++ b/c/src/tests/psxtests/psxstat/Makefile.in
@@ -36,7 +36,7 @@ PRINT_SRCS=$(DOCS)
 
 PGM=${ARCH}/$(TEST).exe
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
diff --git a/c/src/tests/psxtests/psxtime/Makefile.in b/c/src/tests/psxtests/psxtime/Makefile.in
index 7d8fa88bb9..740862bcc7 100644
--- a/c/src/tests/psxtests/psxtime/Makefile.in
+++ b/c/src/tests/psxtests/psxtime/Makefile.in
@@ -36,7 +36,7 @@ PRINT_SRCS=$(DOCS)
 
 PGM=${ARCH}/$(TEST).exe
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
diff --git a/c/src/tests/psxtests/psxtimer/Makefile.in b/c/src/tests/psxtests/psxtimer/Makefile.in
index 20edab513d..916c4c3ae7 100644
--- a/c/src/tests/psxtests/psxtimer/Makefile.in
+++ b/c/src/tests/psxtests/psxtimer/Makefile.in
@@ -36,7 +36,7 @@ PRINT_SRCS=$(DOCS)
 
 PGM=${ARCH}/$(TEST).exe
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
diff --git a/c/src/tests/psxtests/support/Makefile.in b/c/src/tests/psxtests/support/Makefile.in
index 7e2a70babe..6f20287456 100644
--- a/c/src/tests/psxtests/support/Makefile.in
+++ b/c/src/tests/psxtests/support/Makefile.in
@@ -15,7 +15,7 @@ PROJECT_ROOT = @PROJECT_ROOT@
 
 VPATH = @srcdir@
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/directory.cfg
 
 all: 
diff --git a/c/src/tests/psxtests/support/include/Makefile.in b/c/src/tests/psxtests/support/include/Makefile.in
index d9a6a00551..16edc1883d 100644
--- a/c/src/tests/psxtests/support/include/Makefile.in
+++ b/c/src/tests/psxtests/support/include/Makefile.in
@@ -21,7 +21,7 @@ SYS_H_FILES=
 
 SRCS=$(H_FILES) $(SYS_H_FILES)
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 CLEAN_ADDITIONS +=
diff --git a/c/src/tests/samples/Makefile.in b/c/src/tests/samples/Makefile.in
index afbd53cc2b..d8aef81719 100644
--- a/c/src/tests/samples/Makefile.in
+++ b/c/src/tests/samples/Makefile.in
@@ -15,7 +15,7 @@ PROJECT_ROOT = @PROJECT_ROOT@
 
 VPATH = @srcdir@
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/directory.cfg
 
 # cdtest is a C++ constructor/destructor test
diff --git a/c/src/tests/samples/base_mp/Makefile.in b/c/src/tests/samples/base_mp/Makefile.in
index 46748a57c7..228dbef5ef 100644
--- a/c/src/tests/samples/base_mp/Makefile.in
+++ b/c/src/tests/samples/base_mp/Makefile.in
@@ -15,7 +15,7 @@ PROJECT_ROOT = @PROJECT_ROOT@
 
 VPATH = @srcdir@
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/directory.cfg
 
 SUB_DIRS=node1 node2
diff --git a/c/src/tests/samples/base_mp/node1/Makefile.in b/c/src/tests/samples/base_mp/node1/Makefile.in
index 9ed5818f61..7b4990dede 100644
--- a/c/src/tests/samples/base_mp/node1/Makefile.in
+++ b/c/src/tests/samples/base_mp/node1/Makefile.in
@@ -36,7 +36,7 @@ OBJS=$(C_O_FILES)
 
 PRINT_SRCS=$(DOCS)
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
diff --git a/c/src/tests/samples/base_mp/node2/Makefile.in b/c/src/tests/samples/base_mp/node2/Makefile.in
index 785983b9c6..1db244f2fa 100644
--- a/c/src/tests/samples/base_mp/node2/Makefile.in
+++ b/c/src/tests/samples/base_mp/node2/Makefile.in
@@ -36,7 +36,7 @@ OBJS=$(C_O_FILES)
 
 PRINT_SRCS=$(DOCS)
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
diff --git a/c/src/tests/samples/base_sp/Makefile.in b/c/src/tests/samples/base_sp/Makefile.in
index 6652fa0d23..d8bd17666d 100644
--- a/c/src/tests/samples/base_sp/Makefile.in
+++ b/c/src/tests/samples/base_sp/Makefile.in
@@ -35,7 +35,7 @@ OBJS=$(C_O_FILES)
 
 PRINT_SRCS=$(DOCS)
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
diff --git a/c/src/tests/samples/cdtest/Makefile.in b/c/src/tests/samples/cdtest/Makefile.in
index b5d7645182..515a9e6b88 100644
--- a/c/src/tests/samples/cdtest/Makefile.in
+++ b/c/src/tests/samples/cdtest/Makefile.in
@@ -41,7 +41,7 @@ PRINT_SRCS=$(DOCS)
 
 PGM=${ARCH}/$(SAMPLE).exe
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
diff --git a/c/src/tests/samples/hello/Makefile.in b/c/src/tests/samples/hello/Makefile.in
index 0c36bd4e76..12680e0a92 100644
--- a/c/src/tests/samples/hello/Makefile.in
+++ b/c/src/tests/samples/hello/Makefile.in
@@ -37,7 +37,7 @@ PRINT_SRCS=$(DOCS)
 
 PGM=${ARCH}/$(SAMPLE).exe
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
diff --git a/c/src/tests/samples/paranoia/Makefile.in b/c/src/tests/samples/paranoia/Makefile.in
index d8aab5af92..4b359f040d 100644
--- a/c/src/tests/samples/paranoia/Makefile.in
+++ b/c/src/tests/samples/paranoia/Makefile.in
@@ -37,7 +37,7 @@ PRINT_SRCS=$(DOCS)
 
 PGM=${ARCH}/$(SAMPLE).exe
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
diff --git a/c/src/tests/samples/ticker/Makefile.in b/c/src/tests/samples/ticker/Makefile.in
index d0f396273b..281b56e4fc 100644
--- a/c/src/tests/samples/ticker/Makefile.in
+++ b/c/src/tests/samples/ticker/Makefile.in
@@ -37,7 +37,7 @@ PRINT_SRCS=$(DOCS)
 
 PGM=${ARCH}/$(SAMPLE).exe
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
diff --git a/c/src/tests/samples/unlimited/Makefile.in b/c/src/tests/samples/unlimited/Makefile.in
index d7f2251520..73e23af1ef 100644
--- a/c/src/tests/samples/unlimited/Makefile.in
+++ b/c/src/tests/samples/unlimited/Makefile.in
@@ -37,7 +37,7 @@ PRINT_SRCS=$(DOCS)
 
 PGM=${ARCH}/$(SAMPLE).exe
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
diff --git a/c/src/tests/sptests/Makefile.in b/c/src/tests/sptests/Makefile.in
index 9175e43da2..90bc5e7e03 100644
--- a/c/src/tests/sptests/Makefile.in
+++ b/c/src/tests/sptests/Makefile.in
@@ -15,7 +15,7 @@ PROJECT_ROOT = @PROJECT_ROOT@
 
 VPATH = @srcdir@
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/directory.cfg
 
 all: README
diff --git a/c/src/tests/sptests/sp01/Makefile.in b/c/src/tests/sptests/sp01/Makefile.in
index 77ea5a613a..8a071f9689 100644
--- a/c/src/tests/sptests/sp01/Makefile.in
+++ b/c/src/tests/sptests/sp01/Makefile.in
@@ -36,7 +36,7 @@ PRINT_SRCS=$(DOCS)
 
 PGM=${ARCH}/$(TEST).exe
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
diff --git a/c/src/tests/sptests/sp02/Makefile.in b/c/src/tests/sptests/sp02/Makefile.in
index 795e9ee1e4..495bcdca6b 100644
--- a/c/src/tests/sptests/sp02/Makefile.in
+++ b/c/src/tests/sptests/sp02/Makefile.in
@@ -36,7 +36,7 @@ PRINT_SRCS=$(DOCS)
 
 PGM=${ARCH}/$(TEST).exe
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
diff --git a/c/src/tests/sptests/sp03/Makefile.in b/c/src/tests/sptests/sp03/Makefile.in
index 429fda7346..f5751bc3b6 100644
--- a/c/src/tests/sptests/sp03/Makefile.in
+++ b/c/src/tests/sptests/sp03/Makefile.in
@@ -36,7 +36,7 @@ PRINT_SRCS=$(DOCS)
 
 PGM=${ARCH}/$(TEST).exe
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
diff --git a/c/src/tests/sptests/sp04/Makefile.in b/c/src/tests/sptests/sp04/Makefile.in
index 68b4d64385..65174c076e 100644
--- a/c/src/tests/sptests/sp04/Makefile.in
+++ b/c/src/tests/sptests/sp04/Makefile.in
@@ -36,7 +36,7 @@ PRINT_SRCS=$(DOCS)
 
 PGM=${ARCH}/$(TEST).exe
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
diff --git a/c/src/tests/sptests/sp05/Makefile.in b/c/src/tests/sptests/sp05/Makefile.in
index 20b6a1fc62..2c882f1bd1 100644
--- a/c/src/tests/sptests/sp05/Makefile.in
+++ b/c/src/tests/sptests/sp05/Makefile.in
@@ -36,7 +36,7 @@ PRINT_SRCS=$(DOCS)
 
 PGM=${ARCH}/$(TEST).exe
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
diff --git a/c/src/tests/sptests/sp06/Makefile.in b/c/src/tests/sptests/sp06/Makefile.in
index 1e52c327ae..842d78b82e 100644
--- a/c/src/tests/sptests/sp06/Makefile.in
+++ b/c/src/tests/sptests/sp06/Makefile.in
@@ -36,7 +36,7 @@ PRINT_SRCS=$(DOCS)
 
 PGM=${ARCH}/$(TEST).exe
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
diff --git a/c/src/tests/sptests/sp07/Makefile.in b/c/src/tests/sptests/sp07/Makefile.in
index 637951703a..1a6f7a3578 100644
--- a/c/src/tests/sptests/sp07/Makefile.in
+++ b/c/src/tests/sptests/sp07/Makefile.in
@@ -36,7 +36,7 @@ PRINT_SRCS=$(DOCS)
 
 PGM=${ARCH}/$(TEST).exe
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
diff --git a/c/src/tests/sptests/sp08/Makefile.in b/c/src/tests/sptests/sp08/Makefile.in
index c853443889..c4f39c2abf 100644
--- a/c/src/tests/sptests/sp08/Makefile.in
+++ b/c/src/tests/sptests/sp08/Makefile.in
@@ -36,7 +36,7 @@ PRINT_SRCS=$(DOCS)
 
 PGM=${ARCH}/$(TEST).exe
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
diff --git a/c/src/tests/sptests/sp09/Makefile.in b/c/src/tests/sptests/sp09/Makefile.in
index 6a2dc27ce4..a0e29165b7 100644
--- a/c/src/tests/sptests/sp09/Makefile.in
+++ b/c/src/tests/sptests/sp09/Makefile.in
@@ -39,7 +39,7 @@ PRINT_SRCS=$(DOCS)
 
 PGM=${ARCH}/$(TEST).exe
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
diff --git a/c/src/tests/sptests/sp11/Makefile.in b/c/src/tests/sptests/sp11/Makefile.in
index ee60ac2acd..2b0fbec9eb 100644
--- a/c/src/tests/sptests/sp11/Makefile.in
+++ b/c/src/tests/sptests/sp11/Makefile.in
@@ -36,7 +36,7 @@ PRINT_SRCS=$(DOCS)
 
 PGM=${ARCH}/$(TEST).exe
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
diff --git a/c/src/tests/sptests/sp12/Makefile.in b/c/src/tests/sptests/sp12/Makefile.in
index 209a4c7f2a..4862aa2666 100644
--- a/c/src/tests/sptests/sp12/Makefile.in
+++ b/c/src/tests/sptests/sp12/Makefile.in
@@ -36,7 +36,7 @@ PRINT_SRCS=$(DOCS)
 
 PGM=${ARCH}/$(TEST).exe
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
diff --git a/c/src/tests/sptests/sp13/Makefile.in b/c/src/tests/sptests/sp13/Makefile.in
index d783e5b72d..5c6e0e4311 100644
--- a/c/src/tests/sptests/sp13/Makefile.in
+++ b/c/src/tests/sptests/sp13/Makefile.in
@@ -36,7 +36,7 @@ PRINT_SRCS=$(DOCS)
 
 PGM=${ARCH}/$(TEST).exe
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
diff --git a/c/src/tests/sptests/sp14/Makefile.in b/c/src/tests/sptests/sp14/Makefile.in
index 547f6d13bb..00c6b0f884 100644
--- a/c/src/tests/sptests/sp14/Makefile.in
+++ b/c/src/tests/sptests/sp14/Makefile.in
@@ -36,7 +36,7 @@ PRINT_SRCS=$(DOCS)
 
 PGM=${ARCH}/$(TEST).exe
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
diff --git a/c/src/tests/sptests/sp15/Makefile.in b/c/src/tests/sptests/sp15/Makefile.in
index 06c355d374..8a39378fc1 100644
--- a/c/src/tests/sptests/sp15/Makefile.in
+++ b/c/src/tests/sptests/sp15/Makefile.in
@@ -36,7 +36,7 @@ PRINT_SRCS=$(DOCS)
 
 PGM=${ARCH}/$(TEST).exe
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
diff --git a/c/src/tests/sptests/sp16/Makefile.in b/c/src/tests/sptests/sp16/Makefile.in
index d8e9862c30..5cd6d0d648 100644
--- a/c/src/tests/sptests/sp16/Makefile.in
+++ b/c/src/tests/sptests/sp16/Makefile.in
@@ -36,7 +36,7 @@ PRINT_SRCS=$(DOCS)
 
 PGM=${ARCH}/$(TEST).exe
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
diff --git a/c/src/tests/sptests/sp17/Makefile.in b/c/src/tests/sptests/sp17/Makefile.in
index 0276715d61..d2d9dd2756 100644
--- a/c/src/tests/sptests/sp17/Makefile.in
+++ b/c/src/tests/sptests/sp17/Makefile.in
@@ -36,7 +36,7 @@ PRINT_SRCS=$(DOCS)
 
 PGM=${ARCH}/$(TEST).exe
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
diff --git a/c/src/tests/sptests/sp19/Makefile.in b/c/src/tests/sptests/sp19/Makefile.in
index 65d76bc115..89697217af 100644
--- a/c/src/tests/sptests/sp19/Makefile.in
+++ b/c/src/tests/sptests/sp19/Makefile.in
@@ -36,7 +36,7 @@ PRINT_SRCS=$(DOCS)
 
 PGM=${ARCH}/$(TEST).exe
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
diff --git a/c/src/tests/sptests/sp20/Makefile.in b/c/src/tests/sptests/sp20/Makefile.in
index 2bfbe3f769..d1ca826876 100644
--- a/c/src/tests/sptests/sp20/Makefile.in
+++ b/c/src/tests/sptests/sp20/Makefile.in
@@ -36,7 +36,7 @@ PRINT_SRCS=$(DOCS)
 
 PGM=${ARCH}/$(TEST).exe
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
diff --git a/c/src/tests/sptests/sp21/Makefile.in b/c/src/tests/sptests/sp21/Makefile.in
index dff4d91127..7ca641923d 100644
--- a/c/src/tests/sptests/sp21/Makefile.in
+++ b/c/src/tests/sptests/sp21/Makefile.in
@@ -36,7 +36,7 @@ PRINT_SRCS=$(DOCS)
 
 PGM=${ARCH}/$(TEST).exe
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
diff --git a/c/src/tests/sptests/sp22/Makefile.in b/c/src/tests/sptests/sp22/Makefile.in
index 268ce46873..d8d608ac64 100644
--- a/c/src/tests/sptests/sp22/Makefile.in
+++ b/c/src/tests/sptests/sp22/Makefile.in
@@ -36,7 +36,7 @@ PRINT_SRCS=$(DOCS)
 
 PGM=${ARCH}/$(TEST).exe
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
diff --git a/c/src/tests/sptests/sp23/Makefile.in b/c/src/tests/sptests/sp23/Makefile.in
index 5a4cccf961..d4e432ad7c 100644
--- a/c/src/tests/sptests/sp23/Makefile.in
+++ b/c/src/tests/sptests/sp23/Makefile.in
@@ -36,7 +36,7 @@ PRINT_SRCS=$(DOCS)
 
 PGM=${ARCH}/$(TEST).exe
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
diff --git a/c/src/tests/sptests/sp24/Makefile.in b/c/src/tests/sptests/sp24/Makefile.in
index 6441e74f92..61f21f52bc 100644
--- a/c/src/tests/sptests/sp24/Makefile.in
+++ b/c/src/tests/sptests/sp24/Makefile.in
@@ -36,7 +36,7 @@ PRINT_SRCS=$(DOCS)
 
 PGM=${ARCH}/$(TEST).exe
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
diff --git a/c/src/tests/sptests/sp25/Makefile.in b/c/src/tests/sptests/sp25/Makefile.in
index 5cceaa8383..8d14995856 100644
--- a/c/src/tests/sptests/sp25/Makefile.in
+++ b/c/src/tests/sptests/sp25/Makefile.in
@@ -36,7 +36,7 @@ PRINT_SRCS=$(DOCS)
 
 PGM=${ARCH}/$(TEST).exe
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
diff --git a/c/src/tests/sptests/spfatal/Makefile.in b/c/src/tests/sptests/spfatal/Makefile.in
index 8700071ad2..655521792e 100644
--- a/c/src/tests/sptests/spfatal/Makefile.in
+++ b/c/src/tests/sptests/spfatal/Makefile.in
@@ -36,7 +36,7 @@ PRINT_SRCS=$(DOCS)
 
 PGM=${ARCH}/$(TEST).exe
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
diff --git a/c/src/tests/sptests/spsize/Makefile.in b/c/src/tests/sptests/spsize/Makefile.in
index 51fddd222c..bd5c44f1ce 100644
--- a/c/src/tests/sptests/spsize/Makefile.in
+++ b/c/src/tests/sptests/spsize/Makefile.in
@@ -29,7 +29,7 @@ OBJS=$(C_O_FILES)
 
 PGM=${ARCH}/size.exe
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
diff --git a/c/src/tests/support/Makefile.in b/c/src/tests/support/Makefile.in
index 63ea7fb3dc..14af158fab 100644
--- a/c/src/tests/support/Makefile.in
+++ b/c/src/tests/support/Makefile.in
@@ -15,7 +15,7 @@ PROJECT_ROOT = @PROJECT_ROOT@
 
 VPATH = @srcdir@
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/directory.cfg
 
 SUB_DIRS=include stubdr wrapup
diff --git a/c/src/tests/support/include/Makefile.in b/c/src/tests/support/include/Makefile.in
index 419728fa27..e2e569afcd 100644
--- a/c/src/tests/support/include/Makefile.in
+++ b/c/src/tests/support/include/Makefile.in
@@ -21,7 +21,7 @@ SYS_H_FILES=
 
 SRCS=$(H_FILES) $(SYS_H_FILES)
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 CLEAN_ADDITIONS +=
diff --git a/c/src/tests/support/stubdr/Makefile.in b/c/src/tests/support/stubdr/Makefile.in
index 620023daa2..3a798ecd9b 100644
--- a/c/src/tests/support/stubdr/Makefile.in
+++ b/c/src/tests/support/stubdr/Makefile.in
@@ -32,7 +32,7 @@ S_O_FILES=$(S_FILES:%.S=${ARCH}/%.o)
 SRCS=$(DOCS) $(C_FILES) $(H_FILES)
 OBJS=$(C_O_FILES)
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
diff --git a/c/src/tests/support/wrapup/Makefile.in b/c/src/tests/support/wrapup/Makefile.in
index 5fb881c4e2..748b9a5369 100644
--- a/c/src/tests/support/wrapup/Makefile.in
+++ b/c/src/tests/support/wrapup/Makefile.in
@@ -21,7 +21,7 @@ GENERIC_PIECES=stubdr
 OBJS=$(foreach piece, $(GENERIC_PIECES), ../$(piece)/$(ARCH)/$(piece).rel)
 LIB=$(ARCH)/libtest.a
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/lib.cfg
 
 #
diff --git a/c/src/tests/tmtests/Makefile.in b/c/src/tests/tmtests/Makefile.in
index d90c3736ba..22886fc607 100644
--- a/c/src/tests/tmtests/Makefile.in
+++ b/c/src/tests/tmtests/Makefile.in
@@ -15,7 +15,7 @@ PROJECT_ROOT = @PROJECT_ROOT@
 
 VPATH = @srcdir@
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/directory.cfg
 
 all: README
diff --git a/c/src/tests/tmtests/include/Makefile.in b/c/src/tests/tmtests/include/Makefile.in
index 32300b32cd..999a656466 100644
--- a/c/src/tests/tmtests/include/Makefile.in
+++ b/c/src/tests/tmtests/include/Makefile.in
@@ -21,7 +21,7 @@ SYS_H_FILES=
 
 SRCS=$(H_FILES) $(SYS_H_FILES)
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 CLEAN_ADDITIONS +=
diff --git a/c/src/tests/tmtests/tm01/Makefile.in b/c/src/tests/tmtests/tm01/Makefile.in
index bc72a8730e..ba6102aefb 100644
--- a/c/src/tests/tmtests/tm01/Makefile.in
+++ b/c/src/tests/tmtests/tm01/Makefile.in
@@ -36,7 +36,7 @@ PRINT_SRCS=$(DOCS)
 
 PGM=${ARCH}/$(TEST).exe
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
diff --git a/c/src/tests/tmtests/tm02/Makefile.in b/c/src/tests/tmtests/tm02/Makefile.in
index f40e1a13c8..aafb72b8ee 100644
--- a/c/src/tests/tmtests/tm02/Makefile.in
+++ b/c/src/tests/tmtests/tm02/Makefile.in
@@ -36,7 +36,7 @@ PRINT_SRCS=$(DOCS)
 
 PGM=${ARCH}/$(TEST).exe
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
diff --git a/c/src/tests/tmtests/tm03/Makefile.in b/c/src/tests/tmtests/tm03/Makefile.in
index 351a391766..cdd69388c2 100644
--- a/c/src/tests/tmtests/tm03/Makefile.in
+++ b/c/src/tests/tmtests/tm03/Makefile.in
@@ -36,7 +36,7 @@ PRINT_SRCS=$(DOCS)
 
 PGM=${ARCH}/$(TEST).exe
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
diff --git a/c/src/tests/tmtests/tm04/Makefile.in b/c/src/tests/tmtests/tm04/Makefile.in
index 3c8db96ed7..87a58b74b2 100644
--- a/c/src/tests/tmtests/tm04/Makefile.in
+++ b/c/src/tests/tmtests/tm04/Makefile.in
@@ -36,7 +36,7 @@ PRINT_SRCS=$(DOCS)
 
 PGM=${ARCH}/$(TEST).exe
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
diff --git a/c/src/tests/tmtests/tm05/Makefile.in b/c/src/tests/tmtests/tm05/Makefile.in
index b4631010e1..736813d572 100644
--- a/c/src/tests/tmtests/tm05/Makefile.in
+++ b/c/src/tests/tmtests/tm05/Makefile.in
@@ -36,7 +36,7 @@ PRINT_SRCS=$(DOCS)
 
 PGM=${ARCH}/$(TEST).exe
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
diff --git a/c/src/tests/tmtests/tm06/Makefile.in b/c/src/tests/tmtests/tm06/Makefile.in
index 8e9e9a7e28..ad81afed2f 100644
--- a/c/src/tests/tmtests/tm06/Makefile.in
+++ b/c/src/tests/tmtests/tm06/Makefile.in
@@ -36,7 +36,7 @@ PRINT_SRCS=$(DOCS)
 
 PGM=${ARCH}/$(TEST).exe
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
diff --git a/c/src/tests/tmtests/tm07/Makefile.in b/c/src/tests/tmtests/tm07/Makefile.in
index 864c7a3a87..2960ff858b 100644
--- a/c/src/tests/tmtests/tm07/Makefile.in
+++ b/c/src/tests/tmtests/tm07/Makefile.in
@@ -36,7 +36,7 @@ PRINT_SRCS=$(DOCS)
 
 PGM=${ARCH}/$(TEST).exe
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
diff --git a/c/src/tests/tmtests/tm08/Makefile.in b/c/src/tests/tmtests/tm08/Makefile.in
index cf9eff7690..7ee432e6f4 100644
--- a/c/src/tests/tmtests/tm08/Makefile.in
+++ b/c/src/tests/tmtests/tm08/Makefile.in
@@ -36,7 +36,7 @@ PRINT_SRCS=$(DOCS)
 
 PGM=${ARCH}/$(TEST).exe
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
diff --git a/c/src/tests/tmtests/tm09/Makefile.in b/c/src/tests/tmtests/tm09/Makefile.in
index 9f8c235db2..09c4387040 100644
--- a/c/src/tests/tmtests/tm09/Makefile.in
+++ b/c/src/tests/tmtests/tm09/Makefile.in
@@ -36,7 +36,7 @@ PRINT_SRCS=$(DOCS)
 
 PGM=${ARCH}/$(TEST).exe
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
diff --git a/c/src/tests/tmtests/tm10/Makefile.in b/c/src/tests/tmtests/tm10/Makefile.in
index 078c276fe6..51c19b35c0 100644
--- a/c/src/tests/tmtests/tm10/Makefile.in
+++ b/c/src/tests/tmtests/tm10/Makefile.in
@@ -36,7 +36,7 @@ PRINT_SRCS=$(DOCS)
 
 PGM=${ARCH}/$(TEST).exe
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
diff --git a/c/src/tests/tmtests/tm11/Makefile.in b/c/src/tests/tmtests/tm11/Makefile.in
index 1c1484812e..69e4e574ef 100644
--- a/c/src/tests/tmtests/tm11/Makefile.in
+++ b/c/src/tests/tmtests/tm11/Makefile.in
@@ -36,7 +36,7 @@ PRINT_SRCS=$(DOCS)
 
 PGM=${ARCH}/$(TEST).exe
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
diff --git a/c/src/tests/tmtests/tm12/Makefile.in b/c/src/tests/tmtests/tm12/Makefile.in
index 7fd91e082a..a1bf8a35f9 100644
--- a/c/src/tests/tmtests/tm12/Makefile.in
+++ b/c/src/tests/tmtests/tm12/Makefile.in
@@ -36,7 +36,7 @@ PRINT_SRCS=$(DOCS)
 
 PGM=${ARCH}/$(TEST).exe
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
diff --git a/c/src/tests/tmtests/tm13/Makefile.in b/c/src/tests/tmtests/tm13/Makefile.in
index 3944950f03..ab3f713a07 100644
--- a/c/src/tests/tmtests/tm13/Makefile.in
+++ b/c/src/tests/tmtests/tm13/Makefile.in
@@ -36,7 +36,7 @@ PRINT_SRCS=$(DOCS)
 
 PGM=${ARCH}/$(TEST).exe
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
diff --git a/c/src/tests/tmtests/tm14/Makefile.in b/c/src/tests/tmtests/tm14/Makefile.in
index 6e5507164c..d67a0b0a96 100644
--- a/c/src/tests/tmtests/tm14/Makefile.in
+++ b/c/src/tests/tmtests/tm14/Makefile.in
@@ -36,7 +36,7 @@ PRINT_SRCS=$(DOCS)
 
 PGM=${ARCH}/$(TEST).exe
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
diff --git a/c/src/tests/tmtests/tm15/Makefile.in b/c/src/tests/tmtests/tm15/Makefile.in
index 5d8ba669aa..11c5a51122 100644
--- a/c/src/tests/tmtests/tm15/Makefile.in
+++ b/c/src/tests/tmtests/tm15/Makefile.in
@@ -36,7 +36,7 @@ PRINT_SRCS=$(DOCS)
 
 PGM=${ARCH}/$(TEST).exe
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
diff --git a/c/src/tests/tmtests/tm16/Makefile.in b/c/src/tests/tmtests/tm16/Makefile.in
index 002e8fd72a..d14180fb39 100644
--- a/c/src/tests/tmtests/tm16/Makefile.in
+++ b/c/src/tests/tmtests/tm16/Makefile.in
@@ -36,7 +36,7 @@ PRINT_SRCS=$(DOCS)
 
 PGM=${ARCH}/$(TEST).exe
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
diff --git a/c/src/tests/tmtests/tm17/Makefile.in b/c/src/tests/tmtests/tm17/Makefile.in
index 236584d6e4..fb5ddd76bb 100644
--- a/c/src/tests/tmtests/tm17/Makefile.in
+++ b/c/src/tests/tmtests/tm17/Makefile.in
@@ -36,7 +36,7 @@ PRINT_SRCS=$(DOCS)
 
 PGM=${ARCH}/$(TEST).exe
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
diff --git a/c/src/tests/tmtests/tm18/Makefile.in b/c/src/tests/tmtests/tm18/Makefile.in
index af2582cbf5..7acb79e8a2 100644
--- a/c/src/tests/tmtests/tm18/Makefile.in
+++ b/c/src/tests/tmtests/tm18/Makefile.in
@@ -36,7 +36,7 @@ PRINT_SRCS=$(DOCS)
 
 PGM=${ARCH}/$(TEST).exe
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
diff --git a/c/src/tests/tmtests/tm19/Makefile.in b/c/src/tests/tmtests/tm19/Makefile.in
index 203ac85cd5..7db3ec19ca 100644
--- a/c/src/tests/tmtests/tm19/Makefile.in
+++ b/c/src/tests/tmtests/tm19/Makefile.in
@@ -36,7 +36,7 @@ PRINT_SRCS=$(DOCS)
 
 PGM=${ARCH}/$(TEST).exe
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
diff --git a/c/src/tests/tmtests/tm20/Makefile.in b/c/src/tests/tmtests/tm20/Makefile.in
index 3dcaffd576..65d26f6eac 100644
--- a/c/src/tests/tmtests/tm20/Makefile.in
+++ b/c/src/tests/tmtests/tm20/Makefile.in
@@ -36,7 +36,7 @@ PRINT_SRCS=$(DOCS)
 
 PGM=${ARCH}/$(TEST).exe
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
diff --git a/c/src/tests/tmtests/tm21/Makefile.in b/c/src/tests/tmtests/tm21/Makefile.in
index 1a630f45b1..5232d6415d 100644
--- a/c/src/tests/tmtests/tm21/Makefile.in
+++ b/c/src/tests/tmtests/tm21/Makefile.in
@@ -36,7 +36,7 @@ PRINT_SRCS=$(DOCS)
 
 PGM=${ARCH}/$(TEST).exe
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
diff --git a/c/src/tests/tmtests/tm22/Makefile.in b/c/src/tests/tmtests/tm22/Makefile.in
index a155ab7d02..fde0e10549 100644
--- a/c/src/tests/tmtests/tm22/Makefile.in
+++ b/c/src/tests/tmtests/tm22/Makefile.in
@@ -36,7 +36,7 @@ PRINT_SRCS=$(DOCS)
 
 PGM=${ARCH}/$(TEST).exe
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
diff --git a/c/src/tests/tmtests/tm23/Makefile.in b/c/src/tests/tmtests/tm23/Makefile.in
index f62abd05bf..900fe8c45c 100644
--- a/c/src/tests/tmtests/tm23/Makefile.in
+++ b/c/src/tests/tmtests/tm23/Makefile.in
@@ -36,7 +36,7 @@ PRINT_SRCS=$(DOCS)
 
 PGM=${ARCH}/$(TEST).exe
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
diff --git a/c/src/tests/tmtests/tm24/Makefile.in b/c/src/tests/tmtests/tm24/Makefile.in
index b79a6cae80..41347ac3c1 100644
--- a/c/src/tests/tmtests/tm24/Makefile.in
+++ b/c/src/tests/tmtests/tm24/Makefile.in
@@ -36,7 +36,7 @@ PRINT_SRCS=$(DOCS)
 
 PGM=${ARCH}/$(TEST).exe
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
diff --git a/c/src/tests/tmtests/tm25/Makefile.in b/c/src/tests/tmtests/tm25/Makefile.in
index 017aa571ab..e23bf8cc49 100644
--- a/c/src/tests/tmtests/tm25/Makefile.in
+++ b/c/src/tests/tmtests/tm25/Makefile.in
@@ -36,7 +36,7 @@ PRINT_SRCS=$(DOCS)
 
 PGM=${ARCH}/$(TEST).exe
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
diff --git a/c/src/tests/tmtests/tm26/Makefile.in b/c/src/tests/tmtests/tm26/Makefile.in
index 4627b6c337..51279938d4 100644
--- a/c/src/tests/tmtests/tm26/Makefile.in
+++ b/c/src/tests/tmtests/tm26/Makefile.in
@@ -36,7 +36,7 @@ PRINT_SRCS=$(DOCS)
 
 PGM=${ARCH}/$(TEST).exe
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
diff --git a/c/src/tests/tmtests/tm27/Makefile.in b/c/src/tests/tmtests/tm27/Makefile.in
index 0d3046ff95..ecc91194ec 100644
--- a/c/src/tests/tmtests/tm27/Makefile.in
+++ b/c/src/tests/tmtests/tm27/Makefile.in
@@ -36,7 +36,7 @@ PRINT_SRCS=$(DOCS)
 
 PGM=${ARCH}/$(TEST).exe
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
diff --git a/c/src/tests/tmtests/tm28/Makefile.in b/c/src/tests/tmtests/tm28/Makefile.in
index 86846cd0fe..b9cd1e37cb 100644
--- a/c/src/tests/tmtests/tm28/Makefile.in
+++ b/c/src/tests/tmtests/tm28/Makefile.in
@@ -36,7 +36,7 @@ PRINT_SRCS=$(DOCS)
 
 PGM=${ARCH}/$(TEST).exe
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
diff --git a/c/src/tests/tmtests/tm29/Makefile.in b/c/src/tests/tmtests/tm29/Makefile.in
index a7f10393b4..f0895ae3c6 100644
--- a/c/src/tests/tmtests/tm29/Makefile.in
+++ b/c/src/tests/tmtests/tm29/Makefile.in
@@ -36,7 +36,7 @@ PRINT_SRCS=$(DOCS)
 
 PGM=${ARCH}/$(TEST).exe
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
diff --git a/c/src/tests/tmtests/tmck/Makefile.in b/c/src/tests/tmtests/tmck/Makefile.in
index e3cdca991d..af597ad0d4 100644
--- a/c/src/tests/tmtests/tmck/Makefile.in
+++ b/c/src/tests/tmtests/tmck/Makefile.in
@@ -36,7 +36,7 @@ PRINT_SRCS=$(DOCS)
 
 PGM=${ARCH}/$(TEST).exe
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
diff --git a/c/src/tests/tmtests/tmoverhd/Makefile.in b/c/src/tests/tmtests/tmoverhd/Makefile.in
index 5a2cfb3362..1e93c92129 100644
--- a/c/src/tests/tmtests/tmoverhd/Makefile.in
+++ b/c/src/tests/tmtests/tmoverhd/Makefile.in
@@ -36,7 +36,7 @@ PRINT_SRCS=$(DOCS)
 
 PGM=${ARCH}/$(TEST).exe
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
diff --git a/c/src/tests/tools/Makefile.in b/c/src/tests/tools/Makefile.in
index fa0805b157..bb102ce6c8 100644
--- a/c/src/tests/tools/Makefile.in
+++ b/c/src/tests/tools/Makefile.in
@@ -15,7 +15,7 @@ PROJECT_ROOT = @PROJECT_ROOT@
 
 VPATH = @srcdir@
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
 include $(RTEMS_ROOT)/make/directory.cfg
 
 SUB_DIRS=generic $(wildcard $(RTEMS_CPU))