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

5 files changed, 16 insertions, 6 deletions

diff --git a/c/src/lib/libbsp/i386/shared/Makefile.in b/c/src/lib/libbsp/i386/shared/Makefile.in
index cee2697aae..c0d5086ce1 100644
--- a/c/src/lib/libbsp/i386/shared/Makefile.in
+++ b/c/src/lib/libbsp/i386/shared/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/i386/shared/comm/Makefile.in b/c/src/lib/libbsp/i386/shared/comm/Makefile.in
index 960dd1f2b4..198a02134f 100644
--- a/c/src/lib/libbsp/i386/shared/comm/Makefile.in
+++ b/c/src/lib/libbsp/i386/shared/comm/Makefile.in
@@ -8,6 +8,8 @@ VPATH = @srcdir@
 RTEMS_ROOT = @top_srcdir@
 PROJECT_ROOT = @PROJECT_ROOT@
 
+INSTALL = @INSTALL@
+
 H_FILES = $(srcdir)/uart.h 
 
 #
@@ -29,5 +31,5 @@ CLEAN_ADDITIONS +=
 CLOBBER_ADDITIONS +=
 
 preinstall all: $(SRCS)
-	$(INSTALL) -m 444 $(SRCS) $(PROJECT_INCLUDE)
+	$(INSTALL_CHANGE) -m 444 $(SRCS) $(PROJECT_INCLUDE)
 
diff --git a/c/src/lib/libbsp/i386/shared/io/Makefile.in b/c/src/lib/libbsp/i386/shared/io/Makefile.in
index 01fb16150b..091c417c82 100644
--- a/c/src/lib/libbsp/i386/shared/io/Makefile.in
+++ b/c/src/lib/libbsp/i386/shared/io/Makefile.in
@@ -8,6 +8,8 @@ VPATH = @srcdir@
 RTEMS_ROOT = @top_srcdir@
 PROJECT_ROOT = @PROJECT_ROOT@
 
+INSTALL = @INSTALL@
+
 H_FILES = $(srcdir)/bspIo.h
 
 #
@@ -29,5 +31,5 @@ CLEAN_ADDITIONS +=
 CLOBBER_ADDITIONS +=
 
 preinstall 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/i386/shared/irq/Makefile.in b/c/src/lib/libbsp/i386/shared/irq/Makefile.in
index 098852cfa0..8eb77a1f1e 100644
--- a/c/src/lib/libbsp/i386/shared/irq/Makefile.in
+++ b/c/src/lib/libbsp/i386/shared/irq/Makefile.in
@@ -8,6 +8,8 @@ VPATH = @srcdir@
 RTEMS_ROOT = @top_srcdir@
 PROJECT_ROOT = @PROJECT_ROOT@
 
+INSTALL = @INSTALL@
+
 H_FILES = $(srcdir)/irq.h $(srcdir)/irq_asm.h 
 
 #
@@ -29,5 +31,5 @@ CLEAN_ADDITIONS +=
 CLOBBER_ADDITIONS +=
 
 preinstall 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/i386/shared/pci/Makefile.in b/c/src/lib/libbsp/i386/shared/pci/Makefile.in
index 607f26030a..dd624ace5f 100644
--- a/c/src/lib/libbsp/i386/shared/pci/Makefile.in
+++ b/c/src/lib/libbsp/i386/shared/pci/Makefile.in
@@ -8,6 +8,8 @@ VPATH = @srcdir@
 RTEMS_ROOT = @top_srcdir@
 PROJECT_ROOT = @PROJECT_ROOT@
 
+INSTALL = @INSTALL@
+
 H_FILES = $(srcdir)/pcibios.h 
 
 #
@@ -29,4 +31,4 @@ CLEAN_ADDITIONS +=
 CLOBBER_ADDITIONS +=
 
 preinstall all: $(SRCS)
-	$(INSTALL) -m 444 $(SRCS) $(PROJECT_INCLUDE)
+	$(INSTALL_CHANGE) -m 444 $(SRCS) $(PROJECT_INCLUDE)