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/cpu/i960/Makefile.in | 2 ++ c/src/exec/score/cpu/i960/rtems/Makefile.in | 2 ++ c/src/exec/score/cpu/i960/rtems/score/Makefile.in | 6 ++++-- c/src/exec/score/cpu/i960/wrap/Makefile.in | 6 ++++-- 4 files changed, 12 insertions(+), 4 deletions(-) (limited to 'c/src/exec/score/cpu/i960') diff --git a/c/src/exec/score/cpu/i960/Makefile.in b/c/src/exec/score/cpu/i960/Makefile.in index 94424f094e..c7f8cfa74d 100644 --- a/c/src/exec/score/cpu/i960/Makefile.in +++ b/c/src/exec/score/cpu/i960/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/cpu/i960/rtems/Makefile.in b/c/src/exec/score/cpu/i960/rtems/Makefile.in index 17f18d020a..d0b2dcce07 100644 --- a/c/src/exec/score/cpu/i960/rtems/Makefile.in +++ b/c/src/exec/score/cpu/i960/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/cpu/i960/rtems/score/Makefile.in b/c/src/exec/score/cpu/i960/rtems/score/Makefile.in index 89ad3faaa1..f5ec665318 100644 --- a/c/src/exec/score/cpu/i960/rtems/score/Makefile.in +++ b/c/src/exec/score/cpu/i960/rtems/score/Makefile.in @@ -8,6 +8,8 @@ VPATH = @srcdir@ RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ +INSTALL = @INSTALL@ + # C source names, if any, go here -- minus the .c C_PIECES= C_FILES=$(C_PIECES:%=%.c) @@ -50,10 +52,10 @@ CLEAN_ADDITIONS += CLOBBER_ADDITIONS += $(BUILT_SOURCES) # Install the program(s), appending _g or _p as appropriate. -# for include files, just use $(INSTALL) +# for include files, just use $(INSTALL_CHANGE) all: install-headers install-headers: ${H_FILES} - $(INSTALL) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems/score + $(INSTALL_CHANGE) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems/score preinstall: install-headers diff --git a/c/src/exec/score/cpu/i960/wrap/Makefile.in b/c/src/exec/score/cpu/i960/wrap/Makefile.in index 78edad009a..4edebda907 100644 --- a/c/src/exec/score/cpu/i960/wrap/Makefile.in +++ b/c/src/exec/score/cpu/i960/wrap/Makefile.in @@ -15,6 +15,8 @@ VPATH = @srcdir@/.. RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ +INSTALL = @INSTALL@ + RELS=../$(ARCH)/rtems-cpu.rel # C source names, if any, go here -- minus the .c @@ -65,8 +67,8 @@ CLOBBER_ADDITIONS += all: ${ARCH} $(SRCS) preinstall $(OBJS) $(RELS) # Install the program(s), appending _g or _p as appropriate. -# for include files, just use $(INSTALL) +# for include files, just use $(INSTALL_CHANGE) install: all preinstall: ${ARCH} - $(INSTALL) -m 444 ${H_FILES} $(PROJECT_INCLUDE) + $(INSTALL_CHANGE) -m 444 ${H_FILES} $(PROJECT_INCLUDE) -- cgit v1.2.3