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

 * useless Evil.h inclusion

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

diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index bed27fd..8203339 100644 (file)
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -31,7 +31,7 @@ $(EFREETHEADERS)
 libefreet_la_SOURCES = \
        $(EFREETSOURCES)
 libefreet_la_CPPFLAGS =  \
--DDATADIR=\"$(datadir)\" \
+-DPACKAGE_DATA_DIR=\"$(datadir)\" \
 -I$(top_builddir) \
 -I$(top_srcdir) \
 @EFL_EFREET_BUILD@ \

diff --git a/src/lib/efreet_base.c b/src/lib/efreet_base.c
index ca0708f..b9a1342 100644 (file)
--- a/src/lib/efreet_base.c
+++ b/src/lib/efreet_base.c
@@ -98,7 +98,7 @@ efreet_data_dirs_get(void)
 {
     if (xdg_data_dirs) return xdg_data_dirs;
     xdg_data_dirs = efreet_dirs_get("XDG_DATA_DIRS",
-                            DATADIR ":/usr/share");
+                            PACKAGE_DATA_DIR ":/usr/share");
     return xdg_data_dirs;
 }
 

diff --git a/src/lib/efreet_xml.c b/src/lib/efreet_xml.c
index 1d60a26..a70c0ae 100644 (file)
--- a/src/lib/efreet_xml.c
+++ b/src/lib/efreet_xml.c
@@ -13,10 +13,6 @@
 #include <unistd.h>
 #include <sys/mman.h>
 
-#ifdef HAVE_EVIL
-# include <Evil.h>
-#endif
-
 #include <Ecore_File.h>
 
 #include "Efreet.h"