9 files changed, 18 insertions, 36 deletions
diff --git a/c/src/exec/rtems/Makefile.in b/c/src/exec/rtems/Makefile.in
index c2b406a87d..0ef0ca0e76 100644
--- a/c/src/exec/rtems/Makefile.in
+++ b/c/src/exec/rtems/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=headers $(INLINE) optman src
diff --git a/c/src/exec/rtems/headers/Makefile.in b/c/src/exec/rtems/headers/Makefile.in
index 7c48836cc7..adb4903db8 100644
--- a/c/src/exec/rtems/headers/Makefile.in
+++ b/c/src/exec/rtems/headers/Makefile.in
@@ -4,11 +4,9 @@
 
 @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
 
 H_PIECES=asr attr clock config dpmem event eventmp eventset \
    intr message modes mp msgmp options part partmp \
@@ -22,7 +20,7 @@ EXTERNAL_H_FILES=$(EXTERNAL_H_PIECES:%=$(srcdir)/%.h)
 
 SRCS=$(H_FILES) $(EXTERNAL_H_FILES)
 
-include $(RTEMS_CUSTOM)
+include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
diff --git a/c/src/exec/rtems/include/rtems/rtems/Makefile.in b/c/src/exec/rtems/include/rtems/rtems/Makefile.in
index 7c48836cc7..adb4903db8 100644
--- a/c/src/exec/rtems/include/rtems/rtems/Makefile.in
+++ b/c/src/exec/rtems/include/rtems/rtems/Makefile.in
@@ -4,11 +4,9 @@
 
 @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
 
 H_PIECES=asr attr clock config dpmem event eventmp eventset \
    intr message modes mp msgmp options part partmp \
@@ -22,7 +20,7 @@ EXTERNAL_H_FILES=$(EXTERNAL_H_PIECES:%=$(srcdir)/%.h)
 
 SRCS=$(H_FILES) $(EXTERNAL_H_FILES)
 
-include $(RTEMS_CUSTOM)
+include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
diff --git a/c/src/exec/rtems/inline/Makefile.in b/c/src/exec/rtems/inline/Makefile.in
index ad393906a5..9c11a33172 100644
--- a/c/src/exec/rtems/inline/Makefile.in
+++ b/c/src/exec/rtems/inline/Makefile.in
@@ -4,11 +4,9 @@
 
 @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
 
 I_PIECES=asr attr dpmem event eventset message modes options \
    part ratemon region sem status support tasks timer
@@ -16,7 +14,7 @@ I_FILES=$(I_PIECES:%=$(srcdir)/%.inl)
 
 SRCS=$(I_FILES)
 
-include $(RTEMS_CUSTOM)
+include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 include $(RTEMS_ROOT)/make/lib.cfg
 
 #
diff --git a/c/src/exec/rtems/inline/rtems/rtems/Makefile.in b/c/src/exec/rtems/inline/rtems/rtems/Makefile.in
index ad393906a5..9c11a33172 100644
--- a/c/src/exec/rtems/inline/rtems/rtems/Makefile.in
+++ b/c/src/exec/rtems/inline/rtems/rtems/Makefile.in
@@ -4,11 +4,9 @@
 
 @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
 
 I_PIECES=asr attr dpmem event eventset message modes options \
    part ratemon region sem status support tasks timer
@@ -16,7 +14,7 @@ I_FILES=$(I_PIECES:%=$(srcdir)/%.inl)
 
 SRCS=$(I_FILES)
 
-include $(RTEMS_CUSTOM)
+include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 include $(RTEMS_ROOT)/make/lib.cfg
 
 #
diff --git a/c/src/exec/rtems/macros/Makefile.in b/c/src/exec/rtems/macros/Makefile.in
index ad393906a5..9c11a33172 100644
--- a/c/src/exec/rtems/macros/Makefile.in
+++ b/c/src/exec/rtems/macros/Makefile.in
@@ -4,11 +4,9 @@
 
 @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
 
 I_PIECES=asr attr dpmem event eventset message modes options \
    part ratemon region sem status support tasks timer
@@ -16,7 +14,7 @@ I_FILES=$(I_PIECES:%=$(srcdir)/%.inl)
 
 SRCS=$(I_FILES)
 
-include $(RTEMS_CUSTOM)
+include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 include $(RTEMS_ROOT)/make/lib.cfg
 
 #
diff --git a/c/src/exec/rtems/macros/rtems/rtems/Makefile.in b/c/src/exec/rtems/macros/rtems/rtems/Makefile.in
index ad393906a5..9c11a33172 100644
--- a/c/src/exec/rtems/macros/rtems/rtems/Makefile.in
+++ b/c/src/exec/rtems/macros/rtems/rtems/Makefile.in
@@ -4,11 +4,9 @@
 
 @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
 
 I_PIECES=asr attr dpmem event eventset message modes options \
    part ratemon region sem status support tasks timer
@@ -16,7 +14,7 @@ I_FILES=$(I_PIECES:%=$(srcdir)/%.inl)
 
 SRCS=$(I_FILES)
 
-include $(RTEMS_CUSTOM)
+include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 include $(RTEMS_ROOT)/make/lib.cfg
 
 #
diff --git a/c/src/exec/rtems/optman/Makefile.in b/c/src/exec/rtems/optman/Makefile.in
index 9b205274ee..41d7274161 100644
--- a/c/src/exec/rtems/optman/Makefile.in
+++ b/c/src/exec/rtems/optman/Makefile.in
@@ -4,11 +4,9 @@
 
 @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
 
 C_FILES= no-dpmem.c no-event.c no-mp.c no-msg.c \
          no-part.c no-region.c no-rtmon.c no-sem.c no-signal.c no-timer.c
@@ -22,7 +20,7 @@ OBJS=$(C_O_FILES) $(CC_O_FILES)
 
 PGMS=$(C_FILES:%.c=$(ARCH)/%.rel)
 
-include $(RTEMS_CUSTOM)
+include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
diff --git a/c/src/exec/rtems/src/Makefile.in b/c/src/exec/rtems/src/Makefile.in
index 54663d5a7c..6cfbefad4f 100644
--- a/c/src/exec/rtems/src/Makefile.in
+++ b/c/src/exec/rtems/src/Makefile.in
@@ -4,11 +4,9 @@
 
 @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
 
 C_PIECES=attr clock dpmem event eventmp intr intrbody mp msg msgmp \
    part partmp ratemon region regionmp sem semmp signal signalmp \
@@ -19,7 +17,7 @@ C_O_FILES=$(C_PIECES:%=${ARCH}/%.o)
 SRCS=$(C_FILES)
 OBJS=$(C_O_FILES)
 
-include $(RTEMS_CUSTOM)
+include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 include $(RTEMS_ROOT)/make/lib.cfg
 
 #