[Libreoffice-commits] .: Branch 'feature/gnumake4' - 3 commits - configure.in solenv/gbuild

[Bjoern Michaelsen]

 configure.in                  |    4 ++++
 solenv/gbuild/platform/ios.mk |    4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 06fea81558c6f77c5836801a75b5418f5e0b4bec
Merge: 22d71ab... 0e056e7...
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Wed Jun 22 18:49:05 2011 +0200

    Merge branch 'master' into feature/gnumake4

commit 0e056e7844ebd5c401d5e3d71c3a223c4add8caf
Author: Tor Lillqvist <tml at iki.fi>
Date:   Wed Jun 15 21:29:32 2011 +0300

    Eeek, don't let ENABLE_GTK be set for iOS or Android

diff --git a/configure.in b/configure.in
index 58dfaab..ad04142 100755
--- a/configure.in
+++ b/configure.in
@@ -5634,6 +5634,10 @@ if test  "$_os" = "Darwin"; then
    fi
 fi
 
+if test $_os = iOS -o $_os = Android; then
+   enable_gtk=no
+fi
+
 dnl ***************************************
 dnl testing for X libraries and includes...
 dnl ***************************************
commit f8a2a8a230e156c13bb854b5cef69ab28aefdb1d
Author: Tor Lillqvist <tml at iki.fi>
Date:   Wed Jun 15 19:30:54 2011 +0300

    Use the BUILD platform rsc

diff --git a/solenv/gbuild/platform/ios.mk b/solenv/gbuild/platform/ios.mk
index c2215e2..d1ee20e 100644
--- a/solenv/gbuild/platform/ios.mk
+++ b/solenv/gbuild/platform/ios.mk
@@ -386,8 +386,8 @@ gb_SrsPartMergeTarget_TRANSEXPRECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib
 
 # SrsPartTarget class
 
-gb_SrsPartTarget_RSCTARGET := $(OUTDIR)/bin/rsc
-gb_SrsPartTarget_RSCCOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_SrsPartTarget_RSCTARGET)
+gb_SrsPartTarget_RSCTARGET := $(OUTDIR_FOR_BUILD)/bin/rsc
+gb_SrsPartTarget_RSCCOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR_FOR_BUILD)/lib SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(gb_SrsPartTarget_RSCTARGET)
 
 define gb_SrsPartTarget__command_dep
 $(call gb_Helper_abbreviate_dirs,\