diff options
| author | Michael Stahl <mstahl@redhat.com> | 2017-06-02 12:34:47 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2017-06-02 16:34:53 +0200 |
| commit | f8de1df4be6c97f279dd344ef14e2967d848bd32 (patch) | |
| tree | a5ea4f6f0e5a8c660cc5c4e7c506ea17892d617d /Repository.mk | |
| parent | fbed35762a6b14e8fda5179e320a9c30fd426454 (diff) | |
scp2: move fonts to AutoInstall
Add new PACKAGE_FILELIST_FONT
The DONT_DELETE style has no effect for files.
The FONT_WARN_IF_EXISTS style has no effect.
Change-Id: Id062ada0a680341c01827e457b1166d625afe8cc
Diffstat (limited to 'Repository.mk')
| -rw-r--r-- | Repository.mk | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/Repository.mk b/Repository.mk index de4cded208c5..3e8fccfcdc36 100644 --- a/Repository.mk +++ b/Repository.mk @@ -799,10 +799,8 @@ $(eval $(call gb_Helper_register_packages, \ cli_basetypes_copy \ desktop_install \ $(if $(filter DESKTOP,$(BUILD_TYPE)),desktop_scripts_install) \ - extras_fonts \ extras_wordbook \ $(if $(filter MSC,$(COM)),msvc_dlls) \ - more_fonts_conf \ instsetoo_native_setup \ $(if $(ENABLE_OOENV),instsetoo_native_ooenv) \ odk_headers_generated \ @@ -955,6 +953,25 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo,\ $(if $(filter OPENCL,$(BUILD_TYPE)),sc_opencl_runtimetest) \ )) +$(eval $(call gb_Helper_register_packages_for_install,ooo_fonts,\ + extras_fonts \ + $(call gb_Helper_optional,MORE_FONTS,\ + fonts_caladea \ + fonts_carlito \ + fonts_dejavu \ + fonts_emojione_color \ + fonts_gentium \ + fonts_liberation \ + fonts_liberation_narrow \ + fonts_libertineg \ + fonts_opensans \ + fonts_ptserif \ + fonts_sourcecode \ + fonts_sourcesans \ + $(if $(filter-out WNT,$(OS)),more_fonts_conf) \ + ) \ +)) + $(eval $(call gb_Helper_register_packages_for_install,ooo_images,\ postprocess_images \ $(call gb_Helper_optional,HELP,helpcontent2_helpimages) \ |