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). --- c/src/exec/sapi/Makefile.in | 2 ++ c/src/exec/sapi/include/Makefile.in | 2 ++ c/src/exec/sapi/include/rtems/Makefile.in | 6 ++++-- c/src/exec/sapi/include/wrap/Makefile.in | 4 +++- c/src/exec/sapi/inline/Makefile.in | 2 ++ c/src/exec/sapi/inline/rtems/Makefile.in | 4 +++- c/src/exec/sapi/macros/Makefile.in | 2 ++ c/src/exec/sapi/macros/rtems/Makefile.in | 4 +++- c/src/exec/sapi/optman/Makefile.in | 2 ++ c/src/exec/sapi/src/Makefile.in | 2 ++ 10 files changed, 25 insertions(+), 5 deletions(-) (limited to 'c/src/exec/sapi') diff --git a/c/src/exec/sapi/Makefile.in b/c/src/exec/sapi/Makefile.in index 72a335b4f4..8dbcd5a604 100644 --- a/c/src/exec/sapi/Makefile.in +++ b/c/src/exec/sapi/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/sapi/include/Makefile.in b/c/src/exec/sapi/include/Makefile.in index 78c23e2adc..fee1d8fbc8 100644 --- a/c/src/exec/sapi/include/Makefile.in +++ b/c/src/exec/sapi/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/sapi/include/rtems/Makefile.in b/c/src/exec/sapi/include/rtems/Makefile.in index f3bd27cb78..2a97c10726 100644 --- a/c/src/exec/sapi/include/rtems/Makefile.in +++ b/c/src/exec/sapi/include/rtems/Makefile.in @@ -8,6 +8,8 @@ VPATH = @srcdir@ RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ +INSTALL = @INSTALL@ + H_PIECES= config directives extension fatal init io mptables H_FILES=$(H_PIECES:%=$(srcdir)/%.h) @@ -27,10 +29,10 @@ CLEAN_ADDITIONS += CLOBBER_ADDITIONS += all: $(SRCS) $(ARCH) $(PROJECT_INCLUDE)/rtems/sptables.h - $(INSTALL) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems/ + $(INSTALL_CHANGE) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems/ $(PROJECT_INCLUDE)/rtems/sptables.h: $(ARCH)/sptables.h-tmp - $(INSTALL) -m 444 $(ARCH)/sptables.h-tmp $@ + $(INSTALL_CHANGE) -m 444 $(ARCH)/sptables.h-tmp $@ $(ARCH)/sptables.h-tmp: $(srcdir)/sptables.h $(SED) -e 's?REPLACE_THIS_WITH_THE_BSP?$(RTEMS_BSP)?' \ diff --git a/c/src/exec/sapi/include/wrap/Makefile.in b/c/src/exec/sapi/include/wrap/Makefile.in index 4ae1cd6bdd..a4ecaf347c 100644 --- a/c/src/exec/sapi/include/wrap/Makefile.in +++ b/c/src/exec/sapi/include/wrap/Makefile.in @@ -8,6 +8,8 @@ VPATH = @srcdir@ RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ +INSTALL = @INSTALL@ + H_PIECES= confdefs H_FILES=$(H_PIECES:%=$(srcdir)/../%.h) @@ -27,4 +29,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/sapi/inline/Makefile.in b/c/src/exec/sapi/inline/Makefile.in index 629e47c522..5f7a328220 100644 --- a/c/src/exec/sapi/inline/Makefile.in +++ b/c/src/exec/sapi/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/sapi/inline/rtems/Makefile.in b/c/src/exec/sapi/inline/rtems/Makefile.in index 634df7f643..4a5ce106b4 100644 --- a/c/src/exec/sapi/inline/rtems/Makefile.in +++ b/c/src/exec/sapi/inline/rtems/Makefile.in @@ -8,6 +8,8 @@ VPATH = @srcdir@ RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ +INSTALL = @INSTALL@ + I_PIECES= extension I_FILES=$(I_PIECES:%=$(srcdir)/%.inl) @@ -27,4 +29,4 @@ CLEAN_ADDITIONS += $(LIB) CLOBBER_ADDITIONS += all: $(SRCS) - $(INSTALL) -m 444 ${I_FILES} $(PROJECT_INCLUDE)/rtems + $(INSTALL_CHANGE) -m 444 ${I_FILES} $(PROJECT_INCLUDE)/rtems diff --git a/c/src/exec/sapi/macros/Makefile.in b/c/src/exec/sapi/macros/Makefile.in index 629e47c522..5f7a328220 100644 --- a/c/src/exec/sapi/macros/Makefile.in +++ b/c/src/exec/sapi/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/sapi/macros/rtems/Makefile.in b/c/src/exec/sapi/macros/rtems/Makefile.in index 634df7f643..4a5ce106b4 100644 --- a/c/src/exec/sapi/macros/rtems/Makefile.in +++ b/c/src/exec/sapi/macros/rtems/Makefile.in @@ -8,6 +8,8 @@ VPATH = @srcdir@ RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ +INSTALL = @INSTALL@ + I_PIECES= extension I_FILES=$(I_PIECES:%=$(srcdir)/%.inl) @@ -27,4 +29,4 @@ CLEAN_ADDITIONS += $(LIB) CLOBBER_ADDITIONS += all: $(SRCS) - $(INSTALL) -m 444 ${I_FILES} $(PROJECT_INCLUDE)/rtems + $(INSTALL_CHANGE) -m 444 ${I_FILES} $(PROJECT_INCLUDE)/rtems diff --git a/c/src/exec/sapi/optman/Makefile.in b/c/src/exec/sapi/optman/Makefile.in index 7a78007848..953a0742b9 100644 --- a/c/src/exec/sapi/optman/Makefile.in +++ b/c/src/exec/sapi/optman/Makefile.in @@ -8,6 +8,8 @@ VPATH = @srcdir@ RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ +INSTALL = @INSTALL@ + C_FILES= no-ext.c no-io.c H_FILES= diff --git a/c/src/exec/sapi/src/Makefile.in b/c/src/exec/sapi/src/Makefile.in index 23e87931c7..c06fc3fa18 100644 --- a/c/src/exec/sapi/src/Makefile.in +++ b/c/src/exec/sapi/src/Makefile.in @@ -8,6 +8,8 @@ VPATH = @srcdir@ RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ +INSTALL = @INSTALL@ + C_PIECES= debug extension fatal exinit io posixapi rtemsapi C_FILES=$(C_PIECES:%=%.c) C_O_FILES=$(C_PIECES:%=${ARCH}/%.o) -- cgit v1.2.3