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 2cf4cf26eea..1d0a55e997e 100644
--- a/doc/misc/Makefile.in
+++ b/doc/misc/Makefile.in
@@ -63,21 +63,21 @@ INSTALL_DATA = @INSTALL_DATA@
 MAKEINFO = @MAKEINFO@
 MAKEINFO_OPTS = --force -I$(emacsdir)
 
-ifeq ($(INFO_LANG),)
-INFO_LANG:=default
-else ifeq ($(wildcard $(srcdir)/../translations/$(LANG)/info_common.mk),)
-INFO_LANG:=default
+ifeq ($(DOCLANG),)
+DOCLANG:=default
+else ifeq ($(wildcard $(srcdir)/../translations/$(DOCLANG)/info_common.mk),)
+DOCLANG:=default
 endif
 
-lang_suffix:=$(filter-out -default,-$(INFO_LANG))
-lang_subdir:=$(filter-out ../translations/default/misc/,../translations/$(INFO_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@
 DOCMISC_W32_TARGET = efaq-w32
 
 ## Info files to build and install on all platforms.
-include $(srcdir)/../translations/$(INFO_LANG)/info_common.mk
+include $(srcdir)/../translations/$(DOCLANG)/info_common.mk
 
 ## Info files to install on current platform.
 INFO_INSTALL = $(INFO_COMMON) $(DOCMISC_W32)
diff --git a/doc/translations/fr/misc/ses-fr.texi b/doc/translations/fr/misc/ses-fr.texi
index 9d17f174786..368858413f1 100644
--- a/doc/translations/fr/misc/ses-fr.texi
+++ b/doc/translations/fr/misc/ses-fr.texi
@@ -11,11 +11,11 @@
 @syncodeindex ky cp
 @c %**end of header
 @c compiler info avec
-@c    make -C doc/misc ../../info/ses-fr.info INFO_LANG=fr
+@c    make -C doc/misc ../../info/ses-fr.info DOCLANG=fr
 @c ou juste
-@c    make -C doc/misc ses INFO_LANG=fr
+@c    make -C doc/misc ses DOCLANG=fr
 @c compiler pdf avec
-@c    make -C doc/misc ses-fr.pdf INFO_LANG=fr
+@c    make -C doc/misc ses-fr.pdf DOCLANG=fr
 
 @copying
 Ce fichier documente @acronym{SES} : le tableur simple d’Emacs (Simple