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/m68k/efi332/Makefile.in | 2 ++ c/src/lib/libbsp/m68k/efi332/clock/Makefile.in | 2 ++ c/src/lib/libbsp/m68k/efi332/console/Makefile.in | 2 ++ c/src/lib/libbsp/m68k/efi332/include/Makefile.in | 6 ++++-- c/src/lib/libbsp/m68k/efi332/spurious/Makefile.in | 2 ++ c/src/lib/libbsp/m68k/efi332/start/Makefile.in | 2 ++ c/src/lib/libbsp/m68k/efi332/start332/Makefile.in | 2 ++ c/src/lib/libbsp/m68k/efi332/startup/Makefile.in | 4 +++- c/src/lib/libbsp/m68k/efi332/timer/Makefile.in | 2 ++ c/src/lib/libbsp/m68k/efi332/wrapup/Makefile.in | 2 ++ 10 files changed, 23 insertions(+), 3 deletions(-) (limited to 'c/src/lib/libbsp/m68k/efi332') diff --git a/c/src/lib/libbsp/m68k/efi332/Makefile.in b/c/src/lib/libbsp/m68k/efi332/Makefile.in index 21c1abc2c8..f38e570ec5 100644 --- a/c/src/lib/libbsp/m68k/efi332/Makefile.in +++ b/c/src/lib/libbsp/m68k/efi332/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/m68k/efi332/clock/Makefile.in b/c/src/lib/libbsp/m68k/efi332/clock/Makefile.in index 59df4f2702..87b6aa0a86 100644 --- a/c/src/lib/libbsp/m68k/efi332/clock/Makefile.in +++ b/c/src/lib/libbsp/m68k/efi332/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/m68k/efi332/console/Makefile.in b/c/src/lib/libbsp/m68k/efi332/console/Makefile.in index fd05ddfedd..36c95fc3f7 100644 --- a/c/src/lib/libbsp/m68k/efi332/console/Makefile.in +++ b/c/src/lib/libbsp/m68k/efi332/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/m68k/efi332/include/Makefile.in b/c/src/lib/libbsp/m68k/efi332/include/Makefile.in index 145f554e29..bda6026e10 100644 --- a/c/src/lib/libbsp/m68k/efi332/include/Makefile.in +++ b/c/src/lib/libbsp/m68k/efi332/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)/efi332.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/m68k/efi332/spurious/Makefile.in b/c/src/lib/libbsp/m68k/efi332/spurious/Makefile.in index 871175f129..376a5f2bcd 100644 --- a/c/src/lib/libbsp/m68k/efi332/spurious/Makefile.in +++ b/c/src/lib/libbsp/m68k/efi332/spurious/Makefile.in @@ -8,6 +8,8 @@ VPATH = @srcdir@ RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ +INSTALL = @INSTALL@ + PGM=${ARCH}/spurious.rel # C source names, if any, go here -- minus the .c diff --git a/c/src/lib/libbsp/m68k/efi332/start/Makefile.in b/c/src/lib/libbsp/m68k/efi332/start/Makefile.in index 2373aeca0b..9dc7338d4d 100644 --- a/c/src/lib/libbsp/m68k/efi332/start/Makefile.in +++ b/c/src/lib/libbsp/m68k/efi332/start/Makefile.in @@ -8,6 +8,8 @@ VPATH = @srcdir@ RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ +INSTALL = @INSTALL@ + PGM=${ARCH}/start332.o # C source names, if any, go here -- minus the .c diff --git a/c/src/lib/libbsp/m68k/efi332/start332/Makefile.in b/c/src/lib/libbsp/m68k/efi332/start332/Makefile.in index 2373aeca0b..9dc7338d4d 100644 --- a/c/src/lib/libbsp/m68k/efi332/start332/Makefile.in +++ b/c/src/lib/libbsp/m68k/efi332/start332/Makefile.in @@ -8,6 +8,8 @@ VPATH = @srcdir@ RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ +INSTALL = @INSTALL@ + PGM=${ARCH}/start332.o # C source names, if any, go here -- minus the .c diff --git a/c/src/lib/libbsp/m68k/efi332/startup/Makefile.in b/c/src/lib/libbsp/m68k/efi332/startup/Makefile.in index 6cacf17587..0b50e9331a 100644 --- a/c/src/lib/libbsp/m68k/efi332/startup/Makefile.in +++ b/c/src/lib/libbsp/m68k/efi332/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 @@ -49,7 +51,7 @@ ${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/m68k/efi332/timer/Makefile.in b/c/src/lib/libbsp/m68k/efi332/timer/Makefile.in index d9e6e84a0c..7215d8a258 100644 --- a/c/src/lib/libbsp/m68k/efi332/timer/Makefile.in +++ b/c/src/lib/libbsp/m68k/efi332/timer/Makefile.in @@ -8,6 +8,8 @@ VPATH = @srcdir@ RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ +INSTALL = @INSTALL@ + PGM=${ARCH}/timer.rel # C source names, if any, go here -- minus the .c diff --git a/c/src/lib/libbsp/m68k/efi332/wrapup/Makefile.in b/c/src/lib/libbsp/m68k/efi332/wrapup/Makefile.in index 3ef5e9d4bb..4f94ecb028 100644 --- a/c/src/lib/libbsp/m68k/efi332/wrapup/Makefile.in +++ b/c/src/lib/libbsp/m68k/efi332/wrapup/Makefile.in @@ -8,6 +8,8 @@ VPATH = @srcdir@ RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ +INSTALL = @INSTALL@ + BSP_PIECES=startup clock console spurious timer GENERIC_PIECES= -- cgit v1.2.3