From: Jiwan Kim Date: Tue, 24 Mar 2015 11:29:57 +0000 (+0900) Subject: Fix for 64-bit build compatibility X-Git-Tag: submit/tizen_mobile/20150326.075016^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fa0c4632a7d3b121b0c8efc252583837e125db39;p=platform%2Fcore%2Ftelephony%2Ftel-plugin-atmodem.git Fix for 64-bit build compatibility Change-Id: I3252228758161e673cda89a469f49f19e695cac5 Signed-off-by: Jiwan Kim --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 0e47a19..7492dcc 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,7 +4,7 @@ PROJECT(atmodem-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 required packages @@ -47,7 +47,7 @@ SET_TARGET_PROPERTIES(atmodem-plugin PROPERTIES PREFIX "" OUTPUT_NAME atmodem-pl # install INSTALL(TARGETS atmodem-plugin - LIBRARY DESTINATION lib/telephony/plugins/modems) + LIBRARY DESTINATION ${LIBDIR}/telephony/plugins/modems) INSTALL(FILES ${CMAKE_SOURCE_DIR}/res/wiki_mcc_mnc_oper_list.sql DESTINATION /tmp RENAME mcc_mnc_oper_list.sql) INSTALL(FILES ${CMAKE_SOURCE_DIR}/LICENSE DESTINATION /usr/share/license RENAME tel-plugin-atmodem) diff --git a/packaging/tel-plugin-atmodem.spec b/packaging/tel-plugin-atmodem.spec index 55a3a02..3352336 100644 --- a/packaging/tel-plugin-atmodem.spec +++ b/packaging/tel-plugin-atmodem.spec @@ -23,7 +23,8 @@ Telephony AT Modem library %setup -q %build -cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} +cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} \ + -DLIB_INSTALL_DIR=%{_libdir} make %{?_smp_mflags} %post