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/lib/start/Makefile.in | 2 ++ c/src/lib/start/a29k/Makefile.in | 2 ++ c/src/lib/start/i960/Makefile.in | 2 ++ c/src/lib/start/m68k/Makefile.in | 2 ++ c/src/lib/start/mips64orion/Makefile.in | 2 ++ c/src/lib/start/sh/Makefile.in | 2 ++ 6 files changed, 12 insertions(+) (limited to 'c/src/lib/start') diff --git a/c/src/lib/start/Makefile.in b/c/src/lib/start/Makefile.in index 5c974036b3..2d10f3ddfc 100644 --- a/c/src/lib/start/Makefile.in +++ b/c/src/lib/start/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/lib/start/a29k/Makefile.in b/c/src/lib/start/a29k/Makefile.in index 823953baa0..29df5c2500 100644 --- a/c/src/lib/start/a29k/Makefile.in +++ b/c/src/lib/start/a29k/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) diff --git a/c/src/lib/start/i960/Makefile.in b/c/src/lib/start/i960/Makefile.in index 1ed947fc54..518111b7e2 100644 --- a/c/src/lib/start/i960/Makefile.in +++ b/c/src/lib/start/i960/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) diff --git a/c/src/lib/start/m68k/Makefile.in b/c/src/lib/start/m68k/Makefile.in index d982cdec4c..7e3a876cf2 100644 --- a/c/src/lib/start/m68k/Makefile.in +++ b/c/src/lib/start/m68k/Makefile.in @@ -8,6 +8,8 @@ VPATH = @srcdir@ RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ +INSTALL = @INSTALL@ + PGMS=${ARCH}/start.o # C source names, if any, go here -- minus the .c diff --git a/c/src/lib/start/mips64orion/Makefile.in b/c/src/lib/start/mips64orion/Makefile.in index 7aa139ca0b..9b68814e3c 100644 --- a/c/src/lib/start/mips64orion/Makefile.in +++ b/c/src/lib/start/mips64orion/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) diff --git a/c/src/lib/start/sh/Makefile.in b/c/src/lib/start/sh/Makefile.in index 327b4f3b5e..ba268c25ed 100644 --- a/c/src/lib/start/sh/Makefile.in +++ b/c/src/lib/start/sh/Makefile.in @@ -8,6 +8,8 @@ VPATH=@srcdir@ RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ +INSTALL = @INSTALL@ + PGMS=${ARCH}/start.o # C source names, if any, go here -- minus the .c -- cgit v1.2.3