RepositoryExternal.mk | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit c4db7aa8ac9b0db07d6143e8f8149293b17b6f3c
Author: Tor Lillqvist <t...@collabora.com>
Date: Thu Nov 19 16:06:49 2015 +0200
Don't register a glyphy package if we aren't actually building it
Hopefully fixes the Mac tb.
Change-Id: I4786e060009e5232fc7d5ae200fec15334411c57
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index c87e0e4..302126b 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -284,9 +284,9 @@ $(call gb_LinkTarget_add_libs,$(1),$(GLYPHY_LIBS))
endef
else # !SYSTEM_GLYPHY
-$(eval $(call gb_Helper_register_packages_for_install,ooo,\
+$(eval $(gb_Helper_optional,GLYPHY,$(call
gb_Helper_register_packages_for_install,ooo,\
glyphy \
-))
+)))
define gb_LinkTarget__use_glyphy
$(call gb_LinkTarget_use_package,$(1),glyphy)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
