gnucash-docs maint: Multiple changes pushed

[Frank H.Ellenberger]

Updated	 via  https://github.com/Gnucash/gnucash-docs/commit/fb5dab60 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/7b21455a (commit)
	from  https://github.com/Gnucash/gnucash-docs/commit/fd79b6d9 (commit)



commit fb5dab60cb5b29b4442ddb1b5691dcc24653abc0
Merge: fd79b6d9 7b21455a
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date:   Sat Sep 25 14:34:40 2021 +0200

    Merge PR_#226 into maint


commit 7b21455a053d62ce67321550e38337dc932579bb
Author: TANIGUCHI Yasuaki <yasuakit at gmail.com>
Date:   Sat Sep 25 19:54:52 2021 +0900

    Workaround patch for install gnc-locale-${lang}.dtd for CMake.
    This patch is for PR #207.
    
    cmake -S gnucash-docs -B .
    cmake --build .
    cmake --install . --prefix ${prefix}
    
    Then ghelp will be installed under ${prefix}/share/gnome/help/.

diff --git a/cmake/AddGHelpTarget.cmake b/cmake/AddGHelpTarget.cmake
index a974d0da..c90538e4 100644
--- a/cmake/AddGHelpTarget.cmake
+++ b/cmake/AddGHelpTarget.cmake
@@ -18,7 +18,13 @@ function (add_ghelp_target docname lang entities figures)
     foreach(xml_file ${entities} ${docname}.xml)
         list(APPEND source_files "${CMAKE_CURRENT_SOURCE_DIR}/${xml_file}")
     endforeach()
-    list(APPEND source_files "${CMAKE_SOURCE_DIR}/docbook/gnc-docbookx.dtd")
+
+    set(dtd_files "${CMAKE_SOURCE_DIR}/docbook/gnc-docbookx.dtd"
+                  "${CMAKE_SOURCE_DIR}/docbook/gnc-locale-C.dtd"
+                  "${CMAKE_SOURCE_DIR}/docbook/gnc-locale-${lang}.dtd")
+    list(REMOVE_DUPLICATES dtd_files)
+    list(APPEND source_files ${dtd_files})
+
 
     set(dest_files "")
     foreach(xml_file ${entities} ${docname}.xml gnc-docbookx.dtd)
@@ -28,7 +34,7 @@ function (add_ghelp_target docname lang entities figures)
     add_custom_command(
         OUTPUT ${dest_files}
         COMMAND ${CMAKE_COMMAND} -E copy ${source_files} "${BUILD_DIR}"
-        DEPENDS ${entities} "${docname}.xml" "${CMAKE_SOURCE_DIR}/docbook/gnc-docbookx.dtd"
+        DEPENDS ${entities} "${docname}.xml" ${dtd_files}
         WORKING_DIRECTORY "${BUILD_DIR}")
 
     # Copy figures for this document
diff --git a/xmldocs.make b/xmldocs.make
index c630c5d3..64df52d2 100644
--- a/xmldocs.make
+++ b/xmldocs.make
@@ -48,7 +48,7 @@ otherdocdir = $(docdir)/$(lang)
 
 # ************** Rules to install xml files for gnome-help ***********************
 
-xml_files = $(entities) $(docname).xml $(top_srcdir)/docbook/gnc-docbookx.dtd
+xml_files = $(entities) $(docname).xml $(top_srcdir)/docbook/*.dtd
 gnomehelp_DATA =  $(xml_files)
 gnomehelpfiguresdir = $(gnomehelpdir)/$(figdir)
 gnomehelpfigures_DATA = $(shell ls ${srcdir}/${figdir}/*.png)



Summary of changes:
 cmake/AddGHelpTarget.cmake | 10 ++++++++--
 xmldocs.make               |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)