Removed include directory at "build" point and the link of this directory

to lib/include.

Went to using a PROJECT_INCLUDE variable.

18 files changed, 67 insertions, 67 deletions

diff --git a/c/src/exec/score/cpu/a29k/Makefile.in b/c/src/exec/score/cpu/a29k/Makefile.in
index fc16379320..2493b845c8 100644
--- a/c/src/exec/score/cpu/a29k/Makefile.in
+++ b/c/src/exec/score/cpu/a29k/Makefile.in
@@ -64,20 +64,20 @@ $(ARCH)/rtems-cpu.rel: $(OBJS)
 # Install the program(s), appending _g or _p as appropriate.
 # for include files, just use $(INSTALL)
 
-preinstall: ${PROJECT_RELEASE}/include/rtems/score/a29k.h \
-            ${PROJECT_RELEASE}/include/rtems/score/targopts.h \
+preinstall: $(PROJECT_INCLUDE)/rtems/score/a29k.h \
+            $(PROJECT_INCLUDE)/rtems/score/targopts.h \
             ${PROJECT_RELEASE}/lib/bsp_specs
-	$(INSTALL) -m 444 ${H_FILES} ${PROJECT_RELEASE}/include/rtems/score
+	$(INSTALL) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems/score
 # we will share the basic cpu file
-	$(INSTALL) -m 444 ${EXTERNAL_H_FILES} ${PROJECT_RELEASE}/include
+	$(INSTALL) -m 444 ${EXTERNAL_H_FILES} $(PROJECT_INCLUDE)
 
-${PROJECT_RELEASE}/include/rtems/score/a29k.h: a29k.h
+$(PROJECT_INCLUDE)/rtems/score/a29k.h: a29k.h
 	 $(SED) -e 's?REPLACE_THIS_WITH_THE_CPU_MODEL?$(RTEMS_CPU_MODEL)?' \
 	        -e 's?REPLACE_THIS_WITH_THE_BSP?$(RTEMS_BSP)?' \
       < $< >$(ARCH)/a29k.h.tmp
 	$(INSTALL) -m 444 $(ARCH)/a29k.h.tmp $@
 
-${PROJECT_RELEASE}/include/rtems/score/targopts.h: $(ARCH)/targopts.h-tmp
+$(PROJECT_INCLUDE)/rtems/score/targopts.h: $(ARCH)/targopts.h-tmp
 	$(INSTALL) -m 444 $(ARCH)/targopts.h-tmp $@
 
 # $(ARCH)/targopts.h-tmp rule is in leaf.cfg
diff --git a/c/src/exec/score/cpu/hppa1.1/Makefile.in b/c/src/exec/score/cpu/hppa1.1/Makefile.in
index a63f748ea6..534592856c 100644
--- a/c/src/exec/score/cpu/hppa1.1/Makefile.in
+++ b/c/src/exec/score/cpu/hppa1.1/Makefile.in
@@ -64,15 +64,15 @@ $(ARCH)/rtems-cpu.rel: $(OBJS)
 all:  ${ARCH} install-headers $(SRCS) $(ARCH)/offsets.h preinstall $(RELS)
 
 preinstall:
-	$(INSTALL) -m 444 $(ARCH)/offsets.h ${PROJECT_RELEASE}/include/rtems/score
+	$(INSTALL) -m 444 $(ARCH)/offsets.h $(PROJECT_INCLUDE)/rtems/score
 
-install-headers: $(ARCH) ${PROJECT_RELEASE}/include/rtems/score/targopts.h \
+install-headers: $(ARCH) $(PROJECT_INCLUDE)/rtems/score/targopts.h \
             ${PROJECT_RELEASE}/lib/bsp_specs
-	$(INSTALL) -m 444 ${H_FILES} ${PROJECT_RELEASE}/include/rtems/score
+	$(INSTALL) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems/score
 # we will share the basic cpu file
-	$(INSTALL) -m 444 ${EXTERNAL_H_FILES} ${PROJECT_RELEASE}/include
+	$(INSTALL) -m 444 ${EXTERNAL_H_FILES} $(PROJECT_INCLUDE)
 
