summaryrefslogtreecommitdiffstats
path: root/tools/cpu
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 /tools/cpu
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 'tools/cpu')
-rw-r--r--tools/cpu/Makefile.in2
-rw-r--r--tools/cpu/generic/Makefile.in6
-rw-r--r--tools/cpu/sh/Makefile.in6
-rw-r--r--tools/cpu/unix/Makefile.in6
4 files changed, 14 insertions, 6 deletions
diff --git a/tools/cpu/Makefile.in b/tools/cpu/Makefile.in
index 6dba1f38f6..72d96812df 100644
--- a/tools/cpu/Makefile.in
+++ b/tools/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/tools/cpu/generic/Makefile.in b/tools/cpu/generic/Makefile.in
index 33c2fb81dd..d81dfe5ffa 100644
--- a/tools/cpu/generic/Makefile.in
+++ b/tools/cpu/generic/Makefile.in
@@ -12,6 +12,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/leaf.cfg
include $(RTEMS_ROOT)/make/rtems.cfg
@@ -28,9 +30,9 @@ INSTALLED_PGMS=$(PGMS:%=$(DESTDIR)/%)
all: $(DESTDIR) $(PGMS) install
$(DESTDIR):
- @INSTALL@ $(INSTDIRFLAGS) $@
+ @top_srcdir@/mkinstalldirs $@
$(INSTALLED_PGMS): $(PGMS)
- @INSTALL@ $(INSTBINFLAGS) $^ $@
+ $(INSTALL) $(INSTBINFLAGS) $^ $@
install: $(DESTDIR) $(INSTALLED_PGMS)
diff --git a/tools/cpu/sh/Makefile.in b/tools/cpu/sh/Makefile.in
index 61cbdc988b..75537ef4ca 100644
--- a/tools/cpu/sh/Makefile.in
+++ b/tools/cpu/sh/Makefile.in
@@ -10,6 +10,8 @@ VPATH = @srcdir@
RTEMS_ROOT = @top_srcdir@
PROJECT_ROOT = @PROJECT_ROOT@
+INSTALL = @INSTALL@
+
# we use the host compiler here
USE_HOST_COMPILER=yes
@@ -55,8 +57,8 @@ ${PGMS}: $(OBJS) $(LINK_FILES)
$(make-exe)
$(DESTDIR):
- @INSTALL@ $(INSTDIRFLAGS) $@
+ @top_srcdir@/mkinstalldirs $@
# Install the program
install: $(DESTDIR) $(PGMS)
- @INSTALL@ $(INSTBINFLAGS) ${PGMS} $(DESTDIR)
+ $(INSTALL) $(INSTBINFLAGS) ${PGMS} $(DESTDIR)
diff --git a/tools/cpu/unix/Makefile.in b/tools/cpu/unix/Makefile.in
index 0b8402d15f..75320594ea 100644
--- a/tools/cpu/unix/Makefile.in
+++ b/tools/cpu/unix/Makefile.in
@@ -8,6 +8,8 @@ VPATH = @srcdir@
RTEMS_ROOT = @top_srcdir@
PROJECT_ROOT = @PROJECT_ROOT@
+INSTALL = @INSTALL@
+
# we use host compiler here for gensize. Hopefully it has same alignment!!
USE_HOST_COMPILER=yes
@@ -52,7 +54,7 @@ CLOBBER_ADDITIONS +=
all: preinstall
preinstall: ${ARCH} $(SRCS) $(PGMS)
- @INSTALL@ $(INSTBINFLAGS) $(PGMS) ${PROJECT_RELEASE}/bin
+ $(INSTALL) $(INSTBINFLAGS) $(PGMS) ${PROJECT_RELEASE}/bin
# Install the program(s), appending _g or _p as appropriate.
-# for include files, just use $(INSTALL)
+# for include files, just use $(INSTALL_CHANGE)