diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2022-12-14 09:51:51 +0100 |
|---|---|---|
| committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2022-12-19 11:28:59 +0000 |
| commit | f1f75b9cd0c51cb3872a3fa8fb5beee86f04490a (patch) | |
| tree | 6dcd642974180f259bbfa1e30aea7ba2f26b74cd | |
| parent | hid2file.js generation: process in batch, not each file one-by-one (diff) | |
| download | help-f1f75b9cd0c51cb3872a3fa8fb5beee86f04490a.tar.gz help-f1f75b9cd0c51cb3872a3fa8fb5beee86f04490a.zip | |
Fix prepending xargs to gb_ExternalExecutable_get_command, help part
...as was done in f048f02f505704a76c4f01b4ff3f369e8ed928b5 "hid2file.js
generation: process in batch, not each file one-by-one", causing my build to
fail with
> [XSL] CustomTarget/helpcontent2/help3xsl/hid2file.js
> xargs: LD_LIBRARY_PATH=/home/sbergman/gcc/trunk/inst/lib64:/home/sbergman/lo/core/instdir/program:/home/sbergman/lo/core/instdir/program: No such file or directory
Change-Id: I94ea42878de55a887e6955b350997425438bb90e
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/144154
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
(cherry picked from commit 970907045a2400da7ed6e3d14ef76f7ad3b2d783)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/144263
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
| -rw-r--r-- | CustomTarget_html.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/CustomTarget_html.mk b/CustomTarget_html.mk index 46068e82b0..8db68cf8c1 100644 --- a/CustomTarget_html.mk +++ b/CustomTarget_html.mk @@ -48,7 +48,7 @@ $(call gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/hid2file.js : \ ( \ RESPONSEFILE=$(call gb_var2file,$(shell $(gb_MKTEMP)),$(foreach module,$(html_TEXT_MODULES),$(gb_AllLangHelp_$(module)_HELPFILES))) && \ echo 'var hid2fileMap = {' \ - && cd $(SRCDIR) && xargs $(call gb_ExternalExecutable_get_command,xsltproc) $< <$$RESPONSEFILE || { rm $$RESPONSEFILE; exit 1 ; } \ + && cd $(SRCDIR) && $(call gb_ExternalExecutable_get_command,xsltproc,xargs) $< <$$RESPONSEFILE || { rm $$RESPONSEFILE; exit 1 ; } \ && rm "$$RESPONSEFILE" \ && echo '};' \ ) > $@ \ |