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, 16 insertions, 0 deletions

diff --git a/GeneratedPackage_html_icon-themes.mk b/GeneratedPackage_html_icon-themes.mk
new file mode 100644
index 0000000000..7d27e7a2c2
--- /dev/null
+++ b/GeneratedPackage_html_icon-themes.mk
@@ -0,0 +1,16 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t; fill-column: 100 -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+# The help/media/icon-themes/ sub-tree.
+
+$(eval $(call gb_GeneratedPackage_GeneratedPackage,helpcontent2_html_icon-themes,$(SRCDIR)/icon-themes))
+
+$(eval $(call gb_GeneratedPackage_add_dir,helpcontent2_html_icon-themes,$(INSTROOT)/$(LIBO_SHARE_HELP_FOLDER)$(if $(HELP_ONLINE),/$(PRODUCTVERSION))/media/icon-themes,colibre))
+
+# vim: set noet sw=4 ts=4: