From: Jean-Benoit MARTIN Date: Thu, 23 Jan 2014 10:43:32 +0000 (+0100) Subject: Remove hardcoded path for multiuser support X-Git-Tag: accepted/tizen/ivi/panda/20140403.014811^0 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fframework%2Fweb%2Flivebox-cpp.git;a=commitdiff_plain;h=a66e53e3d7794d2634955be2fe3d8f7730ac5980;ds=sidebyside Remove hardcoded path for multiuser support Bug-Tizen: PTREL-342 Change-Id: I45cbdf1aecf190313eb2672890d0a136f3068d8a Signed-off-by: Jean-Benoit MARTIN --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 07ff901..0e08e60 100644 --- 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 --- 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 --- a/src/CModule.cpp +++ b/src/CModule.cpp @@ -23,6 +23,7 @@ #include #include #include +#include #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)