diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2019-04-18 13:54:28 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2019-04-18 15:38:27 +0200 |
| commit | 2c1a12d351d1792bac3c57dfbc7caab5b65978d6 (patch) | |
| tree | aacd830dc2e0a9f3540fc4de804297a07ee82498 /solenv/gbuild | |
| parent | db698a94ad52d1fbc387df66845907595615bb4f (diff) | |
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>
Diffstat (limited to 'solenv/gbuild')
| -rw-r--r-- | solenv/gbuild/Configuration.mk | 4 | ||||
| -rw-r--r-- | solenv/gbuild/Dictionary.mk | 8 |
2 files changed, 6 insertions, 6 deletions
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) |