changeset 3097:c90f5757f351

also install cross and native tools in separate destdir locations
author John W. Eaton <jwe@octave.org>
date Wed, 12 Dec 2012 10:00:54 -0500
parents 74304e21f1ab
children 4efa36d98001
files src/binutils.mk src/gcc.mk src/native-binutils.mk src/native-gcc.mk
diffstat 4 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/binutils.mk
+++ b/src/binutils.mk
@@ -38,4 +38,5 @@
         --disable-werror
     $(MAKE) -C '$(1)' -j '$(JOBS)'
     $(MAKE) -C '$(1)' -j 1 install
+    $(MAKE) -C '$(1)' -j 1 DESTDIR=$(PREFIX)/cross-tools install
 endef
--- a/src/gcc.mk
+++ b/src/gcc.mk
@@ -54,6 +54,7 @@
         $(shell [ `uname -s` == Darwin ] && echo "LDFLAGS='-Wl,-no_pie'")
     $(MAKE) -C '$(1).build' -j '$(JOBS)'
     $(MAKE) -C '$(1).build' -j 1 install
+    $(MAKE) -C '$(1).build' -j 1 DESTDIR=$(PREFIX)/../cross-tools install
 
     # create pkg-config script
     (echo '#!/bin/sh'; \
--- a/src/native-binutils.mk
+++ b/src/native-binutils.mk
@@ -38,5 +38,5 @@
         $(ENABLE_SHARED_OR_STATIC) \
         --disable-werror
     $(MAKE) -C '$(1)' -j '$(JOBS)'
-    $(MAKE) -C '$(1)' -j 1 DESTDIR='$(PREFIX)/../native' install
+    $(MAKE) -C '$(1)' -j 1 DESTDIR='$(PREFIX)/../native-tools' install
 endef
--- a/src/native-gcc.mk
+++ b/src/native-gcc.mk
@@ -55,7 +55,7 @@
         --with-native-system-header-dir=$(PREFIX)/$(TARGET)/include \
         $(shell [ `uname -s` == Darwin ] && echo "LDFLAGS='-Wl,-no_pie'")
     $(MAKE) -C '$(1).build' -j '$(JOBS)'
-    $(MAKE) -C '$(1).build' -j 1 DESTDIR='$(PREFIX)/../native' install
+    $(MAKE) -C '$(1).build' -j 1 DESTDIR='$(PREFIX)/../native-tools' install
 
     # # create pkg-config script
     # (echo '#!/bin/sh'; \