From 8548fe0ae29eafea856090e742c1fd205ed4b0fb Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Thu, 18 Feb 1999 18:36:05 +0000 Subject: Part of the automake VI patch from Ralf Corsepius : > 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). --- tools/build/Makefile.in | 2 ++ tools/build/os/Makefile.in | 2 ++ tools/build/os/msdos/Makefile.in | 4 +++- tools/build/scripts/Makefile.in | 6 ++++-- tools/build/src/Makefile.in | 6 ++++-- tools/cpu/Makefile.in | 2 ++ tools/cpu/generic/Makefile.in | 6 ++++-- tools/cpu/sh/Makefile.in | 6 ++++-- tools/cpu/unix/Makefile.in | 6 ++++-- tools/update/Makefile.in | 8 +++++--- 10 files changed, 34 insertions(+), 14 deletions(-) (limited to 'tools') diff --git a/tools/build/Makefile.in b/tools/build/Makefile.in index ad819e8214..e58758025b 100644 --- a/tools/build/Makefile.in +++ b/tools/build/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/tools/build/os/Makefile.in b/tools/build/os/Makefile.in index d540e58fa0..884a8c9b9e 100644 --- a/tools/build/os/Makefile.in +++ b/tools/build/os/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/tools/build/os/msdos/Makefile.in b/tools/build/os/msdos/Makefile.in index 23a840d33a..bcd523fb64 100644 --- a/tools/build/os/msdos/Makefile.in +++ b/tools/build/os/msdos/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/leaf.cfg @@ -20,7 +22,7 @@ INSTALLED=$(DESTDIR)/ifc.exe \ all: $(DESTDIR) $(PGMS) install $(DESTDIR): - @INSTALL@ $(INSTDIRFLAGS) $@ + @top_srcdir@/mkinstalldirs $@ install: $(INSTALLED) diff --git a/tools/build/scripts/Makefile.in b/tools/build/scripts/Makefile.in index 753bfafaa5..eaf1dd397f 100644 --- a/tools/build/scripts/Makefile.in +++ b/tools/build/scripts/Makefile.in @@ -12,6 +12,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 include $(RTEMS_ROOT)/make/rtems.cfg @@ -28,9 +30,9 @@ INSTALLED_PGMS=$(PGMS:%=$(DESTDIR)/%) all: $(DESTDIR) $(PGMS) install $(DESTDIR): - @INSTALL@ $(INSTDIRFLAGS) $@ + @top_srcdir@/mkinstalldirs $@ $(INSTALLED_PGMS): $(PGMS) - @INSTALL@ $(INSTBINFLAGS) $^ $(DESTDIR) + $(INSTALL) $(INSTBINFLAGS) $^ $(DESTDIR) install: $(DESTDIR) $(INSTALLED_PGMS) diff --git a/tools/build/src/Makefile.in b/tools/build/src/Makefile.in index 52942d909f..415017a9aa 100644 --- a/tools/build/src/Makefile.in +++ b/tools/build/src/Makefile.in @@ -19,6 +19,8 @@ VPATH = @srcdir@ RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ +INSTALL = @INSTALL@ + # we use host compiler in this directory USE_HOST_COMPILER=yes @@ -64,7 +66,7 @@ CLOBBER_ADDITIONS += DESTDIR=${PROJECT_RELEASE}/build-tools $(DESTDIR): - @INSTALL@ $(INSTDIRFLAGS) $@ + @top_srcdir@/mkinstalldirs $@ all: $(ARCH) $(DESTDIR) $(SRCS) $(PGMS) - @INSTALL@ $(INSTBINFLAGS) $(PGMS) $(DESTDIR) + $(INSTALL) $(INSTBINFLAGS) $(PGMS) $(DESTDIR) diff --git a/tools/cpu/Makefile.in b/tools/cpu/Makefile.in index 6dba1f38f6..72d96812df 100644 --- a/tools/cpu/Makefile.in +++ b/tools/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/tools/cpu/generic/Makefile.in b/tools/cpu/generic/Makefile.in index 33c2fb81dd..d81dfe5ffa 100644 --- a/tools/cpu/generic/Makefile.in +++ b/tools/cpu/generic/Makefile.in @@ -12,6 +12,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 include $(RTEMS_ROOT)/make/rtems.cfg @@ -28,9 +30,9 @@ INSTALLED_PGMS=$(PGMS:%=$(DESTDIR)/%) all: $(DESTDIR) $(PGMS) install $(DESTDIR): - @INSTALL@ $(INSTDIRFLAGS) $@ + @top_srcdir@/mkinstalldirs $@ $(INSTALLED_PGMS): $(PGMS) - @INSTALL@ $(INSTBINFLAGS) $^ $@ + $(INSTALL) $(INSTBINFLAGS) $^ $@ install: $(DESTDIR) $(INSTALLED_PGMS) diff --git a/tools/cpu/sh/Makefile.in b/tools/cpu/sh/Makefile.in index 61cbdc988b..75537ef4ca 100644 --- a/tools/cpu/sh/Makefile.in +++ b/tools/cpu/sh/Makefile.in @@ -10,6 +10,8 @@ VPATH = @srcdir@ RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ +INSTALL = @INSTALL@ + # we use the host compiler here USE_HOST_COMPILER=yes @@ -55,8 +57,8 @@ ${PGMS}: $(OBJS) $(LINK_FILES) $(make-exe) $(DESTDIR): - @INSTALL@ $(INSTDIRFLAGS) $@ + @top_srcdir@/mkinstalldirs $@ # Install the program install: $(DESTDIR) $(PGMS) - @INSTALL@ $(INSTBINFLAGS) ${PGMS} $(DESTDIR) + $(INSTALL) $(INSTBINFLAGS) ${PGMS} $(DESTDIR) diff --git a/tools/cpu/unix/Makefile.in b/tools/cpu/unix/Makefile.in index 0b8402d15f..75320594ea 100644 --- a/tools/cpu/unix/Makefile.in +++ b/tools/cpu/unix/Makefile.in @@ -8,6 +8,8 @@ VPATH = @srcdir@ RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ +INSTALL = @INSTALL@ + # we use host compiler here for gensize. Hopefully it has same alignment!! USE_HOST_COMPILER=yes @@ -52,7 +54,7 @@ CLOBBER_ADDITIONS += all: preinstall preinstall: ${ARCH} $(SRCS) $(PGMS) - @INSTALL@ $(INSTBINFLAGS) $(PGMS) ${PROJECT_RELEASE}/bin + $(INSTALL) $(INSTBINFLAGS) $(PGMS) ${PROJECT_RELEASE}/bin # Install the program(s), appending _g or _p as appropriate. -# for include files, just use $(INSTALL) +# for include files, just use $(INSTALL_CHANGE) diff --git a/tools/update/Makefile.in b/tools/update/Makefile.in index 45e3e63515..2bd9896aa6 100644 --- a/tools/update/Makefile.in +++ b/tools/update/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/leaf.cfg include $(RTEMS_ROOT)/make/rtems.cfg @@ -31,13 +33,13 @@ INSTALLED_DATA=$(MISC_SUPPORT:%=$(DESTDIR)/%) all: $(PGMS) $(DESTDIR): - @INSTALL@ $(INSTDIRFLAGS) $@ + @top_srcdir@/mkinstalldirs $@ $(INSTALLED_PGMS): $(PGMS) - @INSTALL@ $(INSTBINFLAGS) $^ $(DESTDIR) + $(INSTALL) $(INSTBINFLAGS) $^ $(DESTDIR) $(INSTALLED_DATA): $(MISC_SUPPORT) - @INSTALL@ $(INSTDATAFLAGS) $^ $(DESTDIR) + $(INSTALL) $(INSTDATAFLAGS) $^ $(DESTDIR) install: $(DESTDIR) $(INSTALLED_PGMS) $(INSTALLED_DATA) -- cgit v1.2.3