[Libreoffice-commits] core.git: Repository.mk

Stephan Bergmann sbergman at redhat.com
Mon Sep 25 08:59:13 UTC 2017


 Repository.mk |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 00d247353e793ed3348b013212a9f838615b8203
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Sep 25 10:58:03 2017 +0200

    Adapt Repository.mk to d383d0e9852ac52c36b138c33ce3b3ede8df9215
    
    ..."Install fc_local.conf only where used"
    
    Change-Id: I3c10a77f37add8731d9844566c4ba364b34d8da1

diff --git a/Repository.mk b/Repository.mk
index c5924473eafa..09c9ea20d0e6 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -943,7 +943,8 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo,\
 
 $(eval $(call gb_Helper_register_packages_for_install,ooo_fonts,\
 	extras_fonts \
-	$(if $(filter-out WNT,$(OS)),postprocess_fontconfig) \
+	$(if $(USING_X11)$(ENABLE_HEADLESS)$(filter ANDROID,$(OS)), \
+		postprocess_fontconfig) \
 	$(call gb_Helper_optional,MORE_FONTS,\
 		fonts_caladea \
 		fonts_carlito \


More information about the Libreoffice-commits mailing list