* DATADIR is used in a Windows directory. Use PACKAGE_DATA_DIR instead

* useless Evil.h inclusion


SVN revision: 41084
This commit is contained in:
Vincent Torri 2009-06-17 16:07:29 +00:00
parent 010621dd4a
commit 54b27e4edc
3 changed files with 2 additions and 6 deletions

View File

@ -31,7 +31,7 @@ $(EFREETHEADERS)
libefreet_la_SOURCES = \ libefreet_la_SOURCES = \
$(EFREETSOURCES) $(EFREETSOURCES)
libefreet_la_CPPFLAGS = \ libefreet_la_CPPFLAGS = \
-DDATADIR=\"$(datadir)\" \ -DPACKAGE_DATA_DIR=\"$(datadir)\" \
-I$(top_builddir) \ -I$(top_builddir) \
-I$(top_srcdir) \ -I$(top_srcdir) \
@EFL_EFREET_BUILD@ \ @EFL_EFREET_BUILD@ \

View File

@ -98,7 +98,7 @@ efreet_data_dirs_get(void)
{ {
if (xdg_data_dirs) return xdg_data_dirs; if (xdg_data_dirs) return xdg_data_dirs;
xdg_data_dirs = efreet_dirs_get("XDG_DATA_DIRS", xdg_data_dirs = efreet_dirs_get("XDG_DATA_DIRS",
DATADIR ":/usr/share"); PACKAGE_DATA_DIR ":/usr/share");
return xdg_data_dirs; return xdg_data_dirs;
} }

View File

@ -13,10 +13,6 @@
#include <unistd.h> #include <unistd.h>
#include <sys/mman.h> #include <sys/mman.h>
#ifdef HAVE_EVIL
# include <Evil.h>
#endif
#include <Ecore_File.h> #include <Ecore_File.h>
#include "Efreet.h" #include "Efreet.h"