Removed CONFIG_DIR and PROJECT_HOME directories.

c/Makefile.in

@@ -25,9 +25,6 @@ RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 include $(RTEMS_CUSTOM)
 include $(RTEMS_ROOT)/make/directory.cfg
 
-# dubious, but needed by rtems-glom ...
-export PROJECT_HOME
-
 SUB_DIRS=build-tools src
 
 # We only make the install point for the KA9Q header files if it is enabled.
@@ -74,9 +71,9 @@ clean_wrapup: clean_tools clean_dirs clean_modules
 .PHONY:	dirs clean_wrapup clean_dirs clean_tools clean_modules env install
 
 dirs:
+	-$(MKDIR) ${CREATE_DIRS:%=$(PROJECT_ROOT)/$(RTEMS_BSP)/%}
 	-test -d $(PROJECT_ROOT)/c/src/lib/libhwapi && \
 	    (cd $(PROJECT_ROOT)/c/src/lib/libhwapi ; $(MAKE) mkdirs)
-	-$(MKDIR) ${CREATE_DIRS:%=$(PROJECT_ROOT)/$(RTEMS_BSP)/%}
 #	@echo Making directories in build tree ...
 #	-$(foreach dir,$(CREATE_DIRS), \
 #	    $(shell $(MKDIR) $(PROJECT_ROOT)/$(RTEMS_BSP)/$(dir)))
@@ -89,21 +86,20 @@ clean_dirs:
 clean_tools:
 	cd build-tools; $(MAKE) clean
 
+$(PROJECT_ROOT)/$(RTEMS_BSP)/Makefile.inc: $(PROJECT_ROOT)/make/Templates/Makefile.inc
+	echo "RTEMS_BSP = $(RTEMS_BSP)" > $@
+	$(CAT) $< >> $@
+
 # NOTE: The wildcard on the install should pick up everything except
 #       the tests directory.  This significantly minimizes the install size.
 
-
+install_files: $(PROJECT_ROOT)/$(RTEMS_BSP)/Makefile.inc
-install_files:
+	-$(MKDIR) $(prefix)/
-	 -$(MKDIR) $(prefix)/
+	-$(MKDIR) $(prefix)/rtems
-	 -$(MKDIR) $(prefix)/rtems
+	-$(RM) -rf $(prefix)/rtems/$(RTEMS_BSP)
-	 -$(MKDIR) $(prefix)/rtems/make
+	cd ../; tar cf - $(RTEMS_BSP)/[bilsuM]* | \
-	 -$(MKDIR) $(prefix)/rtems/make/compilers
-	 -$(MKDIR) $(prefix)/rtems/make/custom
-	-rm -rf $(prefix)/rtems/$(RTEMS_BSP)
-	cd ../; tar cf - make $(RTEMS_BSP)/[bilsu]* | \
 		(cd $(prefix)/rtems; tar xpBf - )
-	(echo RTEMS_BSP = $(RTEMS_BSP) ; $(CAT) make/Templates/Makefile.inc ) \
+	cd ../make; make RTEMS_BSP=$(RTEMS_BSP) install
-		> $(prefix)/rtems/$(RTEMS_BSP)/Makefile.inc
 
 tests:
 	cd src/tests; $(MAKE) all

c/build-tools/os/msdos/Makefile.in

@@ -11,7 +11,7 @@ PROJECT_ROOT = @PROJECT_ROOT@
 RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 include $(RTEMS_CUSTOM)
-include $(PROJECT_ROOT)/make/leaf.cfg
+include $(RTEMS_ROOT)/make/leaf.cfg
 
 DESTDIR=$(PROJECT_RELEASE)/build-tools
 

c/src/Makefile.in

@@ -11,7 +11,7 @@ PROJECT_ROOT = @PROJECT_ROOT@
 RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 include $(RTEMS_CUSTOM)
-include $(PROJECT_ROOT)/make/directory.cfg
+include $(RTEMS_ROOT)/make/directory.cfg
 
 SUB_DIRS=exec lib tests/tools tests/support tests/samples
 

c/src/exec/Makefile.in

@@ -11,7 +11,7 @@ PROJECT_ROOT = @PROJECT_ROOT@
 RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 include $(RTEMS_CUSTOM)
-include $(PROJECT_ROOT)/make/directory.cfg
+include $(RTEMS_ROOT)/make/directory.cfg
 
 POSIX_DIRS_yes_V=posix
 POSIX_DIRS = $(POSIX_DIRS_$(HAS_POSIX_API)_V)

c/src/exec/posix/Makefile.in

@@ -11,6 +11,6 @@ PROJECT_ROOT = @PROJECT_ROOT@
 RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 include $(RTEMS_CUSTOM)
-include $(PROJECT_ROOT)/make/directory.cfg
+include $(RTEMS_ROOT)/make/directory.cfg
 
 SUB_DIRS=base sys headers $(INLINE) optman src

c/src/exec/posix/base/Makefile.in

@@ -20,7 +20,7 @@ H_FILES=$(H_PIECES:%=$(srcdir)/%.h)
 SRCS=$(H_FILES)
 
 include $(RTEMS_CUSTOM)
-include $(PROJECT_ROOT)/make/leaf.cfg
+include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
 # Add your list of files to delete here.  The config files

c/src/exec/posix/headers/Makefile.in

@@ -20,7 +20,7 @@ H_FILES=$(H_PIECES:%=$(srcdir)/%.h)
 SRCS=$(H_FILES)
 
 include $(RTEMS_CUSTOM)
-include $(PROJECT_ROOT)/make/leaf.cfg
+include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
 # Add your list of files to delete here.  The config files

