diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2018-05-02 10:40:01 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2018-05-02 10:42:28 +0200 |
| commit | 09f72e64083e9a6003e6c10fa26e1c5ca3c4d785 (patch) | |
| tree | 271d659d556206c38c6f4b2e9a1c30bb3b0ff79b /Module_helpcontent2.mk | |
| parent | cb3e183c7fa7bd926e6564e52b5a79b0a0d15262 (diff) | |
tdf#116240: Include --with-help=html in installation sets
...by extending the hackery in helpcontent2/CustomTarget_html.mk (see comment
there). (Ultimately, the gbuild HelpTarget machinery should probably be adapted
to the needs of this new help format, once the old help format is no longer
supported?)
The Perl packaging code finds source files through the "include" paths specified
in instsetoo_native/util/openoffice.lst.in. To avoid potential name clashes,
put the new .filelist files into
workdir/CustomTarget/helpcontent2/help3xsl/filelists/html-help/ sub-directories.
read_filelist in solenv/bin/modules/installer/filelists.pm does not strip white
space following the last item in a file list, but (with HAVE_GNUMAKE_FILE_FUNC)
the gb_HelpTarget_get_translation_target .filelist files (which are then
transformed with sed into the .html .filelist files read by the Perl packaging
code) may contain such trailing white space. So $(strip ...) their content in
solenv/gbuild/HelpTarget.mk.
This is the helpcontent2 part of a change spanning core and helpcontent2.
Change-Id: I730caaaec783d0a0a9c79caf85268a775220dee3
Reviewed-on: https://gerrit.libreoffice.org/53724
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'Module_helpcontent2.mk')
| -rw-r--r-- | Module_helpcontent2.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Module_helpcontent2.mk b/Module_helpcontent2.mk index 2975af0adb..2f199d91d2 100644 --- a/Module_helpcontent2.mk +++ b/Module_helpcontent2.mk @@ -16,11 +16,11 @@ $(eval $(call gb_Module_add_targets,helpcontent2,\ ifeq ($(ENABLE_HTMLHELP),TRUE) $(eval $(call gb_Module_add_targets,helpcontent2,\ + AllLangPackage_html_lang \ CustomTarget_html \ GeneratedPackage_html_lang_generated \ GeneratedPackage_html_media \ Package_html_dynamic \ - Package_html_lang \ Package_html_static \ )) endif |