-${PROJECT_RELEASE}/include/rtems/score/targopts.h: $(ARCH)/targopts.h-tmp
+$(PROJECT_INCLUDE)/rtems/score/targopts.h: $(ARCH)/targopts.h-tmp
 	$(INSTALL) -m 444 $(ARCH)/targopts.h-tmp $@
 
 # $(ARCH)/targopts.h-tmp rule is in leaf.cfg
diff --git a/c/src/exec/score/cpu/i386/Makefile.in b/c/src/exec/score/cpu/i386/Makefile.in
index 81a4978937..62b74b8d36 100644
--- a/c/src/exec/score/cpu/i386/Makefile.in
+++ b/c/src/exec/score/cpu/i386/Makefile.in
@@ -62,20 +62,20 @@ all:	${ARCH} $(SRCS) preinstall $(OBJS) $(RELS)
 # for include files, just use $(INSTALL)
 install:  all
 
-preinstall: ${PROJECT_RELEASE}/include/rtems/score/i386.h \
-            ${PROJECT_RELEASE}/include/rtems/score/targopts.h \
+preinstall: $(PROJECT_INCLUDE)/rtems/score/i386.h \
+            $(PROJECT_INCLUDE)/rtems/score/targopts.h \
             ${PROJECT_RELEASE}/lib/bsp_specs
-	$(INSTALL) -m 444 ${H_FILES} ${PROJECT_RELEASE}/include/rtems/score
+	$(INSTALL) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems/score
 # we will share the basic cpu file
-	$(INSTALL) -m 444 ${EXTERNAL_H_FILES} ${PROJECT_RELEASE}/include
+	$(INSTALL) -m 444 ${EXTERNAL_H_FILES} $(PROJECT_INCLUDE)
 
-${PROJECT_RELEASE}/include/rtems/score/i386.h: i386.h
+$(PROJECT_INCLUDE)/rtems/score/i386.h: i386.h
 	$(SED) -e 's?REPLACE_THIS_WITH_THE_CPU_MODEL?$(RTEMS_CPU_MODEL)?' \
 	        -e 's?REPLACE_THIS_WITH_THE_BSP?$(RTEMS_BSP)?' \
       < $< >$(ARCH)/i386.h-tmp
 	$(INSTALL) -m 444 $(ARCH)/i386.h-tmp $@
 
-${PROJECT_RELEASE}/include/rtems/score/targopts.h: $(ARCH)/targopts.h-tmp
+$(PROJECT_INCLUDE)/rtems/score/targopts.h: $(ARCH)/targopts.h-tmp
 	$(INSTALL) -m 444 $(ARCH)/targopts.h-tmp $@
 
 # $(ARCH)/targopts.h-tmp rule is in leaf.cfg
diff --git a/c/src/exec/score/cpu/i960/Makefile.in b/c/src/exec/score/cpu/i960/Makefile.in
index 2841cb17a8..0b89fc4ced 100644
--- a/c/src/exec/score/cpu/i960/Makefile.in
+++ b/c/src/exec/score/cpu/i960/Makefile.in
@@ -62,20 +62,20 @@ all:	${ARCH} $(SRCS) preinstall $(OBJS) $(RELS)
 # for include files, just use $(INSTALL)
 install:  all
 
-preinstall: ${PROJECT_RELEASE}/include/rtems/score/i960.h \
-            ${PROJECT_RELEASE}/include/rtems/score/targopts.h \
+preinstall: $(PROJECT_INCLUDE)/rtems/score/i960.h \
+            $(PROJECT_INCLUDE)/rtems/score/targopts.h \
             ${PROJECT_RELEASE}/lib/bsp_specs
-	$(INSTALL) -m 444 ${H_FILES} ${PROJECT_RELEASE}/include/rtems/score
+	$(INSTALL) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems/score
 # we will share the basic cpu file
-	$(INSTALL) -m 444 ${EXTERNAL_H_FILES} ${PROJECT_RELEASE}/include
+	$(INSTALL) -m 444 ${EXTERNAL_H_FILES} $(PROJECT_INCLUDE)
 
