diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-11-28 11:48:22 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-11-28 11:57:28 +0100 |
| commit | 45ca1bfc22f5d6857aeefc1e444f369cf6519805 (patch) | |
| tree | 47b0ca41002ac8adbb00f2a7d8bff916c0466c06 /javaunohelper/Jar_juh.mk | |
| parent | eef94c1655605ce890f182e31f3cc64ee3748625 (diff) | |
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
Diffstat (limited to 'javaunohelper/Jar_juh.mk')
| -rw-r--r-- | javaunohelper/Jar_juh.mk | 7 |
1 files changed, 6 insertions, 1 deletions
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)) |