diff options
| author | jy910.yun <jy910.yun@samsung.com> | 2013-06-21 21:22:28 +0900 |
|---|---|---|
| committer | jy910.yun <jy910.yun@samsung.com> | 2013-06-21 21:22:28 +0900 |
| commit | cf5cefdd3a785365ae813f89fc6f73c8caf5cef7 (patch) | |
| tree | 42c0a1b5a997e2de50820758f5bc6cfd1d49f533 /devman | |
| parent | 8c4ee55843dad616099d8e01c86c57a8adf91ef0 (diff) | |
| download | deviced-cf5cefdd3a785365ae813f89fc6f73c8caf5cef7.tar.gz deviced-cf5cefdd3a785365ae813f89fc6f73c8caf5cef7.tar.bz2 deviced-cf5cefdd3a785365ae813f89fc6f73c8caf5cef7.zip | |
revert "Fix x86-64 build" patchset
Because after applying the patchset, system-server doesn't work correctly.
Diffstat (limited to 'devman')
| -rw-r--r-- | devman/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | devman/devman.pc.in | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/devman/CMakeLists.txt b/devman/CMakeLists.txt index 825ca5aa..1b7553b6 100644 --- a/devman/CMakeLists.txt +++ b/devman/CMakeLists.txt @@ -31,6 +31,7 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/${INC_DIR}) SET(PREFIX ${CMAKE_INSTALL_PREFIX}) SET(EXEC_PREFIX "${PREFIX}/bin") SET(INCLUDEDIR "${PREFIX}/include/${PROJECT_NAME}") +SET(LIBDIR "\${prefix}/lib") SET(DATADIR "${PREFIX}/share/devman") SET(VERSION 0.1) @@ -51,9 +52,9 @@ INSTALL(TARGETS display_wd DESTINATION bin) CONFIGURE_FILE(${PROJECT_NAME}.pc.in ${PROJECT_NAME}.pc @ONLY) CONFIGURE_FILE(${PROJECT_NAME}_haptic.pc.in ${PROJECT_NAME}_haptic.pc @ONLY) -INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_INSTALL_DIR} COMPONENT RuntimeLibraries) -INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig) -INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}_haptic.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig) +INSTALL(TARGETS ${PROJECT_NAME} DESTINATION lib COMPONENT RuntimeLibraries) +INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc DESTINATION lib/pkgconfig) +INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}_haptic.pc DESTINATION lib/pkgconfig) FOREACH(hfile ${HEADERS}) INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${hfile} DESTINATION include/${PROJECT_NAME}) diff --git a/devman/devman.pc.in b/devman/devman.pc.in index 7ffae14d..b99a8721 100644 --- a/devman/devman.pc.in +++ b/devman/devman.pc.in @@ -2,7 +2,7 @@ prefix=@PREFIX@ exec_prefix=@EXEC_PREFIX@ -libdir=@LIB_INSTALL_DIR@ +libdir=@LIBDIR@ includedir=@INCLUDEDIR@ Name: device manager |