Efreet: Consistent PACKAGE_DATA_DIR

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/efreet@58606 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index ff5301a..3040a20 100644 (file)
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -6,7 +6,7 @@ AM_CPPFLAGS = \
 -I$(top_srcdir)/src/lib \
 -DPACKAGE_BIN_DIR=\"$(bindir)\" \
 -DPACKAGE_LIB_DIR=\"$(libdir)\" \
--DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
+-DPACKAGE_DATA_DIR=\"$(datadir)\" \
 @EFREET_CFLAGS@
 
 internal_bindir=$(libdir)/efreet

diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
index c727d34..29de633 100644 (file)
--- a/src/tests/Makefile.am
+++ b/src/tests/Makefile.am
@@ -8,7 +8,8 @@ AM_CPPFLAGS = \
 -I$(top_srcdir)/src/lib \
 -DPACKAGE_BIN_DIR=\"$(bindir)\" \
 -DPACKAGE_LIB_DIR=\"$(libdir)\" \
--DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" \
+-DPACKAGE_DATA_DIR=\"$(datadir)\" \
+-DPKG_DATA_DIR=\"$(pkgdatadir)\" \
 @EFREET_CFLAGS@
 
 bin_PROGRAMS = \

diff --git a/src/tests/ef_desktop.c b/src/tests/ef_desktop.c
index 6a5e338..39f942a 100644 (file)
--- a/src/tests/ef_desktop.c
+++ b/src/tests/ef_desktop.c
@@ -17,7 +17,7 @@ ef_cb_desktop_parse(void)
     Eina_List *l;
     int ret = 1;
 
