make it easy for vendors to override misc installation paths

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1f28e1a..488bc46 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -644,7 +644,7 @@ if(UNIX AND (CMAKE_SKIP_INSTALL_RPATH OR NOT CMAKE_INSTALL_RPATH))
 
     install(
         FILES ${CMAKE_BINARY_DIR}/katie.conf
-        DESTINATION etc/ld.so.conf.d
+        DESTINATION ${LDCONF_INSTALL_DIR}
     )
 endif()
 

diff --git a/mkspecs/mkspecs.cmake b/mkspecs/mkspecs.cmake
index 2a62d32..97d35cb 100644 (file)
--- a/mkspecs/mkspecs.cmake
+++ b/mkspecs/mkspecs.cmake
@@ -108,6 +108,11 @@ endif()
 
 include(${KATIE_MKSPECS_DIR}/tests/tests.cmake)
 
+# vendors are free to change them
+set(LDCONF_INSTALL_DIR "etc/ld.so.conf.d")
+set(DBUS_INTERFACES_INSTALL_DIR "etc/dbus-1/interfaces")
+set(KDE4_SERVICES_INSTALL_DIR "share/kde4/services/phononbackends")
+
 if(${KATIE_KEY} STREQUAL "auto")
     set(KATIE_KEY "${KATIE_ARCHITECTURE} ${KATIE_PLATFORM} ${KATIE_COMPILER} full-config")
 endif()

diff --git a/src/phonon/CMakeLists.txt b/src/phonon/CMakeLists.txt
index cdf1b78..1197e13 100644 (file)
--- a/src/phonon/CMakeLists.txt
+++ b/src/phonon/CMakeLists.txt
@@ -72,9 +72,6 @@ set(PHONON_LIB_PATCH_VERSION ${KATIE_MICRO})
 set(PHONON_EXPERIMENTAL TRUE)
 set(PHONON_GRAPHICS TRUE)
 set(BACKEND_INSTALL_DIR "${QT_PLUGINS_PATH_INST}/phonon_backend/")
-# TODO: revisit
-set(DBUS_INTERFACES_INSTALL_DIR "etc/dbus-1/interfaces")
-set(SERVICES_INSTALL_DIR "share/kde4/services")
 
 set_source_files_properties(
     ${CMAKE_CURRENT_SOURCE_DIR}/experimental/factory.cpp

diff --git a/src/phonon/phonon-vlc/CMakeLists.txt b/src/phonon/phonon-vlc/CMakeLists.txt
index 3561039..4524d03 100644 (file)
--- a/src/phonon/phonon-vlc/CMakeLists.txt
+++ b/src/phonon/phonon-vlc/CMakeLists.txt
@@ -129,5 +129,5 @@ configure_file(
 
 install(
     FILES ${CMAKE_CURRENT_BINARY_DIR}/vlc.desktop
-    DESTINATION ${SERVICES_INSTALL_DIR}/phononbackends
+    DESTINATION ${KDE4_SERVICES_INSTALL_DIR}
 )