master b0d7164edc8: bug#81332 fix, info/dir generation with manual translations

branch: master
commit b0d7164edc89e5d205af516545d7e0de1bbac533
Author: Vincent Belaïche <[email protected]>
Commit: Vincent Belaïche <[email protected]>

    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.
---
 Makefile.in                                        | 5 +++--
 doc/misc/Makefile.in                               | 4 ++--
 doc/translations/default/{ => misc}/info_common.mk | 0
 doc/translations/fr/{ => misc}/info_common.mk      | 0
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index c0b9803ec21..24d5584b68f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -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)))))
 
diff --git a/doc/misc/Makefile.in b/doc/misc/Makefile.in
index 11a2dc3d517..dda6a9dd7a9 100644
--- a/doc/misc/Makefile.in
+++ b/doc/misc/Makefile.in
@@ -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)
diff --git a/doc/translations/default/info_common.mk b/doc/translations/default/misc/info_common.mk
similarity index 100%
rename from doc/translations/default/info_common.mk
rename to doc/translations/default/misc/info_common.mk
diff --git a/doc/translations/fr/info_common.mk b/doc/translations/fr/misc/info_common.mk
similarity index 100%
rename from doc/translations/fr/info_common.mk
rename to doc/translations/fr/misc/info_common.mk