c/src/exec/posix/include/rtems/posix/Makefile.in

@@ -20,7 +20,7 @@ H_FILES=$(H_PIECES:%=$(srcdir)/%.h)
 SRCS=$(H_FILES)
 
 include $(RTEMS_CUSTOM)
-include $(PROJECT_ROOT)/make/leaf.cfg
+include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
 # Add your list of files to delete here.  The config files

c/src/exec/posix/include/sys/Makefile.in

@@ -17,7 +17,7 @@ H_FILES=$(H_PIECES:%=$(srcdir)/%.h)
 SRCS=$(H_FILES)
 
 include $(RTEMS_CUSTOM)
-include $(PROJECT_ROOT)/make/leaf.cfg
+include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
 # Add your list of files to delete here.  The config files

c/src/exec/posix/include/wrap/Makefile.in

@@ -20,7 +20,7 @@ H_FILES=$(H_PIECES:%=$(srcdir)/%.h)
 SRCS=$(H_FILES)
 
 include $(RTEMS_CUSTOM)
-include $(PROJECT_ROOT)/make/leaf.cfg
+include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
 # Add your list of files to delete here.  The config files

c/src/exec/posix/inline/Makefile.in

@@ -17,7 +17,7 @@ I_FILES=$(I_PIECES:%=$(srcdir)/%.inl)
 SRCS=$(I_FILES)
 
 include $(RTEMS_CUSTOM)
-include $(PROJECT_ROOT)/make/leaf.cfg
+include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
 # Add your list of files to delete here.  The config files

c/src/exec/posix/inline/rtems/posix/Makefile.in

@@ -17,7 +17,7 @@ I_FILES=$(I_PIECES:%=$(srcdir)/%.inl)
 SRCS=$(I_FILES)
 
 include $(RTEMS_CUSTOM)
-include $(PROJECT_ROOT)/make/leaf.cfg
+include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
 # Add your list of files to delete here.  The config files

c/src/exec/posix/macros/Makefile.in

@@ -18,7 +18,7 @@ I_FILES=$(I_PIECES:%=$(srcdir)/%.inl)
 SRCS=$(I_FILES)
 
 include $(RTEMS_CUSTOM)
-include $(PROJECT_ROOT)/make/leaf.cfg
+include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
 # Add your list of files to delete here.  The config files

c/src/exec/posix/macros/rtems/posix/Makefile.in

@@ -18,7 +18,7 @@ I_FILES=$(I_PIECES:%=$(srcdir)/%.inl)
 SRCS=$(I_FILES)
 
 include $(RTEMS_CUSTOM)
-include $(PROJECT_ROOT)/make/leaf.cfg
+include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
 # Add your list of files to delete here.  The config files

c/src/exec/posix/optman/Makefile.in

@@ -20,7 +20,7 @@ OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES)
 PGMS=$(C_FILES:%.c=$(ARCH)/%.rel)
 
 include $(RTEMS_CUSTOM)
-include $(PROJECT_ROOT)/make/leaf.cfg
+include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
 # (OPTIONAL) Add local stuff here using +=

c/src/exec/posix/src/Makefile.in

@@ -22,7 +22,7 @@ SRCS=$(C_FILES) $(CC_FILES)
 OBJS=$(C_O_FILES) $(CC_O_FILES)
 
 include $(RTEMS_CUSTOM)
-include $(PROJECT_ROOT)/make/lib.cfg
+include $(RTEMS_ROOT)/make/lib.cfg
 
 #
 # Add local stuff here using +=

c/src/exec/posix/sys/Makefile.in

@@ -17,7 +17,7 @@ H_FILES=$(H_PIECES:%=$(srcdir)/%.h)
 SRCS=$(H_FILES)
 
 include $(RTEMS_CUSTOM)
-include $(PROJECT_ROOT)/make/leaf.cfg
+include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
 # Add your list of files to delete here.  The config files

c/src/exec/rtems/Makefile.in

@@ -11,6 +11,6 @@ PROJECT_ROOT = @PROJECT_ROOT@
 RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 include $(RTEMS_CUSTOM)
-include $(PROJECT_ROOT)/make/directory.cfg
+include $(RTEMS_ROOT)/make/directory.cfg
 
 SUB_DIRS=headers $(INLINE) optman src

c/src/exec/rtems/headers/Makefile.in

@@ -23,7 +23,7 @@ EXTERNAL_H_FILES=$(EXTERNAL_H_PIECES:%=$(srcdir)/%.h)
 SRCS=$(H_FILES) $(EXTERNAL_H_FILES)
 
 include $(RTEMS_CUSTOM)
-include $(PROJECT_ROOT)/make/leaf.cfg
+include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
 # Add your list of files to delete here.  The config files

c/src/exec/rtems/include/rtems/rtems/Makefile.in

@@ -23,7 +23,7 @@ EXTERNAL_H_FILES=$(EXTERNAL_H_PIECES:%=$(srcdir)/%.h)
 SRCS=$(H_FILES) $(EXTERNAL_H_FILES)
 
 include $(RTEMS_CUSTOM)
-include $(PROJECT_ROOT)/make/leaf.cfg
+include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
 # Add your list of files to delete here.  The config files

c/src/exec/rtems/inline/Makefile.in

@@ -17,7 +17,7 @@ I_FILES=$(I_PIECES:%=$(srcdir)/%.inl)
 SRCS=$(I_FILES)
 
 include $(RTEMS_CUSTOM)
-include $(PROJECT_ROOT)/make/lib.cfg
+include $(RTEMS_ROOT)/make/lib.cfg
 
 #
 # Add your list of files to delete here.  The config files

