Part of the automake VI patch from Ralf Corsepius <corsepiu@faw.uni-ulm.de>:

> 5) rtems-rc-19990202-1.diff/reorg-install.sh
>
> reorg-install.sh fixes a Makefile variable name clash of RTEMS
> configuration files and automake/autoconf standards.
> Until now, RTEMS used $(INSTALL) for install-if-change. Automake and
> autoconf use $(INSTALL) for a bsd-compatible install. As
> install-if-change and bsd-install are not compatible, I renamed all
> references to install-if-changed to $(INSTALL_CHANGED) and used
> $(INSTALL) for bsd-install (==automake/autoconf standard).  When
> automake will be introduced install-if-change will probably be replaced
> by $(INSTALL) and therefore will slowly vanish. For the moment, this
> patch fixes a very nasty problem which prevents adding any automake file
> until now (There are still more).

45 files changed, 134 insertions, 44 deletions

diff --git a/c/src/exec/score/cpu/Makefile.in b/c/src/exec/score/cpu/Makefile.in
index a4e56fed6e..44e7ab64bc 100644
--- a/c/src/exec/score/cpu/Makefile.in
+++ b/c/src/exec/score/cpu/Makefile.in
@@ -8,6 +8,8 @@ VPATH = @srcdir@
 RTEMS_ROOT = @top_srcdir@
 PROJECT_ROOT = @PROJECT_ROOT@
 
+INSTALL = @INSTALL@
+
 include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 include $(RTEMS_ROOT)/make/directory.cfg
 
diff --git a/c/src/exec/score/cpu/a29k/Makefile.in b/c/src/exec/score/cpu/a29k/Makefile.in
index 94424f094e..c7f8cfa74d 100644
--- a/c/src/exec/score/cpu/a29k/Makefile.in
+++ b/c/src/exec/score/cpu/a29k/Makefile.in
@@ -8,6 +8,8 @@ VPATH = @srcdir@
 RTEMS_ROOT = @top_srcdir@
 PROJECT_ROOT = @PROJECT_ROOT@
 
+INSTALL = @INSTALL@
+
 include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 include $(RTEMS_ROOT)/make/directory.cfg
 
diff --git a/c/src/exec/score/cpu/a29k/rtems/Makefile.in b/c/src/exec/score/cpu/a29k/rtems/Makefile.in
index 17f18d020a..d0b2dcce07 100644
--- a/c/src/exec/score/cpu/a29k/rtems/Makefile.in
+++ b/c/src/exec/score/cpu/a29k/rtems/Makefile.in
@@ -8,6 +8,8 @@ VPATH = @srcdir@
 RTEMS_ROOT = @top_srcdir@
 PROJECT_ROOT = @PROJECT_ROOT@
 
+INSTALL = @INSTALL@
+
 include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 include $(RTEMS_ROOT)/make/directory.cfg
 
diff --git a/c/src/exec/score/cpu/a29k/rtems/score/Makefile.in b/c/src/exec/score/cpu/a29k/rtems/score/Makefile.in
index 229bb91391..c8b33da4b3 100644
--- a/c/src/exec/score/cpu/a29k/rtems/score/Makefile.in
+++ b/c/src/exec/score/cpu/a29k/rtems/score/Makefile.in
@@ -8,6 +8,8 @@ VPATH = @srcdir@
 RTEMS_ROOT = @top_srcdir@
 PROJECT_ROOT = @PROJECT_ROOT@
 
+INSTALL = @INSTALL@
+
 # C source names, if any, go here -- minus the .c
 C_PIECES=
 C_FILES=$(C_PIECES:%=%.c)
@@ -50,10 +52,10 @@ CLEAN_ADDITIONS +=
 CLOBBER_ADDITIONS += $(BUILT_SOURCES)
 
 # Install the program(s), appending _g or _p as appropriate.
-# for include files, just use $(INSTALL)
+# for include files, just use $(INSTALL_CHANGE)
 all: install-headers
 
 install-headers: ${H_FILES}
-	$(INSTALL) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems/score
+	$(INSTALL_CHANGE) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems/score
 
 preinstall: install-headers
diff --git a/c/src/exec/score/cpu/a29k/wrap/Makefile.in b/c/src/exec/score/cpu/a29k/wrap/Makefile.in
index 064e2e8a13..94b8e6add7 100644
--- a/c/src/exec/score/cpu/a29k/wrap/Makefile.in
+++ b/c/src/exec/score/cpu/a29k/wrap/Makefile.in
@@ -15,6 +15,8 @@ VPATH = @srcdir@/..
 RTEMS_ROOT = @top_srcdir@
 PROJECT_ROOT = @PROJECT_ROOT@
 
+INSTALL = @INSTALL@
+
 RELS=../$(ARCH)/rtems-cpu.rel
 
 # C source names, if any, go here -- minus the .c
@@ -65,8 +67,8 @@ CLOBBER_ADDITIONS +=
 all:    ${ARCH} $(SRCS) preinstall $(OBJS) $(RELS)
 
 # Install the program(s), appending _g or _p as appropriate.
-# for include files, just use $(INSTALL)
+# for include files, just use $(INSTALL_CHANGE)
 install:  all
 
 preinstall: ${ARCH}
