10 files changed, 40 insertions, 10 deletions
diff --git a/c/src/lib/libbsp/i960/Makefile.in b/c/src/lib/libbsp/i960/Makefile.in
index 375b34ab4d..4c87cefb77 100644
--- a/c/src/lib/libbsp/i960/Makefile.in
+++ b/c/src/lib/libbsp/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
 
 include $(RTEMS_CUSTOM)
 include $(PROJECT_ROOT)/make/directory.cfg
diff --git a/c/src/lib/libbsp/i960/cvme961/Makefile.in b/c/src/lib/libbsp/i960/cvme961/Makefile.in
index 1280bbaad6..42f5d2f29e 100644
--- a/c/src/lib/libbsp/i960/cvme961/Makefile.in
+++ b/c/src/lib/libbsp/i960/cvme961/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
diff --git a/c/src/lib/libbsp/i960/cvme961/clock/Makefile.in b/c/src/lib/libbsp/i960/cvme961/clock/Makefile.in
index 8e325402ca..d910c9658f 100644
--- a/c/src/lib/libbsp/i960/cvme961/clock/Makefile.in
+++ b/c/src/lib/libbsp/i960/cvme961/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
 
diff --git a/c/src/lib/libbsp/i960/cvme961/console/Makefile.in b/c/src/lib/libbsp/i960/cvme961/console/Makefile.in
index ff608c8496..c6a89f100d 100644
--- a/c/src/lib/libbsp/i960/cvme961/console/Makefile.in
+++ b/c/src/lib/libbsp/i960/cvme961/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
 
diff --git a/c/src/lib/libbsp/i960/cvme961/include/Makefile.in b/c/src/lib/libbsp/i960/cvme961/include/Makefile.in
index ba2deffd3a..2897aaeabb 100644
--- a/c/src/lib/libbsp/i960/cvme961/include/Makefile.in
+++ b/c/src/lib/libbsp/i960/cvme961/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
 
diff --git a/c/src/lib/libbsp/i960/cvme961/shmsupp/Makefile.in b/c/src/lib/libbsp/i960/cvme961/shmsupp/Makefile.in
index 113ab8109a..9cfae81c74 100644
--- a/c/src/lib/libbsp/i960/cvme961/shmsupp/Makefile.in
+++ b/c/src/lib/libbsp/i960/cvme961/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
 
diff --git a/c/src/lib/libbsp/i960/cvme961/start/Makefile.in b/c/src/lib/libbsp/i960/cvme961/start/Makefile.in
index ca57ecd097..34b5c2699b 100644
--- a/c/src/lib/libbsp/i960/cvme961/start/Makefile.in
+++ b/c/src/lib/libbsp/i960/cvme961/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=
diff --git a/c/src/lib/libbsp/i960/cvme961/startup/Makefile.in b/c/src/lib/libbsp/i960/cvme961/startup/Makefile.in
index 9b6906ed4c..3bcd6acdc3 100644
--- a/c/src/lib/libbsp/i960/cvme961/startup/Makefile.in
+++ b/c/src/lib/libbsp/i960/cvme961/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
 
diff --git a/c/src/lib/libbsp/i960/cvme961/timer/Makefile.in b/c/src/lib/libbsp/i960/cvme961/timer/Makefile.in
index c2ba3476d3..1795c16b9a 100644
--- a/c/src/lib/libbsp/i960/cvme961/timer/Makefile.in
+++ b/c/src/lib/libbsp/i960/cvme961/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
 
diff --git a/c/src/lib/libbsp/i960/cvme961/wrapup/Makefile.in b/c/src/lib/libbsp/i960/cvme961/wrapup/Makefile.in
index 1f8b6feae9..1e555e97e1 100644
--- a/c/src/lib/libbsp/i960/cvme961/wrapup/Makefile.in
+++ b/c/src/lib/libbsp/i960/cvme961/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