Fix for 64-bit build compatibility

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9be36c3..8208729 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,7 +4,7 @@ PROJECT(nitz-plugin C)
 # INCLUDE(FindPkgConfig)
 SET(PREFIX ${CMAKE_INSTALL_PREFIX})
 SET(EXEC_PREFIX "\${prefix}")
-SET(LIBDIR "\${prefix}/lib")
+SET(LIBDIR ${LIB_INSTALL_DIR})
 SET(INCLUDEDIR "\${prefix}/include")
 
 # Set required packages
@@ -42,4 +42,4 @@ SET_TARGET_PROPERTIES(nitz-plugin PROPERTIES PREFIX "" OUTPUT_NAME nitz-plugin)
 
 # install
 INSTALL(TARGETS nitz-plugin
-               LIBRARY DESTINATION lib/telephony/plugins)
+               LIBRARY DESTINATION ${LIBDIR}/telephony/plugins)

diff --git a/packaging/tel-plugin-nitz.spec b/packaging/tel-plugin-nitz.spec
index c3544a0..ee8a996 100644 (file)
--- a/packaging/tel-plugin-nitz.spec
+++ b/packaging/tel-plugin-nitz.spec
@@ -25,7 +25,9 @@ nitz plugin for telephony
 
 %build
 versionint=$[%{major} * 1000000 + %{minor} * 1000 + %{patchlevel}]
-cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DVERSION=$versionint
+cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} \
+       -DLIB_INSTALL_DIR=%{_libdir} \
+       -DVERSION=$versionint
 make %{?jobs:-j%jobs}
 
 %post