4 files changed, 6 insertions, 3 deletions
diff --git a/make/Templates/Makefile.dir b/make/Templates/Makefile.dir
index 36d056bcd8..e70d40c0cb 100644
--- a/make/Templates/Makefile.dir
+++ b/make/Templates/Makefile.dir
@@ -2,7 +2,7 @@
 #  $Id$
 #
 
-include $(RTEMS_CUSTOM)
+include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 include $(RTEMS_ROOT)/make/directory.cfg
 
 SUB_DIRS=a b c your-directories-go-here
diff --git a/make/Templates/Makefile.inc.in b/make/Templates/Makefile.inc.in
index edaf5e7dfd..6fd57a5f3f 100644
--- a/make/Templates/Makefile.inc.in
+++ b/make/Templates/Makefile.inc.in
@@ -40,6 +40,9 @@ RTEMS_HAS_CPLUSPLUS = @RTEMS_HAS_CPLUSPLUS@
 RTEMS_USE_GCC272 = @RTEMS_USE_GCC272@
 RTEMS_LIBC_DIR = @RTEMS_LIBC_DIR@
 
+# FIXME: This shouldn't be here
+RTEMS_ROOT = $(PROJECT_HOME)
+
 export RTEMS_BSP
 export RTEMS_CUSTOM
 export PROJECT_ROOT
diff --git a/make/Templates/Makefile.leaf b/make/Templates/Makefile.leaf
index 5bf8e08fe2..6f098d4b50 100644
--- a/make/Templates/Makefile.leaf
+++ b/make/Templates/Makefile.leaf
@@ -34,7 +34,7 @@ PGMS=${ARCH}/xxx-your-program-here ${ARCH}/xxx-another-one
 MANAGERS=io event message rate_monotonic semaphore timer, etc.
 
 
-include $(RTEMS_CUSTOM)
+include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
diff --git a/make/Templates/Makefile.lib b/make/Templates/Makefile.lib
index 3c339a7054..18baaedbaa 100644
--- a/make/Templates/Makefile.lib
+++ b/make/Templates/Makefile.lib
@@ -27,7 +27,7 @@ S_O_FILES=$(S_FILES:%.s=${ARCH}/%.o)
 SRCS=$(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES)
 OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES)
 
-include $(RTEMS_CUSTOM)
+include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 include $(RTEMS_ROOT)/make/lib.cfg
 
 #