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/include/rtems/Makefile.in | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'c/src/exec/sapi/include/rtems') 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)?' \ -- cgit v1.2.3