c/src/exec/rtems/inline/rtems/rtems/Makefile.in

@@ -17,7 +17,7 @@ I_FILES=$(I_PIECES:%=$(srcdir)/%.inl)
 SRCS=$(I_FILES)
 
 include $(RTEMS_CUSTOM)
-include $(PROJECT_ROOT)/make/lib.cfg
+include $(RTEMS_ROOT)/make/lib.cfg
 
 #
 # Add your list of files to delete here.  The config files

c/src/exec/rtems/macros/Makefile.in

@@ -17,7 +17,7 @@ I_FILES=$(I_PIECES:%=$(srcdir)/%.inl)
 SRCS=$(I_FILES)
 
 include $(RTEMS_CUSTOM)
-include $(PROJECT_ROOT)/make/lib.cfg
+include $(RTEMS_ROOT)/make/lib.cfg
 
 #
 # Add your list of files to delete here.  The config files

c/src/exec/rtems/macros/rtems/rtems/Makefile.in

@@ -17,7 +17,7 @@ I_FILES=$(I_PIECES:%=$(srcdir)/%.inl)
 SRCS=$(I_FILES)
 
 include $(RTEMS_CUSTOM)
-include $(PROJECT_ROOT)/make/lib.cfg
+include $(RTEMS_ROOT)/make/lib.cfg
 
 #
 # Add your list of files to delete here.  The config files

c/src/exec/rtems/optman/Makefile.in

@@ -23,7 +23,7 @@ OBJS=$(C_O_FILES) $(CC_O_FILES)
 PGMS=$(C_FILES:%.c=$(ARCH)/%.rel)
 
 include $(RTEMS_CUSTOM)
-include $(PROJECT_ROOT)/make/leaf.cfg
+include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
 # (OPTIONAL) Add local stuff here using +=

c/src/exec/rtems/src/Makefile.in

@@ -20,7 +20,7 @@ SRCS=$(C_FILES)
 OBJS=$(C_O_FILES)
 
 include $(RTEMS_CUSTOM)
-include $(PROJECT_ROOT)/make/lib.cfg
+include $(RTEMS_ROOT)/make/lib.cfg
 
 #
 # Add local stuff here using +=

c/src/exec/sapi/Makefile.in

@@ -11,6 +11,6 @@ PROJECT_ROOT = @PROJECT_ROOT@
 RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 include $(RTEMS_CUSTOM)
-include $(PROJECT_ROOT)/make/directory.cfg
+include $(RTEMS_ROOT)/make/directory.cfg
 
 SUB_DIRS=headers $(INLINE) optman src

c/src/exec/sapi/headers/Makefile.in

@@ -20,7 +20,7 @@ EXTERNAL_H_FILES=$(EXTERNAL_H_PIECES:%=$(srcdir)/%.h)
 SRCS=$(H_FILES) $(EXTERNAL_H_FILES)
 
 include $(RTEMS_CUSTOM)
-include $(PROJECT_ROOT)/make/leaf.cfg
+include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
 # Add your list of files to delete here.  The config files

c/src/exec/sapi/include/rtems/Makefile.in

@@ -20,7 +20,7 @@ EXTERNAL_H_FILES=$(EXTERNAL_H_PIECES:%=$(srcdir)/%.h)
 SRCS=$(H_FILES) $(EXTERNAL_H_FILES)
 
 include $(RTEMS_CUSTOM)
-include $(PROJECT_ROOT)/make/leaf.cfg
+include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
 # Add your list of files to delete here.  The config files

c/src/exec/sapi/inline/Makefile.in

@@ -16,7 +16,7 @@ I_FILES=$(I_PIECES:%=$(srcdir)/%.inl)
 SRCS=$(I_FILES)
 
 include $(RTEMS_CUSTOM)
-include $(PROJECT_ROOT)/make/lib.cfg
+include $(RTEMS_ROOT)/make/lib.cfg
 
 #
 # Add your list of files to delete here.  The config files

c/src/exec/sapi/inline/rtems/Makefile.in

@@ -16,7 +16,7 @@ I_FILES=$(I_PIECES:%=$(srcdir)/%.inl)
 SRCS=$(I_FILES)
 
 include $(RTEMS_CUSTOM)
-include $(PROJECT_ROOT)/make/lib.cfg
+include $(RTEMS_ROOT)/make/lib.cfg
 
 #
 # Add your list of files to delete here.  The config files

c/src/exec/sapi/macros/Makefile.in

@@ -16,7 +16,7 @@ I_FILES=$(I_PIECES:%=$(srcdir)/%.inl)
 SRCS=$(I_FILES)
 
 include $(RTEMS_CUSTOM)
-include $(PROJECT_ROOT)/make/lib.cfg
+include $(RTEMS_ROOT)/make/lib.cfg
 
 #
 # Add your list of files to delete here.  The config files

c/src/exec/sapi/macros/rtems/Makefile.in

@@ -16,7 +16,7 @@ I_FILES=$(I_PIECES:%=$(srcdir)/%.inl)
 SRCS=$(I_FILES)
 
 include $(RTEMS_CUSTOM)
-include $(PROJECT_ROOT)/make/lib.cfg
+include $(RTEMS_ROOT)/make/lib.cfg
 
 #
 # Add your list of files to delete here.  The config files

c/src/exec/sapi/optman/Makefile.in

@@ -20,7 +20,7 @@ OBJS=$(C_O_FILES) $(S_O_FILES)
 PGMS=$(C_FILES:%.c=$(ARCH)/%.rel)
 
 include $(RTEMS_CUSTOM)
