diff options
| author | Anas Nashif <anas.nashif@intel.com> | 2013-05-18 13:56:37 -0400 |
|---|---|---|
| committer | Anas Nashif <anas.nashif@intel.com> | 2013-05-18 13:56:37 -0400 |
| commit | 005c01c1ff29e006c5356653d81c8f2588ca0d12 (patch) | |
| tree | ecd26a160b4b00bfe28d0d0854ac16c165e2b855 | |
| parent | 8072547c03801982c3b5cc142202fe1597113e52 (diff) | |
| download | privacy-manager-005c01c1ff29e006c5356653d81c8f2588ca0d12.tar.gz privacy-manager-005c01c1ff29e006c5356653d81c8f2588ca0d12.tar.bz2 privacy-manager-005c01c1ff29e006c5356653d81c8f2588ca0d12.zip | |
fix hardcoding in cmake files
| -rw-r--r-- | capi/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | client/CMakeLists.txt | 4 | ||||
| -rwxr-xr-x | packaging/privacy-manager.spec | 2 | ||||
| -rw-r--r-- | server/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | server/src/CMakeLists.txt | 4 |
5 files changed, 8 insertions, 8 deletions
diff --git a/capi/CMakeLists.txt b/capi/CMakeLists.txt index 906fba7..ee547f7 100644 --- 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 98b9409..091abb2 100644 --- 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 df01cf7..d9385f7 100755 --- 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 fd1e15d..af5f1a4 100644 --- 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 12f7a8d..8aea0ea 100644 --- 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}) |