diff options
| author | Junfeng Dong <junfeng.dong@intel.com> | 2013-04-08 16:01:11 +0800 |
|---|---|---|
| committer | Junfeng Dong <junfeng.dong@intel.com> | 2013-04-08 16:01:33 +0800 |
| commit | d8cf8f99825094a0eadec1befc4eda91d68dd4d0 (patch) | |
| tree | c354236389b937aa503776f4cb25d1831ab5106e | |
| parent | ca822b5283bf7a1ef36c042f6b5576b674e36126 (diff) | |
| download | livebox-cpp-d8cf8f99825094a0eadec1befc4eda91d68dd4d0.tar.gz livebox-cpp-d8cf8f99825094a0eadec1befc4eda91d68dd4d0.tar.bz2 livebox-cpp-d8cf8f99825094a0eadec1befc4eda91d68dd4d0.zip | |
Fix for 64 bit compatibility.
- Fix hardcoding path.
- Use %cmake to set default paths.
Change-Id: Ieb14447026dcdaca4947f7ab5011e63574d09889
| -rw-r--r-- | CMakeLists.txt | 6 | ||||
| -rw-r--r-- | packaging/liblivebox-cpp.spec | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 1dca0f0..600297e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,7 +4,7 @@ PROJECT(livebox-cpp CXX) 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") @@ -48,8 +48,8 @@ TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${pkgs_LDFLAGS} "-ldl") 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-cpp.h DESTINATION include/${PROJECT_NAME}) INSTALL(FILES ${CMAKE_SOURCE_DIR}/include/livebox-cpp_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-cpp.spec b/packaging/liblivebox-cpp.spec index 4087701..0798ef7 100644 --- a/packaging/liblivebox-cpp.spec +++ b/packaging/liblivebox-cpp.spec @@ -25,7 +25,7 @@ Livebox development library (C++) (dev) %setup -q %build -cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} +%cmake . make %{?jobs:-j%jobs} %install |