[Libreoffice-commits] core.git: librelogo/CustomTarget_librelogo.mk solenv/gbuild

[Christian Lohmaier]

 librelogo/CustomTarget_librelogo.mk |    3 +--
 solenv/gbuild/AllLangResTarget.mk   |    3 +--
 solenv/gbuild/Configuration.mk      |    3 +--
 solenv/gbuild/CustomTarget.mk       |    3 +--
 solenv/gbuild/Extension.mk          |    3 +--
 solenv/gbuild/UIConfig.mk           |    3 +--
 6 files changed, 6 insertions(+), 12 deletions(-)

New commits:
commit 6cad56c32a1464fea3dffd63600c79f8ee00627e
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date:   Mon Nov 10 11:15:48 2014 +0100

    avoid exceeding commandline limits
    
    by using make's file function via the var2file wrapper instead of
    using loooooong echo statements
    
    Change-Id: Ie81007ad7de8c4e9f4d07724fba3cbe0e93f821d

diff --git a/librelogo/CustomTarget_librelogo.mk b/librelogo/CustomTarget_librelogo.mk
index 6affb4a..a523d50 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 4289db1..ef10ec5 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 e5b8a9a..8d3b949 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 e2dc2fd..f68d7da 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 ee3841f..fc6e6b7 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 84f2609..7746a5d 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) \