Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-06-14 04:21:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix clash with locale variable

Browse source 
LANG is a locale variable, use INFO_LANG instead.

* doc/misc/Makefile.in (INFO_LANG): Renamed from LANG, all uses
changed.
* doc/translations/fr/misc/ses-fr.texi: Use INFO_LANG instead of
LANG.
This commit is contained in:
Andreas Schwab 2026-05-31 11:06:55 +02:00
parent 64f4ce7b2d
commit 75153f7b76
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
doc/misc/Makefile.in
View file

@ -63,21 +63,21 @@ INSTALL_DATA = @INSTALL_DATA@
MAKEINFO = @MAKEINFO@ MAKEINFO = @MAKEINFO@
MAKEINFO_OPTS = --force -I$(emacsdir) MAKEINFO_OPTS = --force -I$(emacsdir)
ifeq ($(LANG),) ifeq ($(INFO_LANG),)
LANG:=default INFO_LANG:=default
else ifeq ($(wildcard $(srcdir)/../translations/$(LANG)/info_common.mk),) else ifeq ($(wildcard $(srcdir)/../translations/$(LANG)/info_common.mk),)
LANG:=default INFO_LANG:=default
endif endif
lang_suffix:=$(filter-out -default,-$(LANG)) lang_suffix:=$(filter-out -default,-$(INFO_LANG))
lang_subdir:=$(filter-out ../translations/default/misc/,../translations/$(LANG)/misc/) lang_subdir:=$(filter-out ../translations/default/misc/,../translations/$(INFO_LANG)/misc/)
## On MS Windows, efaq-w32; otherwise blank. ## On MS Windows, efaq-w32; otherwise blank.
DOCMISC_W32 = @DOCMISC_W32@ DOCMISC_W32 = @DOCMISC_W32@
DOCMISC_W32_TARGET = efaq-w32 DOCMISC_W32_TARGET = efaq-w32
## Info files to build and install on all platforms. ## Info files to build and install on all platforms.
include $(srcdir)/../translations/$(LANG)/info_common.mk include $(srcdir)/../translations/$(INFO_LANG)/info_common.mk
## Info files to install on current platform. ## Info files to install on current platform.
INFO_INSTALL = $(INFO_COMMON) $(DOCMISC_W32) INFO_INSTALL = $(INFO_COMMON) $(DOCMISC_W32)

6
doc/translations/fr/misc/ses-fr.texi
View file

@ -11,11 +11,11 @@
@syncodeindex ky cp @syncodeindex ky cp
@c %**end of header @c %**end of header
@c compiler info avec @c compiler info avec
@c make -C doc/misc ../../info/ses-fr.info LANG=fr @c make -C doc/misc ../../info/ses-fr.info INFO_LANG=fr
@c ou juste @c ou juste
@c make -C doc/misc ses LANG=fr @c make -C doc/misc ses INFO_LANG=fr
@c compiler pdf avec @c compiler pdf avec
@c make -C doc/misc ses-fr.pdf LANG=fr @c make -C doc/misc ses-fr.pdf INFO_LANG=fr
@copying @copying
Ce fichier documente @acronym{SES} : le tableur simple d’Emacs (Simple Ce fichier documente @acronym{SES} : le tableur simple d’Emacs (Simple