summaryrefslogtreecommitdiffstats
path: root/tools/build
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/build
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/build')
-rw-r--r--tools/build/Makefile.in2
-rw-r--r--tools/build/os/Makefile.in2
-rw-r--r--tools/build/os/msdos/Makefile.in4
-rw-r--r--tools/build/scripts/Makefile.in6
-rw-r--r--tools/build/src/Makefile.in6
5 files changed, 15 insertions, 5 deletions
diff --git a/tools/build/Makefile.in b/tools/build/Makefile.in
index ad819e8214..e58758025b 100644
--- a/tools/build/Makefile.in
+++ b/tools/build/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/build/os/Makefile.in b/tools/build/os/Makefile.in
index d540e58fa0..884a8c9b9e 100644
--- a/tools/build/os/Makefile.in
+++ b/tools/build/os/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/build/os/msdos/Makefile.in b/tools/build/os/msdos/Makefile.in
index 23a840d33a..bcd523fb64 100644
--- a/tools/build/os/msdos/Makefile.in
+++ b/tools/build/os/msdos/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/leaf.cfg
@@ -20,7 +22,7 @@ INSTALLED=$(DESTDIR)/ifc.exe \
all: $(DESTDIR) $(PGMS) install
$(DESTDIR):
- @INSTALL@ $(INSTDIRFLAGS) $@
+ @top_srcdir@/mkinstalldirs $@
install: $(INSTALLED)
diff --git a/tools/build/scripts/Makefile.in b/tools/build/scripts/Makefile.in
index 753bfafaa5..eaf1dd397f 100644
--- a/tools/build/scripts/Makefile.in
+++ b/tools/build/scripts/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) $^ $(DESTDIR)
+ $(INSTALL) $(INSTBINFLAGS) $^ $(DESTDIR)
install: $(DESTDIR) $(INSTALLED_PGMS)
diff --git a/tools/build/src/Makefile.in b/tools/build/src/Makefile.in
index 52942d909f..415017a9aa 100644
--- a/tools/build/src/Makefile.in
+++ b/tools/build/src/Makefile.in
@@ -19,6 +19,8 @@ VPATH = @srcdir@
RTEMS_ROOT = @top_srcdir@
PROJECT_ROOT = @PROJECT_ROOT@
+INSTALL = @INSTALL@
+
# we use host compiler in this directory
USE_HOST_COMPILER=yes
@@ -64,7 +66,7 @@ CLOBBER_ADDITIONS +=
DESTDIR=${PROJECT_RELEASE}/build-tools
$(DESTDIR):
- @INSTALL@ $(INSTDIRFLAGS) $@
+ @top_srcdir@/mkinstalldirs $@
all: $(ARCH) $(DESTDIR) $(SRCS) $(PGMS)
- @INSTALL@ $(INSTBINFLAGS) $(PGMS) $(DESTDIR)
+ $(INSTALL) $(INSTBINFLAGS) $(PGMS) $(DESTDIR)