From 5c3511e5cff1019e683239fd71f6ea3254e1eccb Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel.sherrill@OARcorp.com>
Date: Fri, 30 Jan 1998 21:49:51 +0000
Subject: Big patch form Ralf Corsepius described in this email:

  Here is the result of my nightly work to get RTEMS_ROOT=$srcdir working
  with different shells and relative/absolute paths.

  What I did is relatively simple in principle:
  Instead of setting RTEMS_ROOT in configure.in and then let configure
  substitute @RTEMS_ROOT@ inside the Makefiles, I now let each Makefile
  set RTEMS_ROOT from each Makefile's @top_srcdir@ value.

  The difference is subtile, but with enormous side effects:
  - If RTEMS_ROOT is set in configure, then the same single value will be
  propagated to all Makefiles. This breaks using relative paths, as the
  relative path to the root of the source tree is used inside of all
  subdirectory Makefiles.
  - Now each Makefile.in sets RTEMS_ROOT = @top_srcdir@.  top_srcdir  is
  computed individually by configure for each single Makefile.in, hereby
  receiving the correct value, no matter if relative or absolute paths are
  used.

  To get this working, I needed to remove setting RTEMS_ROOT from
  target.cfg.in, because this overrides the value of RTEMS_ROOT from each
  individual Makefile.


  Furthermore, I removed RTEMS_CUSTOM from the Makefiles and replaced all
  "include $(RTEMS_CUSTOM)" directives with"include
  $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP)". Perhaps you don't like this,
  but I think, to have one variable less is clearer and easier to
  understand than having several variables refering to the next one.


  I enclose a small patch to this mail, which
  - fixes the config.h problem (to finally clearify misunderstands)
  - removes assignment/subsitution of RTEMS_ROOT from configure.in
  - contains a workaround for the application Makefile's RTEMS_ROOT
  problem (reported by Eric)
  - removes some unused lines from the toplevel Makefile.in
  - removes assignment of RTEMS_ROOT from make/target.cfg.in
---
 c/src/tests/mptests/Makefile.in            | 6 ++----
 c/src/tests/mptests/mp01/Makefile.in       | 6 ++----
 c/src/tests/mptests/mp01/node1/Makefile.in | 6 ++----
 c/src/tests/mptests/mp01/node2/Makefile.in | 6 ++----
 c/src/tests/mptests/mp02/Makefile.in       | 6 ++----
 c/src/tests/mptests/mp02/node1/Makefile.in | 6 ++----
 c/src/tests/mptests/mp02/node2/Makefile.in | 6 ++----
 c/src/tests/mptests/mp03/Makefile.in       | 6 ++----
 c/src/tests/mptests/mp03/node1/Makefile.in | 6 ++----
 c/src/tests/mptests/mp03/node2/Makefile.in | 6 ++----
 c/src/tests/mptests/mp04/Makefile.in       | 6 ++----
 c/src/tests/mptests/mp04/node1/Makefile.in | 6 ++----
 c/src/tests/mptests/mp04/node2/Makefile.in | 6 ++----
 c/src/tests/mptests/mp05/Makefile.in       | 6 ++----
 c/src/tests/mptests/mp05/node1/Makefile.in | 6 ++----
 c/src/tests/mptests/mp05/node2/Makefile.in | 6 ++----
 c/src/tests/mptests/mp06/Makefile.in       | 6 ++----
 c/src/tests/mptests/mp06/node1/Makefile.in | 6 ++----
 c/src/tests/mptests/mp06/node2/Makefile.in | 6 ++----
 c/src/tests/mptests/mp07/Makefile.in       | 6 ++----
 c/src/tests/mptests/mp07/node1/Makefile.in | 6 ++----
 c/src/tests/mptests/mp07/node2/Makefile.in | 6 ++----
 c/src/tests/mptests/mp08/Makefile.in       | 6 ++----
 c/src/tests/mptests/mp08/node1/Makefile.in | 6 ++----
 c/src/tests/mptests/mp08/node2/Makefile.in | 6 ++----
 c/src/tests/mptests/mp09/Makefile.in       | 6 ++----
 c/src/tests/mptests/mp09/node1/Makefile.in | 6 ++----
 c/src/tests/mptests/mp09/node2/Makefile.in | 6 ++----
 c/src/tests/mptests/mp10/Makefile.in       | 6 ++----
 c/src/tests/mptests/mp10/node1/Makefile.in | 6 ++----
 c/src/tests/mptests/mp10/node2/Makefile.in | 6 ++----
 c/src/tests/mptests/mp11/Makefile.in       | 6 ++----
 c/src/tests/mptests/mp11/node1/Makefile.in | 6 ++----
 c/src/tests/mptests/mp11/node2/Makefile.in | 6 ++----
 c/src/tests/mptests/mp12/Makefile.in       | 6 ++----
 c/src/tests/mptests/mp12/node1/Makefile.in | 6 ++----
 c/src/tests/mptests/mp12/node2/Makefile.in | 6 ++----
 c/src/tests/mptests/mp13/Makefile.in       | 6 ++----
 c/src/tests/mptests/mp13/node1/Makefile.in | 6 ++----
 c/src/tests/mptests/mp13/node2/Makefile.in | 6 ++----
 c/src/tests/mptests/mp14/Makefile.in       | 6 ++----
 c/src/tests/mptests/mp14/node1/Makefile.in | 6 ++----
 c/src/tests/mptests/mp14/node2/Makefile.in | 6 ++----
 43 files changed, 86 insertions(+), 172 deletions(-)

