Fix Runtimes Issue : Remove hardcoded path

Fix https://bugs.tizen.org/jira/browse/TDIST-250

diff --git a/packaging/pkgmgr-info.changes b/packaging/pkgmgr-info.changes
index 09e2f7c..0725c87 100644 (file)
--- a/packaging/pkgmgr-info.changes
+++ b/packaging/pkgmgr-info.changes
@@ -1,3 +1,6 @@
+* Mon Jul 08 2013 Baptiste DURAND <baptiste.durand@eurogiciel.fr> accepted/tizen/20130703.235718@ba6f4aa
+- Fix Runtimes Issue : Remove hardcoded path
+
 * Wed Jul 03 2013 Anas Nashif <anas.nashif@intel.com> accepted/tizen/20130520.100925@8038963
 - Clean up %post and install in /etc
 

diff --git a/parser/CMakeLists.txt b/parser/CMakeLists.txt
index c7cdd08..7bb9f3f 100755 (executable)
--- a/parser/CMakeLists.txt
+++ b/parser/CMakeLists.txt
@@ -37,6 +37,7 @@ SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} -fvisibility=hidden")
 SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} -g -Wall")
 SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS}")
 
+add_definitions("-DSYSCONFDIR=\"${SYSCONFDIR}\"")
 ### Set current binary dir to be included (for generated *.h files)
 include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
 

diff --git a/parser/pkgmgr_parser.c b/parser/pkgmgr_parser.c
index 2843148..aefec70 100755 (executable)
--- a/parser/pkgmgr_parser.c
+++ b/parser/pkgmgr_parser.c
@@ -3729,7 +3729,7 @@ END:
 }
 
 #define MANIFEST_RO_PREFIX "/usr/share/packages/"
-#define PRELOAD_PACKAGE_LIST "/etc/package-manager/preload/preload_list.txt"
+#define PRELOAD_PACKAGE_LIST SYSCONFDIR "/package-manager/preload/preload_list.txt"
 static int __add_preload_info(manifest_x * mfx, const char *manifest)
 {
        FILE *fp = NULL;
@@ -4231,7 +4231,7 @@ API int pkgmgr_parser_run_parser_for_uninstallation(xmlDocPtr docPtr, const char
        return __ps_run_parser(docPtr, tag, ACTION_UNINSTALL, pkgid);
 }
 
-#define SCHEMA_FILE "/usr/etc/package-manager/preload/manifest.xsd"
+#define SCHEMA_FILE SYSCONFDIR "/package-manager/preload/manifest.xsd"
 #if 1
 API int pkgmgr_parser_check_manifest_validation(const char *manifest)
 {

diff --git a/parser/pkgmgr_parser.h b/parser/pkgmgr_parser.h
index 401e32c..a5b6fba 100755 (executable)
--- a/parser/pkgmgr_parser.h
+++ b/parser/pkgmgr_parser.h
@@ -49,7 +49,7 @@ extern "C" {
 #define DEFAULT_LOCALE         "No Locale"
 
 #define PKG_PARSERLIB  "parserlib:"
-#define PKG_PARSER_CONF_PATH   "/usr/etc/package-manager/parser_path.conf"
+#define PKG_PARSER_CONF_PATH   SYSCONFDIR "/package-manager/parser_path.conf"
 
 #define PKG_STRING_LEN_MAX 1024
 

diff --git a/pkgmgr-info.pc.in b/pkgmgr-info.pc.in
index 6a40cfd..c4fa16f 100755 (executable)
--- a/pkgmgr-info.pc.in
+++ b/pkgmgr-info.pc.in
@@ -9,4 +9,4 @@ Name: pkgmgr-info
 Description: Simple string key/val dictionary library
 Version: @VERSION@
 Libs: -L${libdir} -lpkgmgr-info
-Cflags: -I${includedir}
+Cflags: -I${includedir} -DSYSCONFDIR=\"@SYSCONFDIR@\"