-	$(INSTALL) -m 444 ${H_FILES} $(PROJECT_INCLUDE)
+	$(INSTALL_CHANGE) -m 444 ${H_FILES} $(PROJECT_INCLUDE)
diff --git a/c/src/exec/score/cpu/hppa1.1/Makefile.in b/c/src/exec/score/cpu/hppa1.1/Makefile.in
index 94424f094e..c7f8cfa74d 100644
--- a/c/src/exec/score/cpu/hppa1.1/Makefile.in
+++ b/c/src/exec/score/cpu/hppa1.1/Makefile.in
@@ -8,6 +8,8 @@ VPATH = @srcdir@
 RTEMS_ROOT = @top_srcdir@
 PROJECT_ROOT = @PROJECT_ROOT@
 
+INSTALL = @INSTALL@
+
 include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 include $(RTEMS_ROOT)/make/directory.cfg
 
diff --git a/c/src/exec/score/cpu/hppa1.1/rtems/Makefile.in b/c/src/exec/score/cpu/hppa1.1/rtems/Makefile.in
index 17f18d020a..d0b2dcce07 100644
--- a/c/src/exec/score/cpu/hppa1.1/rtems/Makefile.in
+++ b/c/src/exec/score/cpu/hppa1.1/rtems/Makefile.in
@@ -8,6 +8,8 @@ VPATH = @srcdir@
 RTEMS_ROOT = @top_srcdir@
 PROJECT_ROOT = @PROJECT_ROOT@
 
+INSTALL = @INSTALL@
+
 include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 include $(RTEMS_ROOT)/make/directory.cfg
 
diff --git a/c/src/exec/score/cpu/hppa1.1/rtems/score/Makefile.in b/c/src/exec/score/cpu/hppa1.1/rtems/score/Makefile.in
index 669388d781..3b2a4fd379 100644
--- a/c/src/exec/score/cpu/hppa1.1/rtems/score/Makefile.in
+++ b/c/src/exec/score/cpu/hppa1.1/rtems/score/Makefile.in
@@ -8,6 +8,8 @@ VPATH = @srcdir@
 RTEMS_ROOT = @top_srcdir@
 PROJECT_ROOT = @PROJECT_ROOT@
 
+INSTALL = @INSTALL@
+
 BUILT_SOURCES = offsets.h
 
 # C source names, if any, go here -- minus the .c
@@ -57,10 +59,10 @@ CLEAN_ADDITIONS +=
 CLOBBER_ADDITIONS += $(BUILT_SOURCES)
 
 # Install the program(s), appending _g or _p as appropriate.
-# for include files, just use $(INSTALL)
+# for include files, just use $(INSTALL_CHANGE)
 all: install-headers
 
 install-headers: ${H_FILES}
-	$(INSTALL) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems/score
+	$(INSTALL_CHANGE) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems/score
 
 preinstall: install-headers
diff --git a/c/src/exec/score/cpu/hppa1.1/wrap/Makefile.in b/c/src/exec/score/cpu/hppa1.1/wrap/Makefile.in
index df5248688d..8b34df9b0e 100644
--- a/c/src/exec/score/cpu/hppa1.1/wrap/Makefile.in
+++ b/c/src/exec/score/cpu/hppa1.1/wrap/Makefile.in
@@ -15,6 +15,8 @@ VPATH = @srcdir@/..
 RTEMS_ROOT = @top_srcdir@
 PROJECT_ROOT = @PROJECT_ROOT@
 
+INSTALL = @INSTALL@
+
 RELS=../$(ARCH)/rtems-cpu.rel
 
 # C source names, if any, go here -- minus the .c
@@ -65,8 +67,8 @@ CLOBBER_ADDITIONS +=
 all:    ${ARCH} $(SRCS) preinstall $(OBJS) $(RELS)
 
 # Install the program(s), appending _g or _p as appropriate.
-# for include files, just use $(INSTALL)
+# for include files, just use $(INSTALL_CHANGE)
 install:  all
 
 preinstall: ${ARCH}
-	$(INSTALL) -m 444 ${H_FILES} $(PROJECT_INCLUDE)
+	$(INSTALL_CHANGE) -m 444 ${H_FILES} $(PROJECT_INCLUDE)
diff --git a/c/src/exec/score/cpu/i386/Makefile.in b/c/src/exec/score/cpu/i386/Makefile.in
index 94424f094e..c7f8cfa74d 100644
--- a/c/src/exec/score/cpu/i386/Makefile.in
+++ b/c/src/exec/score/cpu/i386/Makefile.in
@@ -8,6 +8,8 @@ VPATH = @srcdir@
 RTEMS_ROOT = @top_srcdir@
 PROJECT_ROOT = @PROJECT_ROOT@
 
+INSTALL = @INSTALL@
+
 include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 include $(RTEMS_ROOT)/make/directory.cfg
 
diff --git a/c/src/exec/score/cpu/i386/rtems/Makefile.in b/c/src/exec/score/cpu/i386/rtems/Makefile.in
index 17f18d020a..d0b2dcce07 100644
--- a/c/src/exec/score/cpu/i386/rtems/Makefile.in
+++ b/c/src/exec/score/cpu/i386/rtems/Makefile.in
@@ -8,6 +8,8 @@ VPATH = @srcdir@
 RTEMS_ROOT = @top_srcdir@
 PROJECT_ROOT = @PROJECT_ROOT@
 
+INSTALL = @INSTALL@
+
 include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 include $(RTEMS_ROOT)/make/directory.cfg
 
diff --git a/c/src/exec/score/cpu/i386/rtems/score/Makefile.in b/c/src/exec/score/cpu/i386/rtems/score/Makefile.in
index c494486266..b7addcf05f 100644
--- a/c/src/exec/score/cpu/i386/rtems/score/Makefile.in
+++ b/c/src/exec/score/cpu/i386/rtems/score/Makefile.in
@@ -8,6 +8,8 @@ VPATH = @srcdir@
 RTEMS_ROOT = @top_srcdir@
 PROJECT_ROOT = @PROJECT_ROOT@
 
