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

* useless Evil.h inclusion


SVN revision: 41084

legacy/efreet/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@ \

legacy/efreet/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;
 }
 

legacy/efreet/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"