Fixed build on x86_64.

Change-Id: I421e3b52d7de45acc0eeccae3d2836df9a5050bc

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e5a812d79e74281deaeb5fd71bc2cb62fa558bf6..60b45a3d930be2806a43e9b38463d06f1c693068 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,7 +6,7 @@ SET(PREFIX ${CMAKE_INSTALL_PREFIX})
 SET(EXEC_PREFIX "\${prefix}")
 SET(LIBDIR "\${prefix}/lib")
 SET(INCLUDEDIR "\${prefix}/include")
-SET(PKGCONFIGDIR "${PREFIX}/lib/pkgconfig" CACHE PATH PKGCONFIGDIR)
+SET(PKGCONFIGDIR "${PREFIX}/${LIB_INSTALL_DIR}/pkgconfig" CACHE PATH PKGCONFIGDIR)
 SET(CMAKE_INSTALL_PREFIX "${PREFIX}")
 
 # Set required packages
@@ -43,5 +43,5 @@ SET_TARGET_PROPERTIES(vconf-plugin PROPERTIES PREFIX "" OUTPUT_NAME vconf-plugin
 
 # install
 INSTALL(TARGETS vconf-plugin
-               LIBRARY DESTINATION lib/telephony/plugins)
+       LIBRARY DESTINATION ${LIB_INSTALL_DIR}/telephony/plugins)
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/LICENSE DESTINATION /usr/share/license RENAME tel-plugin-vconf)

diff --git a/packaging/tel-plugin-vconf.spec b/packaging/tel-plugin-vconf.spec
index b1b43086aa540205d1513cc19459a9a420d25379..6d3f50e240ee17dd82ddf22ae313c0e7011803be 100644 (file)
--- a/packaging/tel-plugin-vconf.spec
+++ b/packaging/tel-plugin-vconf.spec
@@ -25,7 +25,7 @@ Telephony Vconf storage plugin
 
 %build
 versionint=$[%{major} * 1000000 + %{minor} * 1000 + %{patchlevel}]
-cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DVERSION=$versionint
+%cmake . -DVERSION=$versionint
 make %{?jobs:-j%jobs}
 
 %post
@@ -85,13 +85,11 @@ vconftool set -t bool db/telephony/flight_mode 0 -i -f
 %postun -p /sbin/ldconfig
 
 %install
-rm -rf %{buildroot}
 %make_install
 mkdir -p %{buildroot}/usr/share/license
 
 %files
 %manifest tel-plugin-vconf.manifest
 %defattr(-,root,root,-)
-#%doc COPYING
 %{_libdir}/telephony/plugins/vconf-plugin*
 /usr/share/license/tel-plugin-vconf