+INSTALL = @INSTALL@
+
 # C source names, if any, go here -- minus the .c
 C_PIECES=
 C_FILES=$(C_PIECES:%=%.c)
@@ -50,10 +52,10 @@ CLEAN_ADDITIONS +=
 CLOBBER_ADDITIONS += $(BUILT_SOURCES)
 
 # Install the program(s), appending _g or _p as appropriate.
-# for include files, just use $(INSTALL)
+# for include files, just use $(INSTALL_CHANGE)
 all: install-headers
 
 install-headers: ${H_FILES}
-	$(INSTALL) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems/score
+	$(INSTALL_CHANGE) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems/score
 
 preinstall: install-headers
diff --git a/c/src/exec/score/cpu/i386/wrap/Makefile.in b/c/src/exec/score/cpu/i386/wrap/Makefile.in
index 78edad009a..4edebda907 100644
--- a/c/src/exec/score/cpu/i386/wrap/Makefile.in
+++ b/c/src/exec/score/cpu/i386/wrap/Makefile.in
@@ -15,6 +15,8 @@ VPATH = @srcdir@/..
 RTEMS_ROOT = @top_srcdir@
 PROJECT_ROOT = @PROJECT_ROOT@
 
+INSTALL = @INSTALL@
+
 RELS=../$(ARCH)/rtems-cpu.rel
 
 # C source names, if any, go here -- minus the .c
@@ -65,8 +67,8 @@ CLOBBER_ADDITIONS +=
 all:    ${ARCH} $(SRCS) preinstall $(OBJS) $(RELS)
 
 # Install the program(s), appending _g or _p as appropriate.
-# for include files, just use $(INSTALL)
+# for include files, just use $(INSTALL_CHANGE)
 install:  all
 
 preinstall: ${ARCH}
-	$(INSTALL) -m 444 ${H_FILES} $(PROJECT_INCLUDE)
+	$(INSTALL_CHANGE) -m 444 ${H_FILES} $(PROJECT_INCLUDE)
diff --git a/c/src/exec/score/cpu/i960/Makefile.in b/c/src/exec/score/cpu/i960/Makefile.in
index 94424f094e..c7f8cfa74d 100644
--- a/c/src/exec/score/cpu/i960/Makefile.in
+++ b/c/src/exec/score/cpu/i960/Makefile.in
@@ -8,6 +8,8 @@ VPATH = @srcdir@
 RTEMS_ROOT = @top_srcdir@
 PROJECT_ROOT = @PROJECT_ROOT@
 
+INSTALL = @INSTALL@
+
 include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 include $(RTEMS_ROOT)/make/directory.cfg
 
diff --git a/c/src/exec/score/cpu/i960/rtems/Makefile.in b/c/src/exec/score/cpu/i960/rtems/Makefile.in
index 17f18d020a..d0b2dcce07 100644
--- a/c/src/exec/score/cpu/i960/rtems/Makefile.in
+++ b/c/src/exec/score/cpu/i960/rtems/Makefile.in
@@ -8,6 +8,8 @@ VPATH = @srcdir@
 RTEMS_ROOT = @top_srcdir@
 PROJECT_ROOT = @PROJECT_ROOT@
 
+INSTALL = @INSTALL@
+
 include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 include $(RTEMS_ROOT)/make/directory.cfg
 
diff --git a/c/src/exec/score/cpu/i960/rtems/score/Makefile.in b/c/src/exec/score/cpu/i960/rtems/score/Makefile.in
index 89ad3faaa1..f5ec665318 100644
--- a/c/src/exec/score/cpu/i960/rtems/score/Makefile.in
+++ b/c/src/exec/score/cpu/i960/rtems/score/Makefile.in
@@ -8,6 +8,8 @@ VPATH = @srcdir@
 RTEMS_ROOT = @top_srcdir@
 PROJECT_ROOT = @PROJECT_ROOT@
 
+INSTALL = @INSTALL@
+
 # C source names, if any, go here -- minus the .c
 C_PIECES=
 C_FILES=$(C_PIECES:%=%.c)
@@ -50,10 +52,10 @@ CLEAN_ADDITIONS +=
 CLOBBER_ADDITIONS += $(BUILT_SOURCES)
 
 # Install the program(s), appending _g or _p as appropriate.
-# for include files, just use $(INSTALL)
+# for include files, just use $(INSTALL_CHANGE)
 all: install-headers
 
 install-headers: ${H_FILES}
-	$(INSTALL) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems/score
+	$(INSTALL_CHANGE) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems/score
 
 preinstall: install-headers
diff --git a/c/src/exec/score/cpu/i960/wrap/Makefile.in b/c/src/exec/score/cpu/i960/wrap/Makefile.in
index 78edad009a..4edebda907 100644
--- a/c/src/exec/score/cpu/i960/wrap/Makefile.in
+++ b/c/src/exec/score/cpu/i960/wrap/Makefile.in
@@ -15,6 +15,8 @@ VPATH = @srcdir@/..
 RTEMS_ROOT = @top_srcdir@
 PROJECT_ROOT = @PROJECT_ROOT@
 
+INSTALL = @INSTALL@
+
 RELS=../$(ARCH)/rtems-cpu.rel
 
 # C source names, if any, go here -- minus the .c
@@ -65,8 +67,8 @@ CLOBBER_ADDITIONS +=
 all:    ${ARCH} $(SRCS) preinstall $(OBJS) $(RELS)
 
 # Install the program(s), appending _g or _p as appropriate.