-include $(PROJECT_ROOT)/make/leaf.cfg
+include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
 # (OPTIONAL) Add local stuff here using +=

c/src/exec/sapi/src/Makefile.in

@@ -18,7 +18,7 @@ SRCS=$(C_FILES)
 OBJS=$(C_O_FILES)
 
 include $(RTEMS_CUSTOM)
-include $(PROJECT_ROOT)/make/lib.cfg
+include $(RTEMS_ROOT)/make/lib.cfg
 
 #
 # Add local stuff here using +=

c/src/exec/score/Makefile.in

@@ -11,6 +11,6 @@ PROJECT_ROOT = @PROJECT_ROOT@
 RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 include $(RTEMS_CUSTOM)
-include $(PROJECT_ROOT)/make/directory.cfg
+include $(RTEMS_ROOT)/make/directory.cfg
 
 SUB_DIRS=headers $(INLINE) tools cpu src

c/src/exec/score/cpu/Makefile.in

@@ -11,6 +11,6 @@ PROJECT_ROOT = @PROJECT_ROOT@
 RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 include $(RTEMS_CUSTOM)
-include $(PROJECT_ROOT)/make/directory.cfg
+include $(RTEMS_ROOT)/make/directory.cfg
 
 SUB_DIRS=$(RTEMS_CPU)

c/src/exec/score/cpu/a29k/Makefile.in

@@ -34,7 +34,7 @@ SRCS=$(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) $(EXTERNAL_H_FILES)
 OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES)
 
 include $(RTEMS_CUSTOM)
-include $(PROJECT_ROOT)/make/leaf.cfg
+include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
 # (OPTIONAL) Add local stuff here using +=

c/src/exec/score/cpu/hppa1.1/Makefile.in

@@ -32,7 +32,7 @@ SRCS=$(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) $(EXTERNAL_H_FILES)
 OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES)
 
 include $(RTEMS_CUSTOM)
-include $(PROJECT_ROOT)/make/leaf.cfg
+include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
 # (OPTIONAL) Add local stuff here using +=

c/src/exec/score/cpu/i386/Makefile.in

@@ -32,7 +32,7 @@ SRCS=$(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) $(EXTERNAL_H_FILES)
 OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES)
 
 include $(RTEMS_CUSTOM)
-include $(PROJECT_ROOT)/make/leaf.cfg
+include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
 # (OPTIONAL) Add local stuff here using +=

c/src/exec/score/cpu/i960/Makefile.in

@@ -32,7 +32,7 @@ SRCS=$(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) $(EXTERNAL_H_FILES)
 OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES)
 
 include $(RTEMS_CUSTOM)
-include $(PROJECT_ROOT)/make/leaf.cfg
+include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
 # (OPTIONAL) Add local stuff here using +=

c/src/exec/score/cpu/m68k/Makefile.in

@@ -32,7 +32,7 @@ SRCS=$(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) $(EXTERNAL_H_FILES)
 OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES)
 
 include $(RTEMS_CUSTOM)
-include $(PROJECT_ROOT)/make/leaf.cfg
+include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
 # (OPTIONAL) Add local stuff here using +=

c/src/exec/score/cpu/mips64orion/Makefile.in

@@ -34,7 +34,7 @@ SRCS=$(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) $(EXTERNAL_H_FILES)
 OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES)
 
 include $(RTEMS_CUSTOM)
-include $(PROJECT_ROOT)/make/leaf.cfg
+include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
 # (OPTIONAL) Add local stuff here using +=

c/src/exec/score/cpu/no_cpu/Makefile.in

@@ -34,7 +34,7 @@ SRCS=$(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) $(EXTERNAL_H_FILES)
 OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES)
 
 include $(RTEMS_CUSTOM)
-include $(PROJECT_ROOT)/make/leaf.cfg
+include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
 # (OPTIONAL) Add local stuff here using +=

c/src/exec/score/cpu/powerpc/Makefile.in

@@ -34,7 +34,7 @@ SRCS=$(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) $(EXTERNAL_H_FILES)
 OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES)
 
 include $(RTEMS_CUSTOM)
-include $(PROJECT_ROOT)/make/leaf.cfg
+include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
 # (OPTIONAL) Add local stuff here using +=

c/src/exec/score/cpu/sparc/Makefile.in

@@ -31,7 +31,7 @@ SRCS=$(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) $(EXTERNAL_H_FILES)
 OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES)
 
 include $(RTEMS_CUSTOM)
-include $(PROJECT_ROOT)/make/leaf.cfg
+include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
 # (OPTIONAL) Add local stuff here using +=

c/src/exec/score/cpu/unix/Makefile.in

@@ -28,7 +28,7 @@ SRCS=$(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES)
 OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES)
 
 include $(RTEMS_CUSTOM)
-include $(PROJECT_ROOT)/make/leaf.cfg
+include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
 # (OPTIONAL) Add local stuff here using +=

c/src/exec/score/headers/Makefile.in

@@ -31,7 +31,7 @@ NET_H_FILES=$(NET_H_PIECES:%=$(srcdir)/%.h)
 SRCS=$(H_FILES) $(SAPI_H_FILES) $(EXTERNAL_H_FILES)
 
 include $(RTEMS_CUSTOM)
-include $(PROJECT_ROOT)/make/leaf.cfg
+include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
 # Add your list of files to delete here.  The config files

c/src/exec/score/include/rtems/score/Makefile.in

