summaryrefslogtreecommitdiffstats
path: root/CustomTarget_html.mk
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@collabora.com>2018-08-14 16:13:34 +0200
committerJan Holesovsky <kendy@collabora.com>2018-08-14 16:29:25 +0200
commit1c76993a281f99a80c4dcbcf7e2133ef2dd3db69 (patch)
treed64a6167311bade82516df6adc97a885acf9d8b6 /CustomTarget_html.mk
parentRename get_url.xsl to generate_hid2file.xsl, because that's what it's doing. (diff)
downloadhelp-1c76993a281f99a80c4dcbcf7e2133ef2dd3db69.tar.gz
help-1c76993a281f99a80c4dcbcf7e2133ef2dd3db69.zip
Rename 'map' to 'hid2fileMap'.
Also update dependency, so that the file gets rebuilt when the 'echo' part of the makefile changes. Change-Id: I0412f882dd12e265d8261a259ed83c469e261cdf Reviewed-on: https://gerrit.libreoffice.org/58993 Tested-by: Jenkins Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Diffstat (limited to 'CustomTarget_html.mk')
-rw-r--r--CustomTarget_html.mk5
1 files changed, 3 insertions, 2 deletions
diff --git a/CustomTarget_html.mk b/CustomTarget_html.mk
index a8447e4fe2..58f7b7aaf2 100644
--- a/CustomTarget_html.mk
+++ b/CustomTarget_html.mk
@@ -29,11 +29,12 @@ $(eval $(call gb_CustomTarget_register_targets,helpcontent2/help3xsl,\
$(call gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/hid2file.js : \
$(SRCDIR)/helpcontent2/help3xsl/generate_hid2file.xsl \
$(call gb_ExternalExecutable_get_dependencies,xsltproc) \
- $(foreach module,$(html_TEXT_MODULES),$(call gb_AllLangHelp_get_helpfiles_target,$(module)))
+ $(foreach module,$(html_TEXT_MODULES),$(call gb_AllLangHelp_get_helpfiles_target,$(module))) \
+ $(SRCDIR)/helpcontent2/CustomTarget_html.mk
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),XSL,1)
$(call gb_Helper_abbreviate_dirs,\
( \
- echo 'var map={' \
+ echo 'var hid2fileMap = {' \
&& RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),100,$(foreach module,$(html_TEXT_MODULES),$(addprefix $(SRCDIR)/,$(gb_AllLangHelp_$(module)_HELPFILES)))) \
&& <"$$RESPONSEFILE" $(if $(filter WNT,$(OS)),tr -d '\r' | env -i PATH="$$PATH") xargs -n 1 printf '%s\n' \
| while read xhp; do \