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/rtems/Makefile.in | 2 ++ c/src/exec/rtems/include/Makefile.in | 2 ++ c/src/exec/rtems/include/rtems/Makefile.in | 2 ++ c/src/exec/rtems/include/rtems/rtems/Makefile.in | 4 +++- c/src/exec/rtems/include/wrap/Makefile.in | 4 +++- c/src/exec/rtems/inline/Makefile.in | 2 ++ c/src/exec/rtems/inline/rtems/Makefile.in | 2 ++ c/src/exec/rtems/inline/rtems/rtems/Makefile.in | 4 +++- c/src/exec/rtems/macros/Makefile.in | 2 ++ c/src/exec/rtems/macros/rtems/Makefile.in | 2 ++ c/src/exec/rtems/macros/rtems/rtems/Makefile.in | 4 +++- c/src/exec/rtems/optman/Makefile.in | 2 ++ c/src/exec/rtems/src/Makefile.in | 2 ++ 13 files changed, 30 insertions(+), 4 deletions(-) (limited to 'c/src/exec/rtems') diff --git a/c/src/exec/rtems/Makefile.in b/c/src/exec/rtems/Makefile.in index 72a335b4f4..8dbcd5a604 100644 --- a/c/src/exec/rtems/Makefile.in +++ b/c/src/exec/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/rtems/include/Makefile.in b/c/src/exec/rtems/include/Makefile.in index 78c23e2adc..fee1d8fbc8 100644 --- a/c/src/exec/rtems/include/Makefile.in +++ b/c/src/exec/rtems/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/rtems/include/rtems/Makefile.in b/c/src/exec/rtems/include/rtems/Makefile.in index 629e47c522..5f7a328220 100644 --- a/c/src/exec/rtems/include/rtems/Makefile.in +++ b/c/src/exec/rtems/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/rtems/include/rtems/rtems/Makefile.in b/c/src/exec/rtems/include/rtems/rtems/Makefile.in index c00c2a1600..90b52d97c0 100644 --- a/c/src/exec/rtems/include/rtems/rtems/Makefile.in +++ b/c/src/exec/rtems/include/rtems/rtems/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 = eventmp mp msgmp partmp regionmp semmp signalmp taskmp MP_PIECES = $(MP_PIECES_$(HAS_MP)_V) @@ -34,4 +36,4 @@ CLEAN_ADDITIONS += CLOBBER_ADDITIONS += all: $(SRCS) - $(INSTALL) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems/rtems + $(INSTALL_CHANGE) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems/rtems diff --git a/c/src/exec/rtems/include/wrap/Makefile.in b/c/src/exec/rtems/include/wrap/Makefile.in index 002ca3c49f..78b4d8d058 100644 --- a/c/src/exec/rtems/include/wrap/Makefile.in +++ b/c/src/exec/rtems/include/wrap/Makefile.in @@ -8,6 +8,8 @@ VPATH = @srcdir@ RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ +INSTALL = @INSTALL@ + H_PIECES=rtems 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/rtems/inline/Makefile.in b/c/src/exec/rtems/inline/Makefile.in index 629e47c522..5f7a328220 100644 --- a/c/src/exec/rtems/inline/Makefile.in +++ b/c/src/exec/rtems/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/rtems/inline/rtems/Makefile.in b/c/src/exec/rtems/inline/rtems/Makefile.in index 629e47c522..5f7a328220 100644 --- a/c/src/exec/rtems/inline/rtems/Makefile.in +++ b/c/src/exec/rtems/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/rtems/inline/rtems/rtems/Makefile.in b/c/src/exec/rtems/inline/rtems/rtems/Makefile.in index 9c11a33172..ddea11e1aa 100644 --- a/c/src/exec/rtems/inline/rtems/rtems/Makefile.in +++ b/c/src/exec/rtems/inline/rtems/rtems/Makefile.in @@ -8,6 +8,8 @@ VPATH = @srcdir@ RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ +INSTALL = @INSTALL@ + I_PIECES=asr attr dpmem event eventset message modes options \ part ratemon region sem status support tasks timer I_FILES=$(I_PIECES:%=$(srcdir)/%.inl) @@ -28,4 +30,4 @@ CLEAN_ADDITIONS += $(LIB) CLOBBER_ADDITIONS += all: $(SRCS) - $(INSTALL) -m 444 ${I_FILES} $(PROJECT_INCLUDE)/rtems/rtems + $(INSTALL_CHANGE) -m 444 ${I_FILES} $(PROJECT_INCLUDE)/rtems/rtems diff --git a/c/src/exec/rtems/macros/Makefile.in b/c/src/exec/rtems/macros/Makefile.in index 629e47c522..5f7a328220 100644 --- a/c/src/exec/rtems/macros/Makefile.in +++ b/c/src/exec/rtems/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/rtems/macros/rtems/Makefile.in b/c/src/exec/rtems/macros/rtems/Makefile.in index 629e47c522..5f7a328220 100644 --- a/c/src/exec/rtems/macros/rtems/Makefile.in +++ b/c/src/exec/rtems/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/rtems/macros/rtems/rtems/Makefile.in b/c/src/exec/rtems/macros/rtems/rtems/Makefile.in index 9c11a33172..ddea11e1aa 100644 --- a/c/src/exec/rtems/macros/rtems/rtems/Makefile.in +++ b/c/src/exec/rtems/macros/rtems/rtems/Makefile.in @@ -8,6 +8,8 @@ VPATH = @srcdir@ RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ +INSTALL = @INSTALL@ + I_PIECES=asr attr dpmem event eventset message modes options \ part ratemon region sem status support tasks timer I_FILES=$(I_PIECES:%=$(srcdir)/%.inl) @@ -28,4 +30,4 @@ CLEAN_ADDITIONS += $(LIB) CLOBBER_ADDITIONS += all: $(SRCS) - $(INSTALL) -m 444 ${I_FILES} $(PROJECT_INCLUDE)/rtems/rtems + $(INSTALL_CHANGE) -m 444 ${I_FILES} $(PROJECT_INCLUDE)/rtems/rtems diff --git a/c/src/exec/rtems/optman/Makefile.in b/c/src/exec/rtems/optman/Makefile.in index d674921aba..d5276318d7 100644 --- a/c/src/exec/rtems/optman/Makefile.in +++ b/c/src/exec/rtems/optman/Makefile.in @@ -8,6 +8,8 @@ VPATH = @srcdir@ RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ +INSTALL = @INSTALL@ + C_FILES= no-dpmem.c no-event.c no-msg.c no-mp.c \ no-part.c no-region.c no-rtmon.c no-sem.c no-signal.c no-timer.c diff --git a/c/src/exec/rtems/src/Makefile.in b/c/src/exec/rtems/src/Makefile.in index fe68ccbe2d..16fdde2168 100644 --- a/c/src/exec/rtems/src/Makefile.in +++ b/c/src/exec/rtems/src/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 = eventmp mp msgmp partmp regionmp semmp signalmp taskmp MP_PIECES = $(MP_PIECES_$(HAS_MP)_V) -- cgit v1.2.3