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/libcpu/powerpc/mpc860/Makefile.in | 2 ++ c/src/lib/libcpu/powerpc/mpc860/clock/Makefile.in | 2 ++ c/src/lib/libcpu/powerpc/mpc860/console-generic/Makefile.in | 2 ++ c/src/lib/libcpu/powerpc/mpc860/include/Makefile.in | 4 +++- c/src/lib/libcpu/powerpc/mpc860/timer/Makefile.in | 2 ++ c/src/lib/libcpu/powerpc/mpc860/vectors/Makefile.in | 2 ++ 6 files changed, 13 insertions(+), 1 deletion(-) (limited to 'c/src/lib/libcpu/powerpc/mpc860') diff --git a/c/src/lib/libcpu/powerpc/mpc860/Makefile.in b/c/src/lib/libcpu/powerpc/mpc860/Makefile.in index 2439fbdc40..c58a42866b 100644 --- a/c/src/lib/libcpu/powerpc/mpc860/Makefile.in +++ b/c/src/lib/libcpu/powerpc/mpc860/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/libcpu/powerpc/mpc860/clock/Makefile.in b/c/src/lib/libcpu/powerpc/mpc860/clock/Makefile.in index 7b299d4ef0..52b74e28aa 100644 --- a/c/src/lib/libcpu/powerpc/mpc860/clock/Makefile.in +++ b/c/src/lib/libcpu/powerpc/mpc860/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/libcpu/powerpc/mpc860/console-generic/Makefile.in b/c/src/lib/libcpu/powerpc/mpc860/console-generic/Makefile.in index b538d198f7..a6e8eec8e1 100644 --- a/c/src/lib/libcpu/powerpc/mpc860/console-generic/Makefile.in +++ b/c/src/lib/libcpu/powerpc/mpc860/console-generic/Makefile.in @@ -8,6 +8,8 @@ VPATH = @srcdir@ RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ +INSTALL = @INSTALL@ + PGM=${ARCH}/console-generic.rel # C source names, if any, go here -- minus the .c diff --git a/c/src/lib/libcpu/powerpc/mpc860/include/Makefile.in b/c/src/lib/libcpu/powerpc/mpc860/include/Makefile.in index faff98bb28..3b14172b0f 100644 --- a/c/src/lib/libcpu/powerpc/mpc860/include/Makefile.in +++ b/c/src/lib/libcpu/powerpc/mpc860/include/Makefile.in @@ -12,6 +12,8 @@ VPATH = @srcdir@ RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ +INSTALL = @INSTALL@ + H_FILES = $(wildcard $(srcdir)/*.h) SRCS=$(H_FILES) @@ -22,7 +24,7 @@ all: install install: test -d $(PROJECT_INCLUDE)/mpc860 || $(MKDIR) $(PROJECT_INCLUDE)/mpc860 - $(INSTALL) -m 444 $(H_FILES) $(PROJECT_INCLUDE)/mpc860 + $(INSTALL_CHANGE) -m 444 $(H_FILES) $(PROJECT_INCLUDE)/mpc860 all: FORCEIT cd ../../../../libbsp/$(RTEMS_CPU)/$(RTEMS_BSP)/include; $(MAKE) all diff --git a/c/src/lib/libcpu/powerpc/mpc860/timer/Makefile.in b/c/src/lib/libcpu/powerpc/mpc860/timer/Makefile.in index 2c423f2a5a..08018f0512 100644 --- a/c/src/lib/libcpu/powerpc/mpc860/timer/Makefile.in +++ b/c/src/lib/libcpu/powerpc/mpc860/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/libcpu/powerpc/mpc860/vectors/Makefile.in b/c/src/lib/libcpu/powerpc/mpc860/vectors/Makefile.in index 9ca5b8d2cf..c80d9be8c1 100644 --- a/c/src/lib/libcpu/powerpc/mpc860/vectors/Makefile.in +++ b/c/src/lib/libcpu/powerpc/mpc860/vectors/Makefile.in @@ -8,6 +8,8 @@ VPATH = @srcdir@ RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ +INSTALL = @INSTALL@ + PGM=${ARCH}/vectors.rel # C source names, if any, go here -- minus the .c -- cgit v1.2.3