diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2018-05-02 10:41:08 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2018-05-02 10:42:45 +0200 |
| commit | e606179d5722427bc4137838585b38892e01b328 (patch) | |
| tree | ebecbb4be82c8893274820a563da4bbfd740bab6 /Repository.mk | |
| parent | 8e09329ea6e1625cbb9a4b79ad13e462c965b973 (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 core part of a change spanning core and helpcontent2.
Change-Id: I82e0093ea2064725327330c5485f8e581573e1f2
Diffstat (limited to 'Repository.mk')
| -rw-r--r-- | Repository.mk | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/Repository.mk b/Repository.mk index 01c51c7a9db0..6ef05911a1bd 100644 --- a/Repository.mk +++ b/Repository.mk @@ -954,8 +954,6 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo,\ $(if $(and $(filter WNT,$(OS)), $(filter X86_64,$(CPUNAME))),twain_dsm) \ $(if $(ENABLE_HTMLHELP),\ helpcontent2_html_dynamic \ - helpcontent2_html_lang \ - helpcontent2_html_lang_generated \ helpcontent2_html_media \ helpcontent2_html_static \ ) \ |