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/score/include/rtems/Makefile.in | 2 ++ c/src/exec/score/include/rtems/score/Makefile.in | 4 +++- c/src/exec/score/include/rtems/wrap/Makefile.in | 4 +++- 3 files changed, 8 insertions(+), 2 deletions(-) (limited to 'c/src/exec/score/include/rtems') diff --git a/c/src/exec/score/include/rtems/Makefile.in b/c/src/exec/score/include/rtems/Makefile.in index e5f650d756..cdfa9b83be 100644 --- a/c/src/exec/score/include/rtems/Makefile.in +++ b/c/src/exec/score/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/score/include/rtems/score/Makefile.in b/c/src/exec/score/include/rtems/score/Makefile.in index 6fa695eb66..4ebe840a62 100644 --- a/c/src/exec/score/include/rtems/score/Makefile.in +++ b/c/src/exec/score/include/rtems/score/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 = mpci mppkt objectmp threadmp MP_PIECES = $(MP_PIECES_$(HAS_MP)_V) @@ -87,4 +89,4 @@ endif all: $(SRCS) - $(INSTALL) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems/score + $(INSTALL_CHANGE) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems/score diff --git a/c/src/exec/score/include/rtems/wrap/Makefile.in b/c/src/exec/score/include/rtems/wrap/Makefile.in index b6abaa78b4..bc2539a8b1 100644 --- a/c/src/exec/score/include/rtems/wrap/Makefile.in +++ b/c/src/exec/score/include/rtems/wrap/Makefile.in @@ -8,6 +8,8 @@ VPATH = @srcdir@ RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ +INSTALL = @INSTALL@ + H_PIECES=debug system H_FILES=$(H_PIECES:%=$(srcdir)/../%.h) @@ -17,4 +19,4 @@ include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg all: $(SRCS) - $(INSTALL) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems + $(INSTALL_CHANGE) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems -- cgit v1.2.3