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

to lib/include.

Went to using a PROJECT_INCLUDE variable.

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

@@ -30,4 +30,4 @@ CLEAN_ADDITIONS +=
 CLOBBER_ADDITIONS +=
 
 all:	$(SRCS)
-	$(INSTALL) -m 444 ${H_FILES} ${PROJECT_RELEASE}/include/
+	$(INSTALL) -m 444 ${H_FILES} $(PROJECT_INCLUDE)

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

@@ -30,4 +30,4 @@ CLEAN_ADDITIONS +=
 CLOBBER_ADDITIONS +=
 
 all:	$(SRCS)
-	$(INSTALL) -m 444 ${H_FILES} ${PROJECT_RELEASE}/include/rtems/posix
+	$(INSTALL) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems/posix

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

@@ -30,4 +30,4 @@ CLEAN_ADDITIONS +=
 CLOBBER_ADDITIONS +=
 
 all:	$(SRCS)
-	$(INSTALL) -m 444 ${H_FILES} ${PROJECT_RELEASE}/include/rtems/posix
+	$(INSTALL) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems/posix

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

@@ -27,4 +27,4 @@ CLEAN_ADDITIONS +=
 CLOBBER_ADDITIONS +=
 
 all:	$(SRCS)
-	$(INSTALL) -m 444 ${H_FILES} ${PROJECT_RELEASE}/include/sys
+	$(INSTALL) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/sys

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

@@ -30,4 +30,4 @@ CLEAN_ADDITIONS +=
 CLOBBER_ADDITIONS +=
 
 all:	$(SRCS)
-	$(INSTALL) -m 444 ${H_FILES} ${PROJECT_RELEASE}/include/
+	$(INSTALL) -m 444 ${H_FILES} $(PROJECT_INCLUDE)

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

@@ -27,4 +27,4 @@ CLEAN_ADDITIONS +=
 CLOBBER_ADDITIONS +=
 
 all:	$(SRCS)
-	$(INSTALL) -m 444 ${I_FILES} ${PROJECT_RELEASE}/include/rtems/posix
+	$(INSTALL) -m 444 ${I_FILES} $(PROJECT_INCLUDE)/rtems/posix

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

@@ -27,4 +27,4 @@ CLEAN_ADDITIONS +=
 CLOBBER_ADDITIONS +=
 
 all:	$(SRCS)
-	$(INSTALL) -m 444 ${I_FILES} ${PROJECT_RELEASE}/include/rtems/posix
+	$(INSTALL) -m 444 ${I_FILES} $(PROJECT_INCLUDE)/rtems/posix

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

@@ -28,4 +28,4 @@ CLEAN_ADDITIONS +=
 CLOBBER_ADDITIONS +=
 
 all:	$(SRCS)
-	#$(INSTALL) -m 444 ${I_FILES} ${PROJECT_RELEASE}/include/rtems/posix
+	#$(INSTALL) -m 444 ${I_FILES} $(PROJECT_INCLUDE)/rtems/posix

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

@@ -28,4 +28,4 @@ CLEAN_ADDITIONS +=
 CLOBBER_ADDITIONS +=
 
 all:	$(SRCS)
-	#$(INSTALL) -m 444 ${I_FILES} ${PROJECT_RELEASE}/include/rtems/posix
+	#$(INSTALL) -m 444 ${I_FILES} $(PROJECT_INCLUDE)/rtems/posix

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

@@ -27,7 +27,7 @@ DEFINES  +=
 CPPFLAGS +=
 CFLAGS   += $(CFLAGS_OS_V)
 
-ASM4FLAGS += -I $(PROJECT_RELEASE)/include/rtems
+ASM4FLAGS += -I $(PROJECT_INCLUDE)/rtems
 LD_PATHS  +=
 LD_LIBS   +=
 LDFLAGS   +=

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

@@ -27,4 +27,4 @@ CLEAN_ADDITIONS +=
 CLOBBER_ADDITIONS +=
 
 all:	$(SRCS)
-	$(INSTALL) -m 444 ${H_FILES} ${PROJECT_RELEASE}/include/sys
+	$(INSTALL) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/sys

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

@@ -33,5 +33,5 @@ CLEAN_ADDITIONS +=
 CLOBBER_ADDITIONS +=
 
 all:	$(SRCS)
-	$(INSTALL) -m 444 ${H_FILES} ${PROJECT_RELEASE}/include/rtems/rtems
+	$(INSTALL) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems/rtems
-	$(INSTALL) -m 444 ${EXTERNAL_H_FILES} ${PROJECT_RELEASE}/include
+	$(INSTALL) -m 444 ${EXTERNAL_H_FILES} $(PROJECT_INCLUDE)

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

@@ -33,5 +33,5 @@ CLEAN_ADDITIONS +=
 CLOBBER_ADDITIONS +=
 
 all:	$(SRCS)
-	$(INSTALL) -m 444 ${H_FILES} ${PROJECT_RELEASE}/include/rtems/rtems
+	$(INSTALL) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems/rtems
-	$(INSTALL) -m 444 ${EXTERNAL_H_FILES} ${PROJECT_RELEASE}/include
+	$(INSTALL) -m 444 ${EXTERNAL_H_FILES} $(PROJECT_INCLUDE)

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

@@ -27,4 +27,4 @@ CLEAN_ADDITIONS += $(LIB)
 CLOBBER_ADDITIONS +=
 
 all:	$(SRCS)
-	$(INSTALL) -m 444 ${I_FILES} ${PROJECT_RELEASE}/include/rtems/rtems
+	$(INSTALL) -m 444 ${I_FILES} $(PROJECT_INCLUDE)/rtems/rtems

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

@@ -27,4 +27,4 @@ CLEAN_ADDITIONS += $(LIB)
 CLOBBER_ADDITIONS +=
 
 all:	$(SRCS)
-	$(INSTALL) -m 444 ${I_FILES} ${PROJECT_RELEASE}/include/rtems/rtems
+	$(INSTALL) -m 444 ${I_FILES} $(PROJECT_INCLUDE)/rtems/rtems

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

@@ -27,4 +27,4 @@ CLEAN_ADDITIONS += $(LIB)
 CLOBBER_ADDITIONS +=
 
 all:	$(SRCS)
-	$(INSTALL) -m 444 ${I_FILES} ${PROJECT_RELEASE}/include/rtems/rtems
+	$(INSTALL) -m 444 ${I_FILES} $(PROJECT_INCLUDE)/rtems/rtems

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

@@ -27,4 +27,4 @@ CLEAN_ADDITIONS += $(LIB)
 CLOBBER_ADDITIONS +=
 
 all:	$(SRCS)
-	$(INSTALL) -m 444 ${I_FILES} ${PROJECT_RELEASE}/include/rtems/rtems
+	$(INSTALL) -m 444 ${I_FILES} $(PROJECT_INCLUDE)/rtems/rtems

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

@@ -30,7 +30,7 @@ DEFINES  +=
 CPPFLAGS +=
 CFLAGS   += $(CFLAGS_OS_V)
 
-ASM4FLAGS += -I $(PROJECT_RELEASE)/include/rtems
+ASM4FLAGS += -I $(PROJECT_INCLUDE)/rtems
 LD_PATHS  +=
 LD_LIBS   +=
 LDFLAGS   +=

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

@@ -30,5 +30,5 @@ CLEAN_ADDITIONS +=
 CLOBBER_ADDITIONS +=
 
 all:	$(SRCS)
-	$(INSTALL) -m 444 ${H_FILES} ${PROJECT_RELEASE}/include/rtems/
+	$(INSTALL) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems/
-	$(INSTALL) -m 444 ${EXTERNAL_H_FILES} ${PROJECT_RELEASE}/include
+	$(INSTALL) -m 444 ${EXTERNAL_H_FILES} $(PROJECT_INCLUDE)

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

@@ -30,5 +30,5 @@ CLEAN_ADDITIONS +=
 CLOBBER_ADDITIONS +=
 
 all:	$(SRCS)
-	$(INSTALL) -m 444 ${H_FILES} ${PROJECT_RELEASE}/include/rtems/
+	$(INSTALL) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems/
-	$(INSTALL) -m 444 ${EXTERNAL_H_FILES} ${PROJECT_RELEASE}/include
+	$(INSTALL) -m 444 ${EXTERNAL_H_FILES} $(PROJECT_INCLUDE)

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

@@ -26,4 +26,4 @@ CLEAN_ADDITIONS += $(LIB)
 CLOBBER_ADDITIONS +=
 
 all:	$(SRCS)
-	$(INSTALL) -m 444 ${I_FILES} ${PROJECT_RELEASE}/include/rtems
+	$(INSTALL) -m 444 ${I_FILES} $(PROJECT_INCLUDE)/rtems

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

@@ -26,4 +26,4 @@ CLEAN_ADDITIONS += $(LIB)
 CLOBBER_ADDITIONS +=
 
 all:	$(SRCS)
-	$(INSTALL) -m 444 ${I_FILES} ${PROJECT_RELEASE}/include/rtems
+	$(INSTALL) -m 444 ${I_FILES} $(PROJECT_INCLUDE)/rtems

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

@@ -26,4 +26,4 @@ CLEAN_ADDITIONS += $(LIB)
 CLOBBER_ADDITIONS +=
 
 all:	$(SRCS)
-	$(INSTALL) -m 444 ${I_FILES} ${PROJECT_RELEASE}/include/rtems
+	$(INSTALL) -m 444 ${I_FILES} $(PROJECT_INCLUDE)/rtems

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

@@ -26,4 +26,4 @@ CLEAN_ADDITIONS += $(LIB)
 CLOBBER_ADDITIONS +=
 
 all:	$(SRCS)
-	$(INSTALL) -m 444 ${I_FILES} ${PROJECT_RELEASE}/include/rtems
+	$(INSTALL) -m 444 ${I_FILES} $(PROJECT_INCLUDE)/rtems

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

@@ -27,7 +27,7 @@ DEFINES  +=
 CPPFLAGS +=
 CFLAGS   += $(CFLAGS_OS_V)
 
