7 files changed, 14 insertions, 28 deletions
diff --git a/c/src/libmisc/assoc/Makefile.in b/c/src/libmisc/assoc/Makefile.in
index 695cff0e3a..a547bb6565 100644
--- a/c/src/libmisc/assoc/Makefile.in
+++ b/c/src/libmisc/assoc/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
 
 LIB=${ARCH}/libassoc-tmp.a
 
@@ -22,7 +20,7 @@ H_FILES=$(srcdir)/assoc.h
 SRCS=$(C_FILES) $(H_FILES) $(INSTALLED_H_FILES)
 OBJS=$(C_O_FILES)
 
-include $(RTEMS_CUSTOM)
+include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 include $(RTEMS_ROOT)/make/lib.cfg
 
 #
diff --git a/c/src/libmisc/cpuuse/Makefile.in b/c/src/libmisc/cpuuse/Makefile.in
index fc8cc583a4..391b6cac8f 100644
--- a/c/src/libmisc/cpuuse/Makefile.in
+++ b/c/src/libmisc/cpuuse/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
 
 LIB=${ARCH}/libcpuuse-tmp.a
 
@@ -23,7 +21,7 @@ INSTALLED_H_FILES=$(srcdir)/cpuuse.h
 SRCS=$(C_FILES) $(H_FILES) $(INSTALLED_H_FILES)
 OBJS=$(C_O_FILES)
 
-include $(RTEMS_CUSTOM)
+include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 include $(RTEMS_ROOT)/make/lib.cfg
 
 #
diff --git a/c/src/libmisc/error/Makefile.in b/c/src/libmisc/error/Makefile.in
index 613ca85784..5cc51de586 100644
--- a/c/src/libmisc/error/Makefile.in
+++ b/c/src/libmisc/error/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
 
 LIB=${ARCH}/liberror-tmp.a
 
@@ -22,7 +20,7 @@ H_FILES=$(srcdir)/error.h
 SRCS=$(C_FILES) $(H_FILES) $(INSTALLED_H_FILES)
 OBJS=$(C_O_FILES)
 
-include $(RTEMS_CUSTOM)
+include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 include $(RTEMS_ROOT)/make/lib.cfg
 
 #
diff --git a/c/src/libmisc/monitor/Makefile.in b/c/src/libmisc/monitor/Makefile.in
index c327df7fe8..1ed5d13cb1 100644
--- a/c/src/libmisc/monitor/Makefile.in
+++ b/c/src/libmisc/monitor/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
 
 LIB=${ARCH}/libmonitor-tmp.a
 # C source names, if any, go here -- minus the .c
@@ -24,7 +22,7 @@ INSTALLED_H_FILES=$(srcdir)/monitor.h $(srcdir)/symbols.h
 SRCS=README $(C_FILES) $(H_FILES) $(INSTALLED_H_FILES)
 OBJS=$(C_O_FILES)
 
-include $(RTEMS_CUSTOM)
+include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 include $(RTEMS_ROOT)/make/lib.cfg
 
 #
diff --git a/c/src/libmisc/rtmonuse/Makefile.in b/c/src/libmisc/rtmonuse/Makefile.in
index 87d68c9ed1..a344c894b6 100644
--- a/c/src/libmisc/rtmonuse/Makefile.in
+++ b/c/src/libmisc/rtmonuse/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
 
 LIB=${ARCH}/librtmonuse-tmp.a
 
@@ -23,7 +21,7 @@ INSTALLED_H_FILES=$(srcdir)/rtmonuse.h
 SRCS=$(C_FILES) $(H_FILES) $(INSTALLED_H_FILES)
 OBJS=$(C_O_FILES)
 
-include $(RTEMS_CUSTOM)
+include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 include $(RTEMS_ROOT)/make/lib.cfg
 
 #
diff --git a/c/src/libmisc/stackchk/Makefile.in b/c/src/libmisc/stackchk/Makefile.in
index e262e27b81..2708e825bc 100644
--- a/c/src/libmisc/stackchk/Makefile.in
+++ b/c/src/libmisc/stackchk/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
 
 LIB=${ARCH}/libstackchk-tmp.a
 
@@ -23,7 +21,7 @@ INSTALLED_H_FILES=$(srcdir)/stackchk.h
 SRCS=$(C_FILES) $(H_FILES) $(INSTALLED_H_FILES)
 OBJS=$(C_O_FILES)
 
-include $(RTEMS_CUSTOM)
+include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 include $(RTEMS_ROOT)/make/lib.cfg
 
 #
diff --git a/c/src/libmisc/wrapup/Makefile.in b/c/src/libmisc/wrapup/Makefile.in
index 7d8b43535a..6a78cf222a 100644
--- a/c/src/libmisc/wrapup/Makefile.in
+++ b/c/src/libmisc/wrapup/Makefile.in
@@ -4,15 +4,13 @@
 
 @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
 
 LIB=$(ARCH)/libmisc.a
 
-include $(RTEMS_CUSTOM)
+include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 include $(RTEMS_ROOT)/make/lib.cfg
 
 #  Using the wildcard on the Purify support makes sure it may not be there