-${PROJECT_RELEASE}/include/rtems/score/i960.h: i960.h
+$(PROJECT_INCLUDE)/rtems/score/i960.h: i960.h
 	 $(SED) -e 's?REPLACE_THIS_WITH_THE_CPU_MODEL?$(RTEMS_CPU_MODEL)?' \
 	        -e 's?REPLACE_THIS_WITH_THE_BSP?$(RTEMS_BSP)?' \
       < $< >$(ARCH)/i960.h.tmp
 	$(INSTALL) -m 444 $(ARCH)/i960.h.tmp $@
 
-${PROJECT_RELEASE}/include/rtems/score/targopts.h: $(ARCH)/targopts.h-tmp
+$(PROJECT_INCLUDE)/rtems/score/targopts.h: $(ARCH)/targopts.h-tmp
 	$(INSTALL) -m 444 $(ARCH)/targopts.h-tmp $@
 
 # $(ARCH)/targopts.h-tmp rule is in leaf.cfg
diff --git a/c/src/exec/score/cpu/m68k/Makefile.in b/c/src/exec/score/cpu/m68k/Makefile.in
index 298642c169..0511018f5f 100644
--- a/c/src/exec/score/cpu/m68k/Makefile.in
+++ b/c/src/exec/score/cpu/m68k/Makefile.in
@@ -58,13 +58,13 @@ $(ARCH)/rtems-cpu.rel: $(OBJS)
 
 all:	${ARCH} $(SRCS) preinstall $(OBJS) $(RELS)
 
-preinstall: ${PROJECT_RELEASE}/include/rtems/score/targopts.h \
+preinstall: $(PROJECT_INCLUDE)/rtems/score/targopts.h \
             ${PROJECT_RELEASE}/lib/bsp_specs
-	$(INSTALL) -m 444 ${H_FILES} ${PROJECT_RELEASE}/include/rtems/score
+	$(INSTALL) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems/score
 # we will share the basic cpu file
-	$(INSTALL) -m 444 ${EXTERNAL_H_FILES} ${PROJECT_RELEASE}/include
+	$(INSTALL) -m 444 ${EXTERNAL_H_FILES} $(PROJECT_INCLUDE)
 
-${PROJECT_RELEASE}/include/rtems/score/targopts.h: $(ARCH)/targopts.h-tmp
+$(PROJECT_INCLUDE)/rtems/score/targopts.h: $(ARCH)/targopts.h-tmp
 	$(INSTALL) -m 444 $(ARCH)/targopts.h-tmp $@
 
 # $(ARCH)/targopts.h-tmp rule is in leaf.cfg
diff --git a/c/src/exec/score/cpu/mips64orion/Makefile.in b/c/src/exec/score/cpu/mips64orion/Makefile.in
index 9ebff0d60e..f976af1b35 100644
--- a/c/src/exec/score/cpu/mips64orion/Makefile.in
+++ b/c/src/exec/score/cpu/mips64orion/Makefile.in
@@ -64,13 +64,13 @@ $(ARCH)/rtems-cpu.rel: $(OBJS)
 # Install the program(s), appending _g or _p as appropriate.
 # for include files, just use $(INSTALL)
 
-preinstall: ${PROJECT_RELEASE}/include/rtems/score/targopts.h \
+preinstall: $(PROJECT_INCLUDE)/rtems/score/targopts.h \
             ${PROJECT_RELEASE}/lib/bsp_specs
-	$(INSTALL) -m 444 ${H_FILES} ${PROJECT_RELEASE}/include/rtems/score
+	$(INSTALL) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems/score
 # we will share the basic cpu file
-	$(INSTALL) -m 444 ${EXTERNAL_H_FILES} ${PROJECT_RELEASE}/include
+	$(INSTALL) -m 444 ${EXTERNAL_H_FILES} $(PROJECT_INCLUDE)
 
-${PROJECT_RELEASE}/include/rtems/score/targopts.h: $(ARCH)/targopts.h-tmp
+$(PROJECT_INCLUDE)/rtems/score/targopts.h: $(ARCH)/targopts.h-tmp
 	$(INSTALL) -m 444 $(ARCH)/targopts.h-tmp $@
 
 # $(ARCH)/targopts.h-tmp rule is in leaf.cfg