-    desktop = efreet_desktop_get(PACKAGE_DATA_DIR"/test/test.desktop");
+    desktop = efreet_desktop_get(PKG_DATA_DIR"/test/test.desktop");
     if (!desktop)
     {
         printf("No desktop found.\n");
@@ -80,7 +80,7 @@ ef_cb_desktop_file_id(void)
     Efreet_Desktop *desktop;
     int ret = 1;
 
-    desktop = efreet_desktop_get(PACKAGE_DATA_DIR"/test/test.desktop");
+    desktop = efreet_desktop_get(PKG_DATA_DIR"/test/test.desktop");
     if (desktop)
     {
         const char *id;
@@ -92,10 +92,10 @@ ef_cb_desktop_file_id(void)
             char *prefix;
             char *expected;
         } tests[] = {
-            {PACKAGE_DATA_DIR"/test/", 0, NULL, "test.desktop"},
-            {PACKAGE_DATA_DIR"/", 0, NULL, "test-test.desktop"},
-            {PACKAGE_DATA_DIR"/", 1, NULL, "test.desktop"},
-            {PACKAGE_DATA_DIR"/", 1, "prefix", "prefix-test.desktop"},
+            {PKG_DATA_DIR"/test/", 0, NULL, "test.desktop"},
+            {PKG_DATA_DIR"/", 0, NULL, "test-test.desktop"},
+            {PKG_DATA_DIR"/", 1, NULL, "test.desktop"},
+            {PKG_DATA_DIR"/", 1, "prefix", "prefix-test.desktop"},
             {NULL, 0, NULL, NULL}
         };
 
@@ -126,7 +126,7 @@ ef_cb_desktop_save(void)
     Efreet_Desktop *desktop;
 
     printf("\n");
-    desktop = efreet_desktop_get(PACKAGE_DATA_DIR"/test/test.desktop");
+    desktop = efreet_desktop_get(PKG_DATA_DIR"/test/test.desktop");
     if (!desktop)
     {
         printf("Failed to get Desktop file\n");
@@ -376,7 +376,7 @@ ef_cb_desktop_type_parse(void)
     my_type = efreet_desktop_type_add("My_Type", cb_type_parse, NULL,
                                         (Efreet_Desktop_Type_Free_Cb)free);
 
-    desktop = efreet_desktop_get(PACKAGE_DATA_DIR"/test/test_type.desktop");
+    desktop = efreet_desktop_get(PKG_DATA_DIR"/test/test_type.desktop");
     if (!desktop)
     {
         printf("No desktop found.\n");

diff --git a/src/tests/ef_ini.c b/src/tests/ef_ini.c
index d31fb45..00d459e 100644 (file)
--- a/src/tests/ef_ini.c
+++ b/src/tests/ef_ini.c
@@ -12,7 +12,7 @@ ef_cb_ini_parse(void)
 
     putenv("LC_ALL=en_US");
 
-    ini = efreet_ini_new(PACKAGE_DATA_DIR"/test/test.ini");
+    ini = efreet_ini_new(PKG_DATA_DIR"/test/test.ini");
     if (!ini)
     {
         printf("efreet_ini_parse() Failed to initialize Efreet_Ini\n");
@@ -115,7 +115,7 @@ ef_cb_ini_long_line(void)
     {NULL, 0}
   };
 
-  ini = efreet_ini_new(PACKAGE_DATA_DIR"/test/long.ini");
+  ini = efreet_ini_new(PKG_DATA_DIR"/test/long.ini");
   if (!ini)
   {
     printf("Ini failed to parse.\n");
@@ -162,7 +162,7 @@ ef_cb_ini_garbage(void)
   Efreet_Ini *ini;
   int ret = 1;
    
-  ini = efreet_ini_new(PACKAGE_DATA_DIR"/test/test_garbage");
+  ini = efreet_ini_new(PKG_DATA_DIR"/test/test_garbage");
   if (!ini)
   {
     printf("Ini failed to parse.\n");

diff --git a/src/tests/ef_menu.c b/src/tests/ef_menu.c
index 4adbd94..a7519b7 100644 (file)
--- a/src/tests/ef_menu.c
+++ b/src/tests/ef_menu.c
@@ -32,7 +32,7 @@ ef_cb_menu_get(void)
     Efreet_Menu *menu;
 
     menu = efreet_menu_get();
-//    menu = efreet_menu_parse(PACKAGE_DATA_DIR"/test/test.menu");
+//    menu = efreet_menu_parse(PKG_DATA_DIR"/test/test.menu");
     if (!menu)
     {
         printf("efreet_menu_get() returned NULL\n");
@@ -50,7 +50,7 @@ ef_cb_menu_with_slashes(void)
 {
     Efreet_Menu *menu;
 
-    menu = efreet_menu_parse(PACKAGE_DATA_DIR"/test/test_menu_slash_bad.menu");
+    menu = efreet_menu_parse(PKG_DATA_DIR"/test/test_menu_slash_bad.menu");
     if (menu)
     {
         printf("efreet_menu_get() didn't return NULL\n");
@@ -67,7 +67,7 @@ ef_cb_menu_save(void)
     int ret;
 
 //    menu = efreet_menu_get();
-    menu = efreet_menu_parse(PACKAGE_DATA_DIR"/test/test.menu");
+    menu = efreet_menu_parse(PKG_DATA_DIR"/test/test.menu");
     if (!menu)
     {
         printf("efreet_menu_get() returned NULL\n");
@@ -86,7 +86,7 @@ ef_cb_menu_edit(void)
     Efreet_Desktop *desktop;
 
 //    menu = efreet_menu_get();
-    menu = efreet_menu_parse(PACKAGE_DATA_DIR"/test/test.menu");
+    menu = efreet_menu_parse(PKG_DATA_DIR"/test/test.menu");
     if (!menu)
     {
         printf("efreet_menu_get() returned NULL\n");
@@ -98,7 +98,7 @@ ef_cb_menu_edit(void)
     printf("\n");
 #endif
 
-    desktop = efreet_desktop_get(PACKAGE_DATA_DIR"/test/test.desktop");
+    desktop = efreet_desktop_get(PKG_DATA_DIR"/test/test.desktop");
     if (!desktop)
     {
         efreet_menu_free(menu);

diff --git a/src/tests/ef_mime.c b/src/tests/ef_mime.c
index 9202f5b..737b001 100644 (file)
--- a/src/tests/ef_mime.c
+++ b/src/tests/ef_mime.c
@@ -20,10 +20,10 @@ ef_mime_cb_get(void)
         char *file;
         char *mime;
     } files[] = {
-        {PACKAGE_DATA_DIR"/test/test_type.desktop", "application/x-desktop"},
-        {PACKAGE_DATA_DIR"/test/entry.png", "image/png"},
-        {PACKAGE_DATA_DIR"/test/entry", "image/png"},
-        {PACKAGE_DATA_DIR"/test/sub", "inode/directory"},
+        {PKG_DATA_DIR"/test/test_type.desktop", "application/x-desktop"},
+        {PKG_DATA_DIR"/test/entry.png", "image/png"},
+        {PKG_DATA_DIR"/test/entry", "image/png"},
+        {PKG_DATA_DIR"/test/sub", "inode/directory"},
         {NULL, NULL}
     };
     double start;