summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRalf Habacker <ralf.habacker@freenet.de>2019-01-15 11:56:14 +0100
committerRalf Habacker <ralf.habacker@freenet.de>2019-01-22 09:57:57 +0100
commitd9fa5aee8421bff1d3945e204c8f0328a54f0cee (patch)
treea30680c2c8b8b27a2a451deb29ccddad67a08b8b
parent3bf97922bd8df563169f9a448ecc8b2dd6658efc (diff)
downloaddbus-d9fa5aee8421bff1d3945e204c8f0328a54f0cee.tar.gz
Generate documentation html index file from doc/index.html.in for autotools and cmake
Signed-off-by: Ralf Habacker <ralf.habacker@freenet.de>
-rw-r--r--configure.ac1
-rw-r--r--doc/CMakeLists.txt2
-rw-r--r--doc/index.html.in (renamed from cmake/doc/index.html.cmake)3
3 files changed, 4 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index b358e26e..3b07e0c9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1738,6 +1738,7 @@ doc/dbus-send.1.xml
doc/dbus-test-tool.1.xml
doc/dbus-update-activation-environment.1.xml
doc/dbus-uuidgen.1.xml
+doc/index.html
dbus-1.pc
dbus-1-uninstalled.pc
cmake/DBus1Config.cmake:cmake/DBus1Config.pkgconfig.in
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index 7bb610fa..f0fc838f 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -149,7 +149,7 @@ docbook(${CMAKE_CURRENT_BINARY_DIR}/dbus-update-activation-environment.1.xml htm
#
# handle html index file
#
-configure_file(../cmake/doc/index.html.cmake ${CMAKE_CURRENT_BINARY_DIR}/index.html )
+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)
set (EXTRA_DIST
diff --git a/cmake/doc/index.html.cmake b/doc/index.html.in
index ffb1f0fb..feca9fc8 100644
--- a/cmake/doc/index.html.cmake
+++ b/doc/index.html.in
@@ -4,7 +4,7 @@
</head>
<body>
<h1>D-Bus Documentation Index</h1>
-<p>Version @DBUS_VERSION_STRING@</p>
+<p>Version @DBUS_VERSION@</p>
<table>
<tr>
@@ -36,6 +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>
</td>
<td valign=top>
<a href="dbus-daemon.1.html">D-Bus Daemon manual</a>