4 files changed, 12 insertions, 10 deletions
diff --git a/make/Templates/Makefile.am b/make/Templates/Makefile.am
index 28136f27b1..52ee7ff73f 100644
--- a/make/Templates/Makefile.am
+++ b/make/Templates/Makefile.am
@@ -4,12 +4,9 @@
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
-rtems_makedir=$(prefix)/make
-rtems_make_Templatesdir=$(rtems_makedir)/Templates
+rtems_makedir = $(prefix)/make
+rtems_make_Templatesdir = $(rtems_makedir)/Templates
 
-rtems_make_Templates_DATA = \
-Makefile.dir \
-Makefile.leaf \
-Makefile.lib
+rtems_make_Templates_DATA = Makefile.dir Makefile.leaf Makefile.lib
 
-include $(top_srcdir)/automake/local.am
+include $(top_srcdir)/automake/host.am
diff --git a/make/Templates/Makefile.dir b/make/Templates/Makefile.dir
index aa5a9c0b2f..c8b4d4f8a4 100644
--- a/make/Templates/Makefile.dir
+++ b/make/Templates/Makefile.dir
@@ -2,7 +2,9 @@
 #  $Id$
 #
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_MAKEFILE_PATH)/Makefile.inc
+
+include $(RTEMS_CUSTOM)
 include $(RTEMS_ROOT)/make/directory.cfg
 
 SUBDIRS=a b c your-directories-go-here
diff --git a/make/Templates/Makefile.leaf b/make/Templates/Makefile.leaf
index b4c879529f..6338a7f099 100644
--- a/make/Templates/Makefile.leaf
+++ b/make/Templates/Makefile.leaf
@@ -33,8 +33,9 @@ PGMS=${ARCH}/xxx-your-program-here ${ARCH}/xxx-another-one
 # to include all RTEMS managers in the application.
 MANAGERS=io event message rate_monotonic semaphore timer, etc.
 
+include $(RTEMS_MAKEFILE_PATH)/Makefile.inc
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_CUSTOM)
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
diff --git a/make/Templates/Makefile.lib b/make/Templates/Makefile.lib
index 9127ea70de..a515b82b5f 100644
--- a/make/Templates/Makefile.lib
+++ b/make/Templates/Makefile.lib
@@ -27,7 +27,9 @@ 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_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_MAKEFILE_PATH)/Makefile.inc
+
+include $(RTEMS_CUSTOM)
 include $(RTEMS_ROOT)/make/lib.cfg
 
 #