-# for include files, just use $(INSTALL)
+# for include files, just use $(INSTALL_CHANGE)
 install:  all
 
 preinstall: ${ARCH}
-	$(INSTALL) -m 444 ${H_FILES} $(PROJECT_INCLUDE)
+	$(INSTALL_CHANGE) -m 444 ${H_FILES} $(PROJECT_INCLUDE)
diff --git a/c/src/exec/score/cpu/m68k/Makefile.in b/c/src/exec/score/cpu/m68k/Makefile.in
index 94424f094e..c7f8cfa74d 100644
--- a/c/src/exec/score/cpu/m68k/Makefile.in
+++ b/c/src/exec/score/cpu/m68k/Makefile.in
@@ -8,6 +8,8 @@ VPATH = @srcdir@
 RTEMS_ROOT = @top_srcdir@
 PROJECT_ROOT = @PROJECT_ROOT@
 
+INSTALL = @INSTALL@
+
 include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 include $(RTEMS_ROOT)/make/directory.cfg
 
diff --git a/c/src/exec/score/cpu/m68k/rtems/Makefile.in b/c/src/exec/score/cpu/m68k/rtems/Makefile.in
index 17f18d020a..d0b2dcce07 100644
--- a/c/src/exec/score/cpu/m68k/rtems/Makefile.in
+++ b/c/src/exec/score/cpu/m68k/rtems/Makefile.in
@@ -8,6 +8,8 @@ VPATH = @srcdir@
 RTEMS_ROOT = @top_srcdir@
 PROJECT_ROOT = @PROJECT_ROOT@
 
+INSTALL = @INSTALL@
+
 include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 include $(RTEMS_ROOT)/make/directory.cfg
 
diff --git a/c/src/exec/score/cpu/m68k/rtems/score/Makefile.in b/c/src/exec/score/cpu/m68k/rtems/score/Makefile.in
index 6c82bf9d28..d7daf11c7a 100644
--- a/c/src/exec/score/cpu/m68k/rtems/score/Makefile.in
+++ b/c/src/exec/score/cpu/m68k/rtems/score/Makefile.in
@@ -8,6 +8,8 @@ VPATH = @srcdir@
 RTEMS_ROOT = @top_srcdir@
 PROJECT_ROOT = @PROJECT_ROOT@
 
+INSTALL = @INSTALL@
+
 # C source names, if any, go here -- minus the .c
 C_PIECES=
 C_FILES=$(C_PIECES:%=%.c)
@@ -50,10 +52,10 @@ CLEAN_ADDITIONS +=
 CLOBBER_ADDITIONS += $(BUILT_SOURCES)
 
 # Install the program(s), appending _g or _p as appropriate.
-# for include files, just use $(INSTALL)
+# for include files, just use $(INSTALL_CHANGE)
 all: install-headers
 
 install-headers: ${H_FILES}
-	$(INSTALL) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems/score
+	$(INSTALL_CHANGE) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems/score
 
 preinstall: install-headers
diff --git a/c/src/exec/score/cpu/m68k/wrap/Makefile.in b/c/src/exec/score/cpu/m68k/wrap/Makefile.in
index 468c018c06..9c50182bb8 100644
--- a/c/src/exec/score/cpu/m68k/wrap/Makefile.in
+++ b/c/src/exec/score/cpu/m68k/wrap/Makefile.in
@@ -15,6 +15,8 @@ VPATH = @srcdir@/..
 RTEMS_ROOT = @top_srcdir@
 PROJECT_ROOT = @PROJECT_ROOT@
 
+INSTALL = @INSTALL@
+
 RELS=../$(ARCH)/rtems-cpu.rel
 
 # C source names, if any, go here -- minus the .c
@@ -65,8 +67,8 @@ CLOBBER_ADDITIONS +=
 all:    ${ARCH} $(SRCS) preinstall $(OBJS) $(RELS)
 
 # Install the program(s), appending _g or _p as appropriate.
-# for include files, just use $(INSTALL)
+# for include files, just use $(INSTALL_CHANGE)
 install:  all
 
 preinstall: ${ARCH}
-	$(INSTALL) -m 444 ${H_FILES} $(PROJECT_INCLUDE)
+	$(INSTALL_CHANGE) -m 444 ${H_FILES} $(PROJECT_INCLUDE)
diff --git a/c/src/exec/score/cpu/mips64orion/Makefile.in b/c/src/exec/score/cpu/mips64orion/Makefile.in
index 94424f094e..c7f8cfa74d 100644
--- a/c/src/exec/score/cpu/mips64orion/Makefile.in
+++ b/c/src/exec/score/cpu/mips64orion/Makefile.in
@@ -8,6 +8,8 @@ VPATH = @srcdir@
 RTEMS_ROOT = @top_srcdir@
 PROJECT_ROOT = @PROJECT_ROOT@
 
+INSTALL = @INSTALL@
+
 include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 include $(RTEMS_ROOT)/make/directory.cfg
 
diff --git a/c/src/exec/score/cpu/mips64orion/rtems/Makefile.in b/c/src/exec/score/cpu/mips64orion/rtems/Makefile.in
index 17f18d020a..d0b2dcce07 100644
--- a/c/src/exec/score/cpu/mips64orion/rtems/Makefile.in
+++ b/c/src/exec/score/cpu/mips64orion/rtems/Makefile.in
@@ -8,6 +8,8 @@ VPATH = @srcdir@
 RTEMS_ROOT = @top_srcdir@
 PROJECT_ROOT = @PROJECT_ROOT@
 