(limited to 'c/src/tests/mptests')

diff --git a/c/src/tests/mptests/Makefile.in b/c/src/tests/mptests/Makefile.in
index bde186b7d3..aa1c166788 100644
--- a/c/src/tests/mptests/Makefile.in
+++ b/c/src/tests/mptests/Makefile.in
@@ -4,13 +4,11 @@
 
 @SET_MAKE@
 srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
-RTEMS_ROOT = @RTEMS_ROOT@
+RTEMS_ROOT = @top_srcdir@
 PROJECT_ROOT = @PROJECT_ROOT@
-RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
-include $(RTEMS_CUSTOM)
+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 6eb6205261..9090167761 100644
--- a/c/src/tests/mptests/mp01/Makefile.in
+++ b/c/src/tests/mptests/mp01/Makefile.in
@@ -4,13 +4,11 @@
 
 @SET_MAKE@
 srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
-RTEMS_ROOT = @RTEMS_ROOT@
+RTEMS_ROOT = @top_srcdir@
 PROJECT_ROOT = @PROJECT_ROOT@
-RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
-include $(RTEMS_CUSTOM)
+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 cd74337444..3573ffbdf3 100644
--- a/c/src/tests/mptests/mp01/node1/Makefile.in
+++ b/c/src/tests/mptests/mp01/node1/Makefile.in
@@ -4,11 +4,9 @@
 
 @SET_MAKE@
 srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@:@srcdir@/..
-RTEMS_ROOT = @RTEMS_ROOT@
+RTEMS_ROOT = @top_srcdir@
 PROJECT_ROOT = @PROJECT_ROOT@
-RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 NODE=1
 TEST=mp01
@@ -31,7 +29,7 @@ OBJS=$(C_O_FILES)
 
 PRINT_SRCS=$(DOCS)
 
-include $(RTEMS_CUSTOM)
+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 b3c7f8e576..33a7c559ba 100644
--- a/c/src/tests/mptests/mp01/node2/Makefile.in
+++ b/c/src/tests/mptests/mp01/node2/Makefile.in
@@ -4,11 +4,9 @@
 
 @SET_MAKE@
 srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@:@srcdir@/..
-RTEMS_ROOT = @RTEMS_ROOT@
+RTEMS_ROOT = @top_srcdir@
 PROJECT_ROOT = @PROJECT_ROOT@
-RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 NODE=2
 TEST=mp01
@@ -31,7 +29,7 @@ OBJS=$(C_O_FILES)
 
 PRINT_SRCS=$(DOCS)
 
-include $(RTEMS_CUSTOM)
+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 6eb6205261..9090167761 100644
--- a/c/src/tests/mptests/mp02/Makefile.in
+++ b/c/src/tests/mptests/mp02/Makefile.in
@@ -4,13 +4,11 @@
 
 @SET_MAKE@
 srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
