diff options
| -rw-r--r-- | librelogo/CustomTarget_librelogo.mk | 3 | ||||
| -rw-r--r-- | solenv/gbuild/AllLangResTarget.mk | 3 | ||||
| -rw-r--r-- | solenv/gbuild/Configuration.mk | 3 | ||||
| -rw-r--r-- | solenv/gbuild/CustomTarget.mk | 3 | ||||
| -rw-r--r-- | solenv/gbuild/Extension.mk | 3 | ||||
| -rw-r--r-- | solenv/gbuild/UIConfig.mk | 3 |
6 files changed, 6 insertions, 12 deletions
diff --git a/librelogo/CustomTarget_librelogo.mk b/librelogo/CustomTarget_librelogo.mk index 6affb4a367fa..a523d501b2de 100644 --- a/librelogo/CustomTarget_librelogo.mk +++ b/librelogo/CustomTarget_librelogo.mk @@ -38,8 +38,7 @@ $(librelogo_DIR)/LibreLogo_%.properties : \ $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRP,1) $(call gb_Helper_abbreviate_dirs, \ $(if $(filter-out qtz,$(LANG)), \ - MERGEINPUT=`$(gb_MKTEMP)` && \ - echo $(POFILE) > $${MERGEINPUT} && \ + MERGEINPUT=$(call var2file,$(shell $(gb_MKTEMP)),100,$(POFILE)) && \ $(call gb_Executable_get_command,propex) \ -i $(SOURCE) \ -o $@ \ diff --git a/solenv/gbuild/AllLangResTarget.mk b/solenv/gbuild/AllLangResTarget.mk index 4289db1d6687..ef10ec530c0e 100644 --- a/solenv/gbuild/AllLangResTarget.mk +++ b/solenv/gbuild/AllLangResTarget.mk @@ -42,8 +42,7 @@ gb_SrsPartMergeTarget_TRANSEXDEPS := $(call gb_Executable_get_runtime_dependenci gb_SrsPartMergeTarget_TRANSEXCOMMAND = $(call gb_Executable_get_command,transex3) define gb_SrsPartMergeTarget__command -MERGEINPUT=`$(gb_MKTEMP)` && \ -echo $(POFILES) > $${MERGEINPUT} && \ +MERGEINPUT=$(call var2file,$(shell $(gb_MKTEMP)),100,$(POFILES)) && \ $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $(1)) && \ $(gb_SrsPartMergeTarget_TRANSEXCOMMAND) \ diff --git a/solenv/gbuild/Configuration.mk b/solenv/gbuild/Configuration.mk index e5b8a9a4e812..8d3b949e31d9 100644 --- a/solenv/gbuild/Configuration.mk +++ b/solenv/gbuild/Configuration.mk @@ -211,8 +211,7 @@ gb_XcuMergeTarget_CFGEXCOMMAND := $(call gb_Executable_get_command,cfgex) define gb_XcuMergeTarget__command $(call gb_Output_announce,$(2),$(true),XCX,1) -MERGEINPUT=`$(gb_MKTEMP)` && \ -echo $(POFILES) > $${MERGEINPUT} && \ +MERGEINPUT=$(call var2file,$(shell $(gb_MKTEMP)),100,$(POFILES)) && \ $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $(1)) && \ $(gb_XcuMergeTarget_CFGEXCOMMAND) \ diff --git a/solenv/gbuild/CustomTarget.mk b/solenv/gbuild/CustomTarget.mk index e2dc2fdf622a..f68d7da18ecf 100644 --- a/solenv/gbuild/CustomTarget.mk +++ b/solenv/gbuild/CustomTarget.mk @@ -55,8 +55,7 @@ ifneq ($(WITH_LANG),) # $(call gb_CustomTarget_ulfex__command,ulftarget,ulfsource,pofiles) define gb_CustomTarget_ulfex__command $(call gb_Output_announce,$(1),$(true),ULF,1) -MERGEINPUT=`$(gb_MKTEMP)` && \ -echo $(3) > $${MERGEINPUT} && \ +MERGEINPUT=$(call var2file,$(shell $(gb_MKTEMP)),100,$(3)) && \ $(call gb_Helper_abbreviate_dirs,\ $(call gb_Executable_get_command,ulfex) -i $(2) -o $(1) -m $${MERGEINPUT} -l all) && \ rm -rf $${MERGEINPUT} diff --git a/solenv/gbuild/Extension.mk b/solenv/gbuild/Extension.mk index ee3841f9a9fc..fc6e6b7efd64 100644 --- a/solenv/gbuild/Extension.mk +++ b/solenv/gbuild/Extension.mk @@ -79,8 +79,7 @@ $(call gb_Extension_get_workdir,%)/description.xml : else $(call gb_Extension_get_workdir,%)/description.xml : $(gb_Extension_XRMEXDEPS) $(call gb_Output_announce,$*/description.xml,$(true),XRM,3) - MERGEINPUT=`$(gb_MKTEMP)` && \ - echo $(POFILES) > $${MERGEINPUT} && \ + MERGEINPUT=$(call var2file,$(shell $(gb_MKTEMP)),100,$(POFILES)) && \ $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(call gb_Extension_get_workdir,$*) && \ $(gb_Extension_XRMEXCOMMAND) \ diff --git a/solenv/gbuild/UIConfig.mk b/solenv/gbuild/UIConfig.mk index 84f2609a21f2..7746a5de7b65 100644 --- a/solenv/gbuild/UIConfig.mk +++ b/solenv/gbuild/UIConfig.mk @@ -28,8 +28,7 @@ $(call gb_UILocalizeTarget_get_workdir,%).ui : define gb_UILocalizeTarget__command $(call gb_Output_announce,$(2),$(true),UIX,1) -MERGEINPUT=`$(gb_MKTEMP)` && \ -echo $(POFILES) > $${MERGEINPUT} && \ +MERGEINPUT=$(call var2file,$(shell $(gb_MKTEMP)),100,$(POFILES)) && \ $(call gb_Helper_abbreviate_dirs,\ $(gb_UILocalizeTarget_COMMAND) \ -i $(UIConfig_FILE) \ |