diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-09-29 21:57:41 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-09-29 21:57:41 +0200 |
| commit | 2311c8d6771e15bb7573eca6681775256bc94826 (patch) | |
| tree | 61c27f76fa125c7bb0a30d1cfc8444119ba31764 /bridges | |
| parent | ca537697804c22eeed1b52b2540e9d02c7cdebed (diff) | |
Precise, platform-specific Class-Path path for NativeLibraryLoader use
Change-Id: I4aecc887fc4654618444616ef83ff71266a2f93a
Diffstat (limited to 'bridges')
| -rw-r--r-- | bridges/Jar_java_uno.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/bridges/Jar_java_uno.mk b/bridges/Jar_java_uno.mk index 13a50cf9cab7..0bab30368f3c 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,\ |