-RTEMS_ROOT = @RTEMS_ROOT@
+RTEMS_ROOT = @top_srcdir@
 PROJECT_ROOT = @PROJECT_ROOT@
-RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
-include $(RTEMS_CUSTOM)
+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 8988365eb3..fa102f135e 100644
--- a/c/src/tests/mptests/mp02/node1/Makefile.in
+++ b/c/src/tests/mptests/mp02/node1/Makefile.in
@@ -4,11 +4,9 @@
 
 @SET_MAKE@
 srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@:@srcdir@/..
-RTEMS_ROOT = @RTEMS_ROOT@
+RTEMS_ROOT = @top_srcdir@
 PROJECT_ROOT = @PROJECT_ROOT@
-RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 NODE=1
 TEST=mp02
@@ -31,7 +29,7 @@ OBJS=$(C_O_FILES)
 
 PRINT_SRCS=$(DOCS)
 
-include $(RTEMS_CUSTOM)
+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 1df41f8bdc..ed3c8218a3 100644
--- a/c/src/tests/mptests/mp02/node2/Makefile.in
+++ b/c/src/tests/mptests/mp02/node2/Makefile.in
@@ -4,11 +4,9 @@
 
 @SET_MAKE@
 srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@:@srcdir@/..
-RTEMS_ROOT = @RTEMS_ROOT@
+RTEMS_ROOT = @top_srcdir@
 PROJECT_ROOT = @PROJECT_ROOT@
-RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 NODE=2
 TEST=mp02
@@ -31,7 +29,7 @@ OBJS=$(C_O_FILES)
 
 PRINT_SRCS=$(DOCS)
 
-include $(RTEMS_CUSTOM)
+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 6eb6205261..9090167761 100644
--- a/c/src/tests/mptests/mp03/Makefile.in
+++ b/c/src/tests/mptests/mp03/Makefile.in
@@ -4,13 +4,11 @@
 
 @SET_MAKE@
 srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
-RTEMS_ROOT = @RTEMS_ROOT@
+RTEMS_ROOT = @top_srcdir@
 PROJECT_ROOT = @PROJECT_ROOT@
-RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
-include $(RTEMS_CUSTOM)
+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 ca36c384d4..fb171d0d8a 100644
--- a/c/src/tests/mptests/mp03/node1/Makefile.in
+++ b/c/src/tests/mptests/mp03/node1/Makefile.in
@@ -4,11 +4,9 @@
 
 @SET_MAKE@
 srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@:@srcdir@/..
-RTEMS_ROOT = @RTEMS_ROOT@
+RTEMS_ROOT = @top_srcdir@
 PROJECT_ROOT = @PROJECT_ROOT@
-RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 NODE=1
 TEST=mp03
@@ -31,7 +29,7 @@ OBJS=$(C_O_FILES)
 
 PRINT_SRCS=$(DOCS)
 
-include $(RTEMS_CUSTOM)
+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 1d4e1436b5..c88e09a297 100644
--- a/c/src/tests/mptests/mp03/node2/Makefile.in
+++ b/c/src/tests/mptests/mp03/node2/Makefile.in
@@ -4,11 +4,9 @@
 
 @SET_MAKE@
 srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@:@srcdir@/..
-RTEMS_ROOT = @RTEMS_ROOT@
+RTEMS_ROOT = @top_srcdir@
 PROJECT_ROOT = @PROJECT_ROOT@
-RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 NODE=2
 TEST=mp03
@@ -31,7 +29,7 @@ OBJS=$(C_O_FILES)
 
 PRINT_SRCS=$(DOCS)
 
-include $(RTEMS_CUSTOM)
+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 6eb6205261..9090167761 100644
--- a/c/src/tests/mptests/mp04/Makefile.in
+++ b/c/src/tests/mptests/mp04/Makefile.in
@@ -4,13 +4,11 @@
 
 @SET_MAKE@
 srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
-RTEMS_ROOT = @RTEMS_ROOT@
+RTEMS_ROOT = @top_srcdir@
 PROJECT_ROOT = @PROJECT_ROOT@
-RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
-include $(RTEMS_CUSTOM)
+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 3923f48842..7bb1301ebc 100644
--- a/c/src/tests/mptests/mp04/node1/Makefile.in
+++ b/c/src/tests/mptests/mp04/node1/Makefile.in
@@ -4,11 +4,9 @@
 
 @SET_MAKE@
 srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@:@srcdir@/..
-RTEMS_ROOT = @RTEMS_ROOT@
+RTEMS_ROOT = @top_srcdir@
 PROJECT_ROOT = @PROJECT_ROOT@
-RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 NODE=1
 TEST=mp04
@@ -31,7 +29,7 @@ OBJS=$(C_O_FILES)
 
 PRINT_SRCS=$(DOCS)
 
-include $(RTEMS_CUSTOM)
+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 be31d52d46..ca4efd0c26 100644
--- a/c/src/tests/mptests/mp04/node2/Makefile.in
+++ b/c/src/tests/mptests/mp04/node2/Makefile.in
@@ -4,11 +4,9 @@
 
 @SET_MAKE@
 srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@:@srcdir@/..
-RTEMS_ROOT = @RTEMS_ROOT@
+RTEMS_ROOT = @top_srcdir@
 PROJECT_ROOT = @PROJECT_ROOT@
-RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 NODE=2
 TEST=mp04
@@ -31,7 +29,7 @@ OBJS=$(C_O_FILES)
 
 PRINT_SRCS=$(DOCS)
 
-include $(RTEMS_CUSTOM)
+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 6eb6205261..9090167761 100644
--- a/c/src/tests/mptests/mp05/Makefile.in
+++ b/c/src/tests/mptests/mp05/Makefile.in
@@ -4,13 +4,11 @@
 
 @SET_MAKE@
 srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
-RTEMS_ROOT = @RTEMS_ROOT@
+RTEMS_ROOT = @top_srcdir@
 PROJECT_ROOT = @PROJECT_ROOT@
-RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
-include $(RTEMS_CUSTOM)
+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 7820014fd7..ff8fdcb7f7 100644
--- a/c/src/tests/mptests/mp05/node1/Makefile.in
+++ b/c/src/tests/mptests/mp05/node1/Makefile.in
@@ -4,11 +4,9 @@
 
 @SET_MAKE@
 srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@:@srcdir@/..
-RTEMS_ROOT = @RTEMS_ROOT@
+RTEMS_ROOT = @top_srcdir@
 PROJECT_ROOT = @PROJECT_ROOT@
-RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 NODE=1
 TEST=mp05
@@ -31,7 +29,7 @@ OBJS=$(C_O_FILES)
 
 PRINT_SRCS=$(DOCS)
 
-include $(RTEMS_CUSTOM)
+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 a8f903f159..81efd27b68 100644
--- a/c/src/tests/mptests/mp05/node2/Makefile.in
+++ b/c/src/tests/mptests/mp05/node2/Makefile.in
@@ -4,11 +4,9 @@
 
 @SET_MAKE@
 srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@:@srcdir@/..
-RTEMS_ROOT = @RTEMS_ROOT@
+RTEMS_ROOT = @top_srcdir@
 PROJECT_ROOT = @PROJECT_ROOT@
-RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 NODE=2
 TEST=mp05
@@ -31,7 +29,7 @@ OBJS=$(C_O_FILES)
 
 PRINT_SRCS=$(DOCS)
 
-include $(RTEMS_CUSTOM)
+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 6eb6205261..9090167761 100644
--- a/c/src/tests/mptests/mp06/Makefile.in
+++ b/c/src/tests/mptests/mp06/Makefile.in
@@ -4,13 +4,11 @@
 
 @SET_MAKE@
 srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
-RTEMS_ROOT = @RTEMS_ROOT@
+RTEMS_ROOT = @top_srcdir@
 PROJECT_ROOT = @PROJECT_ROOT@
-RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
-include $(RTEMS_CUSTOM)
+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 b574c8fc6e..80628ebbb4 100644
--- a/c/src/tests/mptests/mp06/node1/Makefile.in
+++ b/c/src/tests/mptests/mp06/node1/Makefile.in
@@ -4,11 +4,9 @@
 
 @SET_MAKE@
 srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@:@srcdir@/..
