bridges/Jar_java_uno.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
New commits: commit 2311c8d6771e15bb7573eca6681775256bc94826 Author: Stephan Bergmann <[email protected]> Date: Mon Sep 29 21:57:41 2014 +0200 Precise, platform-specific Class-Path path for NativeLibraryLoader use Change-Id: I4aecc887fc4654618444616ef83ff71266a2f93a diff --git a/bridges/Jar_java_uno.mk b/bridges/Jar_java_uno.mk index 13a50cf..0bab303 100644 --- a/bridges/Jar_java_uno.mk +++ b/bridges/Jar_java_uno.mk @@ -20,9 +20,9 @@ $(eval $(call gb_Jar_set_packageroot,java_uno,com)) $(eval $(call gb_Jar_add_manifest_classpath,java_uno,\ ridl.jar \ - jurt.jar \ - ../../lib/ \ - ../bin/ \ + jurt.jar \ + $(if $(filter MACOSX,$(OS)),../../Frameworks/, \ + $(if $(filter WNT,$(OS)),../bin/,../../lib/)) \ )) $(eval $(call gb_Jar_add_sourcefiles,java_uno,\ _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
