summaryrefslogtreecommitdiffstats
path: root/c/src/exec/score/cpu/i960
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>1999-02-18 18:36:05 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>1999-02-18 18:36:05 +0000
commit8548fe0ae29eafea856090e742c1fd205ed4b0fb (patch)
treeb0f3515dadfdea2a2e12a587ea5a2adaab2229db /c/src/exec/score/cpu/i960
parent7908ba5b8139c73cc45bacb686199ca48c0d803c (diff)
downloadrtems-8548fe0ae29eafea856090e742c1fd205ed4b0fb.tar.bz2
Part of the automake VI patch from Ralf Corsepius <corsepiu@faw.uni-ulm.de>:
> 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).
Diffstat (limited to 'c/src/exec/score/cpu/i960')
-rw-r--r--c/src/exec/score/cpu/i960/Makefile.in2
-rw-r--r--c/src/exec/score/cpu/i960/rtems/Makefile.in2
-rw-r--r--c/src/exec/score/cpu/i960/rtems/score/Makefile.in6
-rw-r--r--c/src/exec/score/cpu/i960/wrap/Makefile.in6
4 files changed, 12 insertions, 4 deletions
diff --git a/c/src/exec/score/cpu/i960/Makefile.in b/c/src/exec/score/cpu/i960/Makefile.in
index 94424f094e..c7f8cfa74d 100644
--- a/c/src/exec/score/cpu/i960/Makefile.in
+++ b/c/src/exec/score/cpu/i960/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/exec/score/cpu/i960/rtems/Makefile.in b/c/src/exec/score/cpu/i960/rtems/Makefile.in
index 17f18d020a..d0b2dcce07 100644
--- a/c/src/exec/score/cpu/i960/rtems/Makefile.in
+++ b/c/src/exec/score/cpu/i960/rtems/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/exec/score/cpu/i960/rtems/score/Makefile.in b/c/src/exec/score/cpu/i960/rtems/score/Makefile.in
index 89ad3faaa1..f5ec665318 100644
--- a/c/src/exec/score/cpu/i960/rtems/score/Makefile.in
+++ b/c/src/exec/score/cpu/i960/rtems/score/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)
@@ -50,10 +52,10 @@ CLEAN_ADDITIONS +=
CLOBBER_ADDITIONS += $(BUILT_SOURCES)
# Install the program(s), appending _g or _p as appropriate.
-# for include files, just use $(INSTALL)
+# for include files, just use $(INSTALL_CHANGE)
all: install-headers
install-headers: ${H_FILES}
- $(INSTALL) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems/score
+ $(INSTALL_CHANGE) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems/score
preinstall: install-headers
diff --git a/c/src/exec/score/cpu/i960/wrap/Makefile.in b/c/src/exec/score/cpu/i960/wrap/Makefile.in
index 78edad009a..4edebda907 100644
--- a/c/src/exec/score/cpu/i960/wrap/Makefile.in
+++ b/c/src/exec/score/cpu/i960/wrap/Makefile.in
@@ -15,6 +15,8 @@ VPATH = @srcdir@/..
RTEMS_ROOT = @top_srcdir@
PROJECT_ROOT = @PROJECT_ROOT@
+INSTALL = @INSTALL@
+
RELS=../$(ARCH)/rtems-cpu.rel
# C source names, if any, go here -- minus the .c
@@ -65,8 +67,8 @@ CLOBBER_ADDITIONS +=
all: ${ARCH} $(SRCS) preinstall $(OBJS) $(RELS)
# Install the program(s), appending _g or _p as appropriate.
-# for include files, just use $(INSTALL)
+# for include files, just use $(INSTALL_CHANGE)
install: all
preinstall: ${ARCH}
- $(INSTALL) -m 444 ${H_FILES} $(PROJECT_INCLUDE)
+ $(INSTALL_CHANGE) -m 444 ${H_FILES} $(PROJECT_INCLUDE)