-RTEMS_ROOT = @RTEMS_ROOT@
+RTEMS_ROOT = @top_srcdir@
 PROJECT_ROOT = @PROJECT_ROOT@
-RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 NODE=1
 TEST=mp06
@@ -31,7 +29,7 @@ OBJS=$(C_O_FILES)
 
 PRINT_SRCS=$(DOCS)
 
-include $(RTEMS_CUSTOM)
+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 28c18c998b..ed9908f70c 100644
--- a/c/src/tests/mptests/mp06/node2/Makefile.in
+++ b/c/src/tests/mptests/mp06/node2/Makefile.in
@@ -4,11 +4,9 @@
 
 @SET_MAKE@
 srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@:@srcdir@/..
-RTEMS_ROOT = @RTEMS_ROOT@
+RTEMS_ROOT = @top_srcdir@
 PROJECT_ROOT = @PROJECT_ROOT@
-RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 NODE=2
 TEST=mp06
@@ -31,7 +29,7 @@ OBJS=$(C_O_FILES)
 
 PRINT_SRCS=$(DOCS)
 
-include $(RTEMS_CUSTOM)
+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 6eb6205261..9090167761 100644
--- a/c/src/tests/mptests/mp07/Makefile.in
+++ b/c/src/tests/mptests/mp07/Makefile.in
@@ -4,13 +4,11 @@
 
 @SET_MAKE@
 srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
-RTEMS_ROOT = @RTEMS_ROOT@
+RTEMS_ROOT = @top_srcdir@
 PROJECT_ROOT = @PROJECT_ROOT@
-RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
-include $(RTEMS_CUSTOM)
+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 bec276e248..8344b15c0e 100644
--- a/c/src/tests/mptests/mp07/node1/Makefile.in
+++ b/c/src/tests/mptests/mp07/node1/Makefile.in
@@ -4,11 +4,9 @@
 
 @SET_MAKE@
 srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@:@srcdir@/..
-RTEMS_ROOT = @RTEMS_ROOT@
+RTEMS_ROOT = @top_srcdir@
 PROJECT_ROOT = @PROJECT_ROOT@
-RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 NODE=1
 TEST=mp07
@@ -31,7 +29,7 @@ OBJS=$(C_O_FILES)
 
 PRINT_SRCS=$(DOCS)
 
-include $(RTEMS_CUSTOM)
+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 394b1866b5..de4f73678d 100644
--- a/c/src/tests/mptests/mp07/node2/Makefile.in
+++ b/c/src/tests/mptests/mp07/node2/Makefile.in
@@ -4,11 +4,9 @@
 
 @SET_MAKE@
 srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@:@srcdir@/..
-RTEMS_ROOT = @RTEMS_ROOT@
+RTEMS_ROOT = @top_srcdir@
 PROJECT_ROOT = @PROJECT_ROOT@
-RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 NODE=2
 TEST=mp07
@@ -31,7 +29,7 @@ OBJS=$(C_O_FILES)
 
 PRINT_SRCS=$(DOCS)
 
-include $(RTEMS_CUSTOM)
+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 6eb6205261..9090167761 100644
--- a/c/src/tests/mptests/mp08/Makefile.in
+++ b/c/src/tests/mptests/mp08/Makefile.in
@@ -4,13 +4,11 @@
 
 @SET_MAKE@
 srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
-RTEMS_ROOT = @RTEMS_ROOT@
+RTEMS_ROOT = @top_srcdir@
 PROJECT_ROOT = @PROJECT_ROOT@
-RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
-include $(RTEMS_CUSTOM)
+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 74744d29ad..b87baa7e1c 100644
--- a/c/src/tests/mptests/mp08/node1/Makefile.in
+++ b/c/src/tests/mptests/mp08/node1/Makefile.in
@@ -4,11 +4,9 @@
 
 @SET_MAKE@
 srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@:@srcdir@/..
-RTEMS_ROOT = @RTEMS_ROOT@
+RTEMS_ROOT = @top_srcdir@
 PROJECT_ROOT = @PROJECT_ROOT@
-RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 NODE=1
 TEST=mp08
@@ -31,7 +29,7 @@ OBJS=$(C_O_FILES)
 
 PRINT_SRCS=$(DOCS)
 
