]> git.ipfire.org Git - thirdparty/dbus.git/commitdiff
projects / thirdparty / dbus.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 3bf9792)
Generate documentation html index file from doc/index.html.in for autotools and cmake
authorRalf Habacker <ralf.habacker@freenet.de>
Tue, 15 Jan 2019 10:56:14 +0000 (11:56 +0100)
committerRalf Habacker <ralf.habacker@freenet.de>
Tue, 22 Jan 2019 08:57:57 +0000 (09:57 +0100)
Signed-off-by: Ralf Habacker <ralf.habacker@freenet.de>
configure.ac patch | blob | blame | history
doc/CMakeLists.txt patch | blob | blame | history
doc/index.html.in [moved from cmake/doc/index.html.cmake with 91% similarity] patch | blob | blame | history

diff --git a/configure.ac b/configure.ac
index b358e26e6e8bb152cb451cfe84afac15f2902146..3b07e0c922a2bec0c99fa9a553660d73a73fe0be 100644 (file)
--- 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 7bb610fae5645145c80651681b2cf11c7eefb4b1..f0fc838f3c9ce2d08e357a7115826466c06ca0b3 100644 (file)
--- 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
similarity index 91%
rename from cmake/doc/index.html.cmake
rename to doc/index.html.in
index ffb1f0fb2be2a22dcbc7e33e3ae0e9e4b7155b32..feca9fc8dd801bd83312ec12c860468d74379abc 100644 (file)
--- 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>
Mirror of https://gitlab.freedesktop.org/dbus/dbus.git