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 /wizards | |
| 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 'wizards')
| -rw-r--r-- | wizards/CustomTarget_wizards.mk | 8 |
1 files changed, 4 insertions, 4 deletions
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) \ ) \ ) |