mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2026-09-10 07:46:51 -04:00
bug#81332 fix, info/dir generation with manual translations
* doc/translations/default/misc/info_common.mk, * doc/translations/fr/misc/info_common.mk: Moved to `misc' subdirectory, in order to account that `INFO_COMMON' content depends on the subdirectory. * doc/misc/Makefile.in: `info_common.mk' is moved. * Makefile.in (GET_DOC_SRC): `info_common.mk' is moved and `srcdir_doc_info_dir_inputs' computation is fixed with correct conversion of default translation path.
This commit is contained in:
parent
e1a4bb7a33
commit
b0d7164edc
|
|
@ -1198,8 +1198,9 @@ TRANSLATED_DIRS:=misc
|
|||
# $(1) = dir
|
||||
# $(2) = lang
|
||||
define GET_DOC_SRC
|
||||
-include ${srcdir}/doc/translations/$(1)/$(2)/info_common.mk
|
||||
srcdir_doc_info_dir_inputs:=$$(srcdir_doc_info_dir_inputs) $$(patsubst %,${srcdir}/doc/translations/$(1)/$(2)/%$$(filter-out -default,-$(2)).texi,$$(INFO_COMMON))
|
||||
-include ${srcdir}/doc/translations/$(2)/$(1)/info_common.mk
|
||||
INFO_COMMON:=$$(subst ccmode,cc-mode,$$(INFO_COMMON))
|
||||
srcdir_doc_info_dir_inputs:=$$(srcdir_doc_info_dir_inputs) $$(patsubst ${srcdir}/doc/translations/default/$(1)/%-default.texi,${srcdir}/doc/$(1)/%.texi,$$(patsubst %,${srcdir}/doc/translations/$(2)/$(1)/%-$(2).texi,$$(INFO_COMMON)))
|
||||
endef
|
||||
$(foreach dir,$(TRANSLATED_DIRS),$(foreach lang,$(DOCLANGS),$(eval $(call GET_DOC_SRC,$(dir),$(lang)))))
|
||||
|
||||
|
|
|
|||
|
|
@ -65,7 +65,7 @@ MAKEINFO_OPTS = --force -I$(emacsdir)
|
|||
|
||||
ifeq ($(DOCLANG),)
|
||||
DOCLANG:=default
|
||||
else ifeq ($(wildcard $(srcdir)/../translations/$(DOCLANG)/info_common.mk),)
|
||||
else ifeq ($(wildcard $(srcdir)/../translations/$(DOCLANG)/misc/info_common.mk),)
|
||||
$(error No manual language $(DOCLANG) found)
|
||||
DOCLANG:=default
|
||||
endif
|
||||
|
|
@ -78,7 +78,7 @@ DOCMISC_W32 = @DOCMISC_W32@
|
|||
DOCMISC_W32_TARGET = efaq-w32
|
||||
|
||||
## Info files to build and install on all platforms.
|
||||
include $(srcdir)/../translations/$(DOCLANG)/info_common.mk
|
||||
include $(srcdir)/../translations/$(DOCLANG)/misc/info_common.mk
|
||||
|
||||
## Info files to install on current platform.
|
||||
INFO_INSTALL = $(INFO_COMMON) $(DOCMISC_W32)
|
||||
|
|
|
|||
Loading…
Reference in a new issue