[Libreoffice-commits] core.git: scp2/InstallModule_ooo.mk

[Rene Engelhard]

 scp2/InstallModule_ooo.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ab87f61b61d72a5d69ba4d4ef543953164848ac2
Author: Rene Engelhard <rene at debian.org>
Date:   Sun Jun 10 11:43:34 2018 +0200

    fix HSQLDB_JAR define in scp2/InstallModule_ooo.mk
    
    for one HSQLDB_JAR is already a path and secondly, gb_Helper_make_path
    doesn't even exist (anymore). It's supposed to end up in
    URE_MORE_JAVA_CLASSPATH_URLS so use gb_Helper_make_url
    
    Change-Id: I52c6117299caeb4fac8c894fc54564befc673e67
    Reviewed-on: https://gerrit.libreoffice.org/55552
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <Michael.Stahl at cib.de>

diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk
index f7f3c80867b2..8739b86cfdf9 100644
--- a/scp2/InstallModule_ooo.mk
+++ b/scp2/InstallModule_ooo.mk
@@ -33,7 +33,7 @@ $(eval $(call gb_InstallModule_define_if_set,scp2/ooo,\
 
 $(eval $(call gb_InstallModule_add_defs,scp2/ooo,\
 	$(if $(SYSTEM_HSQLDB),\
-		-DHSQLDB_JAR=\""$(call gb_Helper_make_path,$(HSQLDB_JAR))"\" \
+		-DHSQLDB_JAR=\""$(call gb_Helper_make_url,$(HSQLDB_JAR))"\" \
 	) \
 ))