@@ -31,7 +31,7 @@ NET_H_FILES=$(NET_H_PIECES:%=$(srcdir)/%.h)
 SRCS=$(H_FILES) $(SAPI_H_FILES) $(EXTERNAL_H_FILES)
 
 include $(RTEMS_CUSTOM)
-include $(PROJECT_ROOT)/make/leaf.cfg
+include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
 # Add your list of files to delete here.  The config files

c/src/exec/score/inline/Makefile.in

@@ -18,7 +18,7 @@ I_FILES=$(I_PIECES:%=$(srcdir)/%.inl)
 SRCS=$(I_FILES)
 
 include $(RTEMS_CUSTOM)
-include $(PROJECT_ROOT)/make/lib.cfg
+include $(RTEMS_ROOT)/make/lib.cfg
 
 #
 # Add your list of files to delete here.  The config files

c/src/exec/score/inline/rtems/score/Makefile.in

@@ -18,7 +18,7 @@ I_FILES=$(I_PIECES:%=$(srcdir)/%.inl)
 SRCS=$(I_FILES)
 
 include $(RTEMS_CUSTOM)
-include $(PROJECT_ROOT)/make/lib.cfg
+include $(RTEMS_ROOT)/make/lib.cfg
 
 #
 # Add your list of files to delete here.  The config files

c/src/exec/score/macros/Makefile.in

@@ -18,7 +18,7 @@ I_FILES=$(I_PIECES:%=$(srcdir)/%.inl)
 SRCS=$(I_FILES)
 
 include $(RTEMS_CUSTOM)
-include $(PROJECT_ROOT)/make/lib.cfg
+include $(RTEMS_ROOT)/make/lib.cfg
 
 #
 # Add your list of files to delete here.  The config files

c/src/exec/score/macros/rtems/score/Makefile.in

@@ -18,7 +18,7 @@ I_FILES=$(I_PIECES:%=$(srcdir)/%.inl)
 SRCS=$(I_FILES)
 
 include $(RTEMS_CUSTOM)
-include $(PROJECT_ROOT)/make/lib.cfg
+include $(RTEMS_ROOT)/make/lib.cfg
 
 #
 # Add your list of files to delete here.  The config files

c/src/exec/score/src/Makefile.in

@@ -21,7 +21,7 @@ SRCS=$(C_FILES)
 OBJS=$(C_O_FILES)
 
 include $(RTEMS_CUSTOM)
-include $(PROJECT_ROOT)/make/lib.cfg
+include $(RTEMS_ROOT)/make/lib.cfg
 
 #
 # Add local stuff here using +=

c/src/exec/score/tools/Makefile.in

@@ -11,6 +11,6 @@ PROJECT_ROOT = @PROJECT_ROOT@
 RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 include $(RTEMS_CUSTOM)
-include $(PROJECT_ROOT)/make/directory.cfg
+include $(RTEMS_ROOT)/make/directory.cfg
 
 SUB_DIRS=generic $(wildcard $(RTEMS_CPU))

c/src/exec/score/tools/generic/Makefile.in

@@ -15,7 +15,7 @@ PROJECT_ROOT = @PROJECT_ROOT@
 RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 include $(RTEMS_CUSTOM)
-include $(PROJECT_ROOT)/make/leaf.cfg
+include $(RTEMS_ROOT)/make/leaf.cfg
 
 DESTDIR=$(PROJECT_RELEASE)/bin
 

c/src/exec/score/tools/hppa1.1/Makefile.in

@@ -26,7 +26,7 @@ OBJS=$(C_O_FILES)
 PGMS=${ARCH}/genoffsets
 
 include $(RTEMS_CUSTOM)
-include $(PROJECT_ROOT)/make/leaf.cfg
+include $(RTEMS_ROOT)/make/leaf.cfg
 
 # We use files that have not been installed yet.
 CPU_DIR=../../cpu/$(RTEMS_CPU)

c/src/exec/score/tools/unix/Makefile.in

@@ -26,7 +26,7 @@ OBJS=$(C_O_FILES)
 PGMS=${ARCH}/gensize
 
 include $(RTEMS_CUSTOM)
-include $(PROJECT_ROOT)/make/leaf.cfg
+include $(RTEMS_ROOT)/make/leaf.cfg
 
 # We use files that have not been installed yet.
 CPU_DIR=../../cpu/$(RTEMS_CPU)

c/src/exec/wrapup/Makefile.in

@@ -11,7 +11,7 @@ PROJECT_ROOT = @PROJECT_ROOT@
 RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 include $(RTEMS_CUSTOM)
-include $(PROJECT_ROOT)/make/directory.cfg
+include $(RTEMS_ROOT)/make/directory.cfg
 
 POSIX_DIRS_yes_V=posix
 POSIX_DIRS = $(POSIX_DIRS_$(HAS_POSIX_API)_V)

c/src/exec/wrapup/posix/Makefile.in

@@ -22,7 +22,7 @@ OBJS=$(CPU_OBJS) $(CORE_OBJS) $(POSIX_OBJS) $(SAPI_OBJS)
 LIB=$(ARCH)/libposix.a
 
 include $(RTEMS_CUSTOM)
-include $(PROJECT_ROOT)/make/lib.cfg
+include $(RTEMS_ROOT)/make/lib.cfg
 
 #
 # (OPTIONAL) Add local stuff here using +=

c/src/exec/wrapup/rtems/Makefile.in

@@ -19,7 +19,7 @@ OBJS=$(CPU_OBJS) $(CORE_OBJS) $(RTEMS_OBJS) $(SAPI_OBJS)
 LIB=$(ARCH)/librtems.a
 
 include $(RTEMS_CUSTOM)
