diff options
| author | Vincent Belaïche <vincentb1@users.sourceforge.net> | 2026-05-30 16:26:55 +0200 |
|---|---|---|
| committer | Vincent Belaïche <vincentb1@users.sourceforge.net> | 2026-05-31 14:20:14 +0200 |
| commit | c44f7ada0c01c3b0b774f6e6b7ed85d29e4887a0 (patch) | |
| tree | 8ed2dba903f2f11f5a60fd9b83bc457c9f8aec72 /doc | |
| parent | 75153f7b7693b8980e4b383fbcbcbb5600fdd076 (diff) | |
Avoid using the LANG environment variable
Amend commit 75153f7b769 " Fix clash with locale variable" by Andreas Schwab.
Use DOCLANG instead of INFO_LANG for renaming, as documentation does not
produce only info output, and DOCLANG is iterating over DOCLANGS.
* Makefile.in: Rename 'LANG' to 'DOCLANG' to avoid clash with well-known
environment variable.
* doc/misc/Makefile.in: Adjusted accordingly, rename 'INFO_LANG' to 'DOCLANG'
where Andreas had already renamed 'LANG'.
* doc/translations/fr/misc/ses-fr.texi: rename 'INFO_LANG' to 'DOCLANG' in
explanatory comment.
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/misc/Makefile.in | 14 | ||||
| -rw-r--r-- | doc/translations/fr/misc/ses-fr.texi | 6 |
2 files changed, 10 insertions, 10 deletions
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 |
