do not alternate res path
authorLukasz Stanislawski <l.stanislaws@samsung.com>
Thu, 31 Mar 2016 10:22:38 +0000 (12:22 +0200)
committerLukasz Stanislawski <l.stanislaws@samsung.com>
Thu, 31 Mar 2016 19:55:10 +0000 (12:55 -0700)
app_get_resource_path function returns correct resource path
in case of global and per user installation.

Change-Id: I03dfac82342675adf3616e9cd8bfef34b3de640f

CMake/CMakeLists.txt
src/util.c

index 563efbe..a0d81c8 100644 (file)
@@ -32,8 +32,6 @@ pkg_check_modules(MENU_PKGS REQUIRED
        context
 )
 
-ADD_DEFINITIONS("-DINSTALL_RESDIR=\"${INSTALL_RESDIR}\"")
-
 FOREACH (flag ${MENU_PKGS_CFLAGS})
     SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
 ENDFOREACH(flag)
index 0c59acb..29fcd0c 100644 (file)
@@ -118,11 +118,7 @@ const char *util_get_file_path(app_subdir dir, const char *relative)
                prefix = app_get_cache_path();
                break;
        case APP_DIR_RESOURCE:
-#ifdef INSTALL_RESDIR
-               prefix = strdup(INSTALL_RESDIR);
-#else
                prefix = app_get_resource_path();
-#endif
                break;
        case APP_DIR_SHARED_DATA:
                prefix = app_get_shared_data_path();