diff options
| author | Olivier Hallot <olivier.hallot@libreoffice.org> | 2018-03-12 08:34:35 -0300 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2018-03-14 09:51:48 +0100 |
| commit | 770c0c1746b5c0b94dc07d5f1d6c2c04802c8540 (patch) | |
| tree | 3634144a257a554182a331a72d66c47ee3a2344b /Package_html.mk | |
| parent | 05d4e9fb471224b6adbc174ecb7968ffa29d4a56 (diff) | |
tdf#116296 remove produt version from help path
Part two.
Part 1 is in sfx2 module
Remove product version from offline help path but keep
in online help.
Product version is kept for online because a help server can have more
than one helponline version.
Change-Id: I1d4ba12a7d6472defd4210c79349e35ccaf32d8d
Reviewed-on: https://gerrit.libreoffice.org/51126
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Tested-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'Package_html.mk')
| -rw-r--r-- | Package_html.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Package_html.mk b/Package_html.mk index aed4b7674e..680b6829c6 100644 --- a/Package_html.mk +++ b/Package_html.mk @@ -11,11 +11,11 @@ $(eval $(call gb_Package_Package,helpcontent2_html,$(call gb_CustomTarget_get_wo $(eval $(call gb_Package_use_customtarget,helpcontent2_html,helpcontent2/help3xsl)) -$(eval $(call gb_Package_add_files,helpcontent2_html,$(LIBO_SHARE_HELP_FOLDER)/$(PRODUCTVERSION),\ +$(eval $(call gb_Package_add_files,helpcontent2_html,$(LIBO_SHARE_HELP_FOLDER)/$(if $(HELP_ONLINE),$(PRODUCTVERSION),),\ hid2file.js \ )) -$(eval $(call gb_Package_add_files_with_dir,helpcontent2_html,$(LIBO_SHARE_HELP_FOLDER)/$(PRODUCTVERSION),\ +$(eval $(call gb_Package_add_files_with_dir,helpcontent2_html,$(LIBO_SHARE_HELP_FOLDER)/$(if $(HELP_ONLINE),$(PRODUCTVERSION),),\ $(foreach lang,$(gb_HELP_LANGS),\ $(lang)/bookmarks.js \ $(lang)/contents.js \ |