diff --git a/c/src/exec/score/cpu/no_cpu/Makefile.in b/c/src/exec/score/cpu/no_cpu/Makefile.in
index 4bbad5b532..8056d8d45a 100644
--- a/c/src/exec/score/cpu/no_cpu/Makefile.in
+++ b/c/src/exec/score/cpu/no_cpu/Makefile.in
@@ -66,19 +66,19 @@ install:  all
 
 # Real ports using the gnu tools will need to have bsp_specs!!!
 #            ${PROJECT_RELEASE}/lib/bsp_specs
-preinstall: ${PROJECT_RELEASE}/include/rtems/score/no_cpu.h \
-            ${PROJECT_RELEASE}/include/rtems/score/targopts.h
-	$(INSTALL) -m 444 ${H_FILES} ${PROJECT_RELEASE}/include/rtems/score
+preinstall: $(PROJECT_INCLUDE)/rtems/score/no_cpu.h \
+            $(PROJECT_INCLUDE)/rtems/score/targopts.h
+	$(INSTALL) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems/score
 # we will share the basic cpu file
-	$(INSTALL) -m 444 ${EXTERNAL_H_FILES} ${PROJECT_RELEASE}/include
+	$(INSTALL) -m 444 ${EXTERNAL_H_FILES} $(PROJECT_INCLUDE)
 
-${PROJECT_RELEASE}/include/rtems/score/no_cpu.h: $(srcdir)/no_cpu.h
+$(PROJECT_INCLUDE)/rtems/score/no_cpu.h: $(srcdir)/no_cpu.h
 	 $(SED) -e 's?REPLACE_THIS_WITH_THE_CPU_MODEL?$(RTEMS_CPU_MODEL)?' \
 	        -e 's?REPLACE_THIS_WITH_THE_BSP?$(RTEMS_BSP)?' \
       <$(srcdir)/no_cpu.h >$(ARCH)/no_cpu.h.tmp
 	$(INSTALL) -m 444 $(ARCH)/no_cpu.h.tmp $@
 
-${PROJECT_RELEASE}/include/rtems/score/targopts.h: $(ARCH)/targopts.h-tmp
+$(PROJECT_INCLUDE)/rtems/score/targopts.h: $(ARCH)/targopts.h-tmp
 	$(INSTALL) -m 444 $(ARCH)/targopts.h-tmp $@
 
 # $(ARCH)/targopts.h-tmp rule is in leaf.cfg
diff --git a/c/src/exec/score/cpu/powerpc/Makefile.in b/c/src/exec/score/cpu/powerpc/Makefile.in
index 114ca43be3..a69324de33 100644
--- a/c/src/exec/score/cpu/powerpc/Makefile.in
+++ b/c/src/exec/score/cpu/powerpc/Makefile.in
@@ -66,22 +66,22 @@ $(ARCH)/cpu_asm.o: irq_stub.s
 # for include files, just use $(INSTALL)
 install:  all
 
-preinstall: ${PROJECT_RELEASE}/include/rtems/score/ppc.h \
-            ${PROJECT_RELEASE}/include/rtems/score/targopts.h \
+preinstall: $(PROJECT_INCLUDE)/rtems/score/ppc.h \
+            $(PROJECT_INCLUDE)/rtems/score/targopts.h \
             ${PROJECT_RELEASE}/lib/bsp_specs
-	$(INSTALL) -m 444 ${H_FILES} ${PROJECT_RELEASE}/include/rtems/score
+	$(INSTALL) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems/score
 # we will share the basic cpu file
-	$(INSTALL) -m 444 ${EXTERNAL_H_FILES} ${PROJECT_RELEASE}/include
+	$(INSTALL) -m 444 ${EXTERNAL_H_FILES} $(PROJECT_INCLUDE)
 # make a link in case we are not compiling in the source directory
 	test -f irq_stub.s || $(LN) -s $(srcdir)/irq_stub.s irq_stub.s
 