+INSTALL = @INSTALL@
+
 include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 include $(RTEMS_ROOT)/make/directory.cfg
 
diff --git a/c/src/exec/score/cpu/mips64orion/rtems/score/Makefile.in b/c/src/exec/score/cpu/mips64orion/rtems/score/Makefile.in
index 6c2fd1c695..77cbf624be 100644
--- a/c/src/exec/score/cpu/mips64orion/rtems/score/Makefile.in
+++ b/c/src/exec/score/cpu/mips64orion/rtems/score/Makefile.in
@@ -8,6 +8,8 @@ VPATH = @srcdir@
 RTEMS_ROOT = @top_srcdir@
 PROJECT_ROOT = @PROJECT_ROOT@
 
+INSTALL = @INSTALL@
+
 # C source names, if any, go here -- minus the .c
 C_PIECES=
 C_FILES=$(C_PIECES:%=%.c)
@@ -50,10 +52,10 @@ CLEAN_ADDITIONS +=
 CLOBBER_ADDITIONS += $(BUILT_SOURCES)
 
 # Install the program(s), appending _g or _p as appropriate.
-# for include files, just use $(INSTALL)
+# for include files, just use $(INSTALL_CHANGE)
 all: install-headers
 
 install-headers: ${H_FILES}
-	$(INSTALL) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems/score
+	$(INSTALL_CHANGE) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems/score
 
 preinstall: install-headers
diff --git a/c/src/exec/score/cpu/mips64orion/wrap/Makefile.in b/c/src/exec/score/cpu/mips64orion/wrap/Makefile.in
index 9b43dd2080..1a1672eee3 100644
--- a/c/src/exec/score/cpu/mips64orion/wrap/Makefile.in
+++ b/c/src/exec/score/cpu/mips64orion/wrap/Makefile.in
@@ -15,6 +15,8 @@ VPATH = @srcdir@/..
 RTEMS_ROOT = @top_srcdir@
 PROJECT_ROOT = @PROJECT_ROOT@
 
+INSTALL = @INSTALL@
+
 RELS=../$(ARCH)/rtems-cpu.rel
 
 # C source names, if any, go here -- minus the .c
@@ -65,8 +67,8 @@ CLOBBER_ADDITIONS +=
 all:    ${ARCH} $(SRCS) preinstall $(OBJS) $(RELS)
 
 # Install the program(s), appending _g or _p as appropriate.
-# for include files, just use $(INSTALL)
+# for include files, just use $(INSTALL_CHANGE)
 install:  all
 
 preinstall: ${ARCH}
-	$(INSTALL) -m 444 ${H_FILES} $(PROJECT_INCLUDE)
+	$(INSTALL_CHANGE) -m 444 ${H_FILES} $(PROJECT_INCLUDE)
diff --git a/c/src/exec/score/cpu/no_cpu/Makefile.in b/c/src/exec/score/cpu/no_cpu/Makefile.in
index 94424f094e..c7f8cfa74d 100644
--- a/c/src/exec/score/cpu/no_cpu/Makefile.in
+++ b/c/src/exec/score/cpu/no_cpu/Makefile.in
@@ -8,6 +8,8 @@ VPATH = @srcdir@
 RTEMS_ROOT = @top_srcdir@
 PROJECT_ROOT = @PROJECT_ROOT@
 
+INSTALL = @INSTALL@
+
 include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 include $(RTEMS_ROOT)/make/directory.cfg
 
diff --git a/c/src/exec/score/cpu/no_cpu/rtems/Makefile.in b/c/src/exec/score/cpu/no_cpu/rtems/Makefile.in
index 17f18d020a..d0b2dcce07 100644
--- a/c/src/exec/score/cpu/no_cpu/rtems/Makefile.in
+++ b/c/src/exec/score/cpu/no_cpu/rtems/Makefile.in
@@ -8,6 +8,8 @@ VPATH = @srcdir@
 RTEMS_ROOT = @top_srcdir@
 PROJECT_ROOT = @PROJECT_ROOT@
 
+INSTALL = @INSTALL@
+
 include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 include $(RTEMS_ROOT)/make/directory.cfg
 
diff --git a/c/src/exec/score/cpu/no_cpu/rtems/score/Makefile.in b/c/src/exec/score/cpu/no_cpu/rtems/score/Makefile.in
index cae4032d63..d25a693c18 100644
--- a/c/src/exec/score/cpu/no_cpu/rtems/score/Makefile.in
+++ b/c/src/exec/score/cpu/no_cpu/rtems/score/Makefile.in
@@ -8,6 +8,8 @@ VPATH = @srcdir@
 RTEMS_ROOT = @top_srcdir@
 PROJECT_ROOT = @PROJECT_ROOT@
 
+INSTALL = @INSTALL@
+
 # C source names, if any, go here -- minus the .c
 C_PIECES=
 C_FILES=$(C_PIECES:%=%.c)
@@ -50,10 +52,10 @@ CLEAN_ADDITIONS +=
 CLOBBER_ADDITIONS += $(BUILT_SOURCES)
 
 # Install the program(s), appending _g or _p as appropriate.
-# for include files, just use $(INSTALL)
+# for include files, just use $(INSTALL_CHANGE)
 all: install-headers
 
 install-headers: ${H_FILES}
-	$(INSTALL) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems/score
+	$(INSTALL_CHANGE) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems/score
 
 preinstall: install-headers
