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/no_cpu/Makefile.in | 2 ++ c/src/lib/libbsp/no_cpu/no_bsp/Makefile.in | 2 ++ c/src/lib/libbsp/no_cpu/no_bsp/clock/Makefile.in | 2 ++ c/src/lib/libbsp/no_cpu/no_bsp/console/Makefile.in | 2 ++ c/src/lib/libbsp/no_cpu/no_bsp/include/Makefile.in | 6 ++++-- c/src/lib/libbsp/no_cpu/no_bsp/shmsupp/Makefile.in | 2 ++ c/src/lib/libbsp/no_cpu/no_bsp/startup/Makefile.in | 4 +++- c/src/lib/libbsp/no_cpu/no_bsp/timer/Makefile.in | 2 ++ c/src/lib/libbsp/no_cpu/no_bsp/wrapup/Makefile.in | 2 ++ 9 files changed, 21 insertions(+), 3 deletions(-) (limited to 'c/src/lib/libbsp/no_cpu') diff --git a/c/src/lib/libbsp/no_cpu/Makefile.in b/c/src/lib/libbsp/no_cpu/Makefile.in index f049e9b2e8..f786f6bff0 100644 --- a/c/src/lib/libbsp/no_cpu/Makefile.in +++ b/c/src/lib/libbsp/no_cpu/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/no_cpu/no_bsp/Makefile.in b/c/src/lib/libbsp/no_cpu/no_bsp/Makefile.in index 18fdec1e6a..b0c872a518 100644 --- a/c/src/lib/libbsp/no_cpu/no_bsp/Makefile.in +++ b/c/src/lib/libbsp/no_cpu/no_bsp/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/no_cpu/no_bsp/clock/Makefile.in b/c/src/lib/libbsp/no_cpu/no_bsp/clock/Makefile.in index c406942630..cd25697e85 100644 --- a/c/src/lib/libbsp/no_cpu/no_bsp/clock/Makefile.in +++ b/c/src/lib/libbsp/no_cpu/no_bsp/clock/Makefile.in @@ -8,6 +8,8 @@ VPATH = @srcdir@ RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ +INSTALL = @INSTALL@ + PGM=${ARCH}/clock.rel # C source names, if any, go here -- minus the .c diff --git a/c/src/lib/libbsp/no_cpu/no_bsp/console/Makefile.in b/c/src/lib/libbsp/no_cpu/no_bsp/console/Makefile.in index 1b9944620b..941e67748a 100644 --- a/c/src/lib/libbsp/no_cpu/no_bsp/console/Makefile.in +++ b/c/src/lib/libbsp/no_cpu/no_bsp/console/Makefile.in @@ -8,6 +8,8 @@ VPATH = @srcdir@ RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ +INSTALL = @INSTALL@ + PGM=${ARCH}/console.rel # C source names, if any, go here -- minus the .c diff --git a/c/src/lib/libbsp/no_cpu/no_bsp/include/Makefile.in b/c/src/lib/libbsp/no_cpu/no_bsp/include/Makefile.in index 7d8581095f..9802423ecb 100644 --- a/c/src/lib/libbsp/no_cpu/no_bsp/include/Makefile.in +++ b/c/src/lib/libbsp/no_cpu/no_bsp/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 # @@ -29,5 +31,5 @@ CLEAN_ADDITIONS += CLOBBER_ADDITIONS += all: $(SRCS) - $(INSTALL) -m 444 $(H_FILES) $(PROJECT_INCLUDE) - $(INSTALL) -m 444 $(EQ_FILES) $(PROJECT_INCLUDE) + $(INSTALL_CHANGE) -m 444 $(H_FILES) $(PROJECT_INCLUDE) + $(INSTALL_CHANGE) -m 444 $(EQ_FILES) $(PROJECT_INCLUDE) diff --git a/c/src/lib/libbsp/no_cpu/no_bsp/shmsupp/Makefile.in b/c/src/lib/libbsp/no_cpu/no_bsp/shmsupp/Makefile.in index 746f00b638..2476a1e167 100644 --- a/c/src/lib/libbsp/no_cpu/no_bsp/shmsupp/Makefile.in +++ b/c/src/lib/libbsp/no_cpu/no_bsp/shmsupp/Makefile.in @@ -8,6 +8,8 @@ VPATH = @srcdir@ RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ +INSTALL = @INSTALL@ + PGM=${ARCH}/shmsupp.rel # C source names, if any, go here -- minus the .c diff --git a/c/src/lib/libbsp/no_cpu/no_bsp/startup/Makefile.in b/c/src/lib/libbsp/no_cpu/no_bsp/startup/Makefile.in index 5b1c461c37..e7c49936c6 100644 --- a/c/src/lib/libbsp/no_cpu/no_bsp/startup/Makefile.in +++ b/c/src/lib/libbsp/no_cpu/no_bsp/startup/Makefile.in @@ -8,6 +8,8 @@ VPATH = @srcdir@:@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 @@ -57,5 +59,5 @@ all: ${ARCH} $(SRCS) $(PGM) # the .rel file built here will be put into libbsp.a by ../wrapup/Makefile install: all - $(INSTALL) linkcmds ${PROJECT_RELEASE}/lib + $(INSTALL_CHANGE) linkcmds ${PROJECT_RELEASE}/lib diff --git a/c/src/lib/libbsp/no_cpu/no_bsp/timer/Makefile.in b/c/src/lib/libbsp/no_cpu/no_bsp/timer/Makefile.in index 57b562caf2..d6897ce5f4 100644 --- a/c/src/lib/libbsp/no_cpu/no_bsp/timer/Makefile.in +++ b/c/src/lib/libbsp/no_cpu/no_bsp/timer/Makefile.in @@ -8,6 +8,8 @@ VPATH = @srcdir@ RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ +INSTALL = @INSTALL@ + PGM=${ARCH}/timer.rel # NOTE: timerisr is normally an assembly file!!! diff --git a/c/src/lib/libbsp/no_cpu/no_bsp/wrapup/Makefile.in b/c/src/lib/libbsp/no_cpu/no_bsp/wrapup/Makefile.in index eb5d570df5..fe08215813 100644 --- a/c/src/lib/libbsp/no_cpu/no_bsp/wrapup/Makefile.in +++ b/c/src/lib/libbsp/no_cpu/no_bsp/wrapup/Makefile.in @@ -8,6 +8,8 @@ VPATH = @srcdir@ RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ +INSTALL = @INSTALL@ + BSP_PIECES=startup clock console timer GENERIC_PIECES=$ -- cgit v1.2.3