[Libreoffice-commits] .: saxon/ExternalProject_saxon.mk

Wed Oct 3 08:58:28 PDT 2012

saxon/ExternalProject_saxon.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 088a01467372a945e7f311678d3cf529cab72dcd
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date:   Wed Oct 3 17:15:30 2012 +0200

    $SOLARBINDIR is not defined in gbuild, replace with $OUTDIR/bin
    
    Otherwise build won't find jsr173_1.0_api.jar, breaking the build when
    using JDK 1.5 (i.e. Mac PPC and others)
    
    Change-Id: I8de0b42d4b14b4da5fe9216515fae94bbfc77b27
    Reviewed-on: https://gerrit.libreoffice.org/757
    Reviewed-by: LuboÅ¡ LuÅˆÃ¡k <l.lunak at suse.cz>
    Tested-by: LuboÅ¡ LuÅˆÃ¡k <l.lunak at suse.cz>

diff --git a/saxon/ExternalProject_saxon.mk b/saxon/ExternalProject_saxon.mk
index 03f0b94..a5c983b 100644
--- a/saxon/ExternalProject_saxon.mk
+++ b/saxon/ExternalProject_saxon.mk
@@ -32,7 +32,7 @@ $(call gb_ExternalProject_get_state_target,saxon,build) :
 				-Dant.build.javac.target=$(JAVA_TARGET_VER) \
 		) \
 		$(if $(debug),-Dbuild.debug="on") \
-		-Dsolarbindir=$(SOLARBINDIR) jar-bj && \
+		-Dsolarbindir=$(OUTDIR)/bin jar-bj && \
 	touch $@
 
 # vim: set noet sw=4 ts=4:
