summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>1997-10-08 14:42:08 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>1997-10-08 14:42:08 +0000
commita2016b9965a4de47b0bac9013b1c4f9f867235f7 (patch)
treeab278df5dac0efc5f8cf1950de236dfed894f2f0
parentf05f7045a55e64481679a38f38524444440a6d64 (diff)
downloadrtems-a2016b9965a4de47b0bac9013b1c4f9f867235f7.tar.bz2
Removed include directory at "build" point and the link of this directory
to lib/include. Went to using a PROJECT_INCLUDE variable.
-rw-r--r--c/src/exec/posix/base/Makefile.in2
-rw-r--r--c/src/exec/posix/headers/Makefile.in2
-rw-r--r--c/src/exec/posix/include/rtems/posix/Makefile.in2
-rw-r--r--c/src/exec/posix/include/sys/Makefile.in2
-rw-r--r--c/src/exec/posix/include/wrap/Makefile.in2
-rw-r--r--c/src/exec/posix/inline/Makefile.in2
-rw-r--r--c/src/exec/posix/inline/rtems/posix/Makefile.in2
-rw-r--r--c/src/exec/posix/macros/Makefile.in2
-rw-r--r--c/src/exec/posix/macros/rtems/posix/Makefile.in2
-rw-r--r--c/src/exec/posix/optman/Makefile.in2
-rw-r--r--c/src/exec/posix/sys/Makefile.in2
-rw-r--r--c/src/exec/rtems/headers/Makefile.in4
-rw-r--r--c/src/exec/rtems/include/rtems/rtems/Makefile.in4
-rw-r--r--c/src/exec/rtems/inline/Makefile.in2
-rw-r--r--c/src/exec/rtems/inline/rtems/rtems/Makefile.in2
-rw-r--r--c/src/exec/rtems/macros/Makefile.in2
-rw-r--r--c/src/exec/rtems/macros/rtems/rtems/Makefile.in2
-rw-r--r--c/src/exec/rtems/optman/Makefile.in2
-rw-r--r--c/src/exec/sapi/headers/Makefile.in4
-rw-r--r--c/src/exec/sapi/include/rtems/Makefile.in4
-rw-r--r--c/src/exec/sapi/inline/Makefile.in2
-rw-r--r--c/src/exec/sapi/inline/rtems/Makefile.in2
-rw-r--r--c/src/exec/sapi/macros/Makefile.in2
-rw-r--r--c/src/exec/sapi/macros/rtems/Makefile.in2
-rw-r--r--c/src/exec/sapi/optman/Makefile.in2
-rw-r--r--c/src/exec/score/cpu/a29k/Makefile.in12
-rw-r--r--c/src/exec/score/cpu/hppa1.1/Makefile.in10
-rw-r--r--c/src/exec/score/cpu/i386/Makefile.in12
-rw-r--r--c/src/exec/score/cpu/i960/Makefile.in12
-rw-r--r--c/src/exec/score/cpu/m68k/Makefile.in8
-rw-r--r--c/src/exec/score/cpu/mips64orion/Makefile.in8
-rw-r--r--c/src/exec/score/cpu/no_cpu/Makefile.in12
-rw-r--r--c/src/exec/score/cpu/powerpc/Makefile.in12
-rw-r--r--c/src/exec/score/cpu/sparc/Makefile.in8
-rw-r--r--c/src/exec/score/cpu/unix/Makefile.in12
-rw-r--r--c/src/exec/score/headers/Makefile.in8
-rw-r--r--c/src/exec/score/include/rtems/score/Makefile.in8
-rw-r--r--c/src/exec/score/inline/Makefile.in2
-rw-r--r--c/src/exec/score/inline/rtems/score/Makefile.in2
-rw-r--r--c/src/exec/score/macros/Makefile.in2
-rw-r--r--c/src/exec/score/macros/rtems/score/Makefile.in2
-rw-r--r--c/src/exec/score/tools/hppa1.1/Makefile.in2
-rw-r--r--c/src/exec/score/tools/unix/Makefile.in2
-rw-r--r--c/src/lib/include/Makefile.in12
-rw-r--r--c/src/lib/libbsp/a29k/portsw/console/Makefile.in2
-rw-r--r--c/src/lib/libbsp/a29k/portsw/include/Makefile.in4
-rw-r--r--c/src/lib/libbsp/hppa1.1/pxfl/Makefile.in2
-rw-r--r--c/src/lib/libbsp/hppa1.1/simhppa/include/Makefile.in4
-rw-r--r--c/src/lib/libbsp/i386/force386/include/Makefile.in4
-rw-r--r--c/src/lib/libbsp/i386/go32/include/Makefile.in4
-rw-r--r--c/src/lib/libbsp/i386/i386ex/include/Makefile.in4
-rw-r--r--c/src/lib/libbsp/i960/cvme961/include/Makefile.in4
-rw-r--r--c/src/lib/libbsp/m68k/dmv152/include/Makefile.in4
-rw-r--r--c/src/lib/libbsp/m68k/efi332/include/Makefile.in4
-rw-r--r--c/src/lib/libbsp/m68k/efi68k/include/Makefile.in4
-rw-r--r--c/src/lib/libbsp/m68k/gen68302/include/Makefile.in4
-rw-r--r--c/src/lib/libbsp/m68k/gen68360/include/Makefile.in4
-rw-r--r--c/src/lib/libbsp/m68k/idp/include/Makefile.in4
-rw-r--r--c/src/lib/libbsp/m68k/mvme136/include/Makefile.in4
-rw-r--r--c/src/lib/libbsp/m68k/mvme147/include/Makefile.in4
-rw-r--r--c/src/lib/libbsp/m68k/mvme147s/include/Makefile.in4
-rw-r--r--c/src/lib/libbsp/m68k/mvme162/consolex/Makefile.in2
-rw-r--r--c/src/lib/libbsp/m68k/mvme162/include/Makefile.in4
-rw-r--r--c/src/lib/libbsp/m68k/ods68302/include/Makefile.in4
-rw-r--r--c/src/lib/libbsp/mips64orion/p4000/include/Makefile.in4
-rw-r--r--c/src/lib/libbsp/no_cpu/no_bsp/include/Makefile.in4
-rw-r--r--c/src/lib/libbsp/powerpc/papyrus/include/Makefile.in4
-rw-r--r--c/src/lib/libbsp/shmdr/Makefile.in2
-rw-r--r--c/src/lib/libbsp/sparc/erc32/include/Makefile.in2
-rw-r--r--c/src/lib/libbsp/unix/posix/include/Makefile.in4
-rw-r--r--c/src/lib/libc/Makefile.in6
-rw-r--r--c/src/lib/libcpu/hppa1.1/runway/Makefile.in2
-rw-r--r--c/src/lib/libcpu/hppa1.1/semaphore/Makefile.in2
-rw-r--r--c/src/lib/libmisc/assoc/Makefile.in2
-rw-r--r--c/src/lib/libmisc/cpuuse/Makefile.in4
-rw-r--r--c/src/lib/libmisc/error/Makefile.in2
-rw-r--r--c/src/lib/libmisc/monitor/Makefile.in2
-rw-r--r--c/src/lib/libmisc/rtmonuse/Makefile.in4
-rw-r--r--c/src/lib/libmisc/stackchk/Makefile.in2
-rw-r--r--c/src/libmisc/assoc/Makefile.in2
-rw-r--r--c/src/libmisc/cpuuse/Makefile.in4
-rw-r--r--c/src/libmisc/error/Makefile.in2
-rw-r--r--c/src/libmisc/monitor/Makefile.in2
-rw-r--r--c/src/libmisc/rtmonuse/Makefile.in4
-rw-r--r--c/src/libmisc/stackchk/Makefile.in2
-rw-r--r--c/src/tests/psxtests/support/include/Makefile.in4
-rw-r--r--c/src/tests/support/include/Makefile.in4
-rw-r--r--c/src/tests/support/stubdr/Makefile.in2
-rw-r--r--c/src/tests/tmtests/include/Makefile.in4
-rw-r--r--tools/cpu/unix/Makefile.in2
90 files changed, 178 insertions, 178 deletions
diff --git a/c/src/exec/posix/base/Makefile.in b/c/src/exec/posix/base/Makefile.in
index d11541a321..8d81713abb 100644
--- a/c/src/exec/posix/base/Makefile.in
+++ b/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)
diff --git a/c/src/exec/posix/headers/Makefile.in b/c/src/exec/posix/headers/Makefile.in
index 7769a4cada..f29a1fdac2 100644
--- a/c/src/exec/posix/headers/Makefile.in
+++ b/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
diff --git a/c/src/exec/posix/include/rtems/posix/Makefile.in b/c/src/exec/posix/include/rtems/posix/Makefile.in
index 7769a4cada..f29a1fdac2 100644
--- a/c/src/exec/posix/include/rtems/posix/Makefile.in
+++ b/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
diff --git a/c/src/exec/posix/include/sys/Makefile.in b/c/src/exec/posix/include/sys/Makefile.in
index 84d2003ba3..9d1a660d31 100644
--- a/c/src/exec/posix/include/sys/Makefile.in
+++ b/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
diff --git a/c/src/exec/posix/include/wrap/Makefile.in b/c/src/exec/posix/include/wrap/Makefile.in
index d11541a321..8d81713abb 100644
--- a/c/src/exec/posix/include/wrap/Makefile.in
+++ b/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)
diff --git a/c/src/exec/posix/inline/Makefile.in b/c/src/exec/posix/inline/Makefile.in
index a68a481925..18ee75ee73 100644
--- a/c/src/exec/posix/inline/Makefile.in
+++ b/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
diff --git a/c/src/exec/posix/inline/rtems/posix/Makefile.in b/c/src/exec/posix/inline/rtems/posix/Makefile.in
index a68a481925..18ee75ee73 100644
--- a/c/src/exec/posix/inline/rtems/posix/Makefile.in
+++ b/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
diff --git a/c/src/exec/posix/macros/Makefile.in b/c/src/exec/posix/macros/Makefile.in
index 127eec1a58..1c59991a36 100644
--- a/c/src/exec/posix/macros/Makefile.in
+++ b/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
diff --git a/c/src/exec/posix/macros/rtems/posix/Makefile.in b/c/src/exec/posix/macros/rtems/posix/Makefile.in
index 127eec1a58..1c59991a36 100644
--- a/c/src/exec/posix/macros/rtems/posix/Makefile.in
+++ b/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
diff --git a/c/src/exec/posix/optman/Makefile.in b/c/src/exec/posix/optman/Makefile.in
index 6d99022a3a..a24ed8c43c 100644
--- a/c/src/exec/posix/optman/Makefile.in
+++ b/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 +=
diff --git a/c/src/exec/posix/sys/Makefile.in b/c/src/exec/posix/sys/Makefile.in
index 84d2003ba3..9d1a660d31 100644
--- a/c/src/exec/posix/sys/Makefile.in
+++ b/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
diff --git a/c/src/exec/rtems/headers/Makefile.in b/c/src/exec/rtems/headers/Makefile.in
index b7b0f463c5..b79ebfa7d9 100644
--- a/c/src/exec/rtems/headers/Makefile.in
+++ b/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 ${EXTERNAL_H_FILES} ${PROJECT_RELEASE}/include
+ $(INSTALL) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems/rtems
+ $(INSTALL) -m 444 ${EXTERNAL_H_FILES} $(PROJECT_INCLUDE)
diff --git a/c/src/exec/rtems/include/rtems/rtems/Makefile.in b/c/src/exec/rtems/include/rtems/rtems/Makefile.in
index b7b0f463c5..b79ebfa7d9 100644
--- a/c/src/exec/rtems/include/rtems/rtems/Makefile.in
+++ b/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 ${EXTERNAL_H_FILES} ${PROJECT_RELEASE}/include
+ $(INSTALL) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems/rtems
+ $(INSTALL) -m 444 ${EXTERNAL_H_FILES} $(PROJECT_INCLUDE)
diff --git a/c/src/exec/rtems/inline/Makefile.in b/c/src/exec/rtems/inline/Makefile.in
index e041a1b657..bacd055cba 100644
--- a/c/src/exec/rtems/inline/Makefile.in
+++ b/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
diff --git a/c/src/exec/rtems/inline/rtems/rtems/Makefile.in b/c/src/exec/rtems/inline/rtems/rtems/Makefile.in
index e041a1b657..bacd055cba 100644
--- a/c/src/exec/rtems/inline/rtems/rtems/Makefile.in
+++ b/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
diff --git a/c/src/exec/rtems/macros/Makefile.in b/c/src/exec/rtems/macros/Makefile.in
index e041a1b657..bacd055cba 100644
--- a/c/src/exec/rtems/macros/Makefile.in
+++ b/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
diff --git a/c/src/exec/rtems/macros/rtems/rtems/Makefile.in b/c/src/exec/rtems/macros/rtems/rtems/Makefile.in
index e041a1b657..bacd055cba 100644
--- a/c/src/exec/rtems/macros/rtems/rtems/Makefile.in
+++ b/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
diff --git a/c/src/exec/rtems/optman/Makefile.in b/c/src/exec/rtems/optman/Makefile.in
index ac24e9b841..59648fd674 100644
--- a/c/src/exec/rtems/optman/Makefile.in
+++ b/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 +=
diff --git a/c/src/exec/sapi/headers/Makefile.in b/c/src/exec/sapi/headers/Makefile.in
index 24e8766199..807522de3c 100644
--- a/c/src/exec/sapi/headers/Makefile.in
+++ b/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 ${EXTERNAL_H_FILES} ${PROJECT_RELEASE}/include
+ $(INSTALL) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems/
+ $(INSTALL) -m 444 ${EXTERNAL_H_FILES} $(PROJECT_INCLUDE)
diff --git a/c/src/exec/sapi/include/rtems/Makefile.in b/c/src/exec/sapi/include/rtems/Makefile.in
index 24e8766199..807522de3c 100644
--- a/c/src/exec/sapi/include/rtems/Makefile.in
+++ b/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 ${EXTERNAL_H_FILES} ${PROJECT_RELEASE}/include
+ $(INSTALL) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems/
+ $(INSTALL) -m 444 ${EXTERNAL_H_FILES} $(PROJECT_INCLUDE)
diff --git a/c/src/exec/sapi/inline/Makefile.in b/c/src/exec/sapi/inline/Makefile.in
index 63b4731cbe..d9dd23ad80 100644
--- a/c/src/exec/sapi/inline/Makefile.in
+++ b/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
diff --git a/c/src/exec/sapi/inline/rtems/Makefile.in b/c/src/exec/sapi/inline/rtems/Makefile.in
index 63b4731cbe..d9dd23ad80 100644
--- a/c/src/exec/sapi/inline/rtems/Makefile.in
+++ b/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
diff --git a/c/src/exec/sapi/macros/Makefile.in b/c/src/exec/sapi/macros/Makefile.in
index 63b4731cbe..d9dd23ad80 100644
--- a/c/src/exec/sapi/macros/Makefile.in
+++ b/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
diff --git a/c/src/exec/sapi/macros/rtems/Makefile.in b/c/src/exec/sapi/macros/rtems/Makefile.in
index 63b4731cbe..d9dd23ad80 100644
--- a/c/src/exec/sapi/macros/rtems/Makefile.in
+++ b/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
diff --git a/c/src/exec/sapi/optman/Makefile.in b/c/src/exec/sapi/optman/Makefile.in
index 1043e11a7f..afbb2f47cf 100644
--- a/c/src/exec/sapi/optman/Makefile.in
+++ b/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 +=
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 +=
diff --git a/c/src/lib/include/Makefile.in b/c/src/lib/include/Makefile.in
index bc0b521c09..505764371c 100644
--- a/c/src/lib/include/Makefile.in
+++ b/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 $(SYS_H_FILES) ${PROJECT_RELEASE}/include/sys
+ $(INSTALL) -m 444 $(H_FILES) $(PROJECT_INCLUDE)
+ $(INSTALL) -m 444 $(SYS_H_FILES) $(PROJECT_INCLUDE)/sys
$(INSTALL) -m 444 $(MOTOROLA_H_FILES) \
- ${PROJECT_RELEASE}/include/motorola
- $(INSTALL) -m 444 $(ZILOG_H_FILES) ${PROJECT_RELEASE}/include/zilog
+ $(PROJECT_INCLUDE)/motorola
+ $(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
diff --git a/c/src/lib/libbsp/a29k/portsw/console/Makefile.in b/c/src/lib/libbsp/a29k/portsw/console/Makefile.in
index 4ba37cd168..5c9124ab14 100644
--- a/c/src/lib/libbsp/a29k/portsw/console/Makefile.in
+++ b/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
diff --git a/c/src/lib/libbsp/a29k/portsw/include/Makefile.in b/c/src/lib/libbsp/a29k/portsw/include/Makefile.in
index fd7d4d6077..b66d3f8b2b 100644
--- a/c/src/lib/libbsp/a29k/portsw/include/Makefile.in
+++ b/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 $(EQ_FILES) ${PROJECT_RELEASE}/include
+ $(INSTALL) -m 444 $(H_FILES) $(PROJECT_INCLUDE)
+ $(INSTALL) -m 444 $(EQ_FILES) $(PROJECT_INCLUDE)
diff --git a/c/src/lib/libbsp/hppa1.1/pxfl/Makefile.in b/c/src/lib/libbsp/hppa1.1/pxfl/Makefile.in
index 000c6435cb..aa1cf6f8cc 100644
--- a/c/src/lib/libbsp/hppa1.1/pxfl/Makefile.in
+++ b/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
diff --git a/c/src/lib/libbsp/hppa1.1/simhppa/include/Makefile.in b/c/src/lib/libbsp/hppa1.1/simhppa/include/Makefile.in
index 6362ab657e..d76c019e3a 100644
--- a/c/src/lib/libbsp/hppa1.1/simhppa/include/Makefile.in
+++ b/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 $(RTEMS_H_FILES) ${PROJECT_RELEASE}/include/rtems
+ $(INSTALL) -m 444 $(H_FILES) $(PROJECT_INCLUDE)
+ $(INSTALL) -m 444 $(RTEMS_H_FILES) $(PROJECT_INCLUDE)/rtems
diff --git a/c/src/lib/libbsp/i386/force386/include/Makefile.in b/c/src/lib/libbsp/i386/force386/include/Makefile.in
index fd7d4d6077..b66d3f8b2b 100644
--- a/c/src/lib/libbsp/i386/force386/include/Makefile.in
+++ b/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 $(EQ_FILES) ${PROJECT_RELEASE}/include
+ $(INSTALL) -m 444 $(H_FILES) $(PROJECT_INCLUDE)
+ $(INSTALL) -m 444 $(EQ_FILES) $(PROJECT_INCLUDE)
diff --git a/c/src/lib/libbsp/i386/go32/include/Makefile.in b/c/src/lib/libbsp/i386/go32/include/Makefile.in
index fd7d4d6077..b66d3f8b2b 100644
--- a/c/src/lib/libbsp/i386/go32/include/Makefile.in
+++ b/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 $(EQ_FILES) ${PROJECT_RELEASE}/include
+ $(INSTALL) -m 444 $(H_FILES) $(PROJECT_INCLUDE)
+ $(INSTALL) -m 444 $(EQ_FILES) $(PROJECT_INCLUDE)
diff --git a/c/src/lib/libbsp/i386/i386ex/include/Makefile.in b/c/src/lib/libbsp/i386/i386ex/include/Makefile.in
index 20c100b31f..fbb49823eb 100644
--- a/c/src/lib/libbsp/i386/i386ex/include/Makefile.in
+++ b/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 $(EQ_FILES) ${PROJECT_RELEASE}/include
+ $(INSTALL) -m 444 $(H_FILES) $(PROJECT_INCLUDE)
+ $(INSTALL) -m 444 $(EQ_FILES) $(PROJECT_INCLUDE)
install: all
diff --git a/c/src/lib/libbsp/i960/cvme961/include/Makefile.in b/c/src/lib/libbsp/i960/cvme961/include/Makefile.in
index c9b50f69c3..ba2deffd3a 100644
--- a/c/src/lib/libbsp/i960/cvme961/include/Makefile.in
+++ b/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 $(EQ_FILES) ${PROJECT_RELEASE}/include/cpu
+ $(INSTALL) -m 444 $(H_FILES) $(PROJECT_INCLUDE)
+ $(INSTALL) -m 444 $(EQ_FILES) $(PROJECT_INCLUDE)/cpu
install: all
diff --git a/c/src/lib/libbsp/m68k/dmv152/include/Makefile.in b/c/src/lib/libbsp/m68k/dmv152/include/Makefile.in
index fd7d4d6077..b66d3f8b2b 100644
--- a/c/src/lib/libbsp/m68k/dmv152/include/Makefile.in
+++ b/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 $(EQ_FILES) ${PROJECT_RELEASE}/include
+ $(INSTALL) -m 444 $(H_FILES) $(PROJECT_INCLUDE)
+ $(INSTALL) -m 444 $(EQ_FILES) $(PROJECT_INCLUDE)
diff --git a/c/src/lib/libbsp/m68k/efi332/include/Makefile.in b/c/src/lib/libbsp/m68k/efi332/include/Makefile.in
index 1e9e4d7edf..7260da11c0 100644
--- a/c/src/lib/libbsp/m68k/efi332/include/Makefile.in
+++ b/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 $(EQ_FILES) ${PROJECT_RELEASE}/include
+ $(INSTALL) -m 444 $(H_FILES) $(PROJECT_INCLUDE)
+ $(INSTALL) -m 444 $(EQ_FILES) $(PROJECT_INCLUDE)
diff --git a/c/src/lib/libbsp/m68k/efi68k/include/Makefile.in b/c/src/lib/libbsp/m68k/efi68k/include/Makefile.in
index f4db4743ed..3e1a7f1e31 100644
--- a/c/src/lib/libbsp/m68k/efi68k/include/Makefile.in
+++ b/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 $(EQ_FILES) ${PROJECT_RELEASE}/include
+ $(INSTALL) -m 444 $(H_FILES) $(PROJECT_INCLUDE)
+ $(INSTALL) -m 444 $(EQ_FILES) $(PROJECT_INCLUDE)
diff --git a/c/src/lib/libbsp/m68k/gen68302/include/Makefile.in b/c/src/lib/libbsp/m68k/gen68302/include/Makefile.in
index fd7d4d6077..b66d3f8b2b 100644
--- a/c/src/lib/libbsp/m68k/gen68302/include/Makefile.in
+++ b/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 $(EQ_FILES) ${PROJECT_RELEASE}/include
+ $(INSTALL) -m 444 $(H_FILES) $(PROJECT_INCLUDE)
+ $(INSTALL) -m 444 $(EQ_FILES) $(PROJECT_INCLUDE)
diff --git a/c/src/lib/libbsp/m68k/gen68360/include/Makefile.in b/c/src/lib/libbsp/m68k/gen68360/include/Makefile.in
index fd7d4d6077..b66d3f8b2b 100644
--- a/c/src/lib/libbsp/m68k/gen68360/include/Makefile.in
+++ b/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 $(EQ_FILES) ${PROJECT_RELEASE}/include
+ $(INSTALL) -m 444 $(H_FILES) $(PROJECT_INCLUDE)
+ $(INSTALL) -m 444 $(EQ_FILES) $(PROJECT_INCLUDE)
diff --git a/c/src/lib/libbsp/m68k/idp/include/Makefile.in b/c/src/lib/libbsp/m68k/idp/include/Makefile.in
index cf2e37be93..7e46cbc96a 100644
--- a/c/src/lib/libbsp/m68k/idp/include/Makefile.in
+++ b/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 $(EQ_FILES) ${PROJECT_RELEASE}/include
+ $(INSTALL) -m 444 $(H_FILES) $(PROJECT_INCLUDE)
+ $(INSTALL) -m 444 $(EQ_FILES) $(PROJECT_INCLUDE)
diff --git a/c/src/lib/libbsp/m68k/mvme136/include/Makefile.in b/c/src/lib/libbsp/m68k/mvme136/include/Makefile.in
index fd7d4d6077..b66d3f8b2b 100644
--- a/c/src/lib/libbsp/m68k/mvme136/include/Makefile.in
+++ b/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 $(EQ_FILES) ${PROJECT_RELEASE}/include
+ $(INSTALL) -m 444 $(H_FILES) $(PROJECT_INCLUDE)
+ $(INSTALL) -m 444 $(EQ_FILES) $(PROJECT_INCLUDE)
diff --git a/c/src/lib/libbsp/m68k/mvme147/include/Makefile.in b/c/src/lib/libbsp/m68k/mvme147/include/Makefile.in
index fd7d4d6077..b66d3f8b2b 100644
--- a/c/src/lib/libbsp/m68k/mvme147/include/Makefile.in
+++ b/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 $(EQ_FILES) ${PROJECT_RELEASE}/include
+ $(INSTALL) -m 444 $(H_FILES) $(PROJECT_INCLUDE)
+ $(INSTALL) -m 444 $(EQ_FILES) $(PROJECT_INCLUDE)
diff --git a/c/src/lib/libbsp/m68k/mvme147s/include/Makefile.in b/c/src/lib/libbsp/m68k/mvme147s/include/Makefile.in
index fd7d4d6077..b66d3f8b2b 100644
--- a/c/src/lib/libbsp/m68k/mvme147s/include/Makefile.in
+++ b/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 $(EQ_FILES) ${PROJECT_RELEASE}/include
+ $(INSTALL) -m 444 $(H_FILES) $(PROJECT_INCLUDE)
+ $(INSTALL) -m 444 $(EQ_FILES) $(PROJECT_INCLUDE)
diff --git a/c/src/lib/libbsp/m68k/mvme162/consolex/Makefile.in b/c/src/lib/libbsp/m68k/mvme162/consolex/Makefile.in
index 09615171e8..f6feee5535 100644
--- a/c/src/lib/libbsp/m68k/mvme162/consolex/Makefile.in
+++ b/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)
diff --git a/c/src/lib/libbsp/m68k/mvme162/include/Makefile.in b/c/src/lib/libbsp/m68k/mvme162/include/Makefile.in
index 8c93d9a2fa..25f58d8d85 100644
--- a/c/src/lib/libbsp/m68k/mvme162/include/Makefile.in
+++ b/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 $(EQ_FILES) ${PROJECT_RELEASE}/include
+ $(INSTALL) -m 444 $(H_FILES) $(PROJECT_INCLUDE)
+ $(INSTALL) -m 444 $(EQ_FILES) $(PROJECT_INCLUDE)
diff --git a/c/src/lib/libbsp/m68k/ods68302/include/Makefile.in b/c/src/lib/libbsp/m68k/ods68302/include/Makefile.in
index a999dff621..b8ec710bdf 100644
--- a/c/src/lib/libbsp/m68k/ods68302/include/Makefile.in
+++ b/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 $(EQ_FILES) ${PROJECT_RELEASE}/include
+ $(INSTALL) -m 444 $(H_FILES) $(PROJECT_INCLUDE)
+ $(INSTALL) -m 444 $(EQ_FILES) $(PROJECT_INCLUDE)
diff --git a/c/src/lib/libbsp/mips64orion/p4000/include/Makefile.in b/c/src/lib/libbsp/mips64orion/p4000/include/Makefile.in
index fd7d4d6077..b66d3f8b2b 100644
--- a/c/src/lib/libbsp/mips64orion/p4000/include/Makefile.in
+++ b/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 $(EQ_FILES) ${PROJECT_RELEASE}/include
+ $(INSTALL) -m 444 $(H_FILES) $(PROJECT_INCLUDE)
+ $(INSTALL) -m 444 $(EQ_FILES) $(PROJECT_INCLUDE)
diff --git a/c/src/lib/libbsp/no_cpu/no_bsp/include/Makefile.in b/c/src/lib/libbsp/no_cpu/no_bsp/include/Makefile.in
index fd7d4d6077..b66d3f8b2b 100644
--- a/c/src/lib/libbsp/no_cpu/no_bsp/include/Makefile.in
+++ b/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 $(EQ_FILES) ${PROJECT_RELEASE}/include
+ $(INSTALL) -m 444 $(H_FILES) $(PROJECT_INCLUDE)
+ $(INSTALL) -m 444 $(EQ_FILES) $(PROJECT_INCLUDE)
diff --git a/c/src/lib/libbsp/powerpc/papyrus/include/Makefile.in b/c/src/lib/libbsp/powerpc/papyrus/include/Makefile.in
index 20c100b31f..fbb49823eb 100644
--- a/c/src/lib/libbsp/powerpc/papyrus/include/Makefile.in
+++ b/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 $(EQ_FILES) ${PROJECT_RELEASE}/include
+ $(INSTALL) -m 444 $(H_FILES) $(PROJECT_INCLUDE)
+ $(INSTALL) -m 444 $(EQ_FILES) $(PROJECT_INCLUDE)
install: all
diff --git a/c/src/lib/libbsp/shmdr/Makefile.in b/c/src/lib/libbsp/shmdr/Makefile.in
index b5cc03afd9..c6768a6576 100644
--- a/c/src/lib/libbsp/shmdr/Makefile.in
+++ b/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)
diff --git a/c/src/lib/libbsp/sparc/erc32/include/Makefile.in b/c/src/lib/libbsp/sparc/erc32/include/Makefile.in
index 8022b50bb2..f74ca712f4 100644
--- a/c/src/lib/libbsp/sparc/erc32/include/Makefile.in
+++ b/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)
diff --git a/c/src/lib/libbsp/unix/posix/include/Makefile.in b/c/src/lib/libbsp/unix/posix/include/Makefile.in
index fd7d4d6077..b66d3f8b2b 100644
--- a/c/src/lib/libbsp/unix/posix/include/Makefile.in
+++ b/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 $(EQ_FILES) ${PROJECT_RELEASE}/include
+ $(INSTALL) -m 444 $(H_FILES) $(PROJECT_INCLUDE)
+ $(INSTALL) -m 444 $(EQ_FILES) $(PROJECT_INCLUDE)
diff --git a/c/src/lib/libc/Makefile.in b/c/src/lib/libc/Makefile.in
index c8679128bc..c8def705f4 100644
--- a/c/src/lib/libc/Makefile.in
+++ b/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 $(H_FILES) ${PROJECT_RELEASE}/include
- $(INSTALL) -m 444 $(SYS_H_FILES) ${PROJECT_RELEASE}/include/sys
+ $(INSTALL) -m 444 ${RTEMS_H_FILES} $(PROJECT_INCLUDE)/rtems
+ $(INSTALL) -m 444 $(H_FILES) $(PROJECT_INCLUDE)
+ $(INSTALL) -m 444 $(SYS_H_FILES) $(PROJECT_INCLUDE)/sys
diff --git a/c/src/lib/libcpu/hppa1.1/runway/Makefile.in b/c/src/lib/libcpu/hppa1.1/runway/Makefile.in
index 0580bf3046..ad7bf1f8da 100644
--- a/c/src/lib/libcpu/hppa1.1/runway/Makefile.in
+++ b/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)
diff --git a/c/src/lib/libcpu/hppa1.1/semaphore/Makefile.in b/c/src/lib/libcpu/hppa1.1/semaphore/Makefile.in
index 423d53c8de..611360f365 100644
--- a/c/src/lib/libcpu/hppa1.1/semaphore/Makefile.in
+++ b/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)
diff --git a/c/src/lib/libmisc/assoc/Makefile.in b/c/src/lib/libmisc/assoc/Makefile.in
index c7189808b5..3e2c4faccf 100644
--- a/c/src/lib/libmisc/assoc/Makefile.in
+++ b/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
diff --git a/c/src/lib/libmisc/cpuuse/Makefile.in b/c/src/lib/libmisc/cpuuse/Makefile.in
index 5311e1c271..0545acd3b6 100644
--- a/c/src/lib/libmisc/cpuuse/Makefile.in
+++ b/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 ${H_FILES} ${PROJECT_RELEASE}/include/rtems
+ $(INSTALL) -m 444 ${INSTALLED_H_FILES} $(PROJECT_INCLUDE)
+# $(INSTALL) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems
diff --git a/c/src/lib/libmisc/error/Makefile.in b/c/src/lib/libmisc/error/Makefile.in
index 67b73d713f..1bbf268219 100644
--- a/c/src/lib/libmisc/error/Makefile.in
+++ b/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
diff --git a/c/src/lib/libmisc/monitor/Makefile.in b/c/src/lib/libmisc/monitor/Makefile.in
index 4ecaa6da7d..d7683ee041 100644
--- a/c/src/lib/libmisc/monitor/Makefile.in
+++ b/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
diff --git a/c/src/lib/libmisc/rtmonuse/Makefile.in b/c/src/lib/libmisc/rtmonuse/Makefile.in
index 6f0808f8f2..419a57c304 100644
--- a/c/src/lib/libmisc/rtmonuse/Makefile.in
+++ b/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 ${H_FILES} ${PROJECT_RELEASE}/include/rtems
+ $(INSTALL) -m 444 ${INSTALLED_H_FILES} $(PROJECT_INCLUDE)
+# $(INSTALL) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems
diff --git a/c/src/lib/libmisc/stackchk/Makefile.in b/c/src/lib/libmisc/stackchk/Makefile.in
index ebaf092657..66768d2a67 100644
--- a/c/src/lib/libmisc/stackchk/Makefile.in
+++ b/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)
diff --git a/c/src/libmisc/assoc/Makefile.in b/c/src/libmisc/assoc/Makefile.in
index c7189808b5..3e2c4faccf 100644
--- a/c/src/libmisc/assoc/Makefile.in
+++ b/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
diff --git a/c/src/libmisc/cpuuse/Makefile.in b/c/src/libmisc/cpuuse/Makefile.in
index 5311e1c271..0545acd3b6 100644
--- a/c/src/libmisc/cpuuse/Makefile.in
+++ b/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 ${H_FILES} ${PROJECT_RELEASE}/include/rtems
+ $(INSTALL) -m 444 ${INSTALLED_H_FILES} $(PROJECT_INCLUDE)
+# $(INSTALL) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems
diff --git a/c/src/libmisc/error/Makefile.in b/c/src/libmisc/error/Makefile.in
index 67b73d713f..1bbf268219 100644
--- a/c/src/libmisc/error/Makefile.in
+++ b/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
diff --git a/c/src/libmisc/monitor/Makefile.in b/c/src/libmisc/monitor/Makefile.in
index 4ecaa6da7d..d7683ee041 100644
--- a/c/src/libmisc/monitor/Makefile.in
+++ b/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
diff --git a/c/src/libmisc/rtmonuse/Makefile.in b/c/src/libmisc/rtmonuse/Makefile.in
index 6f0808f8f2..419a57c304 100644
--- a/c/src/libmisc/rtmonuse/Makefile.in
+++ b/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 ${H_FILES} ${PROJECT_RELEASE}/include/rtems
+ $(INSTALL) -m 444 ${INSTALLED_H_FILES} $(PROJECT_INCLUDE)
+# $(INSTALL) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems
diff --git a/c/src/libmisc/stackchk/Makefile.in b/c/src/libmisc/stackchk/Makefile.in
index ebaf092657..66768d2a67 100644
--- a/c/src/libmisc/stackchk/Makefile.in
+++ b/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)
diff --git a/c/src/tests/psxtests/support/include/Makefile.in b/c/src/tests/psxtests/support/include/Makefile.in
index d51a4547b2..4175de2e2a 100644
--- a/c/src/tests/psxtests/support/include/Makefile.in
+++ b/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 $(SYS_H_FILES) ${PROJECT_RELEASE}/include/sys
+ $(INSTALL) -m 444 $(H_FILES) $(PROJECT_INCLUDE)
+# $(INSTALL) -m 444 $(SYS_H_FILES) $(PROJECT_INCLUDE)/sys
diff --git a/c/src/tests/support/include/Makefile.in b/c/src/tests/support/include/Makefile.in
index 5599c9fe1a..5529062342 100644
--- a/c/src/tests/support/include/Makefile.in
+++ b/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 $(SYS_H_FILES) ${PROJECT_RELEASE}/include/sys
+ $(INSTALL) -m 444 $(H_FILES) $(PROJECT_INCLUDE)
+ $(INSTALL) -m 444 $(SYS_H_FILES) $(PROJECT_INCLUDE)/sys
diff --git a/c/src/tests/support/stubdr/Makefile.in b/c/src/tests/support/stubdr/Makefile.in
index d3265fdde5..0b75fe1553 100644
--- a/c/src/tests/support/stubdr/Makefile.in
+++ b/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
diff --git a/c/src/tests/tmtests/include/Makefile.in b/c/src/tests/tmtests/include/Makefile.in
index a53e59e10d..537891d1b7 100644
--- a/c/src/tests/tmtests/include/Makefile.in
+++ b/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 $(SYS_H_FILES) ${PROJECT_RELEASE}/include/sys
+ $(INSTALL) -m 444 $(H_FILES) $(PROJECT_INCLUDE)
+ $(INSTALL) -m 444 $(SYS_H_FILES) $(PROJECT_INCLUDE)/sys
diff --git a/tools/cpu/unix/Makefile.in b/tools/cpu/unix/Makefile.in
index f2703f098b..77349ecf10 100644
--- a/tools/cpu/unix/Makefile.in
+++ b/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 +=