Remove hardcoded path

Use _sysconfdir, fix incorrect comment.

Change-Id: I241c76601efce425a651c59134ffd6e1f886cbf7
Signed-off-by: Sangyoon Jang <s89.jang@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0bc54d6..8ab31aa 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,6 +12,7 @@ SET(LIBDIR ${LIB_INSTALL_DIR})
 SET(INCLUDEDIR "\${prefix}/include")
 
 ADD_DEFINITIONS(-DDB_DIR="${DB_DIR}")
+ADD_DEFINITIONS(-DBACKEND_DIR="${BACKEND_DIR}")
 
 SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fvisibility=hidden -g -Wall")
 

diff --git a/packaging/pkgmgr-server.spec b/packaging/pkgmgr-server.spec
index 80cd390..21fe2fc 100644 (file)
--- a/packaging/pkgmgr-server.spec
+++ b/packaging/pkgmgr-server.spec
@@ -36,11 +36,12 @@ Packager Manager server package for packaging
 cp %{SOURCE1001} .
 
 %define db_dir %{_localstatedir}/lib/package-manager
+%define backend_dir %{_sysconfdir}/package-manager/backend
 
 %build
 sqlite3 blacklist.db < ./blacklist.sql
 
-%cmake . -DDB_DIR=%{db_dir}
+%cmake . -DDB_DIR=%{db_dir} -DBACKEND_DIR=%{backend_dir}
 
 %__make %{?_smp_mflags}
 

diff --git a/src/pm-queue.c b/src/pm-queue.c
index 0100a9d..1839d53 100644 (file)
--- a/src/pm-queue.c
+++ b/src/pm-queue.c
@@ -31,7 +31,9 @@
 #include "pkgmgr-server.h"
 #include "pm-queue.h"
 
-#define BACKEND_INFO_DIR       "/etc/package-manager/backend"
+#ifndef BACKEND_DIR
+#define BACKEND_DIR "/etc/package-manager/backend"
+#endif
 
 static pm_queue_data *__get_head_from_pkgtype(const char *pkg_type);
 static void __update_head_from_pkgtype(pm_queue_data *data);
@@ -149,22 +151,21 @@ int _pm_queue_init(void)
        int ret = 0;
        char abs_filename[MAX_PKG_NAME_LEN] = {'\0'};
        char buf[MAX_PKG_NAME_LEN] = {'\0'};
-       n = scandir(BACKEND_INFO_DIR, &namelist, NULL, alphasort);
+       n = scandir(BACKEND_DIR, &namelist, NULL, alphasort);
        if (n < 0) {
                perror("scandir");
                return -1;
        }
        i = n;
        /*Find number of backends (symlinks + executables)
-       The /usr/etc/package-manager/backend dir should not conatin
-       any other file except the backends.*/
+       The backend dir should not conatin any other file except the backends.*/
        while(n--)
        {
                if(!strcmp(namelist[n]->d_name, ".") ||
                        !strcmp(namelist[n]->d_name, ".."))
                                continue;
                snprintf(abs_filename, MAX_PKG_NAME_LEN, "%s/%s",
-                       BACKEND_INFO_DIR, namelist[n]->d_name);
+                       BACKEND_DIR, namelist[n]->d_name);
                if (lstat(abs_filename, &fileinfo)) {
                        perror("lstat");
                        continue;
@@ -194,7 +195,7 @@ int _pm_queue_init(void)
                        !strcmp(namelist[n]->d_name, ".."))
                                continue;
                snprintf(abs_filename, MAX_PKG_NAME_LEN, "%s/%s",
-                       BACKEND_INFO_DIR, namelist[n]->d_name);
+                       BACKEND_DIR, namelist[n]->d_name);
                if (lstat(abs_filename, &fileinfo) < 0) {
                        perror(abs_filename);
                        return -1;