fix hardcoding in cmake files

diff --git a/capi/CMakeLists.txt b/capi/CMakeLists.txt
index 906fba772e06015eb4355b0e33ad76f6aade2994..ee547f79090a216d74f0d74d6794b9a8895c7be5 100644 (file)
--- a/capi/CMakeLists.txt
+++ b/capi/CMakeLists.txt
@@ -46,7 +46,7 @@ SET_TARGET_PROPERTIES(${fw_name}
 
 INSTALL(TARGETS ${fw_name} DESTINATION ${LIB_INSTALL_DIR})
 INSTALL(
-        DIRECTORY ${INC_DIR}/ DESTINATION ../include/privacymgr
+    DIRECTORY ${INC_DIR}/ DESTINATION ${INCLUDE_INSTALL_DIR}/privacymgr
         FILES_MATCHING
         PATTERN "*_private.h" EXCLUDE
         PATTERN "${INC_DIR}/*.h"

diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
index 98b940938622d1c94344c9a5cf3365b24873e8a0..091abb2f3e8613296f7d7718927db4c40c4f7f9a 100644 (file)
--- a/client/CMakeLists.txt
+++ b/client/CMakeLists.txt
@@ -5,7 +5,7 @@ SET(CMAKE_INSTALL_PREFIX /usr)
 SET(PREFIX ${CMAKE_INSTALL_PREFIX})
 SET(EXEC_PREFIX "\${prefix}")
 SET(LIBDIR ${LIB_INSTALL_DIR})
-SET(INCLUDEDIR "\${prefix}/include")
+SET(INCLUDEDIR ${INCLUDE_INSTALL_DIR})
 
 INCLUDE(FindPkgConfig)
 pkg_check_modules(privacy-manager-client REQUIRED dlog sqlite3 dbus-1 dbus-glib-1 db-util pkgmgr-info)
@@ -81,4 +81,4 @@ CONFIGURE_FILE(../privacy-manager-client.pc.in privacy-manager-client.pc @ONLY)
 
 INSTALL(TARGETS privacy-manager-client DESTINATION ${LIB_INSTALL_DIR} COMPONENT RuntimeLibraries)
 INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/privacy-manager-client.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
-INSTALL(FILES ${PRIVACY_MANAGER_CLIENT_HEADERS} DESTINATION ../include/privacy_manager)
+INSTALL(FILES ${PRIVACY_MANAGER_CLIENT_HEADERS} DESTINATION ${INCLUDE_INSTALL_DIR}/privacy_manager)

diff --git a/packaging/privacy-manager.spec b/packaging/privacy-manager.spec
index df01cf7e25f95009d4bbbd14db5b4569a5d58fde..d9385f70f892d0955b2f2aedbf7ed2bb0e9db49f 100755 (executable)
--- a/packaging/privacy-manager.spec
+++ b/packaging/privacy-manager.spec
@@ -154,7 +154,7 @@ fi
 %manifest packaging/privacy-manager-client.manifest
 %{_libdir}/libprivacy-manager-client.so*
 /usr/share/license/privacy-manager-client
-/usr/etc/package-manager/parserlib/libprivileges.so
+/etc/package-manager/parserlib/libprivileges.so
 
 %files -n privacy-manager-client-devel
 %defattr(-,root,root,-)

diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt
index fd1e15df1b2f7ee98cbdbb43f6b43676f57473a2..af5f1a498b72b6bf22fc106380931683f4d66c51 100644 (file)
--- a/server/CMakeLists.txt
+++ b/server/CMakeLists.txt
@@ -75,6 +75,6 @@ SET_TARGET_PROPERTIES(privacy-manager-server PROPERTIES COMPILE_FLAGS "${PRIVACY
 
 CONFIGURE_FILE(../privacy-manager-server.pc.in privacy-manager-server.pc @ONLY)
 
-INSTALL(TARGETS privacy-manager-server DESTINATION ../bin COMPONENT RuntimeLibraries)
+INSTALL(TARGETS privacy-manager-server DESTINATION bin COMPONENT RuntimeLibraries)
 INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/privacy-manager-server.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
-INSTALL(FILES ${PRIVACY_MANAGER_SERVER_HEADERS} DESTINATION ../include/privacy_manager/server)
+INSTALL(FILES ${PRIVACY_MANAGER_SERVER_HEADERS} DESTINATION ${INCLUDE_INSTALL_DIR}/privacy_manager/server)

diff --git a/server/src/CMakeLists.txt b/server/src/CMakeLists.txt
index 12f7a8d9f844caa145ce5884cabfab27493e532d..8aea0eaea6dedfb26dc8bf8d8ba1fb42f0ed4489 100644 (file)
--- a/server/src/CMakeLists.txt
+++ b/server/src/CMakeLists.txt
@@ -5,7 +5,7 @@ SET(CMAKE_INSTALL_PREFIX /usr)
 SET(PREFIX ${CMAKE_INSTALL_PREFIX})
 SET(EXEC_PREFIX "\${prefix}")
 SET(LIBDIR ${LIB_INSTALL_DIR})
-SET(INCLUDEDIR "\${prefix}/include")
+SET(INCLUDEDIR ${INCLUDE_INSTALL_DIR})
 SET(VERSION 0.0)
 
 SET(VERSION_MAJOR 0)
@@ -70,4 +70,4 @@ CONFIGURE_FILE(../../privacy-manager-server.pc.in privacy-manager-server.pc @ONL
 
 INSTALL(TARGETS privacy-manager-server DESTINATION ${LIB_INSTALL_DIR} COMPONENT RuntimeLibraries)
 INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/privacy-manager-server.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
-INSTALL(FILES ${PRIVACY_MANAGER_SERVER_HEADERS} DESTINATION ../include)
+INSTALL(FILES ${PRIVACY_MANAGER_SERVER_HEADERS} DESTINATION ${INCLUDE_INSTALL_DIR})