mirror of
git://git.sv.gnu.org/emacs.git
synced 2026-06-14 04:21:24 +00:00
Fix clash with locale variable
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:
parent
64f4ce7b2d
commit
75153f7b76
2 changed files with 9 additions and 9 deletions
|
|
@ -63,21 +63,21 @@ INSTALL_DATA = @INSTALL_DATA@
|
|||
MAKEINFO = @MAKEINFO@
|
||||
MAKEINFO_OPTS = --force -I$(emacsdir)
|
||||
|
||||
ifeq ($(LANG),)
|
||||
LANG:=default
|
||||
ifeq ($(INFO_LANG),)
|
||||
INFO_LANG:=default
|
||||
else ifeq ($(wildcard $(srcdir)/../translations/$(LANG)/info_common.mk),)
|
||||
LANG:=default
|
||||
INFO_LANG:=default
|
||||
endif
|
||||
|
||||
lang_suffix:=$(filter-out -default,-$(LANG))
|
||||
lang_subdir:=$(filter-out ../translations/default/misc/,../translations/$(LANG)/misc/)
|
||||
lang_suffix:=$(filter-out -default,-$(INFO_LANG))
|
||||
lang_subdir:=$(filter-out ../translations/default/misc/,../translations/$(INFO_LANG)/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/$(LANG)/info_common.mk
|
||||
include $(srcdir)/../translations/$(INFO_LANG)/info_common.mk
|
||||
|
||||
## Info files to install on current platform.
|
||||
INFO_INSTALL = $(INFO_COMMON) $(DOCMISC_W32)
|
||||
|
|
|
|||
|
|
@ -11,11 +11,11 @@
|
|||
@syncodeindex ky cp
|
||||
@c %**end of header
|
||||
@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 make -C doc/misc ses LANG=fr
|
||||
@c make -C doc/misc ses INFO_LANG=fr
|
||||
@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
|
||||
Ce fichier documente @acronym{SES} : le tableur simple d’Emacs (Simple
|
||||
|
|
|
|||
Loading…
Reference in a new issue