Fix for 64-bit build compatibility

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b92cb255cafb58704bff13fbdf804d2e5c63cbd7..88560b57099e8ed112f7cafdbe79baae5dd3c374 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,7 +4,7 @@ PROJECT(imcmodem-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_INSTALL_DIR}/pkgconfig" CACHE PATH PKGCONFIGDIR)
 SET(CMAKE_INSTALL_PREFIX "${PREFIX}")
@@ -46,5 +46,5 @@ SET_TARGET_PROPERTIES(imcmodem-plugin PROPERTIES PREFIX "" OUTPUT_NAME imcmodem-
 
 # install
 INSTALL(TARGETS imcmodem-plugin
-       LIBRARY DESTINATION ${LIB_INSTALL_DIR}/telephony/plugins)
+       LIBRARY DESTINATION ${LIBDIR}/telephony/plugins)
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/LICENSE DESTINATION /usr/share/license RENAME tel-plugin-imcmodem)

diff --git a/packaging/tel-plugin-imcmodem.spec b/packaging/tel-plugin-imcmodem.spec
index 7d37ec00d2002cbd49330672e0ec9ceead316c89..6bfd76db1e219b02ecb10dc186e32226c43219c7 100644 (file)
--- a/packaging/tel-plugin-imcmodem.spec
+++ b/packaging/tel-plugin-imcmodem.spec
@@ -23,7 +23,8 @@ imcmodem plugin for telephony
 %setup -q
 
 %build
-%cmake .
+%cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} \
+       -DLIB_INSTALL_DIR=%{_libdir}
 make %{?_smp_mflags}
 
 %post