From 42d852294d6931cf0d44839de74d23bf616591db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A0=D1=83=D1=81=D0=BB=D0=B0=D0=BD=20=D0=98=D0=B6=D0=B1?=
 =?UTF-8?q?=D1=83=D0=BB=D0=B0=D1=82=D0=BE=D0=B2?= <lrn1986@gmail.com>
Date: Thu, 6 Mar 2014 23:23:07 +0000
Subject: [PATCH 9/9] Documentation installation fixes

* Actually install manpages on systems that need them
* Install documentation into DBUS_DOCDIR instead of share/doc/dbus

https://bugs.freedesktop.org/show_bug.cgi?id=73636
---
 cmake/CMakeLists.txt     | 4 ++++
 cmake/doc/CMakeLists.txt | 8 ++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
index c7986b9..53038eb 100644
--- a/cmake/CMakeLists.txt
+++ b/cmake/CMakeLists.txt
@@ -59,6 +59,10 @@ if (NOT DOCDIR)
     SET(DOCDIR ${DATAROOTDIR}/doc/dbus)
 endif()
 
+if (NOT DBUS_DOCDIR)
+    SET(DBUS_DOCDIR ${DBUS_INSTALL_DIR}/${DOCDIR})
+endif()
+
 if (NOT DBUS_DATADIR)
     SET(DBUS_DATADIR ${DATADIR})
 endif()
diff --git a/cmake/doc/CMakeLists.txt b/cmake/doc/CMakeLists.txt
index ad73c9c..b6c043e 100644
--- a/cmake/doc/CMakeLists.txt
+++ b/cmake/doc/CMakeLists.txt
@@ -87,7 +87,7 @@ macro (DOCBOOK _sources _format)
 	  if (${_format} STREQUAL "man")
 		  install(FILES ${_outfile} DESTINATION share/man/man1)
 	  else ()
-		  install(FILES ${_outfile} DESTINATION share/doc/dbus)
+		  install(FILES ${_outfile} DESTINATION ${DBUS_DOCDIR})
 	  endif ()
   else ()
 	  MESSAGE(STATUS "skipping xml doc generating for ${_infile}, file not found")
@@ -135,7 +135,7 @@ DOCBOOK(${CMAKE_BINARY_DIR}/doc/dbus-launch.1.xml html-nochunks)
 DOCBOOK(${CMAKE_BINARY_DIR}/doc/dbus-monitor.1.xml html-nochunks)
 DOCBOOK(${CMAKE_BINARY_DIR}/doc/dbus-send.1.xml html-nochunks)
 DOCBOOK(${CMAKE_BINARY_DIR}/doc/dbus-uuidgen.1.xml html-nochunks)
-if (UNIX)
+if (UNIX OR MSYS)
   DOCBOOK(${CMAKE_BINARY_DIR}/doc/dbus-daemon.1.xml man)
   DOCBOOK(${CMAKE_BINARY_DIR}/doc/dbus-monitor.1.xml man)
   DOCBOOK(${CMAKE_BINARY_DIR}/doc/dbus-send.1.xml man)
@@ -147,7 +147,7 @@ endif()
 # handle html index file
 #
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/index.html.cmake ${CMAKE_CURRENT_BINARY_DIR}/index.html )
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/index.html DESTINATION share/doc/dbus)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/index.html DESTINATION ${DBUS_DOCDIR})
 
 set (EXTRA_DIST 	
 	${CMAKE_SOURCE_DIR}/../doc/busconfig.dtd			
@@ -155,6 +155,6 @@ set (EXTRA_DIST
 	${CMAKE_SOURCE_DIR}/../doc/introspect.xsl
 )
 
-install(FILES ${EXTRA_DIST} DESTINATION share/doc/dbus)
+install(FILES ${EXTRA_DIST} DESTINATION ${DBUS_DOCDIR})
 
 endif(DBUS_ENABLE_XML_DOCS)
-- 
1.8.4