Remove hardcoded path for multiuser support

Bug-Tizen: PTREL-342

Change-Id: I45cbdf1aecf190313eb2672890d0a136f3068d8a
Signed-off-by: Jean-Benoit MARTIN <jean-benoit.martin@open.eurogiciel.org>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 07ff901..0e08e60 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -19,6 +19,7 @@ pkg_check_modules(pkgs REQUIRED
        livebox
        livebox-service
        evas
+       libtzplatform-config
 )
 
 FOREACH(flag ${pkgs_CXXFLAGS})

diff --git a/packaging/liblivebox-cpp.spec b/packaging/liblivebox-cpp.spec
index 246912f..cbbf665 100644 (file)
--- a/packaging/liblivebox-cpp.spec
+++ b/packaging/liblivebox-cpp.spec
@@ -12,6 +12,8 @@ BuildRequires: pkgconfig(dlog)
 BuildRequires: pkgconfig(livebox)
 BuildRequires: pkgconfig(evas)
 BuildRequires: pkgconfig(livebox-service)
+BuildRequires: pkgconfig(libtzplatform-config)
+Requires:      libtzplatform-config
 
 %description
 Livebox development library (C++)

diff --git a/src/CModule.cpp b/src/CModule.cpp
index 8f8c967..9cf6031 100644 (file)
--- a/src/CModule.cpp
+++ b/src/CModule.cpp
@@ -23,6 +23,7 @@
 #include <dlog.h>
 #include <livebox-service.h>
 #include <livebox-errno.h>
+#include <tzplatform_config.h>
 
 #include "debug.h"
 #include "livebox-cpp.h"
@@ -30,7 +31,7 @@
 #include "CModule.h"
 #include "dlist.h"
 
-const char *CModule::m_sModulePath = "/opt/usr/live/%s/libexec/liblive-%s.so";
+const char *CModule::m_sModulePath = tzplatform_mkpath(TZ_USER_LIVE,"%s/libexec/liblive-%s.so");
 struct dlist *CModule::m_pModuleList = NULL;
 
 CModule *CModule::Load(const char *pkgname)