From 54b27e4edc0f6005d0541a147137a53b15ebb59f Mon Sep 17 00:00:00 2001
From: Vincent Torri <vincent.torri@gmail.com>
Date: Wed, 17 Jun 2009 16:07:29 +0000
Subject: [PATCH]  * 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   | 2 +-
 legacy/efreet/src/lib/efreet_base.c | 2 +-
 legacy/efreet/src/lib/efreet_xml.c  | 4 ----
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/legacy/efreet/src/lib/Makefile.am b/legacy/efreet/src/lib/Makefile.am
index bed27fd548..820333996c 100644
--- a/legacy/efreet/src/lib/Makefile.am
+++ b/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@ \
diff --git a/legacy/efreet/src/lib/efreet_base.c b/legacy/efreet/src/lib/efreet_base.c
index ca0708fd57..b9a13421ed 100644
--- a/legacy/efreet/src/lib/efreet_base.c
+++ b/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;
 }
 
diff --git a/legacy/efreet/src/lib/efreet_xml.c b/legacy/efreet/src/lib/efreet_xml.c
index 1d60a26609..a70c0aeb1b 100644
--- a/legacy/efreet/src/lib/efreet_xml.c
+++ b/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"