Fix modem install path for 64 bit

Change-Id: I7286fedcb55b363d7630a171110deffd602e191b

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3807946..bb6c661 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -22,6 +22,7 @@ ADD_DEFINITIONS("-DFEATURE_TLOG_DEBUG")
 ADD_DEFINITIONS("-DTCORE_LOG_TAG=\"TCORE\"")
 #ADD_DEFINITIONS("-DTCORE_HAL_DEBUG")
 ADD_DEFINITIONS("-DTCORE_VERSION=\"${VERSION}\"")
+ADD_DEFINITIONS("-DMODEMS_PATH=\"${LIBDIR}/telephony/plugins/modems/\"")
 
 MESSAGE(${CMAKE_C_FLAGS})
 MESSAGE(${CMAKE_EXE_LINKER_FLAGS})

diff --git a/packaging/libtcore.spec b/packaging/libtcore.spec
index bcc45b2..ba48890 100644 (file)
--- a/packaging/libtcore.spec
+++ b/packaging/libtcore.spec
@@ -1,6 +1,6 @@
 %define major 0
 %define minor 2
-%define patchlevel 90
+%define patchlevel 91
 
 Name:           libtcore
 Version:        %{major}.%{minor}.%{patchlevel}

diff --git a/src/server.c b/src/server.c
index 2accfac..da19106 100644 (file)
--- a/src/server.c
+++ b/src/server.c
@@ -40,7 +40,9 @@
 #include "storage.h"
 #include "util.h"
 
+#ifndef MODEMS_PATH
 #define MODEMS_PATH "/usr/lib/telephony/plugins/modems/"
+#endif
 
 struct tcore_server_type {
        GMainLoop *mainloop;