NorwayFun
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Efreet: Consistent PACKAGE_DATA_DIR 

SVN revision: 58606
This commit is contained in:
Sebastian Dransfeld 2011-04-12 22:42:29 +00:00
parent 4262dd6285
commit 5fcbbac392
6 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
legacy/efreet/src/bin/Makefile.am
View File

@ -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

3
legacy/efreet/src/tests/Makefile.am
View File

@ -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 = \

16
legacy/efreet/src/tests/ef_desktop.c
View File

@ -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");

6
legacy/efreet/src/tests/ef_ini.c
View File

@ -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");

10
legacy/efreet/src/tests/ef_menu.c
View File

@ -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);

8
legacy/efreet/src/tests/ef_mime.c
View File

@ -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;