From a67e6ae04086f2f60bb9747fbfc09a5a3d303d84 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Mon, 29 Sep 2014 22:08:29 +0200
Subject: Precise, platform-specific Class-Path path for NativeLibraryLoader
 use

Change-Id: I01a521f5d5104bf2e6046330e2d667155c27a604
---
 jurt/Jar_jurt.mk | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'jurt')

diff --git a/jurt/Jar_jurt.mk b/jurt/Jar_jurt.mk
index da814ee70c25..aed0d05a34cd 100644
--- a/jurt/Jar_jurt.mk
+++ b/jurt/Jar_jurt.mk
@@ -19,7 +19,11 @@ $(eval $(call gb_Jar_set_packageroot,jurt,com))
 $(eval $(call gb_Jar_set_manifest,jurt,$(SRCDIR)/jurt/util/manifest))
 
 $(eval $(call gb_Jar_add_manifest_classpath,jurt, \
-    ridl.jar unoloader.jar ../../lib/ ../bin/))
+    ridl.jar \
+    unoloader.jar \
+	$(if $(filter MACOSX,$(OS)),../../Frameworks/, \
+		$(if $(filter WNT,$(OS)),../bin/,../../lib/)) \
+))
 
 $(eval $(call gb_Jar_add_sourcefiles,jurt,\
     jurt/com/sun/star/comp/bridgefactory/BridgeFactory \
-- 
cgit