-${PROJECT_RELEASE}/include/rtems/score/ppc.h: ppc.h
+$(PROJECT_INCLUDE)/rtems/score/ppc.h: ppc.h
 	 $(SED) -e 's?REPLACE_THIS_WITH_THE_CPU_MODEL?$(RTEMS_CPU_MODEL)?' \
 	        -e 's?REPLACE_THIS_WITH_THE_BSP?$(RTEMS_BSP)?' \
       < $< >$(ARCH)/ppc.h.tmp
 	$(INSTALL) -m 444 $(ARCH)/ppc.h.tmp $@
 
-${PROJECT_RELEASE}/include/rtems/score/targopts.h: $(ARCH)/targopts.h-tmp
+$(PROJECT_INCLUDE)/rtems/score/targopts.h: $(ARCH)/targopts.h-tmp
 	$(INSTALL) -m 444 $(ARCH)/targopts.h-tmp $@
 
 # $(ARCH)/targopts.h-tmp rule is in leaf.cfg
diff --git a/c/src/exec/score/cpu/sparc/Makefile.in b/c/src/exec/score/cpu/sparc/Makefile.in
index 1d133232b0..c9ca04a604 100644
--- a/c/src/exec/score/cpu/sparc/Makefile.in
+++ b/c/src/exec/score/cpu/sparc/Makefile.in
@@ -57,13 +57,13 @@ $(ARCH)/rtems-cpu.rel: $(OBJS)
 
 all:	${ARCH} $(SRCS) preinstall $(OBJS) $(RELS)
 
-preinstall: ${PROJECT_RELEASE}/include/rtems/score/targopts.h \
+preinstall: $(PROJECT_INCLUDE)/rtems/score/targopts.h \
             ${PROJECT_RELEASE}/lib/bsp_specs
-	$(INSTALL) -m 444 ${H_FILES} ${PROJECT_RELEASE}/include/rtems/score
+	$(INSTALL) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems/score
 # we will share the basic cpu file
-	$(INSTALL) -m 444 ${EXTERNAL_H_FILES} ${PROJECT_RELEASE}/include
+	$(INSTALL) -m 444 ${EXTERNAL_H_FILES} $(PROJECT_INCLUDE)
 
-${PROJECT_RELEASE}/include/rtems/score/targopts.h: $(ARCH)/targopts.h-tmp
+$(PROJECT_INCLUDE)/rtems/score/targopts.h: $(ARCH)/targopts.h-tmp
 	$(INSTALL) -m 444 $(ARCH)/targopts.h-tmp $@
 
 # $(ARCH)/targopts.h-tmp rule is in leaf.cfg
diff --git a/c/src/exec/score/cpu/unix/Makefile.in b/c/src/exec/score/cpu/unix/Makefile.in
index 6ac9ac0544..8bd5520d60 100644
--- a/c/src/exec/score/cpu/unix/Makefile.in
+++ b/c/src/exec/score/cpu/unix/Makefile.in
@@ -65,12 +65,12 @@ install:  all
 
 # Real ports using the gnu tools will need to have bsp_specs!!!
 #            ${PROJECT_RELEASE}/lib/bsp_specs
-preinstall: ${PROJECT_RELEASE}/include/rtems/score/unix.h $(ARCH)/unixsize.h \
-            ${PROJECT_RELEASE}/include/rtems/score/targopts.h 
-	$(INSTALL) -m 444 ${H_FILES} ${PROJECT_RELEASE}/include/rtems/score
-	$(INSTALL) -m 444 ${ARCH}/unixsize.h ${PROJECT_RELEASE}/include/rtems/score
+preinstall: $(PROJECT_INCLUDE)/rtems/score/unix.h $(ARCH)/unixsize.h \
+            $(PROJECT_INCLUDE)/rtems/score/targopts.h 
+	$(INSTALL) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems/score
+	$(INSTALL) -m 444 ${ARCH}/unixsize.h $(PROJECT_INCLUDE)/rtems/score
 