-include $(PROJECT_ROOT)/make/lib.cfg
+include $(RTEMS_ROOT)/make/lib.cfg
 
 #
 # (OPTIONAL) Add local stuff here using +=

c/src/lib/Makefile.in

@@ -11,7 +11,7 @@ PROJECT_ROOT = @PROJECT_ROOT@
 RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 include $(RTEMS_CUSTOM)
-include $(PROJECT_ROOT)/make/directory.cfg
+include $(RTEMS_ROOT)/make/directory.cfg
 
 # We only build the KA9Q library if HAS_KA9Q was defined
 LIBKA9Q_yes_V = libka9q

c/src/lib/include/Makefile.in

@@ -39,7 +39,7 @@ SRCS=$(H_FILES) $(SYS_H_FILES) \
      $(KA9Q_H_FILES) $(MOTOROLA_H_FILES) $(RTEMSCPLUSPLUS_H_FILES)
 
 include $(RTEMS_CUSTOM)
-include $(PROJECT_ROOT)/make/leaf.cfg
+include $(RTEMS_ROOT)/make/leaf.cfg
 CLEAN_ADDITIONS +=
 CLOBBER_ADDITIONS +=
 

c/src/lib/libbsp/Makefile.in

@@ -11,7 +11,7 @@ PROJECT_ROOT = @PROJECT_ROOT@
 RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 include $(RTEMS_CUSTOM)
-include $(PROJECT_ROOT)/make/directory.cfg
+include $(RTEMS_ROOT)/make/directory.cfg
 
 # mptests are the multiprocessing test suite
 # We only build them if HAS_MP was defined

c/src/lib/libbsp/a29k/Makefile.in

@@ -11,7 +11,7 @@ PROJECT_ROOT = @PROJECT_ROOT@
 RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 include $(RTEMS_CUSTOM)
-include $(PROJECT_ROOT)/make/directory.cfg
+include $(RTEMS_ROOT)/make/directory.cfg
 
 # Descend into the $(RTEMS_BSP_FAMILY) directory
 SUB_DIRS=$(RTEMS_BSP_FAMILY)

c/src/lib/libbsp/a29k/portsw/Makefile.in

@@ -11,7 +11,7 @@ PROJECT_ROOT = @PROJECT_ROOT@
 RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 include $(RTEMS_CUSTOM)
-include $(PROJECT_ROOT)/make/directory.cfg
+include $(RTEMS_ROOT)/make/directory.cfg
 
 SRCS=README
 

c/src/lib/libbsp/a29k/portsw/console/Makefile.in

@@ -28,7 +28,7 @@ SRCS=$(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES)
 OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES)
 
 include $(RTEMS_CUSTOM)
-include $(PROJECT_ROOT)/make/leaf.cfg
+include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
 # (OPTIONAL) Add local stuff here using +=

c/src/lib/libbsp/a29k/portsw/include/Makefile.in

@@ -25,7 +25,7 @@ EQ_FILES =
 SRCS=$(H_FILES) $(EQ_FILES)
 
 include $(RTEMS_CUSTOM)
-include $(PROJECT_ROOT)/make/leaf.cfg
+include $(RTEMS_ROOT)/make/leaf.cfg
 
 CLEAN_ADDITIONS +=
 CLOBBER_ADDITIONS +=

c/src/lib/libbsp/a29k/portsw/shmsupp/Makefile.in

@@ -28,7 +28,7 @@ SRCS=$(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES)
 OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES)
 
 include $(RTEMS_CUSTOM)
-include $(PROJECT_ROOT)/make/leaf.cfg
+include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
 # (OPTIONAL) Add local stuff here using +=

c/src/lib/libbsp/a29k/portsw/start/Makefile.in

@@ -26,7 +26,7 @@ SRCS=$(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES)
 OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES)
 
 include $(RTEMS_CUSTOM)
-include $(PROJECT_ROOT)/make/leaf.cfg
+include $(RTEMS_ROOT)/make/leaf.cfg
 
 PGM=${ARCH}/crt0.o ${ARCH}/register.o
 

c/src/lib/libbsp/a29k/portsw/startup/Makefile.in

@@ -28,7 +28,7 @@ SRCS=ramlink romlink $(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES)
 OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES)
 
 include $(RTEMS_CUSTOM)
-include $(PROJECT_ROOT)/make/leaf.cfg
+include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
 # (OPTIONAL) Add local stuff here using +=

c/src/lib/libbsp/a29k/portsw/wrapup/Makefile.in

@@ -21,7 +21,7 @@ OBJS=$(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/$(piece).rel) \
 LIB=$(ARCH)/libbsp.a
 
 include $(RTEMS_CUSTOM)
-include $(PROJECT_ROOT)/make/lib.cfg
+include $(RTEMS_ROOT)/make/lib.cfg
 
 #
 # (OPTIONAL) Add local stuff here using +=

c/src/lib/libbsp/hppa1.1/Makefile.in

@@ -11,7 +11,7 @@ PROJECT_ROOT = @PROJECT_ROOT@
 RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 include $(RTEMS_CUSTOM)
-include $(PROJECT_ROOT)/make/directory.cfg
+include $(RTEMS_ROOT)/make/directory.cfg
 
 # Descend into the $(RTEMS_BSP_FAMILY) directory
 SUB_DIRS=$(RTEMS_BSP_FAMILY)

c/src/lib/libbsp/hppa1.1/pxfl/Makefile.in

@@ -17,7 +17,7 @@ PROJECT_ROOT = @PROJECT_ROOT@
 RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 include $(RTEMS_CUSTOM)
