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).

8 files changed, 20 insertions, 4 deletions

diff --git a/c/src/lib/libbsp/a29k/Makefile.in b/c/src/lib/libbsp/a29k/Makefile.in
index f049e9b2e8..f786f6bff0 100644
--- a/c/src/lib/libbsp/a29k/Makefile.in
+++ b/c/src/lib/libbsp/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/lib/libbsp/a29k/portsw/Makefile.in b/c/src/lib/libbsp/a29k/portsw/Makefile.in
index 48f89c3690..a6af447491 100644
--- a/c/src/lib/libbsp/a29k/portsw/Makefile.in
+++ b/c/src/lib/libbsp/a29k/portsw/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/lib/libbsp/a29k/portsw/console/Makefile.in b/c/src/lib/libbsp/a29k/portsw/console/Makefile.in
index d0d81e6d80..e4a6f35503 100644
--- a/c/src/lib/libbsp/a29k/portsw/console/Makefile.in
+++ b/c/src/lib/libbsp/a29k/portsw/console/Makefile.in
@@ -8,6 +8,8 @@ VPATH = @srcdir@
 RTEMS_ROOT = @top_srcdir@
 PROJECT_ROOT = @PROJECT_ROOT@
 
+INSTALL = @INSTALL@
+
 PGM=${ARCH}/console.rel
 
 # C source names, if any, go here -- minus the .c
@@ -54,6 +56,6 @@ ${PGM}: ${SRCS} ${OBJS}
 	$(make-rel)
 
 all:	${ARCH} $(SRCS) $(PGM)
-	$(INSTALL) -m 444 $(H_FILES) $(PROJECT_INCLUDE)
+	$(INSTALL_CHANGE) -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 7d8581095f..9802423ecb 100644
--- a/c/src/lib/libbsp/a29k/portsw/include/Makefile.in
+++ b/c/src/lib/libbsp/a29k/portsw/include/Makefile.in
@@ -8,6 +8,8 @@ VPATH = @srcdir@
 RTEMS_ROOT = @top_srcdir@
 PROJECT_ROOT = @PROJECT_ROOT@
 
+INSTALL = @INSTALL@
+
 H_FILES = $(srcdir)/bsp.h $(srcdir)/coverhd.h
 
 #
@@ -29,5 +31,5 @@ CLEAN_ADDITIONS +=
 CLOBBER_ADDITIONS +=
 
 all:	$(SRCS)
-	$(INSTALL) -m 444 $(H_FILES) $(PROJECT_INCLUDE)
-	$(INSTALL) -m 444 $(EQ_FILES) $(PROJECT_INCLUDE)
+	$(INSTALL_CHANGE) -m 444 $(H_FILES) $(PROJECT_INCLUDE)
+	$(INSTALL_CHANGE) -m 444 $(EQ_FILES) $(PROJECT_INCLUDE)
diff --git a/c/src/lib/libbsp/a29k/portsw/shmsupp/Makefile.in b/c/src/lib/libbsp/a29k/portsw/shmsupp/Makefile.in
index 746f00b638..2476a1e167 100644
--- a/c/src/lib/libbsp/a29k/portsw/shmsupp/Makefile.in
+++ b/c/src/lib/libbsp/a29k/portsw/shmsupp/Makefile.in
@@ -8,6 +8,8 @@ VPATH = @srcdir@
 RTEMS_ROOT = @top_srcdir@
 PROJECT_ROOT = @PROJECT_ROOT@
 
+INSTALL = @INSTALL@
+
 PGM=${ARCH}/shmsupp.rel
 
 # C source names, if any, go here -- minus the .c
diff --git a/c/src/lib/libbsp/a29k/portsw/start/Makefile.in b/c/src/lib/libbsp/a29k/portsw/start/Makefile.in
index 823953baa0..29df5c2500 100644
--- a/c/src/lib/libbsp/a29k/portsw/start/Makefile.in
+++ b/c/src/lib/libbsp/a29k/portsw/start/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)
diff --git a/c/src/lib/libbsp/a29k/portsw/startup/Makefile.in b/c/src/lib/libbsp/a29k/portsw/startup/Makefile.in
index c7affcea52..a5c5c619fd 100644
--- a/c/src/lib/libbsp/a29k/portsw/startup/Makefile.in
+++ b/c/src/lib/libbsp/a29k/portsw/startup/Makefile.in
@@ -8,6 +8,8 @@ VPATH = @srcdir@:@srcdir@/../../../shared
 RTEMS_ROOT = @top_srcdir@
 PROJECT_ROOT = @PROJECT_ROOT@
 
+INSTALL = @INSTALL@
+
 PGM=${ARCH}/startup.rel
 
 # C source names, if any, go here -- minus the .c
@@ -54,7 +56,7 @@ ${PGM}: ${SRCS} ${OBJS}
 	$(make-rel)
 
 all:	${ARCH} $(SRCS) $(PGM)
-	$(INSTALL) ramlink romlink ${PROJECT_RELEASE}/lib
+	$(INSTALL_CHANGE) ramlink romlink ${PROJECT_RELEASE}/lib
 
 # the .rel file built here will be put into libbsp.a by ../wrapup/Makefile
 
diff --git a/c/src/lib/libbsp/a29k/portsw/wrapup/Makefile.in b/c/src/lib/libbsp/a29k/portsw/wrapup/Makefile.in
index 122f945c4e..5ff9480809 100644
--- a/c/src/lib/libbsp/a29k/portsw/wrapup/Makefile.in
+++ b/c/src/lib/libbsp/a29k/portsw/wrapup/Makefile.in
@@ -8,6 +8,8 @@ VPATH = @srcdir@
 RTEMS_ROOT = @top_srcdir@
 PROJECT_ROOT = @PROJECT_ROOT@
 
+INSTALL = @INSTALL@
+
 BSP_PIECES=startup console iic ethernet flash nvram
 CPU_PIECES=clock timer
 GENERIC_PIECES=