From: Junfeng Dong Date: Fri, 22 Mar 2013 10:47:23 +0000 (+0800) Subject: Fix for 64 bit compatibility. X-Git-Tag: 2.1b_release^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=17d4d17fe2d4298d7ebad68d8d966d1f3f654947;p=platform%2Fcore%2Fsecurity%2Fdrm-client.git Fix for 64 bit compatibility. - Fix hardcoding path. - Use %cmake to set default paths. Change-Id: Ic5cd021a82c85d3d8efdb9c5ce2886ac8efdcecc --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 591fefe..7f58df4 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,7 +7,7 @@ PROJECT(drm-client CXX) # Message #MESSAGE("FLAGS: ${CMAKE_C_FLAGS}") SET(PREFIX ${CMAKE_INSTALL_PREFIX}) -SET(LIBDIR ${PREFIX}/lib) +SET(LIBDIR ${LIB_INSTALL_DIR}) SET(INCLUDEDIR ${PREFIX}/include) SET(VERSION 0.0.1) @@ -50,6 +50,6 @@ IF("${ARCH}" STREQUAL "arm") ENDIF("${ARCH}" STREQUAL "arm") CONFIGURE_FILE(${PROJECT_NAME}.pc.in ${PROJECT_NAME}.pc) -INSTALL(FILES ${PROJECT_NAME}.pc DESTINATION lib/pkgconfig) -INSTALL(TARGETS ${PROJECT_NAME} DESTINATION lib) +INSTALL(FILES ${PROJECT_NAME}.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig) +INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_INSTALL_DIR}) INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/ DESTINATION /usr/include/drm-client/) diff --git a/packaging/drm-client.spec b/packaging/drm-client.spec index 517dde3..bae01dd 100755 --- a/packaging/drm-client.spec +++ b/packaging/drm-client.spec @@ -25,7 +25,7 @@ Development files for %{name} %setup -q %build -cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} +%cmake . make %{?jobs:-j%jobs}