Package_html_dynamic.mk | 2 +- Package_html_static.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
New commits: commit 89f1284e5b8017e7f13e7551559d5038e2c05399 Author: Michael Stahl <michael.st...@cib.de> Date: Tue Jul 10 18:23:55 2018 +0200 tdf#118571 avoid MSI problems with double / in Package_html*.mk MSI helpfully converts "help//fuse.js" into "help/help/fuse.js", which isn't obvious. Or helpful, for that matter. Actually it might be the Perl installer code that messes it up, can't quickly check whose fault it is... Change-Id: I69e9849b533a7fbe54310edb99bda3a879f4f031 diff --git a/Package_html_dynamic.mk b/Package_html_dynamic.mk index 6b42f56be..7af53ecb8 100644 --- a/Package_html_dynamic.mk +++ b/Package_html_dynamic.mk @@ -11,7 +11,7 @@ $(eval $(call gb_Package_Package,helpcontent2_html_dynamic,$(call gb_CustomTarge $(eval $(call gb_Package_use_customtarget,helpcontent2_html_dynamic,helpcontent2/help3xsl)) -$(eval $(call gb_Package_add_files,helpcontent2_html_dynamic,$(LIBO_SHARE_HELP_FOLDER)/$(if $(HELP_ONLINE),/$(PRODUCTVERSION)), \ +$(eval $(call gb_Package_add_files,helpcontent2_html_dynamic,$(LIBO_SHARE_HELP_FOLDER)$(if $(HELP_ONLINE),/$(PRODUCTVERSION)), \ hid2file.js \ )) diff --git a/Package_html_static.mk b/Package_html_static.mk index e5041642d..bab29c9b0 100644 --- a/Package_html_static.mk +++ b/Package_html_static.mk @@ -16,7 +16,7 @@ $(eval $(call gb_Package_add_files,helpcontent2_html_static,$(LIBO_SHARE_HELP_FO $(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)/$(if $(HELP_ONLINE),/$(PRODUCTVERSION)),\ +$(eval $(call gb_Package_add_files,helpcontent2_html_static,$(LIBO_SHARE_HELP_FOLDER)$(if $(HELP_ONLINE),/$(PRODUCTVERSION)),\ default.css \ fuse.js \ help.js \ _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits