mirror of
https://github.com/LibreOffice/help.git
synced 2026-01-13 05:38:56 +00:00
33551e7fd8
...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>
48 lines
1.1 KiB
Makefile
48 lines
1.1 KiB
Makefile
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
|
|
#
|
|
# 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/.
|
|
#
|
|
|
|
$(eval $(call gb_Module_Module,helpcontent2))
|
|
|
|
$(eval $(call gb_Module_add_targets,helpcontent2,\
|
|
CustomTarget_imagelist \
|
|
Package_helpimages \
|
|
))
|
|
|
|
ifeq ($(ENABLE_HTMLHELP),TRUE)
|
|
|
|
$(eval $(call gb_Module_add_targets,helpcontent2,\
|
|
CustomTarget_html \
|
|
GeneratedPackage_html_icon-themes \
|
|
GeneratedPackage_html_lang_generated \
|
|
Package_html_dynamic \
|
|
Package_html_media \
|
|
Package_html_static \
|
|
))
|
|
|
|
$(eval $(call gb_Module_add_l10n_targets,helpcontent2,\
|
|
AllLangPackage_html_lang \
|
|
AllLangPackage_html_media_lang \
|
|
))
|
|
|
|
endif
|
|
|
|
$(eval $(call gb_Module_add_l10n_targets,helpcontent2,\
|
|
AllLangHelp_sbasic \
|
|
AllLangHelp_scalc \
|
|
AllLangHelp_schart \
|
|
AllLangHelp_sdatabase \
|
|
AllLangHelp_sdraw \
|
|
AllLangHelp_shared \
|
|
AllLangHelp_simpress \
|
|
AllLangHelp_smath \
|
|
AllLangHelp_swriter \
|
|
))
|
|
|
|
# vim: set noet sw=4 ts=4:
|