diff options
| author | Junfeng Dong <junfeng.dong@intel.com> | 2013-04-08 14:24:44 +0800 |
|---|---|---|
| committer | Junfeng Dong <junfeng.dong@intel.com> | 2013-04-08 14:24:44 +0800 |
| commit | 642ab9bc8628372c9944c698cefc271b833a2547 (patch) | |
| tree | b6f259a48a55d60b593371d3a3e662cf4b4cc30f | |
| parent | f4de3ca0b85bcf6c08d10b23a53ec08b9ac1f420 (diff) | |
| download | livebox-642ab9bc8628372c9944c698cefc271b833a2547.tar.gz livebox-642ab9bc8628372c9944c698cefc271b833a2547.tar.bz2 livebox-642ab9bc8628372c9944c698cefc271b833a2547.zip | |
Fix for 64 bit compatibility.
- Fix hardcoding path.
- Use %cmake to set default paths.
Change-Id: I75e78c30235fe099d5f7f0a2f5ab0f48a9c1e9df
| -rw-r--r-- | CMakeLists.txt | 6 | ||||
| -rw-r--r-- | packaging/liblivebox.spec | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 66ae402..56ef8f8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,7 +4,7 @@ PROJECT(livebox C) SET(PREFIX ${CMAKE_INSTALL_PREFIX}) SET(EXEC_PREFIX "\${prefix}") SET(PROJECT_NAME "${PROJECT_NAME}") -SET(LIBDIR "\${exec_prefix}/lib") +SET(LIBDIR ${LIB_INSTALL_DIR}) SET(INCLUDEDIR "\${prefix}/include/${PROJECT_NAME}") SET(VERSION_MAJOR 0) SET(VERSION "${VERSION_MAJOR}.0.1") @@ -50,8 +50,8 @@ TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${pkgs_LDFLAGS} "-lpthread") 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(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc DESTINATION lib/pkgconfig) +INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_INSTALL_DIR}) +INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig) INSTALL(FILES ${CMAKE_SOURCE_DIR}/include/livebox.h DESTINATION include/${PROJECT_NAME}) INSTALL(FILES ${CMAKE_SOURCE_DIR}/include/livebox_PG.h DESTINATION /usr/share/doc/${PROJECT_NAME}) INSTALL(FILES ${CMAKE_SOURCE_DIR}/LICENSE DESTINATION /usr/share/license RENAME "lib${PROJECT_NAME}") diff --git a/packaging/liblivebox.spec b/packaging/liblivebox.spec index a79e08f..3b8ba81 100644 --- a/packaging/liblivebox.spec +++ b/packaging/liblivebox.spec @@ -26,7 +26,7 @@ Livebox development library (dev) %setup -q %build -cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} +%cmake . make %{?jobs:-j%jobs} %install |