diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2021-11-04 12:57:40 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2021-11-04 13:00:12 +0100 |
| commit | 15deec972f2ea1e2076a74c4d206b49967c68844 (patch) | |
| tree | 56e8f78d25c5e1cce97b7dc2c715a98253aa3713 /CustomTarget_html.mk | |
| parent | 7488c63b40d151384e8aae67f78d804962e99c99 (diff) | |
Adapt helpcontent2 to var2file rename
...in core commit 3829c0c7db8768ca05f148e8f5c271ddb56d5bae "Resolves: tdf#97046
ensure build system variables start with gb_"
Change-Id: I2d9f579921843dbfb55efde492ea19abb3c6782e
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/124682
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'CustomTarget_html.mk')
| -rw-r--r-- | CustomTarget_html.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/CustomTarget_html.mk b/CustomTarget_html.mk index f66dd95ca1..56224a7d90 100644 --- a/CustomTarget_html.mk +++ b/CustomTarget_html.mk @@ -42,7 +42,7 @@ $(call gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/hid2file.js : \ $(call gb_Helper_abbreviate_dirs,\ ( \ echo 'var hid2fileMap = {' \ - && RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),100,$(foreach module,$(html_TEXT_MODULES),$(addprefix $(SRCDIR)/,$(gb_AllLangHelp_$(module)_HELPFILES)))) \ + && RESPONSEFILE=$(call gb_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 \ rm -f $@.good && \ @@ -216,7 +216,7 @@ $(call gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/%/html.text : \ $(call gb_Helper_abbreviate_dirs,\ cd $(if $(filter en-US,$*),$(SRCDIR),$(call gb_HelpTranslatePartTarget_get_workdir,$*))/helpcontent2/source \ && rm -rf $(dir $@)text \ - && RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),100,$(foreach module,$(html_TEXT_MODULES),$(patsubst helpcontent2/source/%,%,$(gb_AllLangHelp_$(module)_HELPFILES)))) \ + && RESPONSEFILE=$(call gb_var2file,$(shell $(gb_MKTEMP)),100,$(foreach module,$(html_TEXT_MODULES),$(patsubst helpcontent2/source/%,%,$(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 \ mkdir -p $$(dirname $(dir $@)$$xhp) && \ @@ -285,7 +285,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)_BOOKMARK_HELPFILES))) \ + RESPONSEFILE=$(call gb_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' \ | { rm -f $@.good && while read xhp; do \ |