[Libreoffice-commits] .: solenv/inc

[Tor Lillqvist]

 solenv/inc/antsettings.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit fa07a2b41563184bbca4a7f0b061193031f87bac
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Fri Jul 22 10:31:22 2011 +0300

    Use correct solar.jar when cross-compiling

diff --git a/solenv/inc/antsettings.mk b/solenv/inc/antsettings.mk
index fda4a82..0137e33 100644
--- a/solenv/inc/antsettings.mk
+++ b/solenv/inc/antsettings.mk
@@ -82,7 +82,7 @@ JAVA_HOME=
 ANT_FLAGS!:=$(ANT_COMPILER_FLAGS) -Dprj=$(PRJ) -Dprjname=$(PRJNAME) $(ANT_JAVA_VER_FLAGS) \
  -Ddebug=$(ANT_DEBUG) -Doptimize=$(ANT_OPT) -Dtarget=$(TARGET) -Dsolar.update=on \
  -Dout=$(OUT) -Dinpath=$(INPATH) -Dproext="$(PROEXT)" -Dsolar.bin=$(SOLARBINDIR) \
- -Dsolar.jar=$(SOLARBINDIR) -Dsolar.doc=$(SOLARDOCDIR) -Dcommon.jar=$(SOLARCOMMONBINDIR) \
+ -Dsolar.jar=$(SOLARVER)/$(INPATH)/bin -Dsolar.doc=$(SOLARDOCDIR) -Dcommon.jar=$(SOLARCOMMONBINDIR) \
  -Dcommon.doc=$(SOLARCOMMONDOCDIR) -Dsolar.sourceversion=$(SOURCEVERSION) \
  -Dsolar.lastminor=$(LAST_MINOR) -Dsolar.build=$(BUILD) -f $(ANT_BUILDFILE) $(ANT_FLAGS) \
  -emacs $(ANT_VERBOSE)