Modified a lot of files to take a first cut at supporting building from

any directory in the build tree.  The only variable which must be set
before the command "gmake" is invoked is RTEMS_BSP (e.g. RTEMS_BSP=erc32).

Makefile.in

@@ -16,42 +16,19 @@ manext = 1
 mandir = @mandir@/man$(manext)
 program_prefix = @program_prefix@
 
+RTEMS_ROOT = @RTEMS_ROOT@
+PROJECT_ROOT = @PROJECT_ROOT@
 
 VPATH=@srcdir@
 
-CFLAGS = @CFLAGS@
-CPPFLAGS = @CPPFLAGS@
-DEFS = @DEFS@
-LDFLAGS =
-LIBS = @LIBS@
-CC_FOR_BUILD = gcc
-
-
-CC_FOR_TARGET = $(program_prefix)gcc
-AS_FOR_TARGET = $(program_prefix)as
-AR_FOR_TARGET = $(program_prefix)ar
-NM_FOR_TARGET = $(program_prefix)nm
-LD_FOR_TARGET = $(program_prefix)ld
-OBJCOPY_FOR_TARGET = $(program_prefix)objcopy
-SIZE_FOR_TARGET = $(program_prefix)size
-
-RTEMS_ROOT = @RTEMS_ROOT@
-RTEMS_HOST = @RTEMS_HOST@
-PROJECT_ROOT = @PROJECT_ROOT@
-RTEMS_USE_OWN_PDIR = @RTEMS_USE_OWN_PDIR@
-RTEMS_HAS_POSIX_API = @RTEMS_HAS_POSIX_API@
-RTEMS_HAS_KA9Q = @RTEMS_HAS_KA9Q@
-RTEMS_HAS_CPLUSPLUS = @RTEMS_HAS_CPLUSPLUS@
-RTEMS_USE_MACROS = @RTEMS_USE_MACROS@
-RTEMS_USE_GCC272 = @RTEMS_USE_GCC272@
-RTEMS_LIBC_DIR = @RTEMS_LIBC_DIR@
-
 ifeq ($(RTEMSBSP),)
   RTEMS_BSP = @RTEMS_BSP@
 else
   RTEMS_BSP = $(RTEMSBSP)
 endif
 
+MAKE_CONFIG_EXTRA_DIR_PART=c/
+
 include $(RTEMS_ROOT)/make/main.cfg
 
 MTARGETS = all install $(TARGET_VARIANTS) $(TARGET_VARIANTS:%=%_all) \
@@ -65,34 +42,14 @@ EXIT_CMD = exit 1
 # Don't pass flags from previous make - especially NOT CFLAGS 
 override MAKEFLAGS=
 
+#            \"XCFLAGS=$(CFLAGS_FOR_TARGET)\"
+
 $(MTARGETS): make_subdir
 	BASEDIR=`pwd`; \
 	for bsp in $(RTEMS_BSP) xxx; \
 	do if [ $$bsp != xxx ] ; then  \
 	    cd $$BASEDIR; \
 	    cmd="cd c; $(MAKE) RTEMS_BSP=$$bsp $(FLAGS_TO_PASS) \
-	    RTEMS_CUSTOM=$(RTEMS_ROOT)/make/custom/$$bsp.cfg \
-	    INSTALL=$(PROJECT_ROOT)/$$bsp/build-tools/install-if-change \
-            \"CC=$(CC_FOR_TARGET)\" \
-            \"XCFLAGS=$(CFLAGS_FOR_TARGET)\" \
-            \"CC_FOR_BUILD=$(CC_FOR_BUILD)\" \
-            \"AS=$(AS_FOR_TARGET)\" \
-            \"LD=$(LD_FOR_TARGET)\" \
-            \"NM=$(NM_FOR_TARGET)\" \
-            \"AR=$(AR_FOR_TARGET)\" \
-            \"SIZE=$(SIZE_FOR_TARGET)\" \
-            \"OBJCOPY=$(OBJCOPY_FOR_TARGET)\" \
-            \"RTEMS_ROOT=$(RTEMS_ROOT)\" \
-            \"RTEMS_HOST=$(RTEMS_HOST)\" \
-            \"PROJECT_HOME=$(PROJECT_ROOT)/$$bsp\" \
-            \"PROJECT_ROOT=$(PROJECT_ROOT)\" \
-            \"RTEMS_USE_OWN_PDIR=$(RTEMS_USE_OWN_PDIR)\" \
-            \"RTEMS_HAS_POSIX_API=$(RTEMS_HAS_POSIX_API)\" \
-            \"RTEMS_HAS_KA9Q=$(RTEMS_HAS_KA9Q)\" \
-            \"RTEMS_HAS_CPLUSPLUS=$(RTEMS_HAS_CPLUSPLUS)\" \
-            \"RTEMS_USE_MACROS=$(RTEMS_USE_MACROS)\" \
-            \"RTEMS_USE_GCC272=$(RTEMS_USE_GCC272)\" \
-            \"RTEMS_LIBC_DIR=$(RTEMS_LIBC_DIR)\" \
             $@" ; \
 	    eval $$cmd || $(EXIT_CMD); \
 	fi; done; 
