[Libreoffice-commits] help.git: Branch 'libreoffice-6-4' - CustomTarget_html.mk

[Olivier Hallot (via logerrit)]

 CustomTarget_html.mk |   12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

New commits:
commit 61e70da6435aef75d177b227f079fd805f283f60
Author:     Olivier Hallot <olivier.hallot at libreoffice.org>
AuthorDate: Sun Dec 1 09:19:13 2019 -0300
Commit:     Olivier Hallot <olivier.hallot at libreoffice.org>
CommitDate: Sun Dec 1 13:23:59 2019 +0100

    Add dep's for xapian-omindex build
    
    Change-Id: If3e3efbb04e40c906618aec8da5552560bd0678e
    Reviewed-on: https://gerrit.libreoffice.org/84146
    Tested-by: Jenkins
    Reviewed-by: Olivier Hallot <olivier.hallot at libreoffice.org>

diff --git a/CustomTarget_html.mk b/CustomTarget_html.mk
index 0a0f39dc1..5ee580350 100644
--- a/CustomTarget_html.mk
+++ b/CustomTarget_html.mk
@@ -20,12 +20,12 @@ $(eval $(call gb_CustomTarget_register_targets,helpcontent2/help3xsl,\
 	$(foreach lang,$(gb_HELP_LANGS),\
 		$(lang)/bookmarks.js \
 		$(lang)/contents.js \
-		$(if $(HELP_OMINDEX_PAGE),$(lang)/xap_tpl) \
 		$(lang)/html.text \
-		$(lang)/langnames.js \
 		$(foreach module,$(html_TREE_MODULES),$(module)/$(lang)/contents.part) \
 		$(foreach module,$(html_BMARK_MODULES),$(firstword $(subst :, ,$(module)))/$(lang)/bookmarks.part) \
 		$(foreach module,$(html_TEXT_MODULES),filelists/html-help/$(module)/$(lang).filelist) \
+		$(lang)/langnames.js \
+		$(if $(HELP_OMINDEX_PAGE),$(lang)/xap_tpl) \
 	) \
 ))
 
@@ -57,6 +57,14 @@ $(call gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/hid2file.js : \
 # Xapian localized templates
 ifeq ($(HELP_OMINDEX_PAGE),TRUE)
 
+define html_gen_xaptpl_dep
+$(call gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/$(1)/xap_tpl : \
+	$(if $(filter en-US,$(1)),$(SRCDIR),$(call gb_HelpTranslatePartTarget_get_workdir,$(1)))/helpcontent2/source/text/shared/help/browserhelp.xhp
+
+endef
+	
+$(eval $(foreach lang,$(gb_HELP_LANGS),$(call html_gen_xaptpl_dep,$(lang))))
+
 $(call gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/%/xap_tpl : \
 		$(SRCDIR)/helpcontent2/help3xsl/xap_templ_query.xsl \
 		$(call gb_ExternalExecutable_get_dependencies,xsltproc) \