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

[Stephan Bergmann]

 Repository.mk |   10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

New commits:
commit 0ada546b16be51f2b2ec430d99b5c44b9f1e00ad
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Apr 20 15:28:56 2018 +0200

    WIP: Include --with-help=html in installation sets
    
    As a first step, include all the instdir/help/* content that comes from
    helpcontent2 (there's also some *.xsl files there coming from xmlhelp?) in the
    ooo base module:
    
      instdir/help/default.css
                   fuse.js
                   help.html
                   help.js
                   help2.js
                   hid2file.js
                   index.html
                   media/
                   normalize.css
                   paginathing.js
                   en-US/
                   <any other locale>/
    
    The locale-independent parts could remain in the ooo base module or could be
    split out into some help module (esp. the media/ tree may grow large?).  The
    per-locale sub-dirs will definitely need to be split into locale-specific
    modules in a next step.
    
    Change-Id: I3e7b1b0e9c965372a23a51ed8ddc809e395fd891
    Reviewed-on: https://gerrit.libreoffice.org/53213
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/Repository.mk b/Repository.mk
index 81268953a3a3..b0722e031a3d 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -802,10 +802,6 @@ $(eval $(call gb_Helper_register_packages, \
 	test_unittest \
 	cli_basetypes_copy \
 	extras_wordbook \
-	$(if $(ENABLE_HTMLHELP),\
-		helpcontent2_html_static \
-		helpcontent2_html \
-	) \
 	instsetoo_native_setup \
 	$(if $(ENABLE_OOENV),instsetoo_native_ooenv) \
 	postprocess_registry \
@@ -955,6 +951,12 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo,\
 	sfx2_classification \
     $(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_media \
+		helpcontent2_html_static \
+	) \
 ))
 
 $(eval $(call gb_Helper_register_packages_for_install,ooo_fonts,\