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/libbsp/sh/Makefile.in | 2 ++ c/src/lib/libbsp/sh/gensh1/Makefile.in | 2 ++ c/src/lib/libbsp/sh/gensh1/include/Makefile.in | 4 +++- c/src/lib/libbsp/sh/gensh1/scitab/Makefile.in | 2 ++ c/src/lib/libbsp/sh/gensh1/start/Makefile.in | 2 ++ c/src/lib/libbsp/sh/gensh1/startup/Makefile.in | 4 +++- c/src/lib/libbsp/sh/gensh1/wrapup/Makefile.in | 2 ++ 7 files changed, 16 insertions(+), 2 deletions(-) (limited to 'c/src/lib/libbsp/sh') diff --git a/c/src/lib/libbsp/sh/Makefile.in b/c/src/lib/libbsp/sh/Makefile.in index 3479cee62d..880b2b83b9 100644 --- a/c/src/lib/libbsp/sh/Makefile.in +++ b/c/src/lib/libbsp/sh/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/libbsp/sh/gensh1/Makefile.in b/c/src/lib/libbsp/sh/gensh1/Makefile.in index 3caf2c69c5..301190b46f 100644 --- a/c/src/lib/libbsp/sh/gensh1/Makefile.in +++ b/c/src/lib/libbsp/sh/gensh1/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/libbsp/sh/gensh1/include/Makefile.in b/c/src/lib/libbsp/sh/gensh1/include/Makefile.in index e632fca2f1..2aaca4c0e0 100644 --- a/c/src/lib/libbsp/sh/gensh1/include/Makefile.in +++ b/c/src/lib/libbsp/sh/gensh1/include/Makefile.in @@ -8,6 +8,8 @@ VPATH=@srcdir@ RTEMS_ROOT=@top_srcdir@ PROJECT_ROOT=@PROJECT_ROOT@ +INSTALL = @INSTALL@ + H_FILES = \ $(srcdir)/bsp.h \ $(srcdir)/coverhd.h @@ -33,4 +35,4 @@ CLOBBER_ADDITIONS += all: preinstall preinstall: $(SRCS) - @INSTALL@ $(INSTINCFLAGS) $(H_FILES) $(PROJECT_INCLUDE) + $(INSTALL) $(INSTINCFLAGS) $(H_FILES) $(PROJECT_INCLUDE) diff --git a/c/src/lib/libbsp/sh/gensh1/scitab/Makefile.in b/c/src/lib/libbsp/sh/gensh1/scitab/Makefile.in index 06d8574f93..7d05373025 100644 --- a/c/src/lib/libbsp/sh/gensh1/scitab/Makefile.in +++ b/c/src/lib/libbsp/sh/gensh1/scitab/Makefile.in @@ -8,6 +8,8 @@ VPATH=@srcdir@ RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ +INSTALL = @INSTALL@ + PGM=$(ARCH)/scitab.rel # C source names, if any, go here -- minus the .c diff --git a/c/src/lib/libbsp/sh/gensh1/start/Makefile.in b/c/src/lib/libbsp/sh/gensh1/start/Makefile.in index 327b4f3b5e..ba268c25ed 100644 --- a/c/src/lib/libbsp/sh/gensh1/start/Makefile.in +++ b/c/src/lib/libbsp/sh/gensh1/start/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/libbsp/sh/gensh1/startup/Makefile.in b/c/src/lib/libbsp/sh/gensh1/startup/Makefile.in index a7460aa5e8..5bd43f222e 100644 --- a/c/src/lib/libbsp/sh/gensh1/startup/Makefile.in +++ b/c/src/lib/libbsp/sh/gensh1/startup/Makefile.in @@ -8,6 +8,8 @@ VPATH=@srcdir@:@srcdir@/../../shared:@srcdir@/../../../shared RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ +INSTALL = @INSTALL@ + PGM=${ARCH}/startup.rel # C source names, if any, go here -- minus the .c @@ -54,6 +56,6 @@ ${PGM}: ${SRCS} ${OBJS} $(make-rel) all: ${ARCH} $(SRCS) $(PGM) - $(INSTALL) $(srcdir)/linkcmds ${PROJECT_RELEASE}/lib + $(INSTALL_CHANGE) $(srcdir)/linkcmds ${PROJECT_RELEASE}/lib # the .rel file built here will be put into libbsp.a by ../wrapup/Makefile diff --git a/c/src/lib/libbsp/sh/gensh1/wrapup/Makefile.in b/c/src/lib/libbsp/sh/gensh1/wrapup/Makefile.in index 4d2ce1b1bd..4fc7fb5ae5 100644 --- a/c/src/lib/libbsp/sh/gensh1/wrapup/Makefile.in +++ b/c/src/lib/libbsp/sh/gensh1/wrapup/Makefile.in @@ -10,6 +10,8 @@ VPATH=@srcdir@ RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ +INSTALL = @INSTALL@ + BSP_PIECES=startup scitab GENERIC_PIECES= -- cgit v1.2.3