-include $(RTEMS_CUSTOM)
+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 23b8bfb6d3..f5fc63b7d9 100644
--- a/c/src/tests/mptests/mp08/node2/Makefile.in
+++ b/c/src/tests/mptests/mp08/node2/Makefile.in
@@ -4,11 +4,9 @@
 
 @SET_MAKE@
 srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@:@srcdir@/..
-RTEMS_ROOT = @RTEMS_ROOT@
+RTEMS_ROOT = @top_srcdir@
 PROJECT_ROOT = @PROJECT_ROOT@
-RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 NODE=2
 TEST=mp08
@@ -31,7 +29,7 @@ OBJS=$(C_O_FILES)
 
 PRINT_SRCS=$(DOCS)
 
-include $(RTEMS_CUSTOM)
+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 6eb6205261..9090167761 100644
--- a/c/src/tests/mptests/mp09/Makefile.in
+++ b/c/src/tests/mptests/mp09/Makefile.in
@@ -4,13 +4,11 @@
 
 @SET_MAKE@
 srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
-RTEMS_ROOT = @RTEMS_ROOT@
+RTEMS_ROOT = @top_srcdir@
 PROJECT_ROOT = @PROJECT_ROOT@
-RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
-include $(RTEMS_CUSTOM)
+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 92d682008e..917530d146 100644
--- a/c/src/tests/mptests/mp09/node1/Makefile.in
+++ b/c/src/tests/mptests/mp09/node1/Makefile.in
@@ -4,11 +4,9 @@
 
 @SET_MAKE@
 srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@:@srcdir@/..
-RTEMS_ROOT = @RTEMS_ROOT@
+RTEMS_ROOT = @top_srcdir@
 PROJECT_ROOT = @PROJECT_ROOT@
-RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 NODE=1
 TEST=mp09
@@ -31,7 +29,7 @@ OBJS=$(C_O_FILES)
 
 PRINT_SRCS=$(DOCS)
 
-include $(RTEMS_CUSTOM)
+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 5099a42253..ff9bba00dd 100644
--- a/c/src/tests/mptests/mp09/node2/Makefile.in
+++ b/c/src/tests/mptests/mp09/node2/Makefile.in
@@ -4,11 +4,9 @@
 
 @SET_MAKE@
 srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@:@srcdir@/..
-RTEMS_ROOT = @RTEMS_ROOT@
+RTEMS_ROOT = @top_srcdir@
 PROJECT_ROOT = @PROJECT_ROOT@
-RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 NODE=2
 TEST=mp09
@@ -31,7 +29,7 @@ OBJS=$(C_O_FILES)
 
 PRINT_SRCS=$(DOCS)
 
-include $(RTEMS_CUSTOM)
+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 6eb6205261..9090167761 100644
--- a/c/src/tests/mptests/mp10/Makefile.in
+++ b/c/src/tests/mptests/mp10/Makefile.in
@@ -4,13 +4,11 @@
 
 @SET_MAKE@
 srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
-RTEMS_ROOT = @RTEMS_ROOT@
+RTEMS_ROOT = @top_srcdir@
 PROJECT_ROOT = @PROJECT_ROOT@
-RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
-include $(RTEMS_CUSTOM)
+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 ac7d2a1cee..c1d24ea13a 100644
--- a/c/src/tests/mptests/mp10/node1/Makefile.in
+++ b/c/src/tests/mptests/mp10/node1/Makefile.in
@@ -4,11 +4,9 @@
 
 @SET_MAKE@
 srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@:@srcdir@/..
-RTEMS_ROOT = @RTEMS_ROOT@
+RTEMS_ROOT = @top_srcdir@
 PROJECT_ROOT = @PROJECT_ROOT@
-RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 NODE=1
 TEST=mp10
@@ -31,7 +29,7 @@ OBJS=$(C_O_FILES)
 
 PRINT_SRCS=$(DOCS)
 
-include $(RTEMS_CUSTOM)
+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 1c0f461c4c..bb8f49d980 100644
--- a/c/src/tests/mptests/mp10/node2/Makefile.in
+++ b/c/src/tests/mptests/mp10/node2/Makefile.in
@@ -4,11 +4,9 @@
 
 @SET_MAKE@
 srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@:@srcdir@/..
