diff options
| author | Michael Jansen <kde@michael-jansen.biz> | 2009-08-31 19:06:32 +0000 |
|---|---|---|
| committer | Michael Jansen <kde@michael-jansen.biz> | 2009-08-31 19:06:32 +0000 |
| commit | 96038bf56b933ae9c9dcaf7c8cd0b827173eb3af (patch) | |
| tree | 5b2b0764483516dbbe2bba9fae4b04ab90812633 | |
| parent | 2e2020a1e1e4f140fb776d0073203770b5fe6708 (diff) | |
| download | extra-cmake-modules-96038bf56b933ae9c9dcaf7c8cd0b827173eb3af.tar.gz extra-cmake-modules-96038bf56b933ae9c9dcaf7c8cd0b827173eb3af.tar.bz2 | |
Respect PREFIX for "dbus system service" files and dbus "system
configuration files".
Please review extensively :)
CCMAIL: kde-buildsystem@kde.org
CCMAIL: drf@kde.org
svn path=/trunk/KDE/kdelibs/; revision=1017870
| -rw-r--r-- | modules/FindKDE4Internal.cmake | 3 | ||||
| -rw-r--r-- | modules/MacroKAuth.cmake | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/modules/FindKDE4Internal.cmake b/modules/FindKDE4Internal.cmake index 91567585..3c7c1de4 100644 --- a/modules/FindKDE4Internal.cmake +++ b/modules/FindKDE4Internal.cmake @@ -104,6 +104,7 @@ # XDG_MIME_INSTALL_DIR - the XDG mimetypes install dir # DBUS_INTERFACES_INSTALL_DIR - the directory where dbus interfaces be installed (default is prefix/share/dbus-1/interfaces) # DBUS_SERVICES_INSTALL_DIR - the directory where dbus services be installed (default is prefix/share/dbus-1/services ) +# DBUS_SYSTEM_SERVICES_INSTALL_DIR - the directory where dbus system services be installed (default is prefix/share/dbus-1/system-services ) # # The following variable is provided, but seem to be unused: # LIBS_HTML_INSTALL_DIR /share/doc/HTML CACHE STRING "Is this still used ?") @@ -664,6 +665,7 @@ if (WIN32) set(INFO_INSTALL_DIR "share/info" ) # The kde info install dir (default ${SHARE_INSTALL_PREFIX}/info)") set(DBUS_INTERFACES_INSTALL_DIR "share/dbus-1/interfaces" ) # The kde dbus interfaces install dir (default ${SHARE_INSTALL_PREFIX}/dbus-1/interfaces)") set(DBUS_SERVICES_INSTALL_DIR "share/dbus-1/services" ) # The kde dbus services install dir (default ${SHARE_INSTALL_PREFIX}/dbus-1/services)") + set(DBUS_SYSTEM_SERVICES_INSTALL_DIR "share/dbus-1/system-services" ) # The kde dbus system services install dir (default ${SHARE_INSTALL_PREFIX}/dbus-1/system-services)") else (WIN32) @@ -735,6 +737,7 @@ else (WIN32) _set_fancy(INFO_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/info" "The kde info install dir (default ${SHARE_INSTALL_PREFIX}/info)") _set_fancy(DBUS_INTERFACES_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/dbus-1/interfaces" "The kde dbus interfaces install dir (default ${SHARE_INSTALL_PREFIX}/dbus-1/interfaces)") _set_fancy(DBUS_SERVICES_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/dbus-1/services" "The kde dbus services install dir (default ${SHARE_INSTALL_PREFIX}/dbus-1/services)") + _set_fancy(DBUS_SYSTEM_SERVICES_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/dbus-1/system-services" "The kde dbus system services install dir (default ${SHARE_INSTALL_PREFIX}/dbus-1/system-services)") endif (WIN32) diff --git a/modules/MacroKAuth.cmake b/modules/MacroKAuth.cmake index 826c85f2..f05bc8b4 100644 --- a/modules/MacroKAuth.cmake +++ b/modules/MacroKAuth.cmake @@ -35,7 +35,7 @@ macro(kde4_auth_add_helper _HELPER_TARGET _HELPER_ID _HELPER_USER) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${HELPER_ID}.conf DESTINATION ${SYSCONF_INSTALL_DIR}/dbus-1/system.d/) configure_file(${KDE4_KAUTH_DBUS_SERVICE_STUB} ${CMAKE_CURRENT_BINARY_DIR}/${HELPER_ID}.service) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${HELPER_ID}.service DESTINATION ${DBUS_PREFIX}/share/dbus-1/system-services ) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${HELPER_ID}.service DESTINATION ${DBUS_SYSTEM_SERVICES_INSTALL_DIR}) endmacro(kde4_auth_add_helper) |