@@ -109,7 +66,6 @@ make_subdir:
 	        make/Templates/Makefile.leaf make/Templates/Makefile.lib) | \
 		tar xpBf - ; rm -rf make/CVS make/*/CVS ; \
 	  cp c/make/Templates/Makefile.inc make/Templates/Makefile.inc ; \
+	  cp c/make/host.cfg make/host.cfg ; \
+	  cp c/make/target.cfg make/target.cfg ; \
 	fi
-  	
- 	
-

c/Makefile.in

@@ -17,7 +17,10 @@ target = @target@
 manext = 1
 mandir = @mandir@/man$(manext)
 program_prefix = @program_prefix@
-VPATH=@srcdir@
+VPATH = @srcdir@
+RTEMS_ROOT = @RTEMS_ROOT@
+PROJECT_ROOT = @PROJECT_ROOT@
+RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 include $(RTEMS_CUSTOM)
 include $(RTEMS_ROOT)/make/directory.cfg
@@ -50,10 +53,17 @@ CREATE_DIRS = \
     build-tools update-tools
 
 # Make all/install must include 'env'
+# if something is added to TARGET_VARIANTS, then account for it here
 all: env
-$(TARGET_VARIANTS): env
+debug: env
-$(TARGET_VARIANTS:%=%_install): env 
+profile: env
-$(TARGET_VARIANTS:%=%_all): env 
+
+install: all install_files
+debug_install: env debug install_files
+profile_install: env profile install_files
+
+debug_all: debug
+profile_all: profile
 
 # top level clean/clobber will delete the install points
 clean_WRAPUP = $(MAKE) clean_wrapup
@@ -63,14 +73,13 @@ clean_wrapup: clean_tools clean_dirs clean_modules
 
 .PHONY:	dirs clean_wrapup clean_dirs clean_tools clean_modules env install
 
-#  XXX The link is temporary while switching to -specs options.
 dirs:
 	-test -d $(PROJECT_ROOT)/c/src/lib/libhwapi && \
 	    (cd $(PROJECT_ROOT)/c/src/lib/libhwapi ; $(MAKE) mkdirs)
-#	-$(MKDIR) ${CREATE_DIRS:%=$(PROJECT_ROOT)/$(RTEMS_BSP)/%}
+	-$(MKDIR) ${CREATE_DIRS:%=$(PROJECT_ROOT)/$(RTEMS_BSP)/%}
-	@echo Making directories in build tree ...
+#	@echo Making directories in build tree ...
-	-$(foreach dir,$(CREATE_DIRS), \
+#	-$(foreach dir,$(CREATE_DIRS), \
-	    $(shell $(MKDIR) $(PROJECT_ROOT)/$(RTEMS_BSP)/$(dir)))
+#	    $(shell $(MKDIR) $(PROJECT_ROOT)/$(RTEMS_BSP)/$(dir)))
 
 distclean: clobber
 
@@ -82,7 +91,9 @@ clean_tools:
 
 # NOTE: The wildcard on the install should pick up everything except
 #       the tests directory.  This significantly minimizes the install size.
-install: all
+
+
+install_files:
 	 -$(MKDIR) $(prefix)/
 	 -$(MKDIR) $(prefix)/rtems
 	 -$(MKDIR) $(prefix)/rtems/make

c/build-tools/Makefile.in

@@ -5,7 +5,10 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-VPATH=@srcdir@
+VPATH = @srcdir@
+RTEMS_ROOT = @RTEMS_ROOT@
+PROJECT_ROOT = @PROJECT_ROOT@
+RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 include $(RTEMS_CUSTOM)
 include $(RTEMS_ROOT)/make/directory.cfg

c/build-tools/os/Makefile.in

@@ -5,7 +5,10 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-VPATH=@srcdir@
+VPATH = @srcdir@
+RTEMS_ROOT = @RTEMS_ROOT@
+PROJECT_ROOT = @PROJECT_ROOT@
+RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 include $(RTEMS_CUSTOM)
 include $(RTEMS_ROOT)/make/directory.cfg

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

@@ -5,7 +5,10 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-VPATH=@srcdir@
+VPATH = @srcdir@
+RTEMS_ROOT = @RTEMS_ROOT@
+PROJECT_ROOT = @PROJECT_ROOT@
+RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 include $(RTEMS_CUSTOM)
 include $(PROJECT_ROOT)/make/leaf.cfg

c/build-tools/scripts/Makefile.in

@@ -9,7 +9,10 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-VPATH=@srcdir@
+VPATH = @srcdir@
+RTEMS_ROOT = @RTEMS_ROOT@
+PROJECT_ROOT = @PROJECT_ROOT@
+RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 include $(RTEMS_CUSTOM)
 include $(RTEMS_ROOT)/make/leaf.cfg

c/build-tools/src/Makefile.in

@@ -5,7 +5,6 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-VPATH=@srcdir@
 exec_prefix = @exec_prefix@
 bindir = @bindir@
 libdir = @libdir@
@@ -13,9 +12,10 @@ includedir = @includedir@
 manext = 1
 mandir = @mandir@/man$(manext)
 
-
+VPATH = @srcdir@
-VPATH=@srcdir@
+RTEMS_ROOT = @RTEMS_ROOT@
-
+PROJECT_ROOT = @PROJECT_ROOT@
+RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 # we use host compiler in this directory
 USE_HOST_COMPILER=yes

c/src/Makefile.in

@@ -5,7 +5,10 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-VPATH=@srcdir@
+VPATH = @srcdir@
+RTEMS_ROOT = @RTEMS_ROOT@
+PROJECT_ROOT = @PROJECT_ROOT@
+RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 include $(RTEMS_CUSTOM)
 include $(PROJECT_ROOT)/make/directory.cfg

c/src/exec/Makefile.in

@@ -5,7 +5,10 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-VPATH=@srcdir@
+VPATH = @srcdir@
+RTEMS_ROOT = @RTEMS_ROOT@
+PROJECT_ROOT = @PROJECT_ROOT@
+RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 include $(RTEMS_CUSTOM)
 include $(PROJECT_ROOT)/make/directory.cfg

c/src/exec/posix/Makefile.in

@@ -5,7 +5,10 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-VPATH=@srcdir@
+VPATH = @srcdir@
+RTEMS_ROOT = @RTEMS_ROOT@
+PROJECT_ROOT = @PROJECT_ROOT@
+RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 include $(RTEMS_CUSTOM)
 include $(PROJECT_ROOT)/make/directory.cfg

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

@@ -5,7 +5,10 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-VPATH=@srcdir@
+VPATH = @srcdir@
+RTEMS_ROOT = @RTEMS_ROOT@
+PROJECT_ROOT = @PROJECT_ROOT@
+RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 #H_PIECES= aio devctl intr limits mqueue pthread sched semaphore \
 #    signal time unistd

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

@@ -5,7 +5,10 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-VPATH=@srcdir@
+VPATH = @srcdir@
+RTEMS_ROOT = @RTEMS_ROOT@
+PROJECT_ROOT = @PROJECT_ROOT@
+RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 H_PIECES= cond condmp config key mutex mutexmp posixapi \
     priority psignal pthread pthreadmp seterr threadsup time

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

@@ -5,7 +5,10 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-VPATH=@srcdir@
+VPATH = @srcdir@
+RTEMS_ROOT = @RTEMS_ROOT@
+PROJECT_ROOT = @PROJECT_ROOT@
+RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 H_PIECES= cond condmp config key mutex mutexmp posixapi \
     priority psignal pthread pthreadmp seterr threadsup time

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

@@ -5,7 +5,10 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-VPATH=@srcdir@
+VPATH = @srcdir@
+RTEMS_ROOT = @RTEMS_ROOT@
+PROJECT_ROOT = @PROJECT_ROOT@
+RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 #H_PIECES=utsname
 H_PIECES=

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

@@ -5,7 +5,10 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-VPATH=@srcdir@
+VPATH = @srcdir@
+RTEMS_ROOT = @RTEMS_ROOT@
+PROJECT_ROOT = @PROJECT_ROOT@
+RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 #H_PIECES= aio devctl intr limits mqueue pthread sched semaphore \
 #    signal time unistd

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

@@ -5,7 +5,10 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-VPATH=@srcdir@
+VPATH = @srcdir@
+RTEMS_ROOT = @RTEMS_ROOT@
+PROJECT_ROOT = @PROJECT_ROOT@
+RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 #I_PIECES= cond intr key mqueue mutex pthread priority semaphore
 I_PIECES=cond key mutex pthread priority

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

@@ -5,7 +5,10 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-VPATH=@srcdir@
+VPATH = @srcdir@
+RTEMS_ROOT = @RTEMS_ROOT@
+PROJECT_ROOT = @PROJECT_ROOT@
+RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 #I_PIECES= cond intr key mqueue mutex pthread priority semaphore
 I_PIECES=cond key mutex pthread priority

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

@@ -5,7 +5,10 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-VPATH=@srcdir@
+VPATH = @srcdir@
+RTEMS_ROOT = @RTEMS_ROOT@
+PROJECT_ROOT = @PROJECT_ROOT@
+RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 # Right now there are not macro implementation of the posix inline routines
 # So it won't build

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

@@ -5,7 +5,10 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-VPATH=@srcdir@
+VPATH = @srcdir@
+RTEMS_ROOT = @RTEMS_ROOT@
+PROJECT_ROOT = @PROJECT_ROOT@
+RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 # Right now there are not macro implementation of the posix inline routines
 # So it won't build

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

@@ -5,7 +5,10 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-VPATH=@srcdir@
+VPATH = @srcdir@
+RTEMS_ROOT = @RTEMS_ROOT@
+PROJECT_ROOT = @PROJECT_ROOT@
+RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 C_FILES= 
 

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

@@ -5,7 +5,10 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-VPATH=@srcdir@
+VPATH = @srcdir@
+RTEMS_ROOT = @RTEMS_ROOT@
+PROJECT_ROOT = @PROJECT_ROOT@
+RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 # following are semi-implemented and untested
 # C_PIECES=aio cancel devctl intr mqueue ptimer semaphore time utsname

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

@@ -5,7 +5,10 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-VPATH=@srcdir@
+VPATH = @srcdir@
+RTEMS_ROOT = @RTEMS_ROOT@
+PROJECT_ROOT = @PROJECT_ROOT@
+RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 #H_PIECES=utsname
 H_PIECES=

c/src/exec/rtems/Makefile.in

@@ -5,7 +5,10 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-VPATH=@srcdir@
+VPATH = @srcdir@
+RTEMS_ROOT = @RTEMS_ROOT@
+PROJECT_ROOT = @PROJECT_ROOT@
+RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 include $(RTEMS_CUSTOM)
 include $(PROJECT_ROOT)/make/directory.cfg

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

@@ -5,7 +5,10 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-VPATH=@srcdir@
+VPATH = @srcdir@
+RTEMS_ROOT = @RTEMS_ROOT@
+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 \

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

@@ -5,7 +5,10 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-VPATH=@srcdir@
+VPATH = @srcdir@
+RTEMS_ROOT = @RTEMS_ROOT@
+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 \

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

@@ -5,7 +5,10 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-VPATH=@srcdir@
+VPATH = @srcdir@
+RTEMS_ROOT = @RTEMS_ROOT@
+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

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

@@ -5,7 +5,10 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-VPATH=@srcdir@
+VPATH = @srcdir@
+RTEMS_ROOT = @RTEMS_ROOT@
+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

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

@@ -5,7 +5,10 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-VPATH=@srcdir@
+VPATH = @srcdir@
+RTEMS_ROOT = @RTEMS_ROOT@
+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

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

@@ -5,7 +5,10 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-VPATH=@srcdir@
+VPATH = @srcdir@
+RTEMS_ROOT = @RTEMS_ROOT@
+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

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

@@ -5,7 +5,10 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-VPATH=@srcdir@
+VPATH = @srcdir@
+RTEMS_ROOT = @RTEMS_ROOT@
+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

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

@@ -5,7 +5,10 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-VPATH=@srcdir@
+VPATH = @srcdir@
+RTEMS_ROOT = @RTEMS_ROOT@
+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 \

c/src/exec/sapi/Makefile.in

@@ -5,7 +5,10 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-VPATH=@srcdir@
+VPATH = @srcdir@
+RTEMS_ROOT = @RTEMS_ROOT@
+PROJECT_ROOT = @PROJECT_ROOT@
+RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 include $(RTEMS_CUSTOM)
 include $(PROJECT_ROOT)/make/directory.cfg

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

@@ -5,7 +5,10 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-VPATH=@srcdir@
+VPATH = @srcdir@
+RTEMS_ROOT = @RTEMS_ROOT@
+PROJECT_ROOT = @PROJECT_ROOT@
+RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 H_PIECES= config directives extension fatal init io mptables sptables
 H_FILES=$(H_PIECES:%=$(srcdir)/%.h)

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

@@ -5,7 +5,10 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-VPATH=@srcdir@
+VPATH = @srcdir@
+RTEMS_ROOT = @RTEMS_ROOT@
+PROJECT_ROOT = @PROJECT_ROOT@
+RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 H_PIECES= config directives extension fatal init io mptables sptables
 H_FILES=$(H_PIECES:%=$(srcdir)/%.h)

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

@@ -5,7 +5,10 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-VPATH=@srcdir@
+VPATH = @srcdir@
+RTEMS_ROOT = @RTEMS_ROOT@
+PROJECT_ROOT = @PROJECT_ROOT@
+RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 I_PIECES= extension
 I_FILES=$(I_PIECES:%=$(srcdir)/%.inl)

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

@@ -5,7 +5,10 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-VPATH=@srcdir@
+VPATH = @srcdir@
+RTEMS_ROOT = @RTEMS_ROOT@
+PROJECT_ROOT = @PROJECT_ROOT@
+RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 I_PIECES= extension
 I_FILES=$(I_PIECES:%=$(srcdir)/%.inl)

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

@@ -5,7 +5,10 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-VPATH=@srcdir@
+VPATH = @srcdir@
+RTEMS_ROOT = @RTEMS_ROOT@
+PROJECT_ROOT = @PROJECT_ROOT@
+RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 I_PIECES= extension
 I_FILES=$(I_PIECES:%=$(srcdir)/%.inl)

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

@@ -5,7 +5,10 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-VPATH=@srcdir@
+VPATH = @srcdir@
+RTEMS_ROOT = @RTEMS_ROOT@
+PROJECT_ROOT = @PROJECT_ROOT@
+RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 I_PIECES= extension
 I_FILES=$(I_PIECES:%=$(srcdir)/%.inl)

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

@@ -5,7 +5,10 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-VPATH=@srcdir@
+VPATH = @srcdir@
+RTEMS_ROOT = @RTEMS_ROOT@
+PROJECT_ROOT = @PROJECT_ROOT@
+RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 C_FILES= no-ext.c no-io.c
 

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

@@ -5,7 +5,10 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-VPATH=@srcdir@
+VPATH = @srcdir@
+RTEMS_ROOT = @RTEMS_ROOT@
+PROJECT_ROOT = @PROJECT_ROOT@
+RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 C_PIECES= debug extension fatal init io posixapi rtemsapi
 C_FILES=$(C_PIECES:%=%.c)

c/src/exec/score/Makefile.in

@@ -5,7 +5,10 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-VPATH=@srcdir@
+VPATH = @srcdir@
+RTEMS_ROOT = @RTEMS_ROOT@
+PROJECT_ROOT = @PROJECT_ROOT@
+RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 include $(RTEMS_CUSTOM)
 include $(PROJECT_ROOT)/make/directory.cfg

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

@@ -5,7 +5,10 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-VPATH=@srcdir@
+VPATH = @srcdir@
+RTEMS_ROOT = @RTEMS_ROOT@
+PROJECT_ROOT = @PROJECT_ROOT@
+RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 include $(RTEMS_CUSTOM)
 include $(PROJECT_ROOT)/make/directory.cfg

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

@@ -5,7 +5,10 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-VPATH=@srcdir@
+VPATH = @srcdir@
+RTEMS_ROOT = @RTEMS_ROOT@
+PROJECT_ROOT = @PROJECT_ROOT@
+RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 RELS=$(ARCH)/rtems-cpu.rel
 

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

@@ -5,7 +5,10 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-VPATH=@srcdir@
+VPATH = @srcdir@
+RTEMS_ROOT = @RTEMS_ROOT@
+PROJECT_ROOT = @PROJECT_ROOT@
+RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 RELS=$(ARCH)/rtems-cpu.rel
 

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

@@ -5,7 +5,10 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-VPATH=@srcdir@
+VPATH = @srcdir@
+RTEMS_ROOT = @RTEMS_ROOT@
+PROJECT_ROOT = @PROJECT_ROOT@
+RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 RELS=$(ARCH)/rtems-cpu.rel
 

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

@@ -5,7 +5,10 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-VPATH=@srcdir@
+VPATH = @srcdir@
+RTEMS_ROOT = @RTEMS_ROOT@
+PROJECT_ROOT = @PROJECT_ROOT@
+RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 RELS=$(ARCH)/rtems-cpu.rel
 

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

@@ -5,7 +5,10 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-VPATH=@srcdir@
+VPATH = @srcdir@
+RTEMS_ROOT = @RTEMS_ROOT@
+PROJECT_ROOT = @PROJECT_ROOT@
+RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 RELS=$(ARCH)/rtems-cpu.rel
 

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

@@ -5,7 +5,10 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-VPATH=@srcdir@
+VPATH = @srcdir@
+RTEMS_ROOT = @RTEMS_ROOT@
+PROJECT_ROOT = @PROJECT_ROOT@
+RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 RELS=$(ARCH)/rtems-cpu.rel
 

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

@@ -5,7 +5,10 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-VPATH=@srcdir@
+VPATH = @srcdir@
+RTEMS_ROOT = @RTEMS_ROOT@
+PROJECT_ROOT = @PROJECT_ROOT@
+RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 RELS=$(ARCH)/rtems-cpu.rel
 

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

@@ -5,7 +5,10 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-VPATH=@srcdir@
+VPATH = @srcdir@
+RTEMS_ROOT = @RTEMS_ROOT@
+PROJECT_ROOT = @PROJECT_ROOT@
+RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 RELS=$(ARCH)/rtems-cpu.rel
 

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

@@ -5,7 +5,10 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-VPATH=@srcdir@
+VPATH = @srcdir@
+RTEMS_ROOT = @RTEMS_ROOT@
+PROJECT_ROOT = @PROJECT_ROOT@
+RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 RELS=$(ARCH)/rtems-cpu.rel
 

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

@@ -5,7 +5,10 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-VPATH=@srcdir@
+VPATH = @srcdir@
+RTEMS_ROOT = @RTEMS_ROOT@
+PROJECT_ROOT = @PROJECT_ROOT@
+RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 RELS=$(ARCH)/rtems-cpu.rel
 

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

@@ -5,7 +5,10 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-VPATH=@srcdir@
+VPATH = @srcdir@
+RTEMS_ROOT = @RTEMS_ROOT@
+PROJECT_ROOT = @PROJECT_ROOT@
+RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 # H_FILES that get installed in the rtems/score subdirectoy
 H_PIECES= address apiext bitfield chain context copyrt coremsg coremutex \

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

@@ -5,7 +5,10 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-VPATH=@srcdir@
+VPATH = @srcdir@
+RTEMS_ROOT = @RTEMS_ROOT@
+PROJECT_ROOT = @PROJECT_ROOT@
+RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 # H_FILES that get installed in the rtems/score subdirectoy
 H_PIECES= address apiext bitfield chain context copyrt coremsg coremutex \

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

@@ -5,7 +5,10 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-VPATH=@srcdir@
+VPATH = @srcdir@
+RTEMS_ROOT = @RTEMS_ROOT@
+PROJECT_ROOT = @PROJECT_ROOT@
+RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 I_PIECES= address chain coremsg coremutex coresem heap \
     isr mppkt object objectmp priority stack states sysstate thread \

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

@@ -5,7 +5,10 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-VPATH=@srcdir@
+VPATH = @srcdir@
+RTEMS_ROOT = @RTEMS_ROOT@
+PROJECT_ROOT = @PROJECT_ROOT@
+RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 I_PIECES= address chain coremsg coremutex coresem heap \
     isr mppkt object objectmp priority stack states sysstate thread \

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

@@ -5,7 +5,10 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-VPATH=@srcdir@
+VPATH = @srcdir@
+RTEMS_ROOT = @RTEMS_ROOT@
+PROJECT_ROOT = @PROJECT_ROOT@
+RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 I_PIECES= address chain coremsg coremutex coresem heap \
     isr mppkt object objectmp priority stack states sysstate thread \

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

@@ -5,7 +5,10 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-VPATH=@srcdir@
+VPATH = @srcdir@
+RTEMS_ROOT = @RTEMS_ROOT@
+PROJECT_ROOT = @PROJECT_ROOT@
+RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 I_PIECES= address chain coremsg coremutex coresem heap \
     isr mppkt object objectmp priority stack states sysstate thread \

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

@@ -5,7 +5,10 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-VPATH=@srcdir@
+VPATH = @srcdir@
+RTEMS_ROOT = @RTEMS_ROOT@
+PROJECT_ROOT = @PROJECT_ROOT@
+RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 # C and C++ source names, if any, go here -- minus the .c or .cc
 C_PIECES=apiext chain coremsg coremutex coresem heap interr \

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

@@ -5,7 +5,10 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-VPATH=@srcdir@
+VPATH = @srcdir@
+RTEMS_ROOT = @RTEMS_ROOT@
+PROJECT_ROOT = @PROJECT_ROOT@
+RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 include $(RTEMS_CUSTOM)
 include $(PROJECT_ROOT)/make/directory.cfg

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

@@ -9,7 +9,10 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-VPATH=@srcdir@
+VPATH = @srcdir@
+RTEMS_ROOT = @RTEMS_ROOT@
+PROJECT_ROOT = @PROJECT_ROOT@
+RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 include $(RTEMS_CUSTOM)
 include $(PROJECT_ROOT)/make/leaf.cfg

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

@@ -5,7 +5,10 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-VPATH=@srcdir@
+VPATH = @srcdir@
+RTEMS_ROOT = @RTEMS_ROOT@
+PROJECT_ROOT = @PROJECT_ROOT@
+RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 # we use host compiler here for genoffsets.  Hopefully it has same alignment!!
 USE_HOST_COMPILER=yes

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

@@ -5,7 +5,10 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-VPATH=@srcdir@
+VPATH = @srcdir@
+RTEMS_ROOT = @RTEMS_ROOT@
+PROJECT_ROOT = @PROJECT_ROOT@
+RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 # we use host compiler here for gensize.  Hopefully it has same alignment!!
 USE_HOST_COMPILER=yes

c/src/exec/wrapup/Makefile.in

@@ -5,7 +5,10 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-VPATH=@srcdir@
+VPATH = @srcdir@
+RTEMS_ROOT = @RTEMS_ROOT@
+PROJECT_ROOT = @PROJECT_ROOT@
+RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 include $(RTEMS_CUSTOM)
 include $(PROJECT_ROOT)/make/directory.cfg

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

@@ -5,7 +5,10 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-VPATH=@srcdir@
+VPATH = @srcdir@
+RTEMS_ROOT = @RTEMS_ROOT@
+PROJECT_ROOT = @PROJECT_ROOT@
+RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 #
 #  This is really temporary until posix is more an integral part of the tree.

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

@@ -5,7 +5,10 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-VPATH=@srcdir@
+VPATH = @srcdir@
+RTEMS_ROOT = @RTEMS_ROOT@
+PROJECT_ROOT = @PROJECT_ROOT@
+RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 CPU_OBJS=$(wildcard ../../score/cpu/$(RTEMS_CPU)/$(ARCH)/*.rel)
 CORE_OBJS=$(wildcard ../../score/src/$(ARCH)/*.o)

c/src/lib/Makefile.in

@@ -5,7 +5,10 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-VPATH=@srcdir@
+VPATH = @srcdir@
+RTEMS_ROOT = @RTEMS_ROOT@
+PROJECT_ROOT = @PROJECT_ROOT@
+RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 include $(RTEMS_CUSTOM)
 include $(PROJECT_ROOT)/make/directory.cfg

c/src/lib/include/Makefile.in

@@ -5,7 +5,10 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-VPATH=@srcdir@
+VPATH = @srcdir@
+RTEMS_ROOT = @RTEMS_ROOT@
+PROJECT_ROOT = @PROJECT_ROOT@
+RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 H_PIECES=console clockdrv iosupp ringbuf \
    spurious timerdrv vmeintr

c/src/lib/libbsp/Makefile.in

@@ -5,7 +5,10 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-VPATH=@srcdir@
+VPATH = @srcdir@
+RTEMS_ROOT = @RTEMS_ROOT@
+PROJECT_ROOT = @PROJECT_ROOT@
+RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 include $(RTEMS_CUSTOM)
 include $(PROJECT_ROOT)/make/directory.cfg

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

@@ -5,7 +5,10 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-VPATH=@srcdir@
+VPATH = @srcdir@
+RTEMS_ROOT = @RTEMS_ROOT@
+PROJECT_ROOT = @PROJECT_ROOT@
+RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 include $(RTEMS_CUSTOM)
 include $(PROJECT_ROOT)/make/directory.cfg

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

@@ -5,7 +5,10 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-VPATH=@srcdir@
+VPATH = @srcdir@
+RTEMS_ROOT = @RTEMS_ROOT@
+PROJECT_ROOT = @PROJECT_ROOT@
+RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 include $(RTEMS_CUSTOM)
 include $(PROJECT_ROOT)/make/directory.cfg

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

@@ -5,7 +5,10 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-VPATH=@srcdir@
+VPATH = @srcdir@
+RTEMS_ROOT = @RTEMS_ROOT@
+PROJECT_ROOT = @PROJECT_ROOT@
+RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 PGM=${ARCH}/console.rel
 

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

@@ -5,7 +5,10 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-VPATH=@srcdir@
+VPATH = @srcdir@
+RTEMS_ROOT = @RTEMS_ROOT@
+PROJECT_ROOT = @PROJECT_ROOT@
+RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 H_FILES = $(srcdir)/bsp.h $(srcdir)/coverhd.h
 

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

@@ -5,7 +5,10 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-VPATH=@srcdir@
+VPATH = @srcdir@
+RTEMS_ROOT = @RTEMS_ROOT@
+PROJECT_ROOT = @PROJECT_ROOT@
+RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 PGM=${ARCH}/shmsupp.rel
 

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

@@ -5,7 +5,10 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-VPATH=@srcdir@
+VPATH = @srcdir@
+RTEMS_ROOT = @RTEMS_ROOT@
+PROJECT_ROOT = @PROJECT_ROOT@
+RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 # C source names, if any, go here -- minus the .c
 C_PIECES=

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

@@ -5,7 +5,10 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-VPATH=@srcdir@:@srcdir@/../../../shared
+VPATH = @srcdir@:@srcdir@/../../../shared
+RTEMS_ROOT = @RTEMS_ROOT@
+PROJECT_ROOT = @PROJECT_ROOT@
+RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 PGM=${ARCH}/startup.rel
 

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

@@ -5,7 +5,10 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-VPATH=@srcdir@
+VPATH = @srcdir@
+RTEMS_ROOT = @RTEMS_ROOT@
+PROJECT_ROOT = @PROJECT_ROOT@
+RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 BSP_PIECES=startup console iic ethernet flash nvram
 CPU_PIECES=clock timer

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

@@ -5,7 +5,10 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-VPATH=@srcdir@
+VPATH = @srcdir@
+RTEMS_ROOT = @RTEMS_ROOT@
+PROJECT_ROOT = @PROJECT_ROOT@
+RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 include $(RTEMS_CUSTOM)
 include $(PROJECT_ROOT)/make/directory.cfg

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

@@ -11,7 +11,10 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-VPATH=@srcdir@
+VPATH = @srcdir@
+RTEMS_ROOT = @RTEMS_ROOT@
+PROJECT_ROOT = @PROJECT_ROOT@
+RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 include $(RTEMS_CUSTOM)
 include $(PROJECT_ROOT)/make/leaf.cfg

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

@@ -5,7 +5,10 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-VPATH=@srcdir@
+VPATH = @srcdir@
+RTEMS_ROOT = @RTEMS_ROOT@
+PROJECT_ROOT = @PROJECT_ROOT@
+RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 include $(RTEMS_CUSTOM)
 include $(PROJECT_ROOT)/make/directory.cfg

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

@@ -5,7 +5,10 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-VPATH=@srcdir@
+VPATH = @srcdir@
+RTEMS_ROOT = @RTEMS_ROOT@
+PROJECT_ROOT = @PROJECT_ROOT@
+RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 H_PIECES = bsp coverhd
 H_FILES=$(H_PIECES:%=$(srcdir)/%.h)

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

@@ -5,7 +5,10 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-VPATH=@srcdir@
+VPATH = @srcdir@
+RTEMS_ROOT = @RTEMS_ROOT@
+PROJECT_ROOT = @PROJECT_ROOT@
+RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 PGM=${ARCH}/shmsupp.rel
 

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

@@ -5,7 +5,10 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-VPATH=@srcdir@:@srcdir@/../../../shared
+VPATH = @srcdir@:@srcdir@/../../../shared
+RTEMS_ROOT = @RTEMS_ROOT@
+PROJECT_ROOT = @PROJECT_ROOT@
+RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 PGM=${ARCH}/startup.rel
 

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

@@ -5,7 +5,10 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-VPATH=@srcdir@
+VPATH = @srcdir@
+RTEMS_ROOT = @RTEMS_ROOT@
+PROJECT_ROOT = @PROJECT_ROOT@
+RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 # we use host compiler here for genoffsets.  Hopefully it has same alignment!!
 USE_HOST_COMPILER=yes

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

@@ -5,7 +5,10 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-VPATH=@srcdir@
+VPATH = @srcdir@
+RTEMS_ROOT = @RTEMS_ROOT@
+PROJECT_ROOT = @PROJECT_ROOT@
+RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 PGM=${ARCH}/tty.rel
 

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

@@ -5,7 +5,10 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-VPATH=@srcdir@
+VPATH = @srcdir@
+RTEMS_ROOT = @RTEMS_ROOT@
+PROJECT_ROOT = @PROJECT_ROOT@
+RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 BSP_PIECES=startup tty shmsupp
 # pieces to pick up out of libcpu/hppa

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

@@ -5,7 +5,10 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-VPATH=@srcdir@
+VPATH = @srcdir@
+RTEMS_ROOT = @RTEMS_ROOT@
+PROJECT_ROOT = @PROJECT_ROOT@
+RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 include $(RTEMS_CUSTOM)
 include $(PROJECT_ROOT)/make/directory.cfg

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

@@ -5,7 +5,10 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-VPATH=@srcdir@
+VPATH = @srcdir@
+RTEMS_ROOT = @RTEMS_ROOT@
+PROJECT_ROOT = @PROJECT_ROOT@
+RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 include $(RTEMS_CUSTOM)
 include $(PROJECT_ROOT)/make/directory.cfg

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

@@ -5,7 +5,10 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-VPATH=@srcdir@
+VPATH = @srcdir@
+RTEMS_ROOT = @RTEMS_ROOT@
+PROJECT_ROOT = @PROJECT_ROOT@
+RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 PGM=${ARCH}/clock.rel
 

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

@@ -5,7 +5,10 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-VPATH=@srcdir@
+VPATH = @srcdir@
+RTEMS_ROOT = @RTEMS_ROOT@
+PROJECT_ROOT = @PROJECT_ROOT@
+RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 PGM=${ARCH}/console.rel
 

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

@@ -5,7 +5,10 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-VPATH=@srcdir@
+VPATH = @srcdir@
+RTEMS_ROOT = @RTEMS_ROOT@
+PROJECT_ROOT = @PROJECT_ROOT@
+RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 H_FILES = $(srcdir)/bsp.h $(srcdir)/coverhd.h
 

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

@@ -5,7 +5,10 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-VPATH=@srcdir@
+VPATH = @srcdir@
+RTEMS_ROOT = @RTEMS_ROOT@
+PROJECT_ROOT = @PROJECT_ROOT@
+RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 PGM=${ARCH}/shmsupp.rel
 

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

@@ -5,7 +5,10 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-VPATH=@srcdir@:@srcdir@/../../../shared
+VPATH = @srcdir@:@srcdir@/../../../shared
+RTEMS_ROOT = @RTEMS_ROOT@
+PROJECT_ROOT = @PROJECT_ROOT@
+RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 PGM=${ARCH}/startup.rel
 

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

@@ -5,7 +5,10 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-VPATH=@srcdir@
+VPATH = @srcdir@
+RTEMS_ROOT = @RTEMS_ROOT@
+PROJECT_ROOT = @PROJECT_ROOT@
+RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 PGM=${ARCH}/timer.rel
 

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

@@ -5,7 +5,10 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-VPATH=@srcdir@
+VPATH = @srcdir@
+RTEMS_ROOT = @RTEMS_ROOT@
+PROJECT_ROOT = @PROJECT_ROOT@
+RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 BSP_PIECES=startup clock console shmsupp timer
 GENERIC_PIECES=shmdr

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

@@ -5,7 +5,10 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-VPATH=@srcdir@
+VPATH = @srcdir@
+RTEMS_ROOT = @RTEMS_ROOT@
+PROJECT_ROOT = @PROJECT_ROOT@
+RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 include $(RTEMS_CUSTOM)
 include $(PROJECT_ROOT)/make/directory.cfg

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

@@ -5,7 +5,10 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-VPATH=@srcdir@
+VPATH = @srcdir@
+RTEMS_ROOT = @RTEMS_ROOT@
+PROJECT_ROOT = @PROJECT_ROOT@
+RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 PGM=${ARCH}/clock.rel
 

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

@@ -5,7 +5,10 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-VPATH=@srcdir@
+VPATH = @srcdir@
+RTEMS_ROOT = @RTEMS_ROOT@
+PROJECT_ROOT = @PROJECT_ROOT@
+RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 PGM=${ARCH}/console.rel
 

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

@@ -5,7 +5,10 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-VPATH=@srcdir@
+VPATH = @srcdir@
+RTEMS_ROOT = @RTEMS_ROOT@
+PROJECT_ROOT = @PROJECT_ROOT@
+RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 H_FILES = $(srcdir)/bsp.h $(srcdir)/coverhd.h
 

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

@@ -5,7 +5,10 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-VPATH=@srcdir@:@srcdir@/../../../shared
+VPATH = @srcdir@:@srcdir@/../../../shared
+RTEMS_ROOT = @RTEMS_ROOT@
+PROJECT_ROOT = @PROJECT_ROOT@
+RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 PGM=${ARCH}/startup.rel