Makefile.in | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 0f599b89a744defa80dcec1859df41670bac519e
Author: Tor Lillqvist <[email protected]>
Date: Thu Feb 28 22:37:24 2013 +0200
Fix Android and iOS build when SRCDIR!=BUILDDIR
Change-Id: I8906b736551c6ca9f96fec2df9d4b7fd12198f00
diff --git a/Makefile.in b/Makefile.in
index c9f8ccf..13c960e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -185,10 +185,10 @@ bootstrap: compilerplugins
build: bootstrap fetch $(if $(filter
$(INPATH),$(INPATH_FOR_BUILD)),,cross-toolset)
$(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) -f
$(SRCDIR)/Makefile.build all slowcheck
ifeq ($(OS),ANDROID)
- cd android && $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS)
+ $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) android
endif
ifeq ($(OS),IOS)
- cd ios && $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS)
+ $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) ios
endif
build-nocheck : export SKIP_TESTS := YES
_______________________________________________
Libreoffice-commits mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
