diff options
| author | Michael Stahl <Michael.Stahl@cib.de> | 2018-07-10 18:23:55 +0200 |
|---|---|---|
| committer | Olivier Hallot <olivier.hallot@libreoffice.org> | 2018-07-11 12:22:00 +0200 |
| commit | c6546852364c16f18a4e6a6409a4d2b6f26b10c7 (patch) | |
| tree | 98a294ee41dc943097080011b7b712031dddb829 | |
| parent | 54ebfc9f4b4a24f8b0ff78a802cf40d6be3cdbd0 (diff) | |
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
(cherry picked from commit 89f1284e5b8017e7f13e7551559d5038e2c05399)
Reviewed-on: https://gerrit.libreoffice.org/57271
Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>
Tested-by: Olivier Hallot <olivier.hallot@libreoffice.org>
| -rw-r--r-- | Package_html_dynamic.mk | 2 | ||||
| -rw-r--r-- | Package_html_static.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Package_html_dynamic.mk b/Package_html_dynamic.mk index 6b42f56bee..7af53ecb8d 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 e5041642d6..bab29c9b05 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 \ |