[Libreoffice-commits] .: 2 commits - solenv/gbuild wizards/Jar_commonwizards.mk

[Tor Lillqvist]

 solenv/gbuild/platform/winmingw.mk |    1 +
 wizards/Jar_commonwizards.mk       |   10 +++++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

New commits:
commit f3cb2824a260c0ced6c90bf0f2515f8203532b76
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Mon Aug 15 19:51:15 2011 +0300

    Use OUTDIR_FOR_BUILD which is where our jars go when cross-compiling

diff --git a/wizards/Jar_commonwizards.mk b/wizards/Jar_commonwizards.mk
index b2dbb4a..876b327 100644
--- a/wizards/Jar_commonwizards.mk
+++ b/wizards/Jar_commonwizards.mk
@@ -29,11 +29,11 @@
 $(eval $(call gb_Jar_Jar,commonwizards,SRCDIR))
 
 $(eval $(call gb_Jar_add_jars,commonwizards,\
-	$(OUTDIR)/bin/ridl.jar \
-	$(OUTDIR)/bin/unoil.jar \
-	$(OUTDIR)/bin/jurt.jar \
-	$(OUTDIR)/bin/juh.jar \
-	$(OUTDIR)/bin/java_uno.jar \
+	$(OUTDIR_FOR_BUILD)/bin/ridl.jar \
+	$(OUTDIR_FOR_BUILD)/bin/unoil.jar \
+	$(OUTDIR_FOR_BUILD)/bin/jurt.jar \
+	$(OUTDIR_FOR_BUILD)/bin/juh.jar \
+	$(OUTDIR_FOR_BUILD)/bin/java_uno.jar \
 ))
 
 $(eval $(call gb_Jar_set_packageroot,commonwizards,com))
commit d8fbe601040b31f9127ee3796ce7a79b47f3f683
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Mon Aug 15 19:49:56 2011 +0300

    Add gb_CLASSPATHSEP

diff --git a/solenv/gbuild/platform/winmingw.mk b/solenv/gbuild/platform/winmingw.mk
index ad66871..1d28767 100644
--- a/solenv/gbuild/platform/winmingw.mk
+++ b/solenv/gbuild/platform/winmingw.mk
@@ -41,6 +41,7 @@ gb_CC := $(CC)
 gb_CXX := $(CXX)
 gb_AR := $(shell $(CC) -print-prog-name=ar)
 gb_AWK := awk
+gb_CLASSPATHSEP := :
 gb_RC := $(WINDRES)
 ifeq ($(USE_MINGW),cygwin)
 gb_MINGWLIBDIR := $(COMPATH)/lib/mingw