diff --git a/c/src/exec/score/cpu/no_cpu/wrap/Makefile.in b/c/src/exec/score/cpu/no_cpu/wrap/Makefile.in
index 93e7f9e427..4131b97b80 100644
--- a/c/src/exec/score/cpu/no_cpu/wrap/Makefile.in
+++ b/c/src/exec/score/cpu/no_cpu/wrap/Makefile.in
@@ -15,6 +15,8 @@ VPATH = @srcdir@/..
 RTEMS_ROOT = @top_srcdir@
 PROJECT_ROOT = @PROJECT_ROOT@
 
+INSTALL = @INSTALL@
+
 RELS=../$(ARCH)/rtems-cpu.rel
 
 # C source names, if any, go here -- minus the .c
@@ -65,8 +67,8 @@ CLOBBER_ADDITIONS +=
 all:    ${ARCH} $(SRCS) preinstall $(OBJS) $(RELS)
 
 # Install the program(s), appending _g or _p as appropriate.
-# for include files, just use $(INSTALL)
+# for include files, just use $(INSTALL_CHANGE)
 install:  all
 
 preinstall: ${ARCH}
-	$(INSTALL) -m 444 ${H_FILES} $(PROJECT_INCLUDE)
+	$(INSTALL_CHANGE) -m 444 ${H_FILES} $(PROJECT_INCLUDE)
diff --git a/c/src/exec/score/cpu/powerpc/Makefile.in b/c/src/exec/score/cpu/powerpc/Makefile.in
index 94424f094e..c7f8cfa74d 100644
--- a/c/src/exec/score/cpu/powerpc/Makefile.in
+++ b/c/src/exec/score/cpu/powerpc/Makefile.in
@@ -8,6 +8,8 @@ VPATH = @srcdir@
 RTEMS_ROOT = @top_srcdir@
 PROJECT_ROOT = @PROJECT_ROOT@
 
+INSTALL = @INSTALL@
+
 include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 include $(RTEMS_ROOT)/make/directory.cfg
 
diff --git a/c/src/exec/score/cpu/powerpc/rtems/Makefile.in b/c/src/exec/score/cpu/powerpc/rtems/Makefile.in
index 17f18d020a..d0b2dcce07 100644
--- a/c/src/exec/score/cpu/powerpc/rtems/Makefile.in
+++ b/c/src/exec/score/cpu/powerpc/rtems/Makefile.in
@@ -8,6 +8,8 @@ VPATH = @srcdir@
 RTEMS_ROOT = @top_srcdir@
 PROJECT_ROOT = @PROJECT_ROOT@
 
+INSTALL = @INSTALL@
+
 include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 include $(RTEMS_ROOT)/make/directory.cfg
 
diff --git a/c/src/exec/score/cpu/powerpc/rtems/score/Makefile.in b/c/src/exec/score/cpu/powerpc/rtems/score/Makefile.in
index e974683a53..c86b78e312 100644
--- a/c/src/exec/score/cpu/powerpc/rtems/score/Makefile.in
+++ b/c/src/exec/score/cpu/powerpc/rtems/score/Makefile.in
@@ -8,6 +8,8 @@ VPATH = @srcdir@
 RTEMS_ROOT = @top_srcdir@
 PROJECT_ROOT = @PROJECT_ROOT@
 
+INSTALL = @INSTALL@
+
 # C source names, if any, go here -- minus the .c
 C_PIECES=
 C_FILES=$(C_PIECES:%=%.c)
@@ -50,10 +52,10 @@ CLEAN_ADDITIONS +=
 CLOBBER_ADDITIONS += $(BUILT_SOURCES)
 
 # Install the program(s), appending _g or _p as appropriate.
-# for include files, just use $(INSTALL)
+# for include files, just use $(INSTALL_CHANGE)
 all: install-headers
 
 install-headers: ${H_FILES}
-	$(INSTALL) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems/score
+	$(INSTALL_CHANGE) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems/score
 
 preinstall: install-headers
diff --git a/c/src/exec/score/cpu/powerpc/wrap/Makefile.in b/c/src/exec/score/cpu/powerpc/wrap/Makefile.in
index 6fb8d56b7d..12c0f00ee0 100644
--- a/c/src/exec/score/cpu/powerpc/wrap/Makefile.in
+++ b/c/src/exec/score/cpu/powerpc/wrap/Makefile.in
@@ -15,6 +15,8 @@ VPATH = @srcdir@/..
 RTEMS_ROOT = @top_srcdir@
 PROJECT_ROOT = @PROJECT_ROOT@
 
+INSTALL = @INSTALL@
+
 RELS=../$(ARCH)/rtems-cpu.rel
 
 # C source names, if any, go here -- minus the .c
@@ -65,8 +67,8 @@ CLOBBER_ADDITIONS +=
 all:    ${ARCH} $(SRCS) preinstall $(OBJS) $(RELS)
 
 # Install the program(s), appending _g or _p as appropriate.
-# for include files, just use $(INSTALL)
+# for include files, just use $(INSTALL_CHANGE)
 install:  all
 
 preinstall: ${ARCH}
-	$(INSTALL) -m 444 ${H_FILES} $(PROJECT_INCLUDE)
+	$(INSTALL_CHANGE) -m 444 ${H_FILES} $(PROJECT_INCLUDE)
diff --git a/c/src/exec/score/cpu/sh/Makefile.in b/c/src/exec/score/cpu/sh/Makefile.in
index 94424f094e..c7f8cfa74d 100644
--- a/c/src/exec/score/cpu/sh/Makefile.in
+++ b/c/src/exec/score/cpu/sh/Makefile.in
@@ -8,6 +8,8 @@ VPATH = @srcdir@
 RTEMS_ROOT = @top_srcdir@
 PROJECT_ROOT = @PROJECT_ROOT@
 
+INSTALL = @INSTALL@
+
 include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 include $(RTEMS_ROOT)/make/directory.cfg
 
diff --git a/c/src/exec/score/cpu/sh/rtems/Makefile.in b/c/src/exec/score/cpu/sh/rtems/Makefile.in
index 17f18d020a..d0b2dcce07 100644
--- a/c/src/exec/score/cpu/sh/rtems/Makefile.in
+++ b/c/src/exec/score/cpu/sh/rtems/Makefile.in
@@ -8,6 +8,8 @@ VPATH = @srcdir@
 RTEMS_ROOT = @top_srcdir@
 PROJECT_ROOT = @PROJECT_ROOT@
 
+INSTALL = @INSTALL@
+
 include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 include $(RTEMS_ROOT)/make/directory.cfg
 
diff --git a/c/src/exec/score/cpu/sh/rtems/score/Makefile.in b/c/src/exec/score/cpu/sh/rtems/score/Makefile.in
index 68703874c4..cd06c556de 100644
--- a/c/src/exec/score/cpu/sh/rtems/score/Makefile.in
+++ b/c/src/exec/score/cpu/sh/rtems/score/Makefile.in
@@ -8,6 +8,8 @@ VPATH = @srcdir@
 RTEMS_ROOT = @top_srcdir@
 PROJECT_ROOT = @PROJECT_ROOT@
 
+INSTALL = @INSTALL@
+
 # C source names, if any, go here -- minus the .c
 C_PIECES=
 C_FILES=$(C_PIECES:%=%.c)
@@ -50,10 +52,10 @@ CLEAN_ADDITIONS +=
 CLOBBER_ADDITIONS += $(BUILT_SOURCES)
 
 # Install the program(s), appending _g or _p as appropriate.
-# for include files, just use $(INSTALL)
+# for include files, just use $(INSTALL_CHANGE)
 all: install-headers
 
 install-headers: ${H_FILES}
-	$(INSTALL) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems/score
+	$(INSTALL_CHANGE) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems/score
 
 preinstall: install-headers
diff --git a/c/src/exec/score/cpu/sh/wrap/Makefile.in b/c/src/exec/score/cpu/sh/wrap/Makefile.in
index ccd4b51e28..0c3631d048 100644
--- a/c/src/exec/score/cpu/sh/wrap/Makefile.in
+++ b/c/src/exec/score/cpu/sh/wrap/Makefile.in
@@ -15,6 +15,8 @@ VPATH = @srcdir@/..
 RTEMS_ROOT = @top_srcdir@
 PROJECT_ROOT = @PROJECT_ROOT@
 
+INSTALL = @INSTALL@
+
 RELS=../$(ARCH)/rtems-cpu.rel
 
 # C source names, if any, go here -- minus the .c
@@ -65,8 +67,8 @@ CLOBBER_ADDITIONS +=
 all:    ${ARCH} $(SRCS) preinstall $(OBJS) $(RELS)
 
 # Install the program(s), appending _g or _p as appropriate.
-# for include files, just use $(INSTALL)
+# for include files, just use $(INSTALL_CHANGE)
 install:  all
 
 preinstall: ${ARCH}
-	$(INSTALL) -m 444 ${H_FILES} $(PROJECT_INCLUDE)
+	$(INSTALL_CHANGE) -m 444 ${H_FILES} $(PROJECT_INCLUDE)
diff --git a/c/src/exec/score/cpu/sparc/Makefile.in b/c/src/exec/score/cpu/sparc/Makefile.in
index 94424f094e..c7f8cfa74d 100644
--- a/c/src/exec/score/cpu/sparc/Makefile.in
+++ b/c/src/exec/score/cpu/sparc/Makefile.in
@@ -8,6 +8,8 @@ VPATH = @srcdir@
 RTEMS_ROOT = @top_srcdir@
 PROJECT_ROOT = @PROJECT_ROOT@
 
+INSTALL = @INSTALL@
+
 include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 include $(RTEMS_ROOT)/make/directory.cfg
 
diff --git a/c/src/exec/score/cpu/sparc/rtems/Makefile.in b/c/src/exec/score/cpu/sparc/rtems/Makefile.in
index 17f18d020a..d0b2dcce07 100644
--- a/c/src/exec/score/cpu/sparc/rtems/Makefile.in
+++ b/c/src/exec/score/cpu/sparc/rtems/Makefile.in
@@ -8,6 +8,8 @@ VPATH = @srcdir@
 RTEMS_ROOT = @top_srcdir@
 PROJECT_ROOT = @PROJECT_ROOT@
 
+INSTALL = @INSTALL@
+
 include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 include $(RTEMS_ROOT)/make/directory.cfg
 
diff --git a/c/src/exec/score/cpu/sparc/rtems/score/Makefile.in b/c/src/exec/score/cpu/sparc/rtems/score/Makefile.in
index e74655bcc2..51bc86b361 100644
--- a/c/src/exec/score/cpu/sparc/rtems/score/Makefile.in
+++ b/c/src/exec/score/cpu/sparc/rtems/score/Makefile.in
@@ -8,6 +8,8 @@ VPATH = @srcdir@
 RTEMS_ROOT = @top_srcdir@
 PROJECT_ROOT = @PROJECT_ROOT@
 
+INSTALL = @INSTALL@
+
 # C source names, if any, go here -- minus the .c
 C_PIECES=
 C_FILES=$(C_PIECES:%=%.c)
