summaryrefslogtreecommitdiff
path: root/Package_html_static.mk
diff options
context:
space:
mode:
authorOlivier Hallot <olivier.hallot@libreoffice.org>2018-03-12 08:34:35 -0300
committerStephan Bergmann <sbergman@redhat.com>2018-03-14 09:51:48 +0100
commit770c0c1746b5c0b94dc07d5f1d6c2c04802c8540 (patch)
tree3634144a257a554182a331a72d66c47ee3a2344b /Package_html_static.mk
parent05d4e9fb471224b6adbc174ecb7968ffa29d4a56 (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_static.mk')
-rw-r--r--Package_html_static.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/Package_html_static.mk b/Package_html_static.mk
index 40a65b6a77..3619877837 100644
--- a/Package_html_static.mk
+++ b/Package_html_static.mk
@@ -14,9 +14,9 @@ $(eval $(call gb_Package_add_files,helpcontent2_html_static,$(LIBO_SHARE_HELP_FO
help.html \
))
-$(eval $(call gb_Package_add_file,helpcontent2_html_static,$(LIBO_SHARE_HELP_FOLDER)/$(PRODUCTVERSION)/index.html,index2.html))
+$(eval $(call gb_Package_add_file,helpcontent2_html_static,$(LIBO_SHARE_HELP_FOLDER)/$(if $(HELP_ONLINE),$(PRODUCTVERSION),'')/index.html,index2.html))
-$(eval $(call gb_Package_add_files,helpcontent2_html_static,$(LIBO_SHARE_HELP_FOLDER)/$(PRODUCTVERSION),\
+$(eval $(call gb_Package_add_files,helpcontent2_html_static,$(LIBO_SHARE_HELP_FOLDER)/$(if $(HELP_ONLINE),$(PRODUCTVERSION),''),\
help.js \
fuse.js \
paginathing.js \