Fix build for x86_64 arch

Use %cmake macro

Change-Id: I2036c9ba89bc96ec2a9ef220fc5fdf504831d931
Signed-off-by: Baptiste DURAND <baptiste.durand@open.eurogiciel.org>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 96c239b7429f3893197e4f0c4c03bc2bf1796c9d..5adee38807d37de3a3fd78a4ba474c48444c07dc 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,7 +4,6 @@ PROJECT(atmodem-plugin C)
 ### Global setting ###
 SET(PREFIX ${CMAKE_INSTALL_PREFIX})
 SET(EXEC_PREFIX "\${prefix}")
-SET(LIBDIR "\${prefix}/lib")
 SET(INCLUDEDIR "\${prefix}/include")
 
 # Set required packages
@@ -49,7 +48,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 ${LIB_INSTALL_DIR}/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 b94482f10a6101020a1ba37ad40ac0dfed5cce26..ff87945e47152bb97b221ac76049a405c75c041d 100644 (file)
--- a/packaging/tel-plugin-atmodem.spec
+++ b/packaging/tel-plugin-atmodem.spec
@@ -23,7 +23,7 @@ Telephony AT Modem library
 cp %{SOURCE1001} .
 
 %build
-cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix}
+%cmake .
 make %{?jobs:-j%jobs}
 
 %post