Fixed build on x86_64.

Change-Id: I2aeaebea73163d4dc5eb0ba3699c4cb34ae48970

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 24a38f2..d0999e5 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -31,7 +31,7 @@ ENDIF("${ARCH}" STREQUAL "arm")
 ADD_DEFINITIONS("-DPREFIX=\"${CMAKE_INSTALL_PREFIX}\"")
 ADD_DEFINITIONS("-DSLP_DEBUG")
 
-SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -Wl,--rpath=/usr/lib")
+SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -Wl,--rpath=${LIB_INSTALL_DIR}")
 
 aux_source_directory(src SOURCES)
 ADD_LIBRARY(${fw_name} SHARED ${SOURCES})
@@ -68,7 +68,7 @@ INSTALL(TARGETS test_gui DESTINATION /usr/local/bin)
 #---------------------------------------------------------------------
 
 
-INSTALL(TARGETS ${fw_name} DESTINATION lib)
+INSTALL(TARGETS ${fw_name} DESTINATION ${LIB_INSTALL_DIR})
 INSTALL(
         DIRECTORY ${INC_DIR}/ DESTINATION include/system
         FILES_MATCHING
@@ -86,7 +86,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)
 
 # INSTALL (TARGETS test DESTINATION bin)
 

diff --git a/packaging/capi-system-system-settings.spec b/packaging/capi-system-system-settings.spec
index 32ba850..d3f1bcc 100755 (executable)
--- a/packaging/capi-system-system-settings.spec
+++ b/packaging/capi-system-system-settings.spec
@@ -20,9 +20,6 @@ BuildRequires:  pkgconfig(gobject-2.0)
 BuildRequires:  pkgconfig(fontconfig)
 BuildRequires:  pkgconfig(libxml-2.0)
 
-Requires(post): /sbin/ldconfig  
-Requires(postun): /sbin/ldconfig
-
 %description
 
 
@@ -34,22 +31,16 @@ Requires:  pkgconfig(capi-base-common)
 
 %description devel
 
-
-
 %prep
 %setup -q
 
-
 %build
 MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'`  
-cmake . -DCMAKE_INSTALL_PREFIX=/usr -DFULLVER=%{version} -DMAJORVER=${MAJORVER} 
-
+%cmake . -DFULLVER=%{version} -DMAJORVER=${MAJORVER} 
 
 make %{?jobs:-j%jobs}
 
 %install
-rm -rf %{buildroot}
-
 mkdir -p %{buildroot}/usr/share/license
 cp -f LICENSE.APLv2 %{buildroot}/usr/share/license/%{name}