summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRalf Habacker <ralf.habacker@freenet.de>2024-04-17 09:54:46 +0000
committerRalf Habacker <ralf.habacker@freenet.de>2024-04-17 09:54:46 +0000
commite277bf9070fa76712c6f113fbccc7c3b107297dd (patch)
treede5a9e52f56bbe69fc769d76376297319b4dedb1
parent1caf0f62e0fce1b102c9ec6ea9e4ab00fda4f411 (diff)
parentb58ca0e1472c17cd7252c4e1090140b673acea3c (diff)
Merge branch 'cmake-fixes' into 'master'HEADmaster
cmake: complete installed files Closes #504 See merge request dbus/dbus!459
-rw-r--r--doc/CMakeLists.txt15
-rw-r--r--doc/index.html.in2
2 files changed, 15 insertions, 2 deletions
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index db93daec..cbcbf7bd 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -125,7 +125,11 @@ macro(add_docbook _target)
set(STYLESHEET "${DOCBOOKXSL_DIR}/manpages/docbook.xsl")
set(INSTALL_DIR ${CMAKE_INSTALL_DATADIR}/man/man${ARGS_MAN_CATEGORY})
else()
- set(_outname "${_target}.${ARGS_MAN_CATEGORY}.html")
+ if (NOT ARGS_MAN_CATEGORY)
+ set(_outname "${_target}.html")
+ else()
+ set(_outname "${_target}.${ARGS_MAN_CATEGORY}.html")
+ endif()
set(STYLESHEET "${DOCBOOKXSL_DIR}/html/docbook.xsl")
set(INSTALL_DIR ${CMAKE_INSTALL_DATADIR}/doc/dbus)
endif()
@@ -185,10 +189,19 @@ add_docbook(dbus-send TEMPLATE dbus-send.1.xml.in MAN_CATEGORY 1 FORMATS ${forma
add_docbook(dbus-test-tool TEMPLATE dbus-test-tool.1.xml.in MAN_CATEGORY 1 FORMATS ${formats})
add_docbook(dbus-uuidgen TEMPLATE dbus-uuidgen.1.xml.in MAN_CATEGORY 1 FORMATS ${formats})
add_docbook(dbus-update-activation-environment TEMPLATE dbus-update-activation-environment.1.xml.in MAN_CATEGORY 1 FORMATS ${formats})
+add_docbook(dbus-faq SOURCE dbus-faq.xml FORMATS html)
+add_docbook(dbus-specification SOURCE dbus-specification.xml FORMATS html)
+add_docbook(dbus-test-plan SOURCE dbus-test-plan.xml FORMATS html)
+add_docbook(dbus-tutorial SOURCE dbus-tutorial.xml FORMATS html)
#
# handle html index file
#
+if(DBUS_ENABLE_DOXYGEN_DOCS)
+ set(DBUS_APIDOC_LINK "<a href=\"api/html/index.html\">libdbus API Documentation</a>")
+else()
+ set(DBUS_APIDOC_LINK "")
+endif()
configure_file(index.html.in ${CMAKE_CURRENT_BINARY_DIR}/index.html)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/index.html DESTINATION ${CMAKE_INSTALL_DATADIR}/doc/dbus)
diff --git a/doc/index.html.in b/doc/index.html.in
index feca9fc8..eb61d061 100644
--- a/doc/index.html.in
+++ b/doc/index.html.in
@@ -36,7 +36,7 @@ application manuals
<a href="dbus-test-plan.html">D-Bus Test Plan</a>
<br>
<br>
-<a href="api/index.html">libdbus API Documentation</a>
+@DBUS_APIDOC_LINK@
</td>
<td valign=top>
<a href="dbus-daemon.1.html">D-Bus Daemon manual</a>