-include $(PROJECT_ROOT)/make/leaf.cfg
+include $(RTEMS_ROOT)/make/leaf.cfg
 
 SRCS=$(srcdir)/floss-bsp.h
 

c/src/lib/libbsp/hppa1.1/simhppa/Makefile.in

@@ -11,7 +11,7 @@ PROJECT_ROOT = @PROJECT_ROOT@
 RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 include $(RTEMS_CUSTOM)
-include $(PROJECT_ROOT)/make/directory.cfg
+include $(RTEMS_ROOT)/make/directory.cfg
 
 # wrapup is the one that actually builds and installs the library
 #  from the individual .rel files built in other directories

c/src/lib/libbsp/hppa1.1/simhppa/include/Makefile.in

@@ -33,7 +33,7 @@ EQ_FILES =
 SRCS=$(H_FILES) $(EQ_FILES)
 
 include $(RTEMS_CUSTOM)
-include $(PROJECT_ROOT)/make/leaf.cfg
+include $(RTEMS_ROOT)/make/leaf.cfg
 
 CLEAN_ADDITIONS +=
 CLOBBER_ADDITIONS +=

c/src/lib/libbsp/hppa1.1/simhppa/shmsupp/Makefile.in

@@ -23,7 +23,7 @@ SRCS=$(C_FILES) $(H_FILES)
 OBJS=$(C_O_FILES)
 
 include $(RTEMS_CUSTOM)
-include $(PROJECT_ROOT)/make/leaf.cfg
+include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
 # (OPTIONAL) Add local stuff here using +=

c/src/lib/libbsp/hppa1.1/simhppa/startup/Makefile.in

@@ -31,7 +31,7 @@ OBJS=$(C_O_FILES)
 INSTALLED_O_FILES=$(ARCH)/rtems-ctor.o
 
 include $(RTEMS_CUSTOM)
-include $(PROJECT_ROOT)/make/leaf.cfg
+include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
 # (OPTIONAL) Add local stuff here using +=

c/src/lib/libbsp/hppa1.1/simhppa/tools/Makefile.in

@@ -26,7 +26,7 @@ OBJS=$(C_O_FILES)
 PGMS=${ARCH}/print_dump
 
 include $(RTEMS_CUSTOM)
-include $(PROJECT_ROOT)/make/leaf.cfg
+include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
 # (OPTIONAL) Add local stuff here using +=

c/src/lib/libbsp/hppa1.1/simhppa/tty/Makefile.in

@@ -23,7 +23,7 @@ SRCS=$(C_FILES) $(H_FILES)
 OBJS=$(C_O_FILES)
 
 include $(RTEMS_CUSTOM)
-include $(PROJECT_ROOT)/make/leaf.cfg
+include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
 # (OPTIONAL) Add local stuff here using +=

c/src/lib/libbsp/hppa1.1/simhppa/wrapup/Makefile.in

@@ -24,7 +24,7 @@ OBJS=$(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/$(piece).rel) \
 LIB=$(ARCH)/libbsp.a
 
 include $(RTEMS_CUSTOM)
-include $(PROJECT_ROOT)/make/lib.cfg
+include $(RTEMS_ROOT)/make/lib.cfg
 
 #
 # (OPTIONAL) Add local stuff here using +=

c/src/lib/libbsp/i386/Makefile.in

@@ -11,7 +11,7 @@ PROJECT_ROOT = @PROJECT_ROOT@
 RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 include $(RTEMS_CUSTOM)
-include $(PROJECT_ROOT)/make/directory.cfg
+include $(RTEMS_ROOT)/make/directory.cfg
 
 # Descend into the $(RTEMS_BSP_FAMILY) directory
 SUB_DIRS=$(RTEMS_BSP_FAMILY)

c/src/lib/libbsp/i386/force386/Makefile.in

@@ -11,7 +11,7 @@ PROJECT_ROOT = @PROJECT_ROOT@
 RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 include $(RTEMS_CUSTOM)
-include $(PROJECT_ROOT)/make/directory.cfg
+include $(RTEMS_ROOT)/make/directory.cfg
 
 # wrapup is the one that actually builds and installs the library
 #  from the individual .rel files built in other directories

c/src/lib/libbsp/i386/force386/clock/Makefile.in

@@ -23,7 +23,7 @@ SRCS=$(C_FILES) $(H_FILES)
 OBJS=$(C_O_FILES)
 
 include $(RTEMS_CUSTOM)
-include $(PROJECT_ROOT)/make/leaf.cfg
+include $(RTEMS_ROOT)/make/leaf.cfg
 
 
 #

c/src/lib/libbsp/i386/force386/console/Makefile.in

@@ -23,7 +23,7 @@ SRCS=$(C_FILES) $(H_FILES)
 OBJS=$(C_O_FILES)
 
 include $(RTEMS_CUSTOM)
-include $(PROJECT_ROOT)/make/leaf.cfg
+include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
 # (OPTIONAL) Add local stuff here using +=

c/src/lib/libbsp/i386/force386/include/Makefile.in

@@ -25,7 +25,7 @@ EQ_FILES =
 SRCS=$(H_FILES) $(EQ_FILES)
 
 include $(RTEMS_CUSTOM)
-include $(PROJECT_ROOT)/make/leaf.cfg
+include $(RTEMS_ROOT)/make/leaf.cfg
 
 CLEAN_ADDITIONS +=
 CLOBBER_ADDITIONS +=

c/src/lib/libbsp/i386/force386/shmsupp/Makefile.in

@@ -23,7 +23,7 @@ SRCS=$(C_FILES) $(H_FILES)
 OBJS=$(C_O_FILES)
 
 include $(RTEMS_CUSTOM)
