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 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,7 +7,7 @@ PROJECT(drm-client CXX)
 # Message\r
 #MESSAGE("FLAGS: ${CMAKE_C_FLAGS}")\r
 SET(PREFIX ${CMAKE_INSTALL_PREFIX})\r
-SET(LIBDIR ${PREFIX}/lib)\r
+SET(LIBDIR ${LIB_INSTALL_DIR})\r
 SET(INCLUDEDIR ${PREFIX}/include)\r
 SET(VERSION 0.0.1)\r
 \r
@@ -50,6 +50,6 @@ IF("${ARCH}" STREQUAL "arm")
 ENDIF("${ARCH}" STREQUAL "arm")\r
 \r
 CONFIGURE_FILE(${PROJECT_NAME}.pc.in ${PROJECT_NAME}.pc)\r
-INSTALL(FILES ${PROJECT_NAME}.pc DESTINATION lib/pkgconfig)\r
-INSTALL(TARGETS ${PROJECT_NAME} DESTINATION lib)\r
+INSTALL(FILES ${PROJECT_NAME}.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)\r
+INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_INSTALL_DIR})\r
 INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/ DESTINATION /usr/include/drm-client/)\r

diff --git a/packaging/drm-client.spec b/packaging/drm-client.spec
index 517dde3..bae01dd 100755 (executable)
--- 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}