Fix for x86_64 compatibility.

Change-Id: I3824ee57be8044923be23779b3965c6312456344

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a598959f1d6422f9454f947ee90735e96612b577..5add3fbaec079bdd0759a1124b4e7c975c91f01f 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -29,7 +29,7 @@ ENDIF("${ARCH}" STREQUAL "arm")
 ADD_DEFINITIONS("-DPREFIX=\"${CMAKE_INSTALL_PREFIX}\"")
 ADD_DEFINITIONS("-DSLP_DEBUG")
 
-SET(CMAKE_EXE_LINKER_FLAGS "-fvisibility=hidden -Wl,--as-needed -Wl,--rpath=/usr/lib")
+SET(CMAKE_EXE_LINKER_FLAGS "-fvisibility=hidden -Wl,--as-needed -Wl,--rpath=${LIB_INSTALL_DIR}")
 
 aux_source_directory(src SOURCES)
 ADD_LIBRARY(${fw_name} SHARED ${SOURCES})
@@ -43,7 +43,7 @@ SET_TARGET_PROPERTIES(${fw_name}
      CLEAN_DIRECT_OUTPUT 1
 )
 
-INSTALL(TARGETS ${fw_name} DESTINATION lib)
+INSTALL(TARGETS ${fw_name} DESTINATION ${LIB_INSTALL_DIR})
 INSTALL(
         DIRECTORY ${INC_DIR}/ DESTINATION include/system
         FILES_MATCHING
@@ -61,7 +61,7 @@ CONFIGURE_FILE(
     ${CMAKE_CURRENT_SOURCE_DIR}/${fw_name}.pc
     @ONLY
 )
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${fw_name}.pc DESTINATION lib/pkgconfig)
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${fw_name}.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
 
 IF(UNIX)
 

diff --git a/capi-system-runtime-info.pc.in b/capi-system-runtime-info.pc.in
index d0610b91cd42ae5a71a53a4a053bde45d6f38f44..1d79ad07162eb4fb757664668f0ce31920b5689c 100755 (executable)
--- a/capi-system-runtime-info.pc.in
+++ b/capi-system-runtime-info.pc.in
@@ -3,7 +3,7 @@
 
 prefix=@PREFIX@
 exec_prefix=/usr
-libdir=/usr/lib
+libdir=@LIB_INSTALL_DIR@
 includedir=/usr/include/system
 
 Name: @PC_NAME@

diff --git a/packaging/capi-system-runtime-info.spec b/packaging/capi-system-runtime-info.spec
index 25523cef7fe1c06e2a6c014e5d3fbf337a8b3bd6..96e06078024d0875145939dfe29acb324c830dd7 100644 (file)
--- a/packaging/capi-system-runtime-info.spec
+++ b/packaging/capi-system-runtime-info.spec
@@ -30,8 +30,8 @@ Requires:  pkgconfig(capi-base-common)
 
 
 %build
-MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'`
-cmake . -DCMAKE_INSTALL_PREFIX=/usr -DFULLVER=%{version} -DMAJORVER=${MAJORVER}
+MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'`  
+%cmake . -DFULLVER=%{version} -DMAJORVER=${MAJORVER}
 
 
 make %{?jobs:-j%jobs}