gnucash-docs master: Multiple changes pushed

[John Ralls]

Updated	 via  https://github.com/Gnucash/gnucash-docs/commit/8f59685a (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/7909a139 (commit)
	from  https://github.com/Gnucash/gnucash-docs/commit/ca4812a2 (commit)



commit 8f59685a98c422d2d8e18bf49166b45d2f9dbcc2
Author: John Ralls <jralls at ceridwen.us>
Date:   Sat Jun 27 18:28:31 2020 -0700

    Fix building Italian translations with Cmake.
    
    They have no entities so having the targets require them failed.

diff --git a/cmake/AddGncDocTargets.cmake b/cmake/AddGncDocTargets.cmake
index 140b933..c63aeab 100644
--- a/cmake/AddGncDocTargets.cmake
+++ b/cmake/AddGncDocTargets.cmake
@@ -16,26 +16,26 @@ function (add_gnc_doc_targets docname entities)
                                 ${CMAKE_CURRENT_SOURCE_DIR}/${docname}.xml
             DEPENDS ${entities} "${docname}.xml" "${CMAKE_SOURCE_DIR}/docbook/gnc-docbookx.dtd")
         add_dependencies(${docname}-check "${lang}-${docname}-check")
+    endif()
 
-        # Add targets for each document format that is enabled
-        if (WITH_CHM)
-            add_chm_target(${docname} ${lang} "${entities}" "${figures}")
-        endif()
-        if (WITH_GHELP)
-            add_ghelp_target(${docname} ${lang} "${entities}" "${figures}")
-        endif()
-        if (WITH_HTML)
-            add_html_target(${docname} ${lang} "${entities}" "${figures}")
-        endif()
-        if (WITH_PDF)
-            add_pdf_target(${docname} ${lang} "${entities}" "${figures}")
-        endif()
-        if (WITH_EPUB)
-            add_epub_target(${docname} ${lang} "${entities}" "${figures}")
-        endif()
-        if (WITH_MOBI)
-            add_mobi_target(${docname} ${lang})
-        endif()
+    # Add targets for each document format that is enabled
+    if (WITH_CHM)
+      add_chm_target(${docname} ${lang} "${entities}" "${figures}")
+    endif()
+    if (WITH_GHELP)
+      add_ghelp_target(${docname} ${lang} "${entities}" "${figures}")
+    endif()
+    if (WITH_HTML)
+      add_html_target(${docname} ${lang} "${entities}" "${figures}")
+    endif()
+    if (WITH_PDF)
+      add_pdf_target(${docname} ${lang} "${entities}" "${figures}")
+    endif()
+    if (WITH_EPUB)
+      add_epub_target(${docname} ${lang} "${entities}" "${figures}")
+    endif()
+    if (WITH_MOBI)
+      add_mobi_target(${docname} ${lang})
     endif()
 
     if(AUTOTOOLS_IN_DIST)

commit 7909a13977029734846c1d5a8dd4bc9593b3f355
Author: John Ralls <jralls at ceridwen.us>
Date:   Sat Jun 27 18:10:33 2020 -0700

    Fix building mobi with Cmake.

diff --git a/cmake/AddEpubTarget.cmake b/cmake/AddEpubTarget.cmake
index 46b2063..fdef2ba 100644
--- a/cmake/AddEpubTarget.cmake
+++ b/cmake/AddEpubTarget.cmake
@@ -44,7 +44,7 @@ function (add_mobi_target docname lang)
         DEPENDS "${epubfile}")
 
     add_custom_target("${lang}-${docname}-mobi"
-        DEPENDS "${epubfile}")
+        DEPENDS "${mobifile}")
 
     add_dependencies(${docname}-mobi "${lang}-${docname}-mobi")
 



Summary of changes:
 cmake/AddEpubTarget.cmake    |  2 +-
 cmake/AddGncDocTargets.cmake | 38 +++++++++++++++++++-------------------
 2 files changed, 20 insertions(+), 20 deletions(-)