Resolves: tdf#97046 ensure build system variables start with gb_

Change the variable name: var2file to gb_var2file

Change-Id: Ib7d64b76cfe10e6c2df1a176674a360b28704070
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124666
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>

19 files changed, 65 insertions, 65 deletions

diff --git a/solenv/gbuild/AutoInstall.mk b/solenv/gbuild/AutoInstall.mk
index 841baa738e41..aee2750e9904 100644
--- a/solenv/gbuild/AutoInstall.mk
+++ b/solenv/gbuild/AutoInstall.mk
@@ -19,21 +19,21 @@ $(call gb_AutoInstall_get_target,%) : $(GBUILDDIR)/AutoInstall.mk \
 		$(call gb_ExternalExecutable_get_dependencies,python)
 	$(call gb_Output_announce,$*,$(true),AIN,3)
 	$(call gb_Trace_StartRange,$*,AIN)
-	SDKLIBFILE=$(call var2file,$(shell $(gb_MKTEMP)),100,\
+	SDKLIBFILE=$(call gb_var2file,$(shell $(gb_MKTEMP)),100,\
 	   $(foreach lib,$(gb_SdkLinkLibrary_MODULE_$*),\
 			$(lib) \
 			$(notdir $(call gb_Library_get_sdk_link_lib,$(lib))) \
 			../../program/$(call gb_Library_get_runtime_filename,$(lib)))) \
-	&& LIBFILE=$(call var2file,$(shell $(gb_MKTEMP)),100,\
+	&& LIBFILE=$(call gb_var2file,$(shell $(gb_MKTEMP)),100,\
 		$(foreach lib,$(gb_Library_MODULE_$*),\
 			$(lib) \
 			$(call gb_Library_get_runtime_filename,$(lib)))) \
-	&& EXEFILE=$(call var2file,$(shell $(gb_MKTEMP)),100,\
+	&& EXEFILE=$(call gb_var2file,$(shell $(gb_MKTEMP)),100,\
 		$(foreach exe,$(gb_Executable_MODULE_$*),\
 			$(exe) \
 			$(call gb_Executable_get_filename,$(exe)))) \
-	&& JARFILE=$(call var2file,$(shell $(gb_MKTEMP)),100,$(gb_Jar_MODULE_$*)) \
-	&& PKGFILE=$(call var2file,$(shell $(gb_MKTEMP)),100,$(gb_Package_MODULE_$*)) \
+	&& JARFILE=$(call gb_var2file,$(shell $(gb_MKTEMP)),100,$(gb_Jar_MODULE_$*)) \
+	&& PKGFILE=$(call gb_var2file,$(shell $(gb_MKTEMP)),100,$(gb_Package_MODULE_$*)) \
 	&& $(call gb_ExternalExecutable_get_command,python) \
 			$(GBUILDDIR)/gen-autoinstall.py \
 			'$*' '$(SCP2COMPONENTCONDITION)' \
diff --git a/solenv/gbuild/Configuration.mk b/solenv/gbuild/Configuration.mk
index 028ed63ac7a4..5459b913288d 100644
--- a/solenv/gbuild/Configuration.mk
+++ b/solenv/gbuild/Configuration.mk
@@ -219,7 +219,7 @@ gb_XcuMergeTarget_CFGEXDEPS := $(call gb_Executable_get_runtime_dependencies,cfg
 gb_XcuMergeTarget_CFGEXCOMMAND := $(call gb_Executable_get_command,cfgex)
 
 define gb_XcuMergeTarget__command
-MERGEINPUT=$(call var2file,$(shell $(gb_MKTEMP)),100,$(POFILES)) && \
+MERGEINPUT=$(call gb_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 ed1a9addc103..1ea43aa1218a 100644
--- a/solenv/gbuild/CustomTarget.mk
+++ b/solenv/gbuild/CustomTarget.mk
@@ -57,7 +57,7 @@ ifneq ($(WITH_LANG),)
 define gb_CustomTarget_ulfex__command
 $(call gb_Output_announce,$(1),$(true),ULF,1)
 	$(call gb_Trace_StartRange,$(1),ULF)
-MERGEINPUT=$(call var2file,$(shell $(gb_MKTEMP)),100,$(3)) && \
+MERGEINPUT=$(call gb_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/Dictionary.mk b/solenv/gbuild/Dictionary.mk
index 12a42d16f46d..b86f1b49370f 100644
--- a/solenv/gbuild/Dictionary.mk
+++ b/solenv/gbuild/Dictionary.mk
@@ -62,7 +62,7 @@ gb_PropertiesTranslateTarget_DEPS := $(call gb_Executable_get_runtime_dependenci
 define gb_PropertiesTranslateTarget__command
 $(call gb_Helper_abbreviate_dirs, \
 	$(if $(filter-out qtz,$(LANGUAGE)), \
-		MERGEINPUT=$(call var2file,$(shell $(gb_MKTEMP)),100,$(POFILE)) && \
+		MERGEINPUT=$(call gb_var2file,$(shell $(gb_MKTEMP)),100,$(POFILE)) && \
 		$(gb_PropertiesTranslateTarget_COMMAND) \
 			-i $(PROPERTIES_FILE) \
 			-l $(LANGUAGE) \
@@ -127,7 +127,7 @@ gb_DescriptionTranslateTarget_DEPS := $(call gb_Executable_get_runtime_dependenc
 
 define gb_DescriptionTranslateTarget__command
 $(call gb_Helper_abbreviate_dirs,\
-	MERGEINPUT=$(call var2file,$(shell $(gb_MKTEMP)),100,$(POFILES)) && \
+	MERGEINPUT=$(call gb_var2file,$(shell $(gb_MKTEMP)),100,$(POFILES)) && \
 	$(gb_DescriptionTranslateTarget_COMMAND) \
 		-i $(DESCRIPTION_XML) \
 		-l all \
diff --git a/solenv/gbuild/Extension.mk b/solenv/gbuild/Extension.mk
index a79d3999d208..0b9301b5c6fd 100644
--- a/solenv/gbuild/Extension.mk
+++ b/solenv/gbuild/Extension.mk
@@ -81,7 +81,7 @@ else
 $(call gb_Extension_get_workdir,%)/description.xml : $(gb_Extension_XRMEXDEPS) $(gb_Helper_LANGSTARGET)
 	$(call gb_Output_announce,$*/description.xml,$(true),XRM,3)
 	$(call gb_Trace_StartRange,$*/description.xml,XRM)
-	MERGEINPUT=$(call var2file,$(shell $(gb_MKTEMP)),100,$(POFILES)) && \
+	MERGEINPUT=$(call gb_var2file,$(shell $(gb_MKTEMP)),100,$(POFILES)) && \
 	$(call gb_Helper_abbreviate_dirs,\
 		mkdir -p $(call gb_Extension_get_workdir,$*) && \
 		$(gb_Extension_XRMEXCOMMAND) \
@@ -108,7 +108,7 @@ $(call gb_Extension_get_target,%) : \
 		$(if $(LICENSE),cp -f $(LICENSE) $(call gb_Extension_get_rootdir,$*)/registration &&) \
 		$(if $(and $(gb_Extension_TRANS_LANGS),$(DESCRIPTION)),cp $(foreach lang,$(gb_Extension_TRANS_LANGS),$(call gb_Extension_get_workdir,$*)/description-$(lang).txt) $(call gb_Extension_get_rootdir,$*) &&) \
 		cd $(call gb_Extension_get_rootdir,$*) && \
-		ZIPFILES=$(call var2file,$(shell $(gb_MKTEMP)),500,$(sort $(FILES))) && \
+		ZIPFILES=$(call gb_var2file,$(shell $(gb_MKTEMP)),500,$(sort $(FILES))) && \
 		$(gb_Extension_ZIPCOMMAND) -rX --filesync --must-match \
 			$(call gb_Extension_get_target,$*) \
 			`cat $${ZIPFILES} | tr -d '\r'` && rm $${ZIPFILES})
diff --git a/solenv/gbuild/Gallery.mk b/solenv/gbuild/Gallery.mk
index b2833a36fe1a..56d5157ef40c 100644
--- a/solenv/gbuild/Gallery.mk
+++ b/solenv/gbuild/Gallery.mk
@@ -17,7 +17,7 @@ gb_Gallery_INSTDIR := $(LIBO_SHARE_FOLDER)/gallery
 define gb_Gallery__command
 $(call gb_Helper_abbreviate_dirs,\
 	rm -f $(call gb_Gallery_get_workdir,$(2))/* && \
-	RESPONSEFILE=$(call var2file,$(shell $(call gb_MKTEMP)),100,$(GALLERY_FILES)) && \
+	RESPONSEFILE=$(call gb_var2file,$(shell $(call gb_MKTEMP)),100,$(GALLERY_FILES)) && \
 	$(call gb_Helper_print_on_error,\
 		$(call gb_Executable_get_command,gengal,$(ICECREAM_RUN)) \
 			--build-tree \
diff --git a/solenv/gbuild/HelpTarget.mk b/solenv/gbuild/HelpTarget.mk
index 780fb55aebc6..64ec6e278018 100644
--- a/solenv/gbuild/HelpTarget.mk
+++ b/solenv/gbuild/HelpTarget.mk
@@ -37,10 +37,10 @@ gb_HelpTranslatePartTarget_DEPS := $(call gb_Executable_get_runtime_dependencies
 gb_HelpTranslatePartTarget_COMMAND := $(call gb_Executable_get_command,helpex)
 
 define gb_HelpTranslatePartTarget__command
-HELPFILES=$(call var2file,$(shell $(gb_MKTEMP)),100,$(sort $(filter %.xhp,$(3)))) && \
+HELPFILES=$(call gb_var2file,$(shell $(gb_MKTEMP)),100,$(sort $(filter %.xhp,$(3)))) && \
 $(call gb_Helper_abbreviate_dirs, \
 	$(if $(filter-out qtz,$(HELP_LANG)), \
-		POFILES=$(call var2file,$(shell $(gb_MKTEMP)),100,$(sort $(POFILES))) && \
+		POFILES=$(call gb_var2file,$(shell $(gb_MKTEMP)),100,$(sort $(POFILES))) && \
 		$(gb_HelpTranslatePartTarget_COMMAND) \
 			-l $(HELP_LANG) \
 			-mi $${HELPFILES} \
@@ -191,7 +191,7 @@ gb_HelpTreeTarget_COMMAND := $(call gb_Executable_get_command,treex)
 define gb_HelpTreeTarget__command
 $(call gb_Helper_abbreviate_dirs,\
 	$(if $(filter-out qtz,$(HELP_LANG)), \
-		POFILES=$(call var2file,$(shell $(gb_MKTEMP)),100,$(POFILES)) && \
+		POFILES=$(call gb_var2file,$(shell $(gb_MKTEMP)),100,$(POFILES)) && \
 		$(gb_HelpTreeTarget_COMMAND) \
 			-i $(HELP_TREE) \
 			-l $(HELP_LANG) \
@@ -290,7 +290,7 @@ gb_HelpLinkTarget_DEPS := \
 # the ones outside the dir by HelpLinker
 define gb_HelpLinkTarget__command
 	$(if $(HELP_INDEXED),rm -rf $(addprefix $(HELP_WORKDIR)/,$(HELP_INDEXED)) && \)
-RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),100,\
+RESPONSEFILE=$(call gb_var2file,$(shell $(gb_MKTEMP)),100,\
 	-lang $(HELP_LANG) \
 	-mod $(HELP_MODULE) \
 	$(if $(HELP_INDEXED),,-noindex) \
@@ -567,7 +567,7 @@ $(dir $(call gb_HelpTarget_get_target,%))%/.dir :
 # Translation of the module's .xhp files and all used modules is done.
 # Also creates the list for gb_HelpTarget_get_filelist.
 $(call gb_HelpTarget_get_translation_target,%) :
-	rm -f $@ && mv $(call var2file,$@.tmp,100,$(strip $(HELP_FILES))) $@
+	rm -f $@ && mv $(call gb_var2file,$@.tmp,100,$(strip $(HELP_FILES))) $@
 
 # Translation of the module's .xhp files and all used and linked modules
 # is done.
diff --git a/solenv/gbuild/InstallScript.mk b/solenv/gbuild/InstallScript.mk
index afc89e95ea6f..096b3f4e575c 100644
--- a/solenv/gbuild/InstallScript.mk
+++ b/solenv/gbuild/InstallScript.mk
@@ -29,7 +29,7 @@ endef
 
 define gb_InstallScript__command
 $(call gb_Helper_abbreviate_dirs,\
-	RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),100,\
+	RESPONSEFILE=$(call gb_var2file,$(shell $(gb_MKTEMP)),100,\
 		$(call gb_InstallScript__make_arglist,\
 			$(call gb_InstallScript__get_files,$(SCP_MODULES))) \
 	) && \
diff --git a/solenv/gbuild/JavaClassSet.mk b/solenv/gbuild/JavaClassSet.mk
index 39887dee6e5b..0e402db67df2 100644
--- a/solenv/gbuild/JavaClassSet.mk
+++ b/solenv/gbuild/JavaClassSet.mk
@@ -42,7 +42,7 @@ $(call gb_Helper_abbreviate_dirs,\
 	mkdir -p $(dir $(1)) && \
 	$(if $(filter-out $(JARDEPS),$(4)), \
 		rm -rf $(call gb_JavaClassSet_get_classdir,$(2))/* && \
-		RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),500,\
+		RESPONSEFILE=$(call gb_var2file,$(shell $(gb_MKTEMP)),500,\
 			$(filter-out $(JARDEPS) $(T_JAVA9FILES),$(4))) && \
 		$(if $(3),$(call gb_JavaClassSet_JAVACCOMMAND,$(JAVA_TARGET_VER)) \
 			$(gb_JavaClassSet_JAVACDEBUG) \
@@ -51,7 +51,7 @@ $(call gb_Helper_abbreviate_dirs,\
 			@$$RESPONSEFILE &&) \
 		rm -f $$RESPONSEFILE &&) \
 		$(if $(T_MODULENAME),\
-			RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),500,\
+			RESPONSEFILE=$(call gb_var2file,$(shell $(gb_MKTEMP)),500,\
 				$(T_JAVA9FILES)) && \
 			$(if $(3),$(call gb_JavaClassSet_JAVACCOMMAND,9) \
 				$(gb_JavaClassSet_JAVACDEBUG) \
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 0216802d271b..fe40fcbaf4ac 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -718,7 +718,7 @@ gb_LinkTarget_DEFAULTDEFS := $(gb_GLOBALDEFS)
 .PHONY : $(WORKDIR)/Clean/LinkTarget/%
 $(WORKDIR)/Clean/LinkTarget/% :
 	$(call gb_Output_announce,$(LINKTARGETMAKEFILENAME),$(false),LNK,4)
-	RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),200,\
+	RESPONSEFILE=$(call gb_var2file,$(shell $(gb_MKTEMP)),200,\
 		$(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \
 		$(foreach object,$(COBJECTS),$(call gb_CObject_get_dep_target,$(object))) \
 		$(foreach object,$(COBJECTS),$(call gb_CObject_get_dwo_target,$(object))) \
@@ -774,7 +774,7 @@ $(call gb_Output_announce,LNK:$(2),$(true),DEP,1)
 	$(call gb_Trace_StartRange,LNK:$(2),DEP)
 $(call gb_Helper_abbreviate_dirs,\
 	mkdir -p $(dir $(1)) && \
-	RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),200,\
+	RESPONSEFILE=$(call gb_var2file,$(shell $(gb_MKTEMP)),200,\
 		$(foreach object,$(COBJECTS),$(call gb_CObject_get_dep_target,$(object))) \
 		$(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_dep_target,$(object))) \
 		$(foreach object,$(OBJCOBJECTS),$(call gb_ObjCObject_get_dep_target,$(object)))\
@@ -796,7 +796,7 @@ endef
 
 # call gb_LinkTarget__command_objectlist,linktarget
 define gb_LinkTarget__command_objectlist
-TEMPFILE=$(call var2file,$(shell $(gb_MKTEMP)),200,\
+TEMPFILE=$(call gb_var2file,$(shell $(gb_MKTEMP)),200,\
 	$(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \
 	$(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \
 	$(foreach object,$(OBJCOBJECTS),$(call gb_ObjCObject_get_target,$(object))) \
diff --git a/solenv/gbuild/Package.mk b/solenv/gbuild/Package.mk
index 90e22806c994..e08ff07e1ba9 100644
--- a/solenv/gbuild/Package.mk
+++ b/solenv/gbuild/Package.mk
@@ -64,7 +64,7 @@ $(dir $(call gb_Package_get_target,%))%/.dir :
 .PHONY : $(call gb_Package_get_clean_target,%)
 $(call gb_Package_get_clean_target,%) :
 	$(call gb_Output_announce,$*,$(false),PKG,2)
-	RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),500,$(FILES)) \
+	RESPONSEFILE=$(call gb_var2file,$(shell $(gb_MKTEMP)),500,$(FILES)) \
 	&& cat $${RESPONSEFILE} | $(if $(filter WNT,$(OS)),env -i PATH="$$PATH") xargs $(if $(filter MACOSX,$(OS_FOR_BUILD)),-n 1000) rm -fr \
 	&& rm -f $${RESPONSEFILE}
 
@@ -82,7 +82,7 @@ $(call gb_Package_get_target,%) :
 	$(call gb_Trace_StartRange,$*,PKG)
 	$(if $(PACKAGE_DEFINED),,$(call gb_Output_error,Something depends on package $* which does not exist.))
 	rm -f $@ && \
-	mv $(call var2file,$@.tmp,100,$(sort $(FILES))) $@
+	mv $(call gb_var2file,$@.tmp,100,$(sort $(FILES))) $@
 	$(call gb_Trace_EndRange,$*,PKG)
 
 # for other targets that want to create Packages, does not register at Module
diff --git a/solenv/gbuild/PrecompiledHeaders.mk b/solenv/gbuild/PrecompiledHeaders.mk
index 4b2409952599..60c56950350f 100644
--- a/solenv/gbuild/PrecompiledHeaders.mk
+++ b/solenv/gbuild/PrecompiledHeaders.mk
@@ -55,7 +55,7 @@ $(call gb_PrecompiledHeader_get_target,$(1),$(3)) :
 	echo $$(sort $$(PCH_DEFS) $$(PCH_CXXFLAGS) $$(gb_PrecompiledHeader_EXCEPTIONFLAGS)) > $$(call gb_PrecompiledHeader_get_target,$(1),$(3)).flags
 ifeq ($(gb_FULLDEPS),$(true))
 	$$(call gb_Helper_abbreviate_dirs,\
-		RESPONSEFILE=$$(call var2file,$$(shell $$(gb_MKTEMP)),200,$$(call gb_PrecompiledHeader_get_dep_target_tmp,$(1),$(3))) && \
+		RESPONSEFILE=$$(call gb_var2file,$$(shell $$(gb_MKTEMP)),200,$$(call gb_PrecompiledHeader_get_dep_target_tmp,$(1),$(3))) && \
 		$$(call gb_Executable_get_command,concat-deps) $$$${RESPONSEFILE} \
 			> $$(call gb_PrecompiledHeader_get_dep_target,$(1),$(3)) && \
 		rm -f $$$${RESPONSEFILE} $$(call gb_PrecompiledHeader_get_dep_target_tmp,$(1),$(3)))
diff --git a/solenv/gbuild/Rdb.mk b/solenv/gbuild/Rdb.mk
index 337fcc858a3d..ccbb313d9ce8 100644
--- a/solenv/gbuild/Rdb.mk
+++ b/solenv/gbuild/Rdb.mk
@@ -11,7 +11,7 @@ gb_Rdb__get_install_target = $(INSTROOT)/$(LIBO_ETC_FOLDER)/services/$(1).rdb
 
 define gb_Rdb__command
 $(call gb_Helper_abbreviate_dirs,\
-	RESPONSEFILE=$(call var2file,$(shell $(call gb_MKTEMP)),70,\
+	RESPONSEFILE=$(call gb_var2file,$(shell $(call gb_MKTEMP)),70,\
 		<list> \
 		$(foreach component,$(COMPONENTS),\
 			<filename>$(call gb_ComponentTarget_get_target,$(component))</filename>) \
diff --git a/solenv/gbuild/Tempfile.mk b/solenv/gbuild/Tempfile.mk
index 3fede2abb774..ee0593db8b1b 100644
--- a/solenv/gbuild/Tempfile.mk
+++ b/solenv/gbuild/Tempfile.mk
@@ -18,7 +18,7 @@
 #
 
 ifneq ($(HAVE_GNUMAKE_FILE_FUNC),)
-define var2file
+define gb_var2file
 $(file >$(1),$(3))$(1)
 endef
 else
@@ -26,7 +26,7 @@ else
 # fit the commandline
 # parameters: filename, maxitems (for one write), string
 # returns: filename
-define var2file
+define gb_var2file
 $(strip $(1)
 $(eval gb_var2file_helpervar := $$(shell printf "%s" "" > $(1) ))\
 $(eval gb_var2file_curblock := $(firstword $(3)))\
diff --git a/solenv/gbuild/UnoApiTarget.mk b/solenv/gbuild/UnoApiTarget.mk
index bc364ad9ae34..563ab82a2716 100644
--- a/solenv/gbuild/UnoApiTarget.mk
+++ b/solenv/gbuild/UnoApiTarget.mk
@@ -28,7 +28,7 @@ gb_UnoApiTarget_UNOIDLCHECKCOMMAND := $(call gb_Executable_get_command,unoidl-ch
 define gb_UnoApiTarget__command
 mkdir -p $(dir $(1)) \
 $(if $(UNOAPI_ENTITIES), \
-	&& RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),500,$(UNOAPI_ENTITIES))) \
+	&& RESPONSEFILE=$(call gb_var2file,$(shell $(gb_MKTEMP)),500,$(UNOAPI_ENTITIES))) \
 && $(gb_UnoApiTarget_UNOIDLWRITECOMMAND) \
 	$(foreach rdb,$(UNOAPI_DEPRDBS),$(call gb_UnoApiTarget_get_target,$(rdb))) \
 	$(SRCDIR)/$(gb_UnoApiTarget_REG_$(2)) $(if $(UNOAPI_ENTITIES),@$${RESPONSEFILE}) $(1) \
diff --git a/solenv/gbuild/Zip.mk b/solenv/gbuild/Zip.mk
index 673a02df1370..b2debba77812 100644
--- a/solenv/gbuild/Zip.mk
+++ b/solenv/gbuild/Zip.mk
@@ -46,7 +46,7 @@ $(call gb_Zip_get_target,%) :
 	$(call gb_Trace_StartRange,$*,ZIP)
 	$(call gb_Helper_abbreviate_dirs,\
 		$(if $(FILES),\
-			RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),500,\
+			RESPONSEFILE=$(call gb_var2file,$(shell $(gb_MKTEMP)),500,\
                         $(FILES)) && \
 			cd $(LOCATION) && \
 			cat $${RESPONSEFILE} | tr "[:space:]" "\n" | \
diff --git a/solenv/gbuild/extensions/post_GbuildToJson.mk b/solenv/gbuild/extensions/post_GbuildToJson.mk
index 708de742fffb..78e81aa7273c 100644
--- a/solenv/gbuild/extensions/post_GbuildToJson.mk
+++ b/solenv/gbuild/extensions/post_GbuildToJson.mk
@@ -48,36 +48,36 @@ mkdir -p $(WORKDIR)/GbuildToJson/$(dir $(2))
 mkdir -p $(WORKDIR)/LinkTarget/$(dir $(2))
 $(if $(GBUILDTOJSON_LD_LIBRARY_PATH),LD_LIBRARY_PATH=$(GBUILDTOJSON_LD_LIBRARY_PATH)) \
 $(call gb_Executable_get_command,gbuildtojson) \
---makefile=$(call var2file,$(shell $(gb_MKTEMP)),100,$(T_MAKEFILE)) \
---linktarget=$(call var2file,$(shell $(gb_MKTEMP)),100,$(2)) \
---ilibtarget=$(call var2file,$(shell $(gb_MKTEMP)),100,$(ILIBTARGET)) \
---cxxobjects=$(call var2file,$(shell $(gb_MKTEMP)),100,$(CXXOBJECTS)) \
---yaccobjects=$(call var2file,$(shell $(gb_MKTEMP)),100,$(YACCOBJECTS)) \
---objcobjects=$(call var2file,$(shell $(gb_MKTEMP)),100,$(OBJCOBJECTS)) \
---objcxxobjects=$(call var2file,$(shell $(gb_MKTEMP)),100,$(OBJCXXOBJECTS)) \
---cxxclrobjects=$(call var2file,$(shell $(gb_MKTEMP)),100,$(CXXCLROBJECTS)) \
---asmobjects=$(call var2file,$(shell $(gb_MKTEMP)),100,$(ASMOBJECTS)) \
---lexobjects=$(call var2file,$(shell $(gb_MKTEMP)),100,$(LEXOBJECTS)) \
---gencobjects=$(call var2file,$(shell $(gb_MKTEMP)),100,$(GENCOBJECTS)) \
---gencxxobjects=$(call var2file,$(shell $(gb_MKTEMP)),100,$(GENCXXOBJECTS)) \
---gencxxclrobjects=$(call var2file,$(shell $(gb_MKTEMP)),100,$(GENCXXCLROBJECTS)) \
---cobjects=$(call var2file,$(shell $(gb_MKTEMP)),100,$(COBJECTS)) \
---javaobjects=$(call var2file,$(shell $(gb_MKTEMP)),100,$(JAVAOBJECTS)) \
---pythonobjects=$(call var2file,$(shell $(gb_MKTEMP)),100,$(PYTHONOBJECTS)) \
---cflags=$(call var2file,$(shell $(gb_MKTEMP)),100,$(T_CFLAGS)) \
---cflagsappend=$(call var2file,$(shell $(gb_MKTEMP)),100,$(T_CFLAGS_APPEND)) \
---cxxflags=$(call var2file,$(shell $(gb_MKTEMP)),100,$(T_CXXFLAGS)) \
---cxxflagsappend=$(call var2file,$(shell $(gb_MKTEMP)),100,$(T_CXXFLAGS_APPEND)) \
---objcflags=$(call var2file,$(shell $(gb_MKTEMP)),100,$(T_OBJCFLAGS)) \
---objcflagsappend=$(call var2file,$(shell $(gb_MKTEMP)),100,$(T_OBJCFLAGS_APPEND)) \
---objcxxflags=$(call var2file,$(shell $(gb_MKTEMP)),100,$(T_OBJCXXFLAGS)) \
---objcxxflagsappend=$(call var2file,$(shell $(gb_MKTEMP)),100,$(T_OBJCXXFLAGS_APPEND)) \
---cxxclrflags=$(call var2file,$(shell $(gb_MKTEMP)),100,$(T_CXXCLRFLAGS)) \
---cxxclrflagsappend=$(call var2file,$(shell $(gb_MKTEMP)),100,$(T_CXXCLRFLAGS_APPEND)) \
---defs=$(call var2file,$(shell $(gb_MKTEMP)),100,$(DEFS)) \
---include=$(call var2file,$(shell $(gb_MKTEMP)),100,$(INCLUDE)) \
---linked_libs=$(call var2file,$(shell $(gb_MKTEMP)),100,$(LINKED_LIBS)) \
---linked_static_libs=$(call var2file,$(shell $(gb_MKTEMP)),100,$(LINKED_STATIC_LIBS)) \
+--makefile=$(call gb_var2file,$(shell $(gb_MKTEMP)),100,$(T_MAKEFILE)) \
+--linktarget=$(call gb_var2file,$(shell $(gb_MKTEMP)),100,$(2)) \
+--ilibtarget=$(call gb_var2file,$(shell $(gb_MKTEMP)),100,$(ILIBTARGET)) \
+--cxxobjects=$(call gb_var2file,$(shell $(gb_MKTEMP)),100,$(CXXOBJECTS)) \
+--yaccobjects=$(call gb_var2file,$(shell $(gb_MKTEMP)),100,$(YACCOBJECTS)) \
+--objcobjects=$(call gb_var2file,$(shell $(gb_MKTEMP)),100,$(OBJCOBJECTS)) \
+--objcxxobjects=$(call gb_var2file,$(shell $(gb_MKTEMP)),100,$(OBJCXXOBJECTS)) \
+--cxxclrobjects=$(call gb_var2file,$(shell $(gb_MKTEMP)),100,$(CXXCLROBJECTS)) \
+--asmobjects=$(call gb_var2file,$(shell $(gb_MKTEMP)),100,$(ASMOBJECTS)) \
+--lexobjects=$(call gb_var2file,$(shell $(gb_MKTEMP)),100,$(LEXOBJECTS)) \
+--gencobjects=$(call gb_var2file,$(shell $(gb_MKTEMP)),100,$(GENCOBJECTS)) \
+--gencxxobjects=$(call gb_var2file,$(shell $(gb_MKTEMP)),100,$(GENCXXOBJECTS)) \
+--gencxxclrobjects=$(call gb_var2file,$(shell $(gb_MKTEMP)),100,$(GENCXXCLROBJECTS)) \
+--cobjects=$(call gb_var2file,$(shell $(gb_MKTEMP)),100,$(COBJECTS)) \
+--javaobjects=$(call gb_var2file,$(shell $(gb_MKTEMP)),100,$(JAVAOBJECTS)) \
+--pythonobjects=$(call gb_var2file,$(shell $(gb_MKTEMP)),100,$(PYTHONOBJECTS)) \
+--cflags=$(call gb_var2file,$(shell $(gb_MKTEMP)),100,$(T_CFLAGS)) \
+--cflagsappend=$(call gb_var2file,$(shell $(gb_MKTEMP)),100,$(T_CFLAGS_APPEND)) \
+--cxxflags=$(call gb_var2file,$(shell $(gb_MKTEMP)),100,$(T_CXXFLAGS)) \
+--cxxflagsappend=$(call gb_var2file,$(shell $(gb_MKTEMP)),100,$(T_CXXFLAGS_APPEND)) \
+--objcflags=$(call gb_var2file,$(shell $(gb_MKTEMP)),100,$(T_OBJCFLAGS)) \
+--objcflagsappend=$(call gb_var2file,$(shell $(gb_MKTEMP)),100,$(T_OBJCFLAGS_APPEND)) \
+--objcxxflags=$(call gb_var2file,$(shell $(gb_MKTEMP)),100,$(T_OBJCXXFLAGS)) \
+--objcxxflagsappend=$(call gb_var2file,$(shell $(gb_MKTEMP)),100,$(T_OBJCXXFLAGS_APPEND)) \
+--cxxclrflags=$(call gb_var2file,$(shell $(gb_MKTEMP)),100,$(T_CXXCLRFLAGS)) \
+--cxxclrflagsappend=$(call gb_var2file,$(shell $(gb_MKTEMP)),100,$(T_CXXCLRFLAGS_APPEND)) \
+--defs=$(call gb_var2file,$(shell $(gb_MKTEMP)),100,$(DEFS)) \
+--include=$(call gb_var2file,$(shell $(gb_MKTEMP)),100,$(INCLUDE)) \
+--linked_libs=$(call gb_var2file,$(shell $(gb_MKTEMP)),100,$(LINKED_LIBS)) \
+--linked_static_libs=$(call gb_var2file,$(shell $(gb_MKTEMP)),100,$(LINKED_STATIC_LIBS)) \
 > $(WORKDIR)/GbuildToJson/$(2)
 endef
 
diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk
index f0da634be0b9..cdab01f87fa8 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -222,7 +222,7 @@ $(call gb_Output_announce,$(2),$(true),LNK,4)
 	$(call gb_Trace_StartRange,$(2),LNK)
 $(call gb_Helper_abbreviate_dirs,\
 	rm -f $(1) && \
-	RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),100, \
+	RESPONSEFILE=$(call gb_var2file,$(shell $(gb_MKTEMP)),100, \
 		$(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \
 		$(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \
 		$(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \
@@ -671,7 +671,7 @@ endif
 # use responsefile because cui has too many files for command line
 define gb_UIConfig__command
 $(call gb_Helper_abbreviate_dirs,\
-	RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),100,$(if $(UI_IMAGELISTS),$(strip $(UI_IMAGELISTS)),/dev/null)) \
+	RESPONSEFILE=$(call gb_var2file,$(shell $(gb_MKTEMP)),100,$(if $(UI_IMAGELISTS),$(strip $(UI_IMAGELISTS)),/dev/null)) \
 	&& tr " " "\000" < $$RESPONSEFILE | tr -d "\r\n" > $$RESPONSEFILE.0 \
 	&& $(SORT) -u --files0-from=$$RESPONSEFILE.0 > $@ \
 	&& rm $$RESPONSEFILE $$RESPONSEFILE.0 \
@@ -683,7 +683,7 @@ endef
 define gb_UIConfig__gla11y_command
 $(call gb_ExternalExecutale__check_registration,python)
 $(call gb_Helper_abbreviate_dirs,\
-	FILES=$(call var2file,$(shell $(gb_MKTEMP)),100,$(UIFILES)) && \
+	FILES=$(call gb_var2file,$(shell $(gb_MKTEMP)),100,$(UIFILES)) && \
 	$(gb_UIConfig_LXML_PATH) $(if $(SYSTEM_LIBXML)$(SYSTEM_LIBXSLT),,$(gb_Helper_set_ld_path)) \
 	$(call gb_ExternalExecutable_get_command,python) \
 	$(gb_UIConfig_gla11y_SCRIPT) $(gb_UIConfig_gla11y_PARAMETERS) -o $@ -L $$FILES
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index 34738b531ad3..1d139009931e 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -99,7 +99,7 @@ endef
 
 define gb_LinkTarget__command_dynamiclink
 $(call gb_Helper_abbreviate_dirs,\
-	FILELIST=$(call var2file,$(shell $(gb_MKTEMP)),100, \
+	FILELIST=$(call gb_var2file,$(shell $(gb_MKTEMP)),100, \
 		$(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \
 		$(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \
 		$(foreach object,$(ASMOBJECTS),$(call gb_AsmObject_get_target,$(object))) \