Properly handle language-specific parts of --with-help=html media/ sub-tree

...that previously ended up in language-independent parts of installation sets.

The structure of that media/ tree doesn't allow to directly mis-use the existing
AllLangPackage machinery (which expects the language to be encoded in the first
pathname segment within the tree; and which is already mis-used for the
helpcontent2/AllLangPackage_html_lang.mk parts).

So introduce gb_AllLangPackage_add_files_for_lang that allows to specify the
language explicitly, independent of where it is encoded in the pathname (if at
all).  The underlying gb_AllLangPackage_add_file sets a
gb_AllLangPackage_ALLDIRS that is used by `make packageinfo`, which may need
further fixing by anybody actually using that target; see the mail thread
starting at
<https://lists.freedesktop.org/archives/libreoffice/2018-May/080242.html>
"Broken --with-help=html `make packageinfo`".

All files in $(SRCDIR)/helpcontent2/source/media/ must now explicitly be listed
in either helpcontent2/Package_html_media.mk (for the language-independent
files) or helpcontent2/AllLangPackage_html_media_lang.mk (for the language-
specific files).  Also note the two TODOs in
helpcontent2/AllLangPackage_html_media_lang.mk.

What is not quite right yet is that content from
helpcontent2/AllLangPackage_html_lang.mk and
helpcontent2/AllLangPackage_html_media_lang.mk is ending up in both per-language
helpcontent installation sets (as intended, via the instructions in
helpcontent2/CustomTarget_html.mk) and per-language languagepack installation
sets (which is unintended).  This needs to be fixed with a follow-up commit.

This is the helpcontent2 part of a commit spanning core and helpcontent2.

Change-Id: Ie7916b75eee0dde3106e784d19e99fde5bb93195
Reviewed-on: https://gerrit.libreoffice.org/54749
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>

1 files changed, 6 insertions, 4 deletions

diff --git a/CustomTarget_html.mk b/CustomTarget_html.mk
index e4c1626e5d..1cd42d9a91 100644
--- a/CustomTarget_html.mk
+++ b/CustomTarget_html.mk
@@ -176,17 +176,19 @@ $(call gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/%/bookmarks.part : \
 # $(module)/$(lang).filelist files containing lists of files (in instdir) for the corresponding
 # module/lang parts of help data.  As a hack, generate those from the existing HelpTarget file
 # lists, which specify the original .xhp files (in SRCDIR for en-US, translated for all other
-# langs).  For the shared module, also include the per-lang non .xhp/.html files from AllLangPackage
-# helpcontent2_html_lang:
+# langs).  For the shared module, also include the per-lang non .xhp/.html files from the
+# AllLangPackages helpcontent2_html_lang and helpcontent2_html_media_lang:
 
 # html__filelist,lang,module
 define html__filelist
 $(call gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/filelists/html-help/$(2)/$(1).filelist: \
         $(call gb_HelpTarget_get_filelist,$(2)/$(1)) \
-        $(if $(filter $(2),shared),$(call gb_Package_get_target,helpcontent2_html_lang_$(1)))
+        $(if $(filter $(2),shared), \
+            $(call gb_Package_get_target,helpcontent2_html_lang_$(1)) \
+            $(call gb_Package_get_target,helpcontent2_html_media_lang_$(1)))
 	mkdir -p $$$$(dirname $$@)
 	sed -e 's|$(if $(filter $(1),en-US),$(SRCDIR),$(call gb_HelpTranslatePartTarget_get_workdir,$(1)))/helpcontent2/source/|$(INSTROOT)/$(LIBO_SHARE_HELP_FOLDER)/$(1)/|g' -e 's|.xhp|.html|g' $(call gb_HelpTarget_get_filelist,$(2)/$(1)) > $$@
-	$(if $(filter $(2),shared),cat $(call gb_Package_get_target,helpcontent2_html_lang_$(1)) >> $$@,:)
+	$(if $(filter $(2),shared),cat $(call gb_Package_get_target,helpcontent2_html_lang_$(1)) $(call gb_Package_get_target,helpcontent2_html_media_lang_$(1)) >> $$@,:)
 
 endef