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). --- make/Makefile.in | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) (limited to 'make/Makefile.in') 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 -- cgit v1.2.3