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

14 files changed, 33 insertions, 5 deletions

diff --git a/c/src/exec/posix/Makefile.in b/c/src/exec/posix/Makefile.in
index 72a335b4f4..8dbcd5a604 100644
--- a/c/src/exec/posix/Makefile.in
+++ b/c/src/exec/posix/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/posix/include/Makefile.in b/c/src/exec/posix/include/Makefile.in
index df04bc061e..8ec7121c04 100644
--- a/c/src/exec/posix/include/Makefile.in
+++ b/c/src/exec/posix/include/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/posix/include/rtems/Makefile.in b/c/src/exec/posix/include/rtems/Makefile.in
index d6063c8220..7b24505fad 100644
--- a/c/src/exec/posix/include/rtems/Makefile.in
+++ b/c/src/exec/posix/include/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/posix/include/rtems/posix/Makefile.in b/c/src/exec/posix/include/rtems/posix/Makefile.in
index e61c8029a7..bbbbc04e9b 100644
--- a/c/src/exec/posix/include/rtems/posix/Makefile.in
+++ b/c/src/exec/posix/include/rtems/posix/Makefile.in
@@ -8,6 +8,8 @@ VPATH = @srcdir@
 RTEMS_ROOT = @top_srcdir@
 PROJECT_ROOT = @PROJECT_ROOT@
 
+INSTALL = @INSTALL@
+
 # We only build multiprocessing related files if HAS_MP was defined
 MP_PIECES_yes_V = condmp mutexmp pthreadmp 
 MP_PIECES = $(MP_PIECES_$(HAS_MP)_V)
@@ -35,4 +37,4 @@ CLEAN_ADDITIONS +=
 CLOBBER_ADDITIONS +=
 
 all:	$(SRCS)
-	$(INSTALL) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems/posix
+	$(INSTALL_CHANGE) -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 6cd1588f29..ab24bd9238 100644
--- a/c/src/exec/posix/include/sys/Makefile.in
+++ b/c/src/exec/posix/include/sys/Makefile.in
@@ -8,6 +8,8 @@ VPATH = @srcdir@
 RTEMS_ROOT = @top_srcdir@
 PROJECT_ROOT = @PROJECT_ROOT@
 
+INSTALL = @INSTALL@
+
 #H_PIECES=utsname
 H_PIECES=utime 
 H_FILES=$(H_PIECES:%=$(srcdir)/%.h)
@@ -28,4 +30,4 @@ CLEAN_ADDITIONS +=
 CLOBBER_ADDITIONS +=
 
 all:	$(SRCS)
-	$(INSTALL) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/sys
+	$(INSTALL_CHANGE) -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 d58dbb7f51..707b0991b4 100644
--- a/c/src/exec/posix/include/wrap/Makefile.in
+++ b/c/src/exec/posix/include/wrap/Makefile.in
@@ -8,6 +8,8 @@ VPATH = @srcdir@
 RTEMS_ROOT = @top_srcdir@
 PROJECT_ROOT = @PROJECT_ROOT@
 
+INSTALL = @INSTALL@
+
 #H_PIECES= aio devctl intr limits mqueue pthread sched semaphore \
 #    signal time unistd
 H_PIECES= pthread sched
@@ -31,4 +33,4 @@ CLEAN_ADDITIONS +=
 CLOBBER_ADDITIONS +=
 
 all:	$(SRCS)
-	$(INSTALL) -m 444 ${H_FILES} $(PROJECT_INCLUDE)
+	$(INSTALL_CHANGE) -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 629e47c522..5f7a328220 100644
--- a/c/src/exec/posix/inline/Makefile.in
+++ b/c/src/exec/posix/inline/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/posix/inline/rtems/Makefile.in b/c/src/exec/posix/inline/rtems/Makefile.in
index d6063c8220..7b24505fad 100644
--- a/c/src/exec/posix/inline/rtems/Makefile.in
+++ b/c/src/exec/posix/inline/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/posix/inline/rtems/posix/Makefile.in b/c/src/exec/posix/inline/rtems/posix/Makefile.in
index 0b0d64d1ef..73a2c7fdf3 100644
--- a/c/src/exec/posix/inline/rtems/posix/Makefile.in
+++ b/c/src/exec/posix/inline/rtems/posix/Makefile.in
@@ -8,6 +8,8 @@ VPATH = @srcdir@
 RTEMS_ROOT = @top_srcdir@
 PROJECT_ROOT = @PROJECT_ROOT@
 
+INSTALL = @INSTALL@
+
 #I_PIECES= cond intr key mqueue mutex pthread priority semaphore
 I_PIECES=cond key mutex pthread priority
 I_FILES=$(I_PIECES:%=$(srcdir)/%.inl)
@@ -28,4 +30,4 @@ CLEAN_ADDITIONS +=
 CLOBBER_ADDITIONS +=
 
 all:	$(SRCS)
-	$(INSTALL) -m 444 ${I_FILES} $(PROJECT_INCLUDE)/rtems/posix
+	$(INSTALL_CHANGE) -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 629e47c522..5f7a328220 100644
--- a/c/src/exec/posix/macros/Makefile.in
+++ b/c/src/exec/posix/macros/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/posix/macros/rtems/Makefile.in b/c/src/exec/posix/macros/rtems/Makefile.in
index d6063c8220..7b24505fad 100644
--- a/c/src/exec/posix/macros/rtems/Makefile.in
+++ b/c/src/exec/posix/macros/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/posix/macros/rtems/posix/Makefile.in b/c/src/exec/posix/macros/rtems/posix/Makefile.in
index d402b7b788..39978d4c96 100644
--- a/c/src/exec/posix/macros/rtems/posix/Makefile.in
+++ b/c/src/exec/posix/macros/rtems/posix/Makefile.in
@@ -8,6 +8,8 @@ VPATH = @srcdir@
 RTEMS_ROOT = @top_srcdir@
 PROJECT_ROOT = @PROJECT_ROOT@
 
+INSTALL = @INSTALL@
+
 # Right now there are not macro implementation of the posix inline routines
 # So it won't build
 I_PIECES= 
@@ -29,4 +31,4 @@ CLEAN_ADDITIONS +=
 CLOBBER_ADDITIONS +=
 
 all:	$(SRCS)
-	#$(INSTALL) -m 444 ${I_FILES} $(PROJECT_INCLUDE)/rtems/posix
+	#$(INSTALL_CHANGE) -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 3c3c4f1887..8b27002878 100644
--- a/c/src/exec/posix/optman/Makefile.in
+++ b/c/src/exec/posix/optman/Makefile.in
@@ -8,6 +8,8 @@ VPATH = @srcdir@
 RTEMS_ROOT = @top_srcdir@
 PROJECT_ROOT = @PROJECT_ROOT@
 
+INSTALL = @INSTALL@
+
 C_FILES= 
 
 H_FILES=
diff --git a/c/src/exec/posix/src/Makefile.in b/c/src/exec/posix/src/Makefile.in
index cb3083329b..f6d019ffe6 100644
--- a/c/src/exec/posix/src/Makefile.in
+++ b/c/src/exec/posix/src/Makefile.in
@@ -8,6 +8,8 @@ VPATH = @srcdir@
 RTEMS_ROOT = @top_srcdir@
 PROJECT_ROOT = @PROJECT_ROOT@
 
+INSTALL = @INSTALL@
+
 # following are semi-implemented and untested
 # C_PIECES=aio cancel devctl intr mqueue semaphore time utsname