summaryrefslogtreecommitdiffstats
path: root/CustomTarget_html.mk
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2018-11-14 13:58:40 +0100
committerStephan Bergmann <sbergman@redhat.com>2018-11-14 16:23:37 +0100
commit6a39aed4a3bec2ef053371eff3199f6de1f46874 (patch)
treebf92539ef26bdb92abdd6611ffd079ea749ae34b /CustomTarget_html.mk
parentHelp files: http -> https (diff)
downloadhelp-6a39aed4a3bec2ef053371eff3199f6de1f46874.tar.gz
help-6a39aed4a3bec2ef053371eff3199f6de1f46874.zip
Database files should appear with app:"BASE" in instdir/help/*/bookmarks.js
...instead of with app:"SHARED", according to a request by buovjaga. That means that helpcontent2/source/text/shared/explorer/database/*.xhp files (and their per-locale counterparts) should be processed into workdir/ CustomTarget/helpcontent2/help3xsl/shared/explorer/database/*/bookmarks.part (which were empty until now) instead of workdir/CustomTarget/helpcontent2/help3xsl/shared/*/bookmarks.part. This change requres gb_AllLangHelp_*_BOOKMARK_HELPFILES introduced into the core repo with <https://gerrit.libreoffice.org/#/c/63364/> "Prepare gb_AllLangHelp_add_helpfiles for special bookmark needs". Change-Id: I8f37fcec67a37aee4260042e550214a34495254a Reviewed-on: https://gerrit.libreoffice.org/63365 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'CustomTarget_html.mk')
-rw-r--r--CustomTarget_html.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/CustomTarget_html.mk b/CustomTarget_html.mk
index 50fd6aedd9..7c5a9ddc81 100644
--- a/CustomTarget_html.mk
+++ b/CustomTarget_html.mk
@@ -198,7 +198,7 @@ $(call gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/%/bookmarks.part : \
$(call gb_ExternalExecutable_get_dependencies,xsltproc)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),XSL,1)
$(call gb_Helper_abbreviate_dirs,\
- RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),100,$(addprefix $(if $(filter en-US,$(HELP_LANG)),$(SRCDIR),$(call gb_HelpTranslatePartTarget_get_workdir,$(HELP_LANG)))/,$(gb_AllLangHelp_$(APPDIR)_HELPFILES))) \
+ RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),100,$(addprefix $(if $(filter en-US,$(HELP_LANG)),$(SRCDIR),$(call gb_HelpTranslatePartTarget_get_workdir,$(HELP_LANG)))/,$(gb_AllLangHelp_$(APPDIR)_BOOKMARK_HELPFILES))) \
&& ( \
<"$$RESPONSEFILE" $(if $(filter WNT,$(OS)),tr -d '\r' | env -i PATH="$$PATH") xargs -n 1 printf '%s\n' \
| while read xhp; do \