Fix for 64-bit build compatibility

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 67a4dbb..7de12cb 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,7 +4,7 @@ PROJECT(vmodem-plugin C)
 ### Global setting ###
 SET(PREFIX ${CMAKE_INSTALL_PREFIX})
 SET(EXEC_PREFIX "\${prefix}")
-SET(LIBDIR "\${prefix}/lib")
+SET(LIBDIR ${LIB_INSTALL_DIR})
 SET(INCLUDEDIR "\${prefix}/include")
 SET(PKGCONFIGDIR "${PREFIX}/lib/pkgconfig" CACHE PATH PKGCONFIGDIR)
 SET(CMAKE_INSTALL_PREFIX "${PREFIX}")
@@ -49,5 +49,5 @@ SET_TARGET_PROPERTIES(vmodem-plugin PROPERTIES PREFIX "" OUTPUT_NAME vmodem-plug
 
 # install
 INSTALL(TARGETS vmodem-plugin
-               LIBRARY DESTINATION lib/telephony/plugins)
+               LIBRARY DESTINATION ${LIBDIR}/telephony/plugins)
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/LICENSE DESTINATION /usr/share/license RENAME tel-plugin-vmodem)

diff --git a/packaging/tel-plugin-vmodem.spec b/packaging/tel-plugin-vmodem.spec
index 026712e..42f5732 100755 (executable)
--- a/packaging/tel-plugin-vmodem.spec
+++ b/packaging/tel-plugin-vmodem.spec
@@ -24,7 +24,9 @@ Telephony AT Modem library
 
 %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 %{?_smp_mflags}
 
 %post