diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2017-09-24 19:59:43 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2017-09-25 09:27:58 +0200 |
| commit | d383d0e9852ac52c36b138c33ce3b3ede8df9215 (patch) | |
| tree | 006e0ef17439214d104b2c0651b459c6d132dd73 /postprocess | |
| parent | 59ec0fe032badfb9dae59f27e97f842c11c60d98 (diff) | |
Install fc_local.conf only where used
...and at least issue a SAL_INFO when it's missing (there may theoretically be
multiple directories, and it need not be present in every one, so nothing
stronger than SAL_INFO can be used)
Change-Id: I9b7257a551626e5ad081cfb75422a8bd71b86aa4
Reviewed-on: https://gerrit.libreoffice.org/42714
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Tested-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'postprocess')
| -rw-r--r-- | postprocess/Module_postprocess.mk | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/postprocess/Module_postprocess.mk b/postprocess/Module_postprocess.mk index d92a348e4142..6ab59fcc59c1 100644 --- a/postprocess/Module_postprocess.mk +++ b/postprocess/Module_postprocess.mk @@ -28,11 +28,13 @@ $(eval $(call gb_Module_add_targets,postprocess,\ )) endif -# For non-WNT, add instdir/share/fonts/truetype/fc_local.conf when it shall +# For configurations that use fontconfig (cf. inclusion of +# vcl/unx/generic/fontmanager/fontconfig.cxx in Library_vcl), add +# instdir/share/fonts/truetype/fc_local.conf when it shall # contain content from at least one of external/more_fonts/fc_local.snippet # (conditional on MORE_FONTS in BUILD_TYPE) and # extras/source/truetype/symbol/fc_local.snippet (unconditional): -ifneq ($(OS),WNT) +ifneq ($(USING_X11)$(ENABLE_HEADLESS)$(filter ANDROID,$(OS)),) $(eval $(call gb_Module_add_targets,postprocess, \ CustomTarget_fontconfig \ Package_fontconfig \ |