-RTEMS_ROOT = @RTEMS_ROOT@
+RTEMS_ROOT = @top_srcdir@
 PROJECT_ROOT = @PROJECT_ROOT@
-RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 NODE=2
 TEST=mp10
@@ -31,7 +29,7 @@ OBJS=$(C_O_FILES)
 
 PRINT_SRCS=$(DOCS)
 
-include $(RTEMS_CUSTOM)
+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 6eb6205261..9090167761 100644
--- a/c/src/tests/mptests/mp11/Makefile.in
+++ b/c/src/tests/mptests/mp11/Makefile.in
@@ -4,13 +4,11 @@
 
 @SET_MAKE@
 srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
-RTEMS_ROOT = @RTEMS_ROOT@
+RTEMS_ROOT = @top_srcdir@
 PROJECT_ROOT = @PROJECT_ROOT@
-RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
-include $(RTEMS_CUSTOM)
+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 c440b739b3..ea6c2a2a81 100644
--- a/c/src/tests/mptests/mp11/node1/Makefile.in
+++ b/c/src/tests/mptests/mp11/node1/Makefile.in
@@ -4,11 +4,9 @@
 
 @SET_MAKE@
 srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@:@srcdir@/..
-RTEMS_ROOT = @RTEMS_ROOT@
+RTEMS_ROOT = @top_srcdir@
 PROJECT_ROOT = @PROJECT_ROOT@
-RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 NODE=1
 TEST=mp11
@@ -31,7 +29,7 @@ OBJS=$(C_O_FILES)
 
 PRINT_SRCS=$(DOCS)
 
-include $(RTEMS_CUSTOM)
+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 f56f3f1265..0073e6f1d9 100644
--- a/c/src/tests/mptests/mp11/node2/Makefile.in
+++ b/c/src/tests/mptests/mp11/node2/Makefile.in
@@ -4,11 +4,9 @@
 
 @SET_MAKE@
 srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@:@srcdir@/..
-RTEMS_ROOT = @RTEMS_ROOT@
+RTEMS_ROOT = @top_srcdir@
 PROJECT_ROOT = @PROJECT_ROOT@
-RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 NODE=2
 TEST=mp11
@@ -31,7 +29,7 @@ OBJS=$(C_O_FILES)
 
 PRINT_SRCS=$(DOCS)
 
-include $(RTEMS_CUSTOM)
+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 6eb6205261..9090167761 100644
--- a/c/src/tests/mptests/mp12/Makefile.in
+++ b/c/src/tests/mptests/mp12/Makefile.in
@@ -4,13 +4,11 @@
 
 @SET_MAKE@
 srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
-RTEMS_ROOT = @RTEMS_ROOT@
+RTEMS_ROOT = @top_srcdir@
 PROJECT_ROOT = @PROJECT_ROOT@
-RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
-include $(RTEMS_CUSTOM)
+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 27f53e8c8a..717cb67576 100644
--- a/c/src/tests/mptests/mp12/node1/Makefile.in
+++ b/c/src/tests/mptests/mp12/node1/Makefile.in
@@ -4,11 +4,9 @@
 
 @SET_MAKE@
 srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@:@srcdir@/..
-RTEMS_ROOT = @RTEMS_ROOT@
+RTEMS_ROOT = @top_srcdir@
 PROJECT_ROOT = @PROJECT_ROOT@
-RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 NODE=1
 TEST=mp12
@@ -31,7 +29,7 @@ OBJS=$(C_O_FILES)
 
 PRINT_SRCS=$(DOCS)
 
-include $(RTEMS_CUSTOM)
+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 c5673c4079..3d5865c98f 100644
--- a/c/src/tests/mptests/mp12/node2/Makefile.in
+++ b/c/src/tests/mptests/mp12/node2/Makefile.in
@@ -4,11 +4,9 @@
 
 @SET_MAKE@
 srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@:@srcdir@/..
-RTEMS_ROOT = @RTEMS_ROOT@
+RTEMS_ROOT = @top_srcdir@
 PROJECT_ROOT = @PROJECT_ROOT@
-RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 NODE=2
 TEST=mp12
@@ -31,7 +29,7 @@ OBJS=$(C_O_FILES)
 
 PRINT_SRCS=$(DOCS)
 
-include $(RTEMS_CUSTOM)
+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 6eb6205261..9090167761 100644
--- a/c/src/tests/mptests/mp13/Makefile.in
+++ b/c/src/tests/mptests/mp13/Makefile.in
@@ -4,13 +4,11 @@
 
 @SET_MAKE@
 srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
-RTEMS_ROOT = @RTEMS_ROOT@
+RTEMS_ROOT = @top_srcdir@
 PROJECT_ROOT = @PROJECT_ROOT@
-RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
-include $(RTEMS_CUSTOM)
+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 3df5360ef9..6cf55facc8 100644
--- a/c/src/tests/mptests/mp13/node1/Makefile.in
+++ b/c/src/tests/mptests/mp13/node1/Makefile.in
@@ -4,11 +4,9 @@
 
 @SET_MAKE@
 srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@:@srcdir@/..
-RTEMS_ROOT = @RTEMS_ROOT@
+RTEMS_ROOT = @top_srcdir@
 PROJECT_ROOT = @PROJECT_ROOT@
-RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 NODE=1
 TEST=mp13
@@ -31,7 +29,7 @@ OBJS=$(C_O_FILES)
 
 PRINT_SRCS=$(DOCS)
 
-include $(RTEMS_CUSTOM)
+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 6b7100144b..fa5b35cb79 100644
--- a/c/src/tests/mptests/mp13/node2/Makefile.in
+++ b/c/src/tests/mptests/mp13/node2/Makefile.in
@@ -4,11 +4,9 @@
 
 @SET_MAKE@
 srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@:@srcdir@/..
-RTEMS_ROOT = @RTEMS_ROOT@
+RTEMS_ROOT = @top_srcdir@
 PROJECT_ROOT = @PROJECT_ROOT@
-RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 NODE=2
 TEST=mp13
@@ -31,7 +29,7 @@ OBJS=$(C_O_FILES)
 
 PRINT_SRCS=$(DOCS)
 
-include $(RTEMS_CUSTOM)
+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 6eb6205261..9090167761 100644
--- a/c/src/tests/mptests/mp14/Makefile.in
+++ b/c/src/tests/mptests/mp14/Makefile.in
@@ -4,13 +4,11 @@
 
 @SET_MAKE@
 srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
-RTEMS_ROOT = @RTEMS_ROOT@
+RTEMS_ROOT = @top_srcdir@
 PROJECT_ROOT = @PROJECT_ROOT@
-RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
-include $(RTEMS_CUSTOM)
+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 96a5cb9e0d..4129e7d526 100644
--- a/c/src/tests/mptests/mp14/node1/Makefile.in
+++ b/c/src/tests/mptests/mp14/node1/Makefile.in
@@ -4,11 +4,9 @@
 
 @SET_MAKE@
 srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@:@srcdir@/..
-RTEMS_ROOT = @RTEMS_ROOT@
+RTEMS_ROOT = @top_srcdir@
 PROJECT_ROOT = @PROJECT_ROOT@
-RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 NODE=1
 TEST=mp14
@@ -31,7 +29,7 @@ OBJS=$(C_O_FILES)
 
 PRINT_SRCS=$(DOCS)
 
-include $(RTEMS_CUSTOM)
+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 de5af31571..6ebe8cba4b 100644
--- a/c/src/tests/mptests/mp14/node2/Makefile.in
+++ b/c/src/tests/mptests/mp14/node2/Makefile.in
@@ -4,11 +4,9 @@
 
 @SET_MAKE@
 srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@:@srcdir@/..
-RTEMS_ROOT = @RTEMS_ROOT@
+RTEMS_ROOT = @top_srcdir@
 PROJECT_ROOT = @PROJECT_ROOT@
-RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 NODE=2
 TEST=mp14
@@ -31,7 +29,7 @@ OBJS=$(C_O_FILES)
 
 PRINT_SRCS=$(DOCS)
 
-include $(RTEMS_CUSTOM)
+include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
-- 
cgit v1.2.3