-include $(PROJECT_ROOT)/make/leaf.cfg
+include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
 # (OPTIONAL) Add local stuff here using +=

c/src/lib/libbsp/i386/force386/startup/Makefile.in

@@ -28,7 +28,7 @@ SRCS=$(srcdir)/linkcmds $(C_FILES) $(H_FILES) $(S_FILES)
 OBJS=$(C_O_FILES) $(S_O_FILES)
 
 include $(RTEMS_CUSTOM)
-include $(PROJECT_ROOT)/make/leaf.cfg
+include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
 # (OPTIONAL) Add local stuff here using +=

c/src/lib/libbsp/i386/force386/timer/Makefile.in

@@ -28,7 +28,7 @@ SRCS=$(C_FILES) $(H_FILES) $(S_FILES)
 OBJS=$(C_O_FILES) $(S_O_FILES)
 
 include $(RTEMS_CUSTOM)
-include $(PROJECT_ROOT)/make/leaf.cfg
+include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
 # (OPTIONAL) Add local stuff here using +=

c/src/lib/libbsp/i386/force386/wrapup/Makefile.in

@@ -19,7 +19,7 @@ OBJS=$(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/$(piece).rel) \
 LIB=$(ARCH)/libbsp.a
 
 include $(RTEMS_CUSTOM)
-include $(PROJECT_ROOT)/make/lib.cfg
+include $(RTEMS_ROOT)/make/lib.cfg
 
 #
 # (OPTIONAL) Add local stuff here using +=

c/src/lib/libbsp/i386/go32/Makefile.in

@@ -11,7 +11,7 @@ PROJECT_ROOT = @PROJECT_ROOT@
 RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 include $(RTEMS_CUSTOM)
-include $(PROJECT_ROOT)/make/directory.cfg
+include $(RTEMS_ROOT)/make/directory.cfg
 
 # wrapup is the one that actually builds and installs the library
 #  from the individual .rel files built in other directories

c/src/lib/libbsp/i386/go32/clock/Makefile.in

@@ -23,7 +23,7 @@ SRCS=$(C_FILES) $(H_FILES)
 OBJS=$(C_O_FILES)
 
 include $(RTEMS_CUSTOM)
-include $(PROJECT_ROOT)/make/leaf.cfg
+include $(RTEMS_ROOT)/make/leaf.cfg
 
 
 #

c/src/lib/libbsp/i386/go32/console/Makefile.in

@@ -23,7 +23,7 @@ SRCS=$(C_FILES) $(H_FILES)
 OBJS=$(C_O_FILES)
 
 include $(RTEMS_CUSTOM)
-include $(PROJECT_ROOT)/make/leaf.cfg
+include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
 # (OPTIONAL) Add local stuff here using +=

c/src/lib/libbsp/i386/go32/include/Makefile.in

@@ -25,7 +25,7 @@ EQ_FILES =
 SRCS=$(H_FILES) $(EQ_FILES)
 
 include $(RTEMS_CUSTOM)
-include $(PROJECT_ROOT)/make/leaf.cfg
+include $(RTEMS_ROOT)/make/leaf.cfg
 
 CLEAN_ADDITIONS +=
 CLOBBER_ADDITIONS +=

c/src/lib/libbsp/i386/go32/startup/Makefile.in

@@ -23,7 +23,7 @@ SRCS=$(C_FILES) $(H_FILES)
 OBJS=$(C_O_FILES)
 
 include $(RTEMS_CUSTOM)
-include $(PROJECT_ROOT)/make/leaf.cfg
+include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
 # (OPTIONAL) Add local stuff here using +=

c/src/lib/libbsp/i386/go32/timer/Makefile.in

@@ -28,7 +28,7 @@ SRCS=$(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES)
 OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES)
 
 include $(RTEMS_CUSTOM)
-include $(PROJECT_ROOT)/make/leaf.cfg
+include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
 # (OPTIONAL) Add local stuff here using +=

c/src/lib/libbsp/i386/go32/wrapup/Makefile.in

@@ -19,7 +19,7 @@ OBJS=$(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/$(piece).rel) \
 LIB=$(ARCH)/libbsp.a
 
 include $(RTEMS_CUSTOM)
-include $(PROJECT_ROOT)/make/lib.cfg
+include $(RTEMS_ROOT)/make/lib.cfg
 
 #
 # (OPTIONAL) Add local stuff here using +=

c/src/lib/libbsp/i386/i386ex/Makefile.in

@@ -11,7 +11,7 @@ PROJECT_ROOT = @PROJECT_ROOT@
 RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 include $(RTEMS_CUSTOM)
-include $(PROJECT_ROOT)/make/directory.cfg
+include $(RTEMS_ROOT)/make/directory.cfg
 
 # wrapup is the one that actually builds and installs the library
 #  from the individual .rel files built in other directories

c/src/lib/libbsp/i386/i386ex/clock/Makefile.in

@@ -28,7 +28,7 @@ SRCS=$(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES)
 OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES)
 
 include $(RTEMS_CUSTOM)
-include $(PROJECT_ROOT)/make/leaf.cfg
+include $(RTEMS_ROOT)/make/leaf.cfg
 
 
 #

c/src/lib/libbsp/i386/i386ex/console/Makefile.in

@@ -28,7 +28,7 @@ SRCS=$(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES)
 OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES)
 
 include $(RTEMS_CUSTOM)
-include $(PROJECT_ROOT)/make/leaf.cfg
+include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
 # (OPTIONAL) Add local stuff here using +=