[Libreoffice-commits] help.git: CustomTarget_html.mk

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Thu Apr 18 13:40:05 UTC 2019


 CustomTarget_html.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8a21dc1cc51f0363b33e59b5c34c74d5c6737f1e
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Thu Apr 18 13:57:32 2019 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Thu Apr 18 15:38:51 2019 +0200

    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 help half of a change spanning the core and help repos.
    
    Change-Id: Ib5faf612e9030db384f7408ecd4fd03e65120f17
    Reviewed-on: https://gerrit.libreoffice.org/70930
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/CustomTarget_html.mk b/CustomTarget_html.mk
index 45d3f284b..42ff2afee 100644
--- a/CustomTarget_html.mk
+++ b/CustomTarget_html.mk
@@ -83,7 +83,7 @@ $(call gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/%/langnames.js : \
 define html_gen_contents_html_dep
 $(call gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/$(1)/contents.part : $(call gb_HelpTarget__get_treefile,$(1),$(3))
 $(call gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/$(1)/contents.part : TREE_FILE := $(call gb_HelpTarget__get_treefile,$(1),$(3))
-$(call gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/$(1)/contents.part : LANG := $(2)
+$(call gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/$(1)/contents.part : LANGUAGE := $(2)
 $(call gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/$(1)/contents.part : MODULE := $(lastword $(subst :, ,$(filter $(module):%, $(html_BMARK_MODULES))))
 
 endef


More information about the Libreoffice-commits mailing list