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

43 files changed, 43 insertions, 43 deletions

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
 
 #