[Libreoffice-commits] core.git: connectivity/Jar_sdbc_hsqldb.mk

Stephan Bergmann sbergman at redhat.com
Thu Sep 25 11:39:13 PDT 2014


 connectivity/Jar_sdbc_hsqldb.mk |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 13da98f99f0d696a5e2b489600a4eeb0ad832e6c
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Sep 25 20:38:38 2014 +0200

    fdo#84284: Adapt jar Class-Path to new Mac OS X LibreOffice.app layout
    
    Change-Id: If5a04b7b9ab6c7909cf089f7e935f9c08ea31948

diff --git a/connectivity/Jar_sdbc_hsqldb.mk b/connectivity/Jar_sdbc_hsqldb.mk
index 7519bf1..20cd1f8 100644
--- a/connectivity/Jar_sdbc_hsqldb.mk
+++ b/connectivity/Jar_sdbc_hsqldb.mk
@@ -14,9 +14,8 @@ $(eval $(call gb_Jar_use_externals,sdbc_hsqldb,\
 	hsqldb \
 ))
 
-# FIXME: is this really necessary?
 $(eval $(call gb_Jar_add_manifest_classpath,sdbc_hsqldb,\
-	.. \
+	$(if $(filter MACOSX,$(OS)),../../Frameworks/,..) \
 ))
 
 $(eval $(call gb_Jar_set_packageroot,sdbc_hsqldb,com))


More information about the Libreoffice-commits mailing list