-${PROJECT_RELEASE}/include/rtems/score/unix.h: unix.h
+$(PROJECT_INCLUDE)/rtems/score/unix.h: unix.h
 	 $(SED) -e 's?REPLACE_THIS_WITH_THE_CPU_MODEL?$(RTEMS_CPU_MODEL)?' \
 	        -e 's?REPLACE_THIS_WITH_THE_BSP?$(RTEMS_BSP)?' \
 	        -e 's?REPLACE_THIS_WITH_THE_CPU_FAMILY?$(RTEMS_CPU_FAMILY)?' \
@@ -78,7 +78,7 @@ ${PROJECT_RELEASE}/include/rtems/score/unix.h: unix.h
       <$(srcdir)/unix.h >$(ARCH)/unix.h.tmp
 	$(INSTALL) -m 444 $(ARCH)/unix.h.tmp $@
 
-${PROJECT_RELEASE}/include/rtems/score/targopts.h: $(ARCH)/targopts.h-tmp
+$(PROJECT_INCLUDE)/rtems/score/targopts.h: $(ARCH)/targopts.h-tmp
 	$(INSTALL) -m 444 $(ARCH)/targopts.h-tmp $@
 
 # $(ARCH)/targopts.h-tmp rule is in leaf.cfg
diff --git a/c/src/exec/score/headers/Makefile.in b/c/src/exec/score/headers/Makefile.in
index 1be9ef5221..d9d5b7d3f4 100644
--- a/c/src/exec/score/headers/Makefile.in
+++ b/c/src/exec/score/headers/Makefile.in
@@ -41,7 +41,7 @@ CLEAN_ADDITIONS +=
 CLOBBER_ADDITIONS +=
 
 all:	$(SRCS)
-	$(INSTALL) -m 444 ${H_FILES} ${PROJECT_RELEASE}/include/rtems/score
-	$(INSTALL) -m 444 ${SAPI_H_FILES} ${PROJECT_RELEASE}/include/rtems/
-	$(INSTALL) -m 444 ${NET_H_FILES} ${PROJECT_RELEASE}/include/netinet
-#	$(INSTALL) -m 444 ${EXTERNAL_H_FILES} ${PROJECT_RELEASE}/include
+	$(INSTALL) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems/score
+	$(INSTALL) -m 444 ${SAPI_H_FILES} $(PROJECT_INCLUDE)/rtems/
+	$(INSTALL) -m 444 ${NET_H_FILES} $(PROJECT_INCLUDE)/netinet
+#	$(INSTALL) -m 444 ${EXTERNAL_H_FILES} $(PROJECT_INCLUDE)
diff --git a/c/src/exec/score/include/rtems/score/Makefile.in b/c/src/exec/score/include/rtems/score/Makefile.in
index 1be9ef5221..d9d5b7d3f4 100644
--- a/c/src/exec/score/include/rtems/score/Makefile.in
+++ b/c/src/exec/score/include/rtems/score/Makefile.in
@@ -41,7 +41,7 @@ CLEAN_ADDITIONS +=
 CLOBBER_ADDITIONS +=
 
 all:	$(SRCS)
-	$(INSTALL) -m 444 ${H_FILES} ${PROJECT_RELEASE}/include/rtems/score
-	$(INSTALL) -m 444 ${SAPI_H_FILES} ${PROJECT_RELEASE}/include/rtems/
-	$(INSTALL) -m 444 ${NET_H_FILES} ${PROJECT_RELEASE}/include/netinet
-#	$(INSTALL) -m 444 ${EXTERNAL_H_FILES} ${PROJECT_RELEASE}/include
+	$(INSTALL) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems/score
+	$(INSTALL) -m 444 ${SAPI_H_FILES} $(PROJECT_INCLUDE)/rtems/
+	$(INSTALL) -m 444 ${NET_H_FILES} $(PROJECT_INCLUDE)/netinet
+#	$(INSTALL) -m 444 ${EXTERNAL_H_FILES} $(PROJECT_INCLUDE)
diff --git a/c/src/exec/score/inline/Makefile.in b/c/src/exec/score/inline/Makefile.in
index 147df5ad0f..97124a4edc 100644
--- a/c/src/exec/score/inline/Makefile.in
+++ b/c/src/exec/score/inline/Makefile.in
@@ -28,4 +28,4 @@ CLEAN_ADDITIONS += $(LIB)
 CLOBBER_ADDITIONS +=
 
 all:	$(SRCS)
