Fix for 64-bit build compatibility

Change-Id: I0cbcac262b486a4967972096307908fe607bd7e6
Signed-off-by: Jiwan Kim <ji-wan.kim@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index be7e833..c9314ca 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,9 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
 PROJECT(indicator-plugin C)
 
+SET(PREFIX ${CMAKE_INSTALL_PREFIX})
+SET(LIBDIR ${LIB_INSTALL_DIR})
+
 ### Set required packages ###
 INCLUDE(FindPkgConfig)
 pkg_check_modules(pkgs REQUIRED glib-2.0 dlog deviced tcore vconf)
@@ -51,5 +54,5 @@ SET_TARGET_PROPERTIES(indicator-plugin
                COMPILE_DEFINITIONS "${PROFILE_DEFINITIONS}")
 # install
 INSTALL(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION ${PLUGIN_DEST})
-INSTALL(TARGETS indicator-plugin LIBRARY DESTINATION ${LIB_INSTALL_DIR}/telephony/plugins)
+INSTALL(TARGETS indicator-plugin LIBRARY DESTINATION ${LIBDIR}/telephony/plugins)
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/LICENSE DESTINATION /usr/share/license RENAME tel-plugin-indicator)

diff --git a/packaging/tel-plugin-indicator.spec b/packaging/tel-plugin-indicator.spec
index 33b46db..ab103b0 100755 (executable)
--- a/packaging/tel-plugin-indicator.spec
+++ b/packaging/tel-plugin-indicator.spec
@@ -27,7 +27,9 @@ Telephony Indicator plugin
 %build
 versionint=$[%{major} * 1000000 + %{minor} * 1000 + %{patchlevel}]
 
-%cmake . -DVERSION=$versionint \
+%cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} \
+       -DLIB_INSTALL_DIR=%{_libdir} \
+       -DVERSION=$versionint \
 
 make %{?_smp_mflags}