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, 15 insertions, 13 deletions

diff --git a/make/Makefile.in b/make/Makefile.in
index ea5220009c..8be497fb4f 100644
--- a/make/Makefile.in
+++ b/make/Makefile.in
@@ -11,6 +11,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/leaf.cfg
 
@@ -58,7 +60,7 @@ get: retrieve
 all: 
 
 $(prefix)/rtems:
-	@INSTALL@ $(INSTDIRFLAGS) $@
+	@top_srcdir@/mkinstalldirs $@
 
 install: $(prefix)/rtems \
 	$(prefix)/rtems/make \
@@ -68,30 +70,30 @@ install: $(prefix)/rtems \
 	install_files
 
 $(prefix)/rtems/make:
-	@INSTALL@ $(INSTDIRFLAGS) $@
+	@top_srcdir@/mkinstalldirs $@
 
 install_files::	$(GENERIC_FILES) $(MAKEFILES)
-	@INSTALL@ $(INSTDATAFLAGS) $^ \
+	$(INSTALL) $(INSTDATAFLAGS) $^ \
 	$(prefix)/rtems/make
 
 $(prefix)/rtems/make/compilers:
-	@INSTALL@ $(INSTDIRFLAGS) $@
+	@top_srcdir@/mkinstalldirs $@
 
 install_files:: $(COMPILER_FILES)
-	@INSTALL@ $(INSTDATAFLAGS) $^ \
+	$(INSTALL) $(INSTDATAFLAGS) $^ \
 	$(prefix)/rtems/make/compilers
 
 $(prefix)/rtems/make/custom:
-	@INSTALL@ $(INSTDIRFLAGS) $@
+	@top_srcdir@/mkinstalldirs $@
 
 install_files:: $(CUSTOM_FILES) 
-	@INSTALL@ $(INSTDATAFLAGS) $^ \
+	$(INSTALL) $(INSTDATAFLAGS) $^ \
 	$(prefix)/rtems/make/custom
 
 $(prefix)/rtems/make/Templates:
-	@INSTALL@ $(INSTDIRFLAGS) $@
+	@top_srcdir@/mkinstalldirs $@
 
 
 install_files:: $(TEMPLATE_FILES)
-	@INSTALL@ $(INSTDATAFLAGS) $^ \
+	$(INSTALL) $(INSTDATAFLAGS) $^ \
 	$(prefix)/rtems/make/Templates
diff --git a/make/Templates/Makefile.leaf b/make/Templates/Makefile.leaf
index d03155231d..b4c879529f 100644
--- a/make/Templates/Makefile.leaf
+++ b/make/Templates/Makefile.leaf
@@ -72,6 +72,6 @@ ${ARCH}/xxx-your-program-here: ${OBJS} ${LINK_FILES}
 	$(make-exe)
 
 # 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
 	$(INSTALL_VARIANT) -m 555 ${PGMS} ${PROJECT_RELEASE}/bin
diff --git a/make/Templates/Makefile.lib b/make/Templates/Makefile.lib
index ebf9d66f68..9127ea70de 100644
--- a/make/Templates/Makefile.lib
+++ b/make/Templates/Makefile.lib
@@ -54,6 +54,6 @@ $(LIB): ${OBJS}
 	$(make-library)
 
 # Install the library, appending _g or _p as appropriate.
-# for include files, just use $(INSTALL)
+# for include files, just use $(INSTALL_CHANGE)
 install:  all
 	$(INSTALL_VARIANT) -m 644 ${LIB} ${PROJECT_RELEASE}/lib
diff --git a/make/host.cfg.in b/make/host.cfg.in
index 8a9a6c7dde..6e54bcb05a 100644
--- a/make/host.cfg.in
+++ b/make/host.cfg.in
@@ -33,7 +33,7 @@ M4=@M4@
 # Global tools
 PACKHEX=$(PROJECT_TOOLS)/packhex
 
-INSTALL=$(PROJECT_TOOLS)/install-if-change
+INSTALL_CHANGE=$(PROJECT_TOOLS)/install-if-change
 INSTALL_VARIANT=$(PROJECT_TOOLS)/install-if-change -V "$(LIB_VARIANT)"
 
 # FIXME: HACK for a bug in cygwin-hosted egcs which returns a mixture
diff --git a/make/target.cfg.in b/make/target.cfg.in
index 9042611d58..0da0b8d4e1 100644
--- a/make/target.cfg.in
+++ b/make/target.cfg.in
@@ -54,7 +54,7 @@ RTEMS_CPU = @target_cpu@
 BARE_CPU_MODEL = @BARE_CPU_MODEL@
 BARE_CPU_CFLAGS = @BARE_CPU_CFLAGS@
  
-INSTALL=$(PROJECT_ROOT)/$(RTEMS_BSP)/build-tools/install-if-change
+INSTALL_CHANGE=$(PROJECT_ROOT)/$(RTEMS_BSP)/build-tools/install-if-change
 XCFLAGS=$(CFLAGS_FOR_TARGET)
  
 export RTEMS_BSP