From 3b0610daecdbe649428fcf6ca2446dd6fb26f571 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vincent=20Bela=C3=AFche?= Date: Sat, 30 May 2026 16:26:55 +0200 Subject: [PATCH] Avoid using the LANG environment variable * Makefile.in: Rename 'LANG' to 'DOCLANG' to avoid clash with well-known environment variable. * doc/misc/Makefile.in: Adjusted accordingly. --- Makefile.in | 8 ++++---- doc/misc/Makefile.in | 14 +++++++------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Makefile.in b/Makefile.in index b9164afa55d..e0a8d1ae579 100644 --- a/Makefile.in +++ b/Makefile.in @@ -796,7 +796,7 @@ install-info: info [ -f "$(DESTDIR)${infodir}/dir" ] || \ [ ! -f ${srcdir}/info/dir ] || \ ${INSTALL_DATA} ${srcdir}/info/dir "$(DESTDIR)${infodir}/dir"; \ - info_misc="$(foreach lang,$(DOCLANGS),`MAKEFLAGS= $(MAKE) --no-print-directory -s -C doc/misc LANG=$(lang) echo-info`)"; \ + info_misc="$(foreach lang,$(DOCLANGS),`MAKEFLAGS= $(MAKE) --no-print-directory -s -C doc/misc DOCLANG=$(lang) echo-info`)"; \ cd ${srcdir}/info ; \ for elt in ${INFO_NONMISC} $${info_misc}; do \ for f in `ls $$elt $$elt-[1-9] $$elt-[1-9][0-9] 2>/dev/null`; do \ @@ -946,7 +946,7 @@ uninstall: uninstall-$(NTDIR) uninstall-doc uninstall-gsettings-schemas done -rm -rf "$(DESTDIR)${libexecdir}/emacs/${version}" thisdir=`pwd -P`; \ - (info_misc="$(foreach lang,$(DOCLANGS),`MAKEFLAGS= $(MAKE) --no-print-directory -s -C doc/misc LANG=$(lang) echo-info`)"; \ + (info_misc="$(foreach lang,$(DOCLANGS),`MAKEFLAGS= $(MAKE) --no-print-directory -s -C doc/misc DOCLANG=$(lang) echo-info`)"; \ if cd "$(DESTDIR)${infodir}"; then \ for elt in ${INFO_NONMISC} $${info_misc}; do \ (cd "$${thisdir}"; \ @@ -1124,7 +1124,7 @@ TAGS tags: lib lib-src # src $(MAKE) -C doc/emacs tags $(MAKE) -C doc/lispintro tags $(MAKE) -C doc/lispref tags - $(foreach LANG,$(DOCLANGS),$(MAKE) -C doc/misc LANG=$(LANG) tags;) + $(foreach DOCLANG,$(DOCLANGS),$(MAKE) -C doc/misc DOCLANG=$(DOCLANG) tags;) CHECK_TARGETS = check check-maybe check-expensive check-all check-byte-compile .PHONY: $(CHECK_TARGETS) @@ -1147,7 +1147,7 @@ PSS = lispref-ps lispintro-ps emacs-ps misc-ps DOCS = $(DVIS) $(HTMLS) $(INFOS) $(PDFS) $(PSS) define MAKE_DOC $(1): - $(foreach lang,$(DOCLANGS),$$(MAKE) -C doc/$$(subst -, LANG=$(lang) ,$$@);) + $(foreach lang,$(DOCLANGS),$$(MAKE) -C doc/$$(subst -, DOCLANG=$(lang) ,$$@);) endef $(foreach doc,$(DOCS),$(eval $(call MAKE_DOC,$(doc)))) diff --git a/doc/misc/Makefile.in b/doc/misc/Makefile.in index 41ec7aa4566..290c88248fa 100644 --- a/doc/misc/Makefile.in +++ b/doc/misc/Makefile.in @@ -63,20 +63,20 @@ INSTALL_DATA = @INSTALL_DATA@ MAKEINFO = @MAKEINFO@ MAKEINFO_OPTS = --force -I$(emacsdir) -ifeq ($(LANG),) -LANG:=default -else ifeq ($(wildcard $(srcdir)/../translations/$(LANG)/info_common.mk),) -LANG:=default +ifeq ($(DOCLANG),) +DOCLANG:=default +else ifeq ($(wildcard $(srcdir)/../translations/$(DOCLANG)/info_common.mk),) +DOCLANG:=default endif -lang_suffix:=$(filter-out -default,-$(LANG)) -lang_subdir:=$(filter-out ../translations/default/misc/,../translations/$(LANG)/misc/) +lang_suffix:=$(filter-out -default,-$(DOCLANG)) +lang_subdir:=$(filter-out ../translations/default/misc/,../translations/$(DOCLANG)/misc/) ## On MS Windows, efaq-w32; otherwise blank. DOCMISC_W32 = @DOCMISC_W32@ ## Info files to build and install on all platforms. -include $(srcdir)/../translations/$(LANG)/info_common.mk +include $(srcdir)/../translations/$(DOCLANG)/info_common.mk ## Info files to install on current platform. INFO_INSTALL = $(INFO_COMMON) $(DOCMISC_W32)