summaryrefslogtreecommitdiff
path: root/external
diff options
context:
space:
mode:
authorAndras Timar <andras.timar@collabora.com>2019-03-26 15:07:50 +0100
committerMichael Meeks <michael.meeks@collabora.com>2019-03-26 16:55:41 +0100
commitf69ae64c7ed3cf21eb48ccb43d4bedcaf77fa984 (patch)
tree7506bdbc74da5104fe1163ccf8ba2a91f8dd5729 /external
parent77a735be8a2196e890e88662fe73816fa44dd023 (diff)
Do not include Culmus fonts (GPLv2) into MPL subset
Change-Id: I8de0e8e91d785d51b65ce884caddcc05d86bd47d Reviewed-on: https://gerrit.libreoffice.org/69756 Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Michael Meeks <michael.meeks@collabora.com>
Diffstat (limited to 'external')
-rw-r--r--external/more_fonts/Module_more_fonts.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/external/more_fonts/Module_more_fonts.mk b/external/more_fonts/Module_more_fonts.mk
index 023e21361d39..57bf4548783a 100644
--- a/external/more_fonts/Module_more_fonts.mk
+++ b/external/more_fonts/Module_more_fonts.mk
@@ -14,7 +14,7 @@ $(eval $(call gb_Module_add_targets,more_fonts,\
ExternalPackage_amiri \
ExternalPackage_caladea \
ExternalPackage_carlito \
- ExternalPackage_culmus \
+ $(if $(MPL_SUBSET),,ExternalPackage_culmus) \
ExternalPackage_dejavu \
ExternalPackage_gentium \
ExternalPackage_kacst \
@@ -33,7 +33,7 @@ $(eval $(call gb_Module_add_targets,more_fonts,\
UnpackedTarball_amiri \
UnpackedTarball_caladea \
UnpackedTarball_carlito \
- UnpackedTarball_culmus \
+ $(if $(MPL_SUBSET),,UnpackedTarball_culmus) \
UnpackedTarball_dejavu \
UnpackedTarball_gentium \
UnpackedTarball_kacst \