diff options
| author | Junfeng Dong <junfeng.dong@intel.com> | 2013-03-28 17:30:49 +0800 |
|---|---|---|
| committer | lifang <fangx.li@intel.com> | 2013-04-02 22:51:30 +0800 |
| commit | a5e3aa9dcf56e1653603ead24edec7bf868f47b0 (patch) | |
| tree | 95cbf19f116d23a5c7aa7092d5c73cb7e27527b9 | |
| parent | 905740c1408963f022a14809a0d57ccd6b95ed5d (diff) | |
| download | shortcut-a5e3aa9dcf56e1653603ead24edec7bf868f47b0.tar.gz shortcut-a5e3aa9dcf56e1653603ead24edec7bf868f47b0.tar.bz2 shortcut-a5e3aa9dcf56e1653603ead24edec7bf868f47b0.zip | |
Fix for 64 bit compatibility.
- Fix hardcoding path.
- Use %cmake to set default paths.
Change-Id: Idf0f2d2403575f0571447c61bb6d2c953b0888d8
| -rw-r--r-- | lib/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | lib/shortcut.pc.in | 2 | ||||
| -rw-r--r-- | packaging/libshortcut.spec | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index 0e27e2d..9f2f2a7 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -4,7 +4,6 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/lib/include) SET(PREFIX ${CMAKE_INSTALL_PREFIX}) SET(EXEC_PREFIX "\${prefix}") -SET(LIBDIR "\${exec_prefix}/lib") SET(INCLUDEDIR "\${prefix}/include/${PROJECT_NAME}") SET(VERSION_MAJOR 0) SET(VERSION "${VERSION_MAJOR}.0.1") @@ -39,10 +38,10 @@ TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${svc_pkgs_LDFLAGS}) CONFIGURE_FILE(${PROJECT_NAME}.pc.in ${PROJECT_NAME}.pc @ONLY) SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${PROJECT_NAME}.pc") -INSTALL(TARGETS ${PROJECT_NAME} DESTINATION lib) +INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_INSTALL_DIR}) INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/include/shortcut.h DESTINATION include/${PROJECT_NAME}) INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/include/shortcut_PG.h DESTINATION include/${PROJECT_NAME}) -INSTALL(FILES ${CMAKE_BINARY_DIR}/lib/${PROJECT_NAME}.pc DESTINATION lib/pkgconfig) +INSTALL(FILES ${CMAKE_BINARY_DIR}/lib/${PROJECT_NAME}.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig) INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/LICENSE DESTINATION /usr/share/license RENAME "lib${PROJECT_NAME}") SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES SOVERSION ${VERSION_MAJOR}) diff --git a/lib/shortcut.pc.in b/lib/shortcut.pc.in index 8daf96d..769d230 100644 --- a/lib/shortcut.pc.in +++ b/lib/shortcut.pc.in @@ -1,6 +1,6 @@ prefix=@PREFIX@ exec_prefix=@EXEC_PREFIX@ -libdir=@LIBDIR@ +libdir=@LIB_INSTALL_DIR@ includedir=@INCLUDEDIR@ Name: shortcut diff --git a/packaging/libshortcut.spec b/packaging/libshortcut.spec index 7008be7..486c314 100644 --- a/packaging/libshortcut.spec +++ b/packaging/libshortcut.spec @@ -34,7 +34,7 @@ Requires: %{name} = %{version}-%{release} %setup -q %build -cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} +%cmake . make %{?jobs:-j%jobs} %install |