From 45b8b667354ef0387a5068816626523a9cb2b6a6 Mon Sep 17 00:00:00 2001 From: Ralf Habacker Date: Tue, 14 Jan 2014 23:43:51 +0100 Subject: [PATCH 2/2] Keep cmake install locations in sync with autotools. --- cmake/dbus/CMakeLists.txt | 2 +- cmake/doc/CMakeLists.txt | 6 +++--- 2 Dateien geändert, 4 Zeilen hinzugefügt(+), 4 Zeilen entfernt(-) diff --git a/cmake/dbus/CMakeLists.txt b/cmake/dbus/CMakeLists.txt index 035e3a7..076e371 100644 --- a/cmake/dbus/CMakeLists.txt +++ b/cmake/dbus/CMakeLists.txt @@ -272,7 +272,7 @@ else(WIN32) endif(WIN32) install(TARGETS dbus-1 ${INSTALL_TARGETS_DEFAULT_ARGS}) -install(FILES ${dbusinclude_HEADERS} DESTINATION include/dbus) +install(FILES ${dbusinclude_HEADERS} DESTINATION include/dbus-1/dbus) ### Internal library, used for the daemon, tools and tests, compiled statically. diff --git a/cmake/doc/CMakeLists.txt b/cmake/doc/CMakeLists.txt index 7fdfc21..eb9ce5c 100644 --- a/cmake/doc/CMakeLists.txt +++ b/cmake/doc/CMakeLists.txt @@ -81,7 +81,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 share/doc/dbus-1) endif () else () MESSAGE(STATUS "skipping xml doc generating for ${_infile}, file not found") @@ -141,7 +141,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 share/doc/dbus-1) set (EXTRA_DIST ${CMAKE_SOURCE_DIR}/../doc/busconfig.dtd @@ -149,6 +149,6 @@ set (EXTRA_DIST ${CMAKE_SOURCE_DIR}/../doc/introspect.xsl ) -install(FILES ${EXTRA_DIST} DESTINATION share/doc/dbus) +install(FILES ${EXTRA_DIST} DESTINATION share/doc/dbus-1) endif(DBUS_ENABLE_XML_DOCS) -- 1.7.10.4