configure.in | 2 +- solenv/inc/startup/startup.mk | 2 +- solenv/inc/unitools.mk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
New commits: commit 4f769af98a340a47a01009465bf8ba8eb93509e0 Author: Tor Lillqvist <tlillqv...@suse.com> Date: Mon Jan 2 17:30:59 2012 +0200 Fix thinko: ==, not = diff --git a/solenv/inc/unitools.mk b/solenv/inc/unitools.mk index 3f8fc9e..6d7ef05 100644 --- a/solenv/inc/unitools.mk +++ b/solenv/inc/unitools.mk @@ -35,7 +35,7 @@ AUTODOC*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/autodoc LOCALIZE_SL*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/localize_sl GSICHECK*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/gsicheck -.IF "$(XSLTPROC)"="" +.IF "$(XSLTPROC)"=="" .IF "$(SYSTEM_LIBXSLT)"!="YES" XSLTPROC=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/xsltproc .ELSE # "$(SYSTEM_LIBXSLT)"!="YES" commit 004f9bd21f06288df976ff2d124959c2d7546dfa Author: Tor Lillqvist <tlillqv...@suse.com> Date: Mon Jan 2 17:25:39 2012 +0200 We have no MAKEFILE.MK or makefile.rc files diff --git a/solenv/inc/startup/startup.mk b/solenv/inc/startup/startup.mk index 0fa378c..565ab8c 100644 --- a/solenv/inc/startup/startup.mk +++ b/solenv/inc/startup/startup.mk @@ -101,7 +101,7 @@ $(NULLPRQ) .PHONY :; # Check for a Local project file, gets parsed before user makefile. .INCLUDE .IGNORE .NOINFER: "project.mk" -.MAKEFILES :- makefile.mk MAKEFILE.MK $(CONFIG_PROJECT)$/makefile.rc $(SOLARENV)$/inc$/found_no.mk +.MAKEFILES :- makefile.mk $(SOLARENV)$/inc$/found_no.mk LANG=C .EXPORT : LANG commit 08c7038f424a93746c867898769c9f8714247ec2 Author: Tor Lillqvist <tlillqv...@suse.com> Date: Mon Jan 2 13:57:56 2012 +0200 The Android NDK calls the CPU just "arm", not "armel" diff --git a/configure.in b/configure.in index ba05eae..efb7ca0 100644 --- a/configure.in +++ b/configure.in @@ -2750,7 +2750,7 @@ linux-androideabi*) case "$host_cpu" in - armel) + arm|armel) CPU=R CPUNAME=ARM OUTPATH=unxandr _______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits