Fixed a bug that NULL DB path problem.

Once used a parameter with either lon or '_' chracter in the middle or
the parameter, that regarded as NULL. In this case  DB path regarded as NULL.

Change-Id: Ief0b51b5fb01daf32badb01e7fd5d9d550514f6b
Signed-off-by: saerome.kim <saerome.kim@samsung.com>

diff --git a/packaging/ua-manager.spec b/packaging/ua-manager.spec
old mode 100755 (executable)
new mode 100644 (file)
index 75da8ee..884a40e
--- a/packaging/ua-manager.spec
+++ b/packaging/ua-manager.spec
@@ -59,7 +59,7 @@ cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} \
        -DLIB_PATH=%{_lib} \
        -DFULLVER=%{version} \
        -DMAJORVER=${MAJORVER} \
-       -DDATABASE_FULL_PATH=%{database_full_path}
+       -DDBPATH=%{database_full_path}
 
 %install
 %make_install

diff --git a/ua-daemon/CMakeLists.txt b/ua-daemon/CMakeLists.txt
index 976da4a..d7a167c 100644 (file)
--- a/ua-daemon/CMakeLists.txt
+++ b/ua-daemon/CMakeLists.txt
@@ -52,10 +52,9 @@ FOREACH(flag ${PKGS_MGR_CFLAGS})
         SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag} -Wall")
 ENDFOREACH(flag)
 
-MESSAGE(DATABASE_FULL_PATH)
-IF(DATABASE_FULL_PATH)
-    ADD_DEFINITIONS("-DDATABASE_FULL_PATH=\"${DATABAES_FULL_PATH}\"")
-ENDIF(DATABASE_FULL_PATH)
+IF(DBPATH)
+    ADD_DEFINITIONS("-DDATABASE_FULL_PATH=\"${DBPATH}\"")
+ENDIF(DBPATH)
 
 SET(RELO_FLAGS "-D_FORTIFY_SOURCE=2 -Wl,-z,relro")
 SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} ${RELO_FLAGS} -fPIE -fPIC -Wall -Werror")