From 2c1a12d351d1792bac3c57dfbc7caab5b65978d6 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Thu, 18 Apr 2019 13:54:28 +0200
Subject: Don't set LANG env var by accident

...as setting a GNU Make LANG var exports it to recipes as an env var, and see
e.g. 56bc0b1a376f62570a7287e9bb4193e00360c978 "Don't set locale env vars on
macOS" for potential problems caused by that.

This is the core half of a change spanning the core and help repos.

Change-Id: Ib7ae3b6edcef0b70e211a01aad4b3bd5c8905e06
Reviewed-on: https://gerrit.libreoffice.org/70929
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
---
 librelogo/CustomTarget_librelogo.mk | 8 ++++----
 solenv/gbuild/Configuration.mk      | 4 ++--
 solenv/gbuild/Dictionary.mk         | 8 ++++----
 wizards/CustomTarget_wizards.mk     | 8 ++++----
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/librelogo/CustomTarget_librelogo.mk b/librelogo/CustomTarget_librelogo.mk
index a523d501b2de..6cc693f34aa2 100644
--- a/librelogo/CustomTarget_librelogo.mk
+++ b/librelogo/CustomTarget_librelogo.mk
@@ -17,7 +17,7 @@ $(call librelogo_Properties__Properties_impl,$(librelogo_DIR)/LibreLogo_$(1).pro
 endef
 
 define librelogo_Properties__Properties_impl
-$(1) : LANG := $(4)
+$(1) : LANGUAGE := $(4)
 $(1) : POFILE := $(3)
 $(1) : SOURCE := $(2)
 
@@ -37,20 +37,20 @@ $(librelogo_DIR)/LibreLogo_%.properties : \
 		| $(librelogo_DIR)/.dir
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRP,1)
 	$(call gb_Helper_abbreviate_dirs, \
-		$(if $(filter-out qtz,$(LANG)), \
+		$(if $(filter-out qtz,$(LANGUAGE)), \
 			MERGEINPUT=$(call var2file,$(shell $(gb_MKTEMP)),100,$(POFILE)) && \
 			$(call gb_Executable_get_command,propex) \
 				-i $(SOURCE) \
 				-o $@ \
 				-m $${MERGEINPUT} \
-				-l $(LANG) && \
+				-l $(LANGUAGE) && \
 			rm -rf $${MERGEINPUT} \
 			, \
 			$(call gb_Executable_get_command,propex) \
 				-i $(SOURCE) \
 				-o $@ \
 				-m \
-				-l $(LANG) \
+				-l $(LANGUAGE) \
 		) \
 	)
 
diff --git a/solenv/gbuild/Configuration.mk b/solenv/gbuild/Configuration.mk
index 2abf9be737c3..378a3d5625b4 100644
--- a/solenv/gbuild/Configuration.mk
+++ b/solenv/gbuild/Configuration.mk
@@ -190,7 +190,7 @@ define gb_XcuLangpackTarget__command
 $(call gb_Output_announce,$(2),$(true),XCL,1)
 $(call gb_Helper_abbreviate_dirs,\
 	mkdir -p $(dir $(1)) && \
-	sed -e "s/__LANGUAGE__/$(LANG)/" -f $(gb_XcuLangpackTarget_SED_delcomment)\
+	sed -e "s/__LANGUAGE__/$(LANGUAGE)/" -f $(gb_XcuLangpackTarget_SED_delcomment)\
 	    $(3) > $(1))
 endef
 
@@ -384,7 +384,7 @@ $(call gb_Configuration_get_target,$(1)) : \
 	$(call gb_XcuLangpackTarget__get_target_with_lang,$(3),$(4))
 $(call gb_XcuLangpackTarget__get_target_with_lang,$(3),$(4)) : \
 	$(SRCDIR)/$(2)/$(3).tmpl
-$(call gb_XcuLangpackTarget__get_target_with_lang,$(3),$(4)) : LANG := $(4)
+$(call gb_XcuLangpackTarget__get_target_with_lang,$(3),$(4)) : LANGUAGE := $(4)
 
 endef
 
diff --git a/solenv/gbuild/Dictionary.mk b/solenv/gbuild/Dictionary.mk
index 8b8c8c56f8f9..6c4e6a7490e7 100644
--- a/solenv/gbuild/Dictionary.mk
+++ b/solenv/gbuild/Dictionary.mk
@@ -60,18 +60,18 @@ gb_PropertiesTranslateTarget_DEPS := $(call gb_Executable_get_runtime_dependenci
 define gb_PropertiesTranslateTarget__command
 $(call gb_Output_announce,$(2),$(true),PRP,1)
 $(call gb_Helper_abbreviate_dirs, \
-	$(if $(filter-out qtz,$(LANG)), \
+	$(if $(filter-out qtz,$(LANGUAGE)), \
 		MERGEINPUT=$(call var2file,$(shell $(gb_MKTEMP)),100,$(POFILE)) && \
 		$(gb_PropertiesTranslateTarget_COMMAND) \
 			-i $(PROPERTIES_FILE) \
-			-l $(LANG) \
+			-l $(LANGUAGE) \
 			-m $${MERGEINPUT} \
 			-o $(1) && \
 		rm -f $${MERGEINPUT} \
 		, \
 		$(gb_PropertiesTranslateTarget_COMMAND) \
 			-i $(PROPERTIES_FILE) \
-			-l $(LANG) \
+			-l $(LANGUAGE) \
 			-m \
 			-o $(1) \
 	) \
@@ -94,7 +94,7 @@ $(call gb_PropertiesTranslateTarget_get_clean_target,%) :
 
 # gb_PropertiesTranslateTarget_PropertiesTranslateTarget target source lang
 define gb_PropertiesTranslateTarget_PropertiesTranslateTarget
-$(call gb_PropertiesTranslateTarget_get_target,$(1)) : LANG := $(3)
+$(call gb_PropertiesTranslateTarget_get_target,$(1)) : LANGUAGE := $(3)
 $(call gb_PropertiesTranslateTarget_get_target,$(1)) : POFILE := $(gb_POLOCATION)/$(3)/$(patsubst %/,%,$(dir $(2))).po
 $(call gb_PropertiesTranslateTarget_get_target,$(1)) : PROPERTIES_FILE := $(SRCDIR)/$(2)
 
diff --git a/wizards/CustomTarget_wizards.mk b/wizards/CustomTarget_wizards.mk
index 875600ae57cc..d7a4c73dfb5c 100644
--- a/wizards/CustomTarget_wizards.mk
+++ b/wizards/CustomTarget_wizards.mk
@@ -17,7 +17,7 @@ $(call wizards_Properties__Properties_impl,$(wizards_DIR)/resources_$(1).propert
 endef
 
 define wizards_Properties__Properties_impl
-$(1) : LANG := $(4)
+$(1) : LANGUAGE := $(4)
 $(1) : POFILE := $(3)
 $(1) : SOURCE := $(2)
 
@@ -37,20 +37,20 @@ $(wizards_DIR)/resources_%.properties : \
 		| $(wizards_DIR)/.dir
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRP,1)
 	$(call gb_Helper_abbreviate_dirs, \
-		$(if $(filter-out qtz,$(LANG)), \
+		$(if $(filter-out qtz,$(LANGUAGE)), \
 			MERGEINPUT=$(call var2file,$(shell $(gb_MKTEMP)),100,$(POFILE)) && \
 			$(call gb_Executable_get_command,propex) \
 				-i $(SOURCE) \
 				-o $@ \
 				-m $${MERGEINPUT} \
-				-l $(LANG) && \
+				-l $(LANGUAGE) && \
 			rm -rf $${MERGEINPUT} \
 			, \
 			$(call gb_Executable_get_command,propex) \
 				-i $(SOURCE) \
 				-o $@ \
 				-m \
-				-l $(LANG) \
+				-l $(LANGUAGE) \
 		) \
 	)
 
-- 
cgit