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

Stephan Bergmann sbergman at redhat.com
Mon Apr 23 09:53:24 UTC 2018


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

New commits:
commit 412642457f045bb7e5faa8bf50d0ad98e091a88a
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Apr 23 11:49:04 2018 +0200

    WIP: Split --with-help=html packages into non-locale and per-locale
    
    ...in preparation of packaging the per-locale data properly.
    
    non-locale: GeneratedPackage_html_media
                Package_html_dynamic
                Package_html_static
    
    per-locale: GeneratedPackage_html_lang_generated
                Package_html_lang
    
    This is the core part of a change that spans core and helpcontent2.
    
    Change-Id: I0e014649129f9ec498e5307c64807efa95eee0de

diff --git a/Repository.mk b/Repository.mk
index b0722e031a3d..69659692d042 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -952,8 +952,9 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo,\
     $(if $(filter OPENCL,$(BUILD_TYPE)),sc_opencl_runtimetest) \
     $(if $(and $(filter WNT,$(OS)), $(filter X86_64,$(CPUNAME))),twain_dsm) \
 	$(if $(ENABLE_HTMLHELP),\
-		helpcontent2_html \
-		helpcontent2_html_generated \
+		helpcontent2_html_dynamic \
+		helpcontent2_html_lang \
+		helpcontent2_html_lang_generated \
 		helpcontent2_html_media \
 		helpcontent2_html_static \
 	) \


More information about the Libreoffice-commits mailing list