Fix for 64 bit compatibility.

- Fix hardcoding path.
- Use %cmake to set default paths.

Change-Id: Ie8b4640b8ef46c87c72b5af0b5f8cba92e72f4b4

diff --git a/packaging/nfc-manager.spec b/packaging/nfc-manager.spec
index 57b6997..a7b72d5 100644 (file)
--- a/packaging/nfc-manager.spec
+++ b/packaging/nfc-manager.spec
@@ -75,10 +75,10 @@ NFC common library (devel)
 
 
 %build
-export LDFLAGS+="-Wl,--rpath=%{_prefix}/lib -Wl,--as-needed"
+export LDFLAGS+="-Wl,--rpath=%{_libdir} -Wl,--as-needed"
 mkdir cmake_tmp
 cd cmake_tmp
-LDFLAGS="$LDFLAGS" cmake .. -DCMAKE_INSTALL_PREFIX=%{_prefix}
+LDFLAGS="$LDFLAGS" %cmake ..
 
 make
 

diff --git a/src/clientlib/CMakeLists.txt b/src/clientlib/CMakeLists.txt
index 849507c..4daa3d3 100644 (file)
--- a/src/clientlib/CMakeLists.txt
+++ b/src/clientlib/CMakeLists.txt
@@ -89,9 +89,9 @@ SET(CLIENT_HEADER
 )
 
 CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/nfc.pc.in ${CMAKE_CURRENT_SOURCE_DIR}/nfc.pc)
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/nfc.pc DESTINATION lib/pkgconfig)
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/nfc.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
 
-INSTALL(TARGETS ${NFC_CLIENT_LIB} DESTINATION lib)
+INSTALL(TARGETS ${NFC_CLIENT_LIB} DESTINATION ${LIB_INSTALL_DIR})
 
 FOREACH(hfile ${CLIENT_HEADER})
         INSTALL(FILES ${hfile} DESTINATION include/nfc)

diff --git a/src/commonlib/CMakeLists.txt b/src/commonlib/CMakeLists.txt
index ab635f5..65e4b30 100644 (file)
--- a/src/commonlib/CMakeLists.txt
+++ b/src/commonlib/CMakeLists.txt
@@ -64,8 +64,8 @@ SET(COMMON_LIB_HEADER
 )
 
 CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${NFC_COMMON_LIB}.pc.in ${CMAKE_CURRENT_SOURCE_DIR}/${NFC_COMMON_LIB}.pc)
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${NFC_COMMON_LIB}.pc DESTINATION lib/pkgconfig)
-INSTALL(TARGETS ${NFC_COMMON_LIB} DESTINATION lib)
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${NFC_COMMON_LIB}.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
+INSTALL(TARGETS ${NFC_COMMON_LIB} DESTINATION ${LIB_INSTALL_DIR})
 
 FOREACH(hfile ${COMMON_LIB_HEADER})
         INSTALL(FILES ${hfile} DESTINATION include/nfc-common-lib)