Fix for x86_64 compatibility.

Change-Id: Iddd9f3d3e55150d13105ebfdf07cd6e4cdca70eb

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ab3a37b..79cd01a 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,7 +3,7 @@ PROJECT(feedback C)
 
 SET(PREFIX ${CMAKE_INSTALL_PREFIX})
 SET(EXEC_PREFIX "\${prefix}")
-SET(LIBDIR "\${prefix}/lib")
+SET(LIBDIR ${LIB_INSTALL_DIR})
 SET(INCLUDEDIR "\${prefix}/include/${PROJECT_NAME}")
 SET(VERSION 0.1.4)
 
@@ -76,7 +76,7 @@ FOREACH(svidatadir ${SVI_DATA_DIRS})
     INSTALL(DIRECTORY ${svidatadir} DESTINATION share)
 ENDFOREACH(svidatadir)
 
-INSTALL(TARGETS ${PROJECT_NAME} DESTINATION lib COMPONENT RuntimeLibraries)
-INSTALL(TARGETS ${SVI_NAME} DESTINATION lib COMPONENT RuntimeLibraries)
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc DESTINATION lib/pkgconfig)
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${SVI_NAME}.pc DESTINATION lib/pkgconfig)
+INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_INSTALL_DIR} COMPONENT RuntimeLibraries)
+INSTALL(TARGETS ${SVI_NAME} DESTINATION ${LIB_INSTALL_DIR} COMPONENT RuntimeLibraries)
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${SVI_NAME}.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)

diff --git a/packaging/libfeedback.spec b/packaging/libfeedback.spec
index 525490f..64f7269 100644 (file)
--- a/packaging/libfeedback.spec
+++ b/packaging/libfeedback.spec
@@ -62,7 +62,7 @@ svi resource package
 cp %{SOURCE1} .
 cp %{SOURCE2} .
 cp %{SOURCE3} .
-cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix}
+%cmake .
 make
 
 %install