-	$(INSTALL) -m 444 ${I_FILES} ${PROJECT_RELEASE}/include/rtems/score
+	$(INSTALL) -m 444 ${I_FILES} $(PROJECT_INCLUDE)/rtems/score
diff --git a/c/src/exec/score/inline/rtems/score/Makefile.in b/c/src/exec/score/inline/rtems/score/Makefile.in
index 147df5ad0f..97124a4edc 100644
--- a/c/src/exec/score/inline/rtems/score/Makefile.in
+++ b/c/src/exec/score/inline/rtems/score/Makefile.in
@@ -28,4 +28,4 @@ CLEAN_ADDITIONS += $(LIB)
 CLOBBER_ADDITIONS +=
 
 all:	$(SRCS)
-	$(INSTALL) -m 444 ${I_FILES} ${PROJECT_RELEASE}/include/rtems/score
+	$(INSTALL) -m 444 ${I_FILES} $(PROJECT_INCLUDE)/rtems/score
diff --git a/c/src/exec/score/macros/Makefile.in b/c/src/exec/score/macros/Makefile.in
index 147df5ad0f..97124a4edc 100644
--- a/c/src/exec/score/macros/Makefile.in
+++ b/c/src/exec/score/macros/Makefile.in
@@ -28,4 +28,4 @@ CLEAN_ADDITIONS += $(LIB)
 CLOBBER_ADDITIONS +=
 
 all:	$(SRCS)
-	$(INSTALL) -m 444 ${I_FILES} ${PROJECT_RELEASE}/include/rtems/score
+	$(INSTALL) -m 444 ${I_FILES} $(PROJECT_INCLUDE)/rtems/score
diff --git a/c/src/exec/score/macros/rtems/score/Makefile.in b/c/src/exec/score/macros/rtems/score/Makefile.in
index 147df5ad0f..97124a4edc 100644
--- a/c/src/exec/score/macros/rtems/score/Makefile.in
+++ b/c/src/exec/score/macros/rtems/score/Makefile.in
@@ -28,4 +28,4 @@ CLEAN_ADDITIONS += $(LIB)
 CLOBBER_ADDITIONS +=
 
 all:	$(SRCS)
-	$(INSTALL) -m 444 ${I_FILES} ${PROJECT_RELEASE}/include/rtems/score
+	$(INSTALL) -m 444 ${I_FILES} $(PROJECT_INCLUDE)/rtems/score
diff --git a/c/src/exec/score/tools/hppa1.1/Makefile.in b/c/src/exec/score/tools/hppa1.1/Makefile.in
index 0ca40be647..04a9625dfc 100644
--- a/c/src/exec/score/tools/hppa1.1/Makefile.in
+++ b/c/src/exec/score/tools/hppa1.1/Makefile.in
@@ -33,7 +33,7 @@ CPU_DIR=../../cpu/$(RTEMS_CPU)
 #
 
 DEFINES  +=
-CPPFLAGS += -I$(PROJECT_RELEASE)/include \
+CPPFLAGS += -I$(PROJECT_INCLUDE) \
 	    -I$(CPU_DIR)
 CFLAGS   +=
 
diff --git a/c/src/exec/score/tools/unix/Makefile.in b/c/src/exec/score/tools/unix/Makefile.in
index f2703f098b..77349ecf10 100644
--- a/c/src/exec/score/tools/unix/Makefile.in
+++ b/c/src/exec/score/tools/unix/Makefile.in
@@ -33,7 +33,7 @@ CPU_DIR=../../cpu/$(RTEMS_CPU)
 #
 
 DEFINES  +=
-CPPFLAGS += -I$(PROJECT_RELEASE)/include \
+CPPFLAGS += -I$(PROJECT_INCLUDE) \
 	    -I$(CPU_DIR)
 CFLAGS   +=