-ASM4FLAGS += -I $(PROJECT_RELEASE)/include/rtems
+ASM4FLAGS += -I $(PROJECT_INCLUDE)/rtems
 LD_PATHS  +=
 LD_LIBS   +=
 LDFLAGS   +=

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 \
+preinstall: $(PROJECT_INCLUDE)/rtems/score/a29k.h \
-            ${PROJECT_RELEASE}/include/rtems/score/targopts.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

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

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 \
+preinstall: $(PROJECT_INCLUDE)/rtems/score/i386.h \
-            ${PROJECT_RELEASE}/include/rtems/score/targopts.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

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 \
+preinstall: $(PROJECT_INCLUDE)/rtems/score/i960.h \
-            ${PROJECT_RELEASE}/include/rtems/score/targopts.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

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

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

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 \
+preinstall: $(PROJECT_INCLUDE)/rtems/score/no_cpu.h \
-            ${PROJECT_RELEASE}/include/rtems/score/targopts.h
+            $(PROJECT_INCLUDE)/rtems/score/targopts.h
-	$(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/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

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 \
+preinstall: $(PROJECT_INCLUDE)/rtems/score/ppc.h \
-            ${PROJECT_RELEASE}/include/rtems/score/targopts.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

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

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 \
+preinstall: $(PROJECT_INCLUDE)/rtems/score/unix.h $(ARCH)/unixsize.h \
-            ${PROJECT_RELEASE}/include/rtems/score/targopts.h 
+            $(PROJECT_INCLUDE)/rtems/score/targopts.h 
-	$(INSTALL) -m 444 ${H_FILES} ${PROJECT_RELEASE}/include/rtems/score
+	$(INSTALL) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems/score
-	$(INSTALL) -m 444 ${ARCH}/unixsize.h ${PROJECT_RELEASE}/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

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 ${H_FILES} $(PROJECT_INCLUDE)/rtems/score
-	$(INSTALL) -m 444 ${SAPI_H_FILES} ${PROJECT_RELEASE}/include/rtems/
+	$(INSTALL) -m 444 ${SAPI_H_FILES} $(PROJECT_INCLUDE)/rtems/
-	$(INSTALL) -m 444 ${NET_H_FILES} ${PROJECT_RELEASE}/include/netinet
+	$(INSTALL) -m 444 ${NET_H_FILES} $(PROJECT_INCLUDE)/netinet
-#	$(INSTALL) -m 444 ${EXTERNAL_H_FILES} ${PROJECT_RELEASE}/include
+#	$(INSTALL) -m 444 ${EXTERNAL_H_FILES} $(PROJECT_INCLUDE)

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 ${H_FILES} $(PROJECT_INCLUDE)/rtems/score
-	$(INSTALL) -m 444 ${SAPI_H_FILES} ${PROJECT_RELEASE}/include/rtems/
+	$(INSTALL) -m 444 ${SAPI_H_FILES} $(PROJECT_INCLUDE)/rtems/
-	$(INSTALL) -m 444 ${NET_H_FILES} ${PROJECT_RELEASE}/include/netinet
+	$(INSTALL) -m 444 ${NET_H_FILES} $(PROJECT_INCLUDE)/netinet
-#	$(INSTALL) -m 444 ${EXTERNAL_H_FILES} ${PROJECT_RELEASE}/include
+#	$(INSTALL) -m 444 ${EXTERNAL_H_FILES} $(PROJECT_INCLUDE)

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

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

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

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

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   +=
 

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   +=
 

c/src/lib/include/Makefile.in

@@ -41,14 +41,14 @@ CLEAN_ADDITIONS +=
 CLOBBER_ADDITIONS +=
 
 all:	$(SRCS)
-	$(INSTALL) -m 444 $(H_FILES) ${PROJECT_RELEASE}/include
+	$(INSTALL) -m 444 $(H_FILES) $(PROJECT_INCLUDE)
-	$(INSTALL) -m 444 $(SYS_H_FILES) ${PROJECT_RELEASE}/include/sys
+	$(INSTALL) -m 444 $(SYS_H_FILES) $(PROJECT_INCLUDE)/sys
 	$(INSTALL) -m 444 $(MOTOROLA_H_FILES) \
-            ${PROJECT_RELEASE}/include/motorola
+            $(PROJECT_INCLUDE)/motorola
-	$(INSTALL) -m 444 $(ZILOG_H_FILES) ${PROJECT_RELEASE}/include/zilog
+	$(INSTALL) -m 444 $(ZILOG_H_FILES) $(PROJECT_INCLUDE)/zilog
 ifeq ($(HAS_KA9Q),yes)
-	$(INSTALL) -m 444 $(KA9Q_H_FILES) ${PROJECT_RELEASE}/include/ka9q
+	$(INSTALL) -m 444 $(KA9Q_H_FILES) $(PROJECT_INCLUDE)/ka9q
 endif
 ifeq ($(HAS_CPLUSPLUS),yes)
-	$(INSTALL) -m 444 $(RTEMSCPLUSPLUS_H_FILES) ${PROJECT_RELEASE}/include/rtems++
+	$(INSTALL) -m 444 $(RTEMSCPLUSPLUS_H_FILES) $(PROJECT_INCLUDE)/rtems++
 endif

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

@@ -53,6 +53,6 @@ ${PGM}: ${SRCS} ${OBJS}
 	$(make-rel)
 
 all:	${ARCH} $(SRCS) $(PGM)
-	$(INSTALL) -m 444 $(H_FILES) ${PROJECT_RELEASE}/include
+	$(INSTALL) -m 444 $(H_FILES) $(PROJECT_INCLUDE)
 
 # the .rel file built here will be put into libbsp.a by ../wrapup/Makefile

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

@@ -28,5 +28,5 @@ CLEAN_ADDITIONS +=
 CLOBBER_ADDITIONS +=
 
 all:	$(SRCS)
-	$(INSTALL) -m 444 $(H_FILES) ${PROJECT_RELEASE}/include
+	$(INSTALL) -m 444 $(H_FILES) $(PROJECT_INCLUDE)
-	$(INSTALL) -m 444 $(EQ_FILES) ${PROJECT_RELEASE}/include
+	$(INSTALL) -m 444 $(EQ_FILES) $(PROJECT_INCLUDE)

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

@@ -46,4 +46,4 @@ all install::
 	    eval $$cmd || $(EXIT_CMD); \
 	fi
 	@$(ECHO); $(ECHO)
-	$(INSTALL) -m 444 $(srcdir)/floss-bsp.h $(PROJECT_RELEASE)/include/bsp.h
+	$(INSTALL) -m 444 $(srcdir)/floss-bsp.h $(PROJECT_INCLUDE)/bsp.h

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

@@ -36,5 +36,5 @@ CLEAN_ADDITIONS +=
 CLOBBER_ADDITIONS +=
 
 all:	$(SRCS)
-	$(INSTALL) -m 444 $(H_FILES) ${PROJECT_RELEASE}/include
+	$(INSTALL) -m 444 $(H_FILES) $(PROJECT_INCLUDE)
-	$(INSTALL) -m 444 $(RTEMS_H_FILES) ${PROJECT_RELEASE}/include/rtems
+	$(INSTALL) -m 444 $(RTEMS_H_FILES) $(PROJECT_INCLUDE)/rtems

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

@@ -28,5 +28,5 @@ CLEAN_ADDITIONS +=
 CLOBBER_ADDITIONS +=
 
 all:	$(SRCS)
-	$(INSTALL) -m 444 $(H_FILES) ${PROJECT_RELEASE}/include
+	$(INSTALL) -m 444 $(H_FILES) $(PROJECT_INCLUDE)
-	$(INSTALL) -m 444 $(EQ_FILES) ${PROJECT_RELEASE}/include
+	$(INSTALL) -m 444 $(EQ_FILES) $(PROJECT_INCLUDE)

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

@@ -28,5 +28,5 @@ CLEAN_ADDITIONS +=
 CLOBBER_ADDITIONS +=
 
 all:	$(SRCS)
-	$(INSTALL) -m 444 $(H_FILES) ${PROJECT_RELEASE}/include
+	$(INSTALL) -m 444 $(H_FILES) $(PROJECT_INCLUDE)
-	$(INSTALL) -m 444 $(EQ_FILES) ${PROJECT_RELEASE}/include
+	$(INSTALL) -m 444 $(EQ_FILES) $(PROJECT_INCLUDE)

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

@@ -28,7 +28,7 @@ CLEAN_ADDITIONS +=
 CLOBBER_ADDITIONS +=
 
 all:	$(SRCS)
-	$(INSTALL) -m 444 $(H_FILES) ${PROJECT_RELEASE}/include
+	$(INSTALL) -m 444 $(H_FILES) $(PROJECT_INCLUDE)
-	$(INSTALL) -m 444 $(EQ_FILES) ${PROJECT_RELEASE}/include
+	$(INSTALL) -m 444 $(EQ_FILES) $(PROJECT_INCLUDE)
 
 install:  all

c/src/lib/libbsp/i960/cvme961/include/Makefile.in

@@ -31,7 +31,7 @@ CLEAN_ADDITIONS +=
 CLOBBER_ADDITIONS +=
 
 all:	$(SRCS)
-	$(INSTALL) -m 444 $(H_FILES) ${PROJECT_RELEASE}/include
+	$(INSTALL) -m 444 $(H_FILES) $(PROJECT_INCLUDE)
-	$(INSTALL) -m 444 $(EQ_FILES) ${PROJECT_RELEASE}/include/cpu
+	$(INSTALL) -m 444 $(EQ_FILES) $(PROJECT_INCLUDE)/cpu
 
 install:  all

c/src/lib/libbsp/m68k/dmv152/include/Makefile.in

@@ -28,5 +28,5 @@ CLEAN_ADDITIONS +=
 CLOBBER_ADDITIONS +=
 
 all:	$(SRCS)
-	$(INSTALL) -m 444 $(H_FILES) ${PROJECT_RELEASE}/include
+	$(INSTALL) -m 444 $(H_FILES) $(PROJECT_INCLUDE)
-	$(INSTALL) -m 444 $(EQ_FILES) ${PROJECT_RELEASE}/include
+	$(INSTALL) -m 444 $(EQ_FILES) $(PROJECT_INCLUDE)

c/src/lib/libbsp/m68k/efi332/include/Makefile.in

@@ -28,5 +28,5 @@ CLEAN_ADDITIONS +=
 CLOBBER_ADDITIONS +=
 
 all:	$(SRCS)
-	$(INSTALL) -m 444 $(H_FILES) ${PROJECT_RELEASE}/include
+	$(INSTALL) -m 444 $(H_FILES) $(PROJECT_INCLUDE)
-	$(INSTALL) -m 444 $(EQ_FILES) ${PROJECT_RELEASE}/include
+	$(INSTALL) -m 444 $(EQ_FILES) $(PROJECT_INCLUDE)

c/src/lib/libbsp/m68k/efi68k/include/Makefile.in

@@ -29,5 +29,5 @@ CLEAN_ADDITIONS +=
 CLOBBER_ADDITIONS +=
 
 all:	$(SRCS)
-	$(INSTALL) -m 444 $(H_FILES) ${PROJECT_RELEASE}/include
+	$(INSTALL) -m 444 $(H_FILES) $(PROJECT_INCLUDE)
-	$(INSTALL) -m 444 $(EQ_FILES) ${PROJECT_RELEASE}/include
+	$(INSTALL) -m 444 $(EQ_FILES) $(PROJECT_INCLUDE)

c/src/lib/libbsp/m68k/gen68302/include/Makefile.in

@@ -28,5 +28,5 @@ CLEAN_ADDITIONS +=
 CLOBBER_ADDITIONS +=
 
 all:	$(SRCS)
-	$(INSTALL) -m 444 $(H_FILES) ${PROJECT_RELEASE}/include
+	$(INSTALL) -m 444 $(H_FILES) $(PROJECT_INCLUDE)
-	$(INSTALL) -m 444 $(EQ_FILES) ${PROJECT_RELEASE}/include
+	$(INSTALL) -m 444 $(EQ_FILES) $(PROJECT_INCLUDE)

c/src/lib/libbsp/m68k/gen68360/include/Makefile.in

@@ -28,5 +28,5 @@ CLEAN_ADDITIONS +=
 CLOBBER_ADDITIONS +=
 
 all:	$(SRCS)
-	$(INSTALL) -m 444 $(H_FILES) ${PROJECT_RELEASE}/include
+	$(INSTALL) -m 444 $(H_FILES) $(PROJECT_INCLUDE)
-	$(INSTALL) -m 444 $(EQ_FILES) ${PROJECT_RELEASE}/include
+	$(INSTALL) -m 444 $(EQ_FILES) $(PROJECT_INCLUDE)

c/src/lib/libbsp/m68k/idp/include/Makefile.in

@@ -28,5 +28,5 @@ CLEAN_ADDITIONS +=
 CLOBBER_ADDITIONS +=
 
 all:	$(SRCS)
-	$(INSTALL) -m 444 $(H_FILES) ${PROJECT_RELEASE}/include
+	$(INSTALL) -m 444 $(H_FILES) $(PROJECT_INCLUDE)
-	$(INSTALL) -m 444 $(EQ_FILES) ${PROJECT_RELEASE}/include
+	$(INSTALL) -m 444 $(EQ_FILES) $(PROJECT_INCLUDE)

c/src/lib/libbsp/m68k/mvme136/include/Makefile.in

@@ -28,5 +28,5 @@ CLEAN_ADDITIONS +=
 CLOBBER_ADDITIONS +=
 
 all:	$(SRCS)
-	$(INSTALL) -m 444 $(H_FILES) ${PROJECT_RELEASE}/include
+	$(INSTALL) -m 444 $(H_FILES) $(PROJECT_INCLUDE)
-	$(INSTALL) -m 444 $(EQ_FILES) ${PROJECT_RELEASE}/include
+	$(INSTALL) -m 444 $(EQ_FILES) $(PROJECT_INCLUDE)

c/src/lib/libbsp/m68k/mvme147/include/Makefile.in

@@ -28,5 +28,5 @@ CLEAN_ADDITIONS +=
 CLOBBER_ADDITIONS +=
 
 all:	$(SRCS)
-	$(INSTALL) -m 444 $(H_FILES) ${PROJECT_RELEASE}/include
+	$(INSTALL) -m 444 $(H_FILES) $(PROJECT_INCLUDE)
-	$(INSTALL) -m 444 $(EQ_FILES) ${PROJECT_RELEASE}/include
+	$(INSTALL) -m 444 $(EQ_FILES) $(PROJECT_INCLUDE)

c/src/lib/libbsp/m68k/mvme147s/include/Makefile.in

@@ -28,5 +28,5 @@ CLEAN_ADDITIONS +=
 CLOBBER_ADDITIONS +=
 
 all:	$(SRCS)
-	$(INSTALL) -m 444 $(H_FILES) ${PROJECT_RELEASE}/include
+	$(INSTALL) -m 444 $(H_FILES) $(PROJECT_INCLUDE)
-	$(INSTALL) -m 444 $(EQ_FILES) ${PROJECT_RELEASE}/include
+	$(INSTALL) -m 444 $(EQ_FILES) $(PROJECT_INCLUDE)

c/src/lib/libbsp/m68k/mvme162/consolex/Makefile.in

@@ -51,4 +51,4 @@ all:	${ARCH} $(SRCS) $(PGM)
 
 # the .rel file built here will be put into libbsp.a by ../wrapup/Makefile
 install:  all
-	$(INSTALL) -m 444 $(H_FILES) ${PROJECT_RELEASE}/include
+	$(INSTALL) -m 444 $(H_FILES) $(PROJECT_INCLUDE)

c/src/lib/libbsp/m68k/mvme162/include/Makefile.in

@@ -28,5 +28,5 @@ CLEAN_ADDITIONS +=
 CLOBBER_ADDITIONS +=
 
 all:	$(SRCS)
-	$(INSTALL) -m 444 $(H_FILES) ${PROJECT_RELEASE}/include
+	$(INSTALL) -m 444 $(H_FILES) $(PROJECT_INCLUDE)
-	$(INSTALL) -m 444 $(EQ_FILES) ${PROJECT_RELEASE}/include
+	$(INSTALL) -m 444 $(EQ_FILES) $(PROJECT_INCLUDE)

c/src/lib/libbsp/m68k/ods68302/include/Makefile.in

@@ -31,5 +31,5 @@ CLEAN_ADDITIONS +=
 CLOBBER_ADDITIONS +=
 
 all:	$(SRCS)
-	$(INSTALL) -m 444 $(H_FILES) ${PROJECT_RELEASE}/include
+	$(INSTALL) -m 444 $(H_FILES) $(PROJECT_INCLUDE)
-	$(INSTALL) -m 444 $(EQ_FILES) ${PROJECT_RELEASE}/include
+	$(INSTALL) -m 444 $(EQ_FILES) $(PROJECT_INCLUDE)

c/src/lib/libbsp/mips64orion/p4000/include/Makefile.in

@@ -28,5 +28,5 @@ CLEAN_ADDITIONS +=
 CLOBBER_ADDITIONS +=
 
 all:	$(SRCS)
-	$(INSTALL) -m 444 $(H_FILES) ${PROJECT_RELEASE}/include
+	$(INSTALL) -m 444 $(H_FILES) $(PROJECT_INCLUDE)
-	$(INSTALL) -m 444 $(EQ_FILES) ${PROJECT_RELEASE}/include
+	$(INSTALL) -m 444 $(EQ_FILES) $(PROJECT_INCLUDE)

c/src/lib/libbsp/no_cpu/no_bsp/include/Makefile.in

@@ -28,5 +28,5 @@ CLEAN_ADDITIONS +=
 CLOBBER_ADDITIONS +=
 
 all:	$(SRCS)
-	$(INSTALL) -m 444 $(H_FILES) ${PROJECT_RELEASE}/include
+	$(INSTALL) -m 444 $(H_FILES) $(PROJECT_INCLUDE)
-	$(INSTALL) -m 444 $(EQ_FILES) ${PROJECT_RELEASE}/include
+	$(INSTALL) -m 444 $(EQ_FILES) $(PROJECT_INCLUDE)

c/src/lib/libbsp/powerpc/papyrus/include/Makefile.in

@@ -28,7 +28,7 @@ CLEAN_ADDITIONS +=
 CLOBBER_ADDITIONS +=
 
 all:	$(SRCS)
-	$(INSTALL) -m 444 $(H_FILES) ${PROJECT_RELEASE}/include
+	$(INSTALL) -m 444 $(H_FILES) $(PROJECT_INCLUDE)
-	$(INSTALL) -m 444 $(EQ_FILES) ${PROJECT_RELEASE}/include
+	$(INSTALL) -m 444 $(EQ_FILES) $(PROJECT_INCLUDE)
 
 install:  all

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

@@ -56,4 +56,4 @@ all:	preinstall ${ARCH} $(SRCS) $(PGM)
 #   ../$(RTEMS_BSP_FAMILY)/wrapup/Makefile
 
 preinstall:
-	$(INSTALL) -m 444 $(H_FILES) ${PROJECT_RELEASE}/include
+	$(INSTALL) -m 444 $(H_FILES) $(PROJECT_INCLUDE)

c/src/lib/libbsp/sparc/erc32/include/Makefile.in

@@ -31,4 +31,4 @@ CLEAN_ADDITIONS +=
 CLOBBER_ADDITIONS +=
 
 all:	$(SRCS)
-	$(INSTALL) -m 444 $(H_FILES) ${PROJECT_RELEASE}/include
+	$(INSTALL) -m 444 $(H_FILES) $(PROJECT_INCLUDE)

c/src/lib/libbsp/unix/posix/include/Makefile.in

@@ -28,5 +28,5 @@ CLEAN_ADDITIONS +=
 CLOBBER_ADDITIONS +=
 
 all:	$(SRCS)
-	$(INSTALL) -m 444 $(H_FILES) ${PROJECT_RELEASE}/include
+	$(INSTALL) -m 444 $(H_FILES) $(PROJECT_INCLUDE)
-	$(INSTALL) -m 444 $(EQ_FILES) ${PROJECT_RELEASE}/include
+	$(INSTALL) -m 444 $(EQ_FILES) $(PROJECT_INCLUDE)

c/src/lib/libc/Makefile.in

@@ -56,8 +56,8 @@ $(LIB): $(SRCS) ${OBJS}
 # Install the library, appending _g or _p as appropriate.
 # for include files, just use $(INSTALL)
 preinstall:
-	$(INSTALL) -m 444 ${RTEMS_H_FILES} ${PROJECT_RELEASE}/include/rtems
+	$(INSTALL) -m 444 ${RTEMS_H_FILES} $(PROJECT_INCLUDE)/rtems
-	$(INSTALL) -m 444 $(H_FILES) ${PROJECT_RELEASE}/include
+	$(INSTALL) -m 444 $(H_FILES) $(PROJECT_INCLUDE)
-	$(INSTALL) -m 444 $(SYS_H_FILES) ${PROJECT_RELEASE}/include/sys
+	$(INSTALL) -m 444 $(SYS_H_FILES) $(PROJECT_INCLUDE)/sys
 
 

c/src/lib/libcpu/hppa1.1/runway/Makefile.in

@@ -19,4 +19,4 @@ CLEAN_ADDITIONS +=
 CLOBBER_ADDITIONS +=
 
 all:	$(SRCS)
-	$(INSTALL) -m 444 $(H_FILES) ${PROJECT_RELEASE}/include
+	$(INSTALL) -m 444 $(H_FILES) $(PROJECT_INCLUDE)

c/src/lib/libcpu/hppa1.1/semaphore/Makefile.in

@@ -49,4 +49,4 @@ ${PGM}: ${SRCS} ${OBJS}
 	$(make-rel)
 
 all:	${ARCH} $(SRCS) $(PGM)
-	$(INSTALL) -m 444 $(H_FILES) $(PROJECT_RELEASE)/include
+	$(INSTALL) -m 444 $(H_FILES) $(PROJECT_INCLUDE)

c/src/lib/libmisc/assoc/Makefile.in

@@ -48,4 +48,4 @@ ${LIB}: ${SRCS} ${OBJS}
 	$(make-library)
 
 all:	${ARCH} $(SRCS) $(LIB)
-	$(INSTALL) -m 444 ${H_FILES} ${PROJECT_RELEASE}/include/rtems
+	$(INSTALL) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems

c/src/lib/libmisc/cpuuse/Makefile.in

@@ -49,5 +49,5 @@ ${LIB}: ${SRCS} ${OBJS}
 	$(make-library)
 
 all: ${ARCH} $(SRCS) $(LIB)
-	$(INSTALL) -m 444 ${INSTALLED_H_FILES} ${PROJECT_RELEASE}/include
+	$(INSTALL) -m 444 ${INSTALLED_H_FILES} $(PROJECT_INCLUDE)
-#	$(INSTALL) -m 444 ${H_FILES} ${PROJECT_RELEASE}/include/rtems
+#	$(INSTALL) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems

c/src/lib/libmisc/error/Makefile.in

@@ -48,4 +48,4 @@ ${LIB}: ${SRCS} ${OBJS}
 	$(make-library)
 
 all:	${ARCH} $(SRCS) $(LIB)
-	$(INSTALL) -m 444 ${H_FILES} ${PROJECT_RELEASE}/include/rtems
+	$(INSTALL) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems

c/src/lib/libmisc/monitor/Makefile.in

@@ -54,4 +54,4 @@ ${LIB}: ${SRCS} ${OBJS}
 all:	preinstall ${ARCH} $(SRCS) $(LIB)
 
 preinstall: $(INSTALLED_H_FILES)
-	$(INSTALL) -m 444 ${INSTALLED_H_FILES} ${PROJECT_RELEASE}/include/rtems
+	$(INSTALL) -m 444 ${INSTALLED_H_FILES} $(PROJECT_INCLUDE)/rtems

c/src/lib/libmisc/rtmonuse/Makefile.in

@@ -49,5 +49,5 @@ ${LIB}: ${SRCS} ${OBJS}
 	$(make-library)
 
 all: ${ARCH} $(SRCS) $(LIB)
-	$(INSTALL) -m 444 ${INSTALLED_H_FILES} ${PROJECT_RELEASE}/include
+	$(INSTALL) -m 444 ${INSTALLED_H_FILES} $(PROJECT_INCLUDE)
-#	$(INSTALL) -m 444 ${H_FILES} ${PROJECT_RELEASE}/include/rtems
+#	$(INSTALL) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems

c/src/lib/libmisc/stackchk/Makefile.in

@@ -49,4 +49,4 @@ ${LIB}: ${SRCS} ${OBJS}
 	$(make-library)
 
 all:	${ARCH} $(SRCS) $(LIB)
-	 $(INSTALL) -m 444 ${INSTALLED_H_FILES} ${PROJECT_RELEASE}/include
+	 $(INSTALL) -m 444 ${INSTALLED_H_FILES} $(PROJECT_INCLUDE)

c/src/libmisc/assoc/Makefile.in

@@ -48,4 +48,4 @@ ${LIB}: ${SRCS} ${OBJS}
 	$(make-library)
 
 all:	${ARCH} $(SRCS) $(LIB)
-	$(INSTALL) -m 444 ${H_FILES} ${PROJECT_RELEASE}/include/rtems
+	$(INSTALL) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems

c/src/libmisc/cpuuse/Makefile.in

@@ -49,5 +49,5 @@ ${LIB}: ${SRCS} ${OBJS}
 	$(make-library)
 
 all: ${ARCH} $(SRCS) $(LIB)
-	$(INSTALL) -m 444 ${INSTALLED_H_FILES} ${PROJECT_RELEASE}/include
+	$(INSTALL) -m 444 ${INSTALLED_H_FILES} $(PROJECT_INCLUDE)
-#	$(INSTALL) -m 444 ${H_FILES} ${PROJECT_RELEASE}/include/rtems
+#	$(INSTALL) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems

c/src/libmisc/error/Makefile.in

@@ -48,4 +48,4 @@ ${LIB}: ${SRCS} ${OBJS}
 	$(make-library)
 
 all:	${ARCH} $(SRCS) $(LIB)
-	$(INSTALL) -m 444 ${H_FILES} ${PROJECT_RELEASE}/include/rtems
+	$(INSTALL) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems

c/src/libmisc/monitor/Makefile.in

@@ -54,4 +54,4 @@ ${LIB}: ${SRCS} ${OBJS}
 all:	preinstall ${ARCH} $(SRCS) $(LIB)
 
 preinstall: $(INSTALLED_H_FILES)
-	$(INSTALL) -m 444 ${INSTALLED_H_FILES} ${PROJECT_RELEASE}/include/rtems
+	$(INSTALL) -m 444 ${INSTALLED_H_FILES} $(PROJECT_INCLUDE)/rtems

c/src/libmisc/rtmonuse/Makefile.in

@@ -49,5 +49,5 @@ ${LIB}: ${SRCS} ${OBJS}
 	$(make-library)
 
 all: ${ARCH} $(SRCS) $(LIB)
-	$(INSTALL) -m 444 ${INSTALLED_H_FILES} ${PROJECT_RELEASE}/include
+	$(INSTALL) -m 444 ${INSTALLED_H_FILES} $(PROJECT_INCLUDE)
-#	$(INSTALL) -m 444 ${H_FILES} ${PROJECT_RELEASE}/include/rtems
+#	$(INSTALL) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems

c/src/libmisc/stackchk/Makefile.in

@@ -49,4 +49,4 @@ ${LIB}: ${SRCS} ${OBJS}
 	$(make-library)
 
 all:	${ARCH} $(SRCS) $(LIB)
-	 $(INSTALL) -m 444 ${INSTALLED_H_FILES} ${PROJECT_RELEASE}/include
+	 $(INSTALL) -m 444 ${INSTALLED_H_FILES} $(PROJECT_INCLUDE)

c/src/tests/psxtests/support/include/Makefile.in

@@ -20,6 +20,6 @@ CLEAN_ADDITIONS +=
 CLOBBER_ADDITIONS +=
 
 all:	$(SRCS)
-	$(INSTALL) -m 444 $(H_FILES) ${PROJECT_RELEASE}/include
+	$(INSTALL) -m 444 $(H_FILES) $(PROJECT_INCLUDE)
-#	$(INSTALL) -m 444 $(SYS_H_FILES) ${PROJECT_RELEASE}/include/sys
+#	$(INSTALL) -m 444 $(SYS_H_FILES) $(PROJECT_INCLUDE)/sys
 

c/src/tests/support/include/Makefile.in

@@ -20,6 +20,6 @@ CLEAN_ADDITIONS +=
 CLOBBER_ADDITIONS +=
 
 all:	$(SRCS)
-	$(INSTALL) -m 444 $(H_FILES) ${PROJECT_RELEASE}/include
+	$(INSTALL) -m 444 $(H_FILES) $(PROJECT_INCLUDE)
-	$(INSTALL) -m 444 $(SYS_H_FILES) ${PROJECT_RELEASE}/include/sys
+	$(INSTALL) -m 444 $(SYS_H_FILES) $(PROJECT_INCLUDE)/sys
 

c/src/tests/support/stubdr/Makefile.in

@@ -53,5 +53,5 @@ ${PGM}: ${SRCS} ${OBJS}
 	$(make-rel)
 
 all:	${ARCH} $(SRCS) $(PGM)
-	$(INSTALL) -m 444 $(H_FILES) ${PROJECT_RELEASE}/include
+	$(INSTALL) -m 444 $(H_FILES) $(PROJECT_INCLUDE)
 	$(INSTALL_VARIANT) -m 644 $(PGM) ${PROJECT_RELEASE}/lib

c/src/tests/tmtests/include/Makefile.in

@@ -20,6 +20,6 @@ CLEAN_ADDITIONS +=
 CLOBBER_ADDITIONS +=
 
 all:	$(SRCS)
-	$(INSTALL) -m 444 $(H_FILES) ${PROJECT_RELEASE}/include
+	$(INSTALL) -m 444 $(H_FILES) $(PROJECT_INCLUDE)
-	$(INSTALL) -m 444 $(SYS_H_FILES) ${PROJECT_RELEASE}/include/sys
+	$(INSTALL) -m 444 $(SYS_H_FILES) $(PROJECT_INCLUDE)/sys
 

tools/cpu/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   +=