From 45ca1bfc22f5d6857aeefc1e444f369cf6519805 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Fri, 28 Nov 2014 11:48:22 +0100
Subject: Fold URE: Linux ure/lib/* -> program/

The ../../../program/ links in the URE jar Class-Paths are a temporary kludge
(and juh.jar had lacked adaption for Mac OS X).

Change-Id: I2542d8a582866485dd61c05df3fc6b4b39a8403d
---
 javaunohelper/Jar_juh.mk | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'javaunohelper/Jar_juh.mk')

diff --git a/javaunohelper/Jar_juh.mk b/javaunohelper/Jar_juh.mk
index 32f7449049c0..7405ac756b29 100644
--- a/javaunohelper/Jar_juh.mk
+++ b/javaunohelper/Jar_juh.mk
@@ -16,7 +16,12 @@ $(eval $(call gb_Jar_use_jars,juh,\
 
 $(eval $(call gb_Jar_set_packageroot,juh,com))
 
-$(eval $(call gb_Jar_add_manifest_classpath,juh,ridl.jar jurt.jar ../../lib/ ../bin/))
+$(eval $(call gb_Jar_add_manifest_classpath,juh, \
+    jurt.jar \
+    ridl.jar \
+    $(if $(filter MACOSX,$(OS)),../../Frameworks/, \
+        $(if $(filter WNT,$(OS)),../bin/,../../../program/)) \
+))
 
 $(eval $(call gb_Jar_set_manifest,juh,$(SRCDIR)/javaunohelper/util/manifest))
 
-- 
cgit