diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2018-04-20 11:13:03 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2018-04-20 11:20:40 +0200 |
| commit | 5de2306da7f9dea5231c0fd1bfd91491cceb646f (patch) | |
| tree | b5e6572991692bf59aaf9c2b1eeea9990c149765 /Package_html_static.mk | |
| parent | Syntactic clean-up in Package_html.mk (diff) | |
| download | help-5de2306da7f9dea5231c0fd1bfd91491cceb646f.tar.gz help-5de2306da7f9dea5231c0fd1bfd91491cceb646f.zip | |
Clean up Package_html_static.mk
For ONLINE_HELP, apparently the source helpcontent2/help3xsl/index.html goes to
instdir/help/index.html while the source helpcontent2/help3xsl/index2.html goes
to instdir/help/$PRODUCTVERSION/index.html.
And for !ONLINE_HELP, apparently both source files (index.html and index2.html)
went to instdir/help/index.html, and the second one (index2.html) apparently
happened to win. Cleaned that up, so that only the source
helpcontent2/help3xsl/index2.html goes to instdir/help/index.html.
Whether that's all as intended, or some of that is junk, I don't know.
(Also sorted list of files lexicographically, for easier comparison with `ls`
output.)
Change-Id: I36f645e0de99a03b6e76f6c29fc18aa80e48a420
Reviewed-on: https://gerrit.libreoffice.org/53190
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'Package_html_static.mk')
| -rw-r--r-- | Package_html_static.mk | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Package_html_static.mk b/Package_html_static.mk index 79c0be1722..e5041642d6 100644 --- a/Package_html_static.mk +++ b/Package_html_static.mk @@ -10,19 +10,19 @@ $(eval $(call gb_Package_Package,helpcontent2_html_static,$(SRCDIR)/helpcontent2/help3xsl)) $(eval $(call gb_Package_add_files,helpcontent2_html_static,$(LIBO_SHARE_HELP_FOLDER),\ - index.html \ help.html \ + $(if $(HELP_ONLINE),index.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_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 \ help2.js \ - fuse.js \ - paginathing.js \ normalize.css \ - default.css \ + paginathing.js \ )) # vim: set noet sw=4 ts=4: |