@@ -50,10 +52,10 @@ CLEAN_ADDITIONS +=
 CLOBBER_ADDITIONS += $(BUILT_SOURCES)
 
 # Install the program(s), appending _g or _p as appropriate.
-# for include files, just use $(INSTALL)
+# for include files, just use $(INSTALL_CHANGE)
 all: install-headers
 
 install-headers: ${H_FILES}
-	$(INSTALL) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems/score
+	$(INSTALL_CHANGE) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems/score
 
 preinstall: install-headers
diff --git a/c/src/exec/score/cpu/sparc/wrap/Makefile.in b/c/src/exec/score/cpu/sparc/wrap/Makefile.in
index dce2f6db3f..7a05abfb05 100644
--- a/c/src/exec/score/cpu/sparc/wrap/Makefile.in
+++ b/c/src/exec/score/cpu/sparc/wrap/Makefile.in
@@ -15,6 +15,8 @@ VPATH = @srcdir@/..
 RTEMS_ROOT = @top_srcdir@
 PROJECT_ROOT = @PROJECT_ROOT@
 
+INSTALL = @INSTALL@
+
 RELS=../$(ARCH)/rtems-cpu.rel
 
 # C source names, if any, go here -- minus the .c
@@ -65,8 +67,8 @@ CLOBBER_ADDITIONS +=
 all:    ${ARCH} $(SRCS) preinstall $(OBJS) $(RELS)
 
 # Install the program(s), appending _g or _p as appropriate.
-# for include files, just use $(INSTALL)
+# for include files, just use $(INSTALL_CHANGE)
 install:  all
 
 preinstall: ${ARCH}
-	$(INSTALL) -m 444 ${H_FILES} $(PROJECT_INCLUDE)
+	$(INSTALL_CHANGE) -m 444 ${H_FILES} $(PROJECT_INCLUDE)
diff --git a/c/src/exec/score/cpu/unix/Makefile.in b/c/src/exec/score/cpu/unix/Makefile.in
index 94424f094e..c7f8cfa74d 100644
--- a/c/src/exec/score/cpu/unix/Makefile.in
+++ b/c/src/exec/score/cpu/unix/Makefile.in
@@ -8,6 +8,8 @@ VPATH = @srcdir@
 RTEMS_ROOT = @top_srcdir@
 PROJECT_ROOT = @PROJECT_ROOT@
 
+INSTALL = @INSTALL@
+
 include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 include $(RTEMS_ROOT)/make/directory.cfg
 
diff --git a/c/src/exec/score/cpu/unix/rtems/Makefile.in b/c/src/exec/score/cpu/unix/rtems/Makefile.in
index 17f18d020a..d0b2dcce07 100644
--- a/c/src/exec/score/cpu/unix/rtems/Makefile.in
+++ b/c/src/exec/score/cpu/unix/rtems/Makefile.in
@@ -8,6 +8,8 @@ VPATH = @srcdir@
 RTEMS_ROOT = @top_srcdir@
 PROJECT_ROOT = @PROJECT_ROOT@
 
+INSTALL = @INSTALL@
+
 include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 include $(RTEMS_ROOT)/make/directory.cfg
 
diff --git a/c/src/exec/score/cpu/unix/rtems/score/Makefile.in b/c/src/exec/score/cpu/unix/rtems/score/Makefile.in
index 0457b13fe6..bf164fa1ec 100644
--- a/c/src/exec/score/cpu/unix/rtems/score/Makefile.in
+++ b/c/src/exec/score/cpu/unix/rtems/score/Makefile.in
@@ -8,6 +8,8 @@ VPATH = @srcdir@
 RTEMS_ROOT = @top_srcdir@
 PROJECT_ROOT = @PROJECT_ROOT@
 
+INSTALL = @INSTALL@
+
 BUILT_SOURCES = unixsize.h
 
 # C source names, if any, go here -- minus the .c
@@ -57,10 +59,10 @@ CLEAN_ADDITIONS +=
 CLOBBER_ADDITIONS += $(BUILT_SOURCES)
 
 # Install the program(s), appending _g or _p as appropriate.
-# for include files, just use $(INSTALL)
+# for include files, just use $(INSTALL_CHANGE)
 all: install-headers
 
 install-headers: ${H_FILES}
-	$(INSTALL) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems/score
+	$(INSTALL_CHANGE) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems/score
 
 preinstall: install-headers
diff --git a/c/src/exec/score/cpu/unix/wrap/Makefile.in b/c/src/exec/score/cpu/unix/wrap/Makefile.in
index 90bec9e206..6ac83fd828 100644
--- a/c/src/exec/score/cpu/unix/wrap/Makefile.in
+++ b/c/src/exec/score/cpu/unix/wrap/Makefile.in
@@ -15,6 +15,8 @@ VPATH = @srcdir@/..
 RTEMS_ROOT = @top_srcdir@
 PROJECT_ROOT = @PROJECT_ROOT@
 
+INSTALL = @INSTALL@
+
 RELS=../$(ARCH)/rtems-cpu.rel
 
 # C source names, if any, go here -- minus the .c
@@ -65,8 +67,8 @@ CLOBBER_ADDITIONS +=
 all:    ${ARCH} $(SRCS) preinstall $(OBJS) $(RELS)
 
 # Install the program(s), appending _g or _p as appropriate.
-# for include files, just use $(INSTALL)
+# for include files, just use $(INSTALL_CHANGE)
 install:  all
 
 preinstall: ${ARCH}
-	$(INSTALL) -m 444 ${H_FILES} $(PROJECT_INCLUDE)
+	$(INSTALL_CHANGE) -m 444 ${H_FILES} $(PROJECT_INCLUDE)