From 1c62cb1983331b58a4e7986052a092dda68abfa0 Mon Sep 17 00:00:00 2001
From: discomfitor <discomfitor@7cbeb6ba-43b4-40fd-8cce-4c39aea84d33>
Date: Wed, 23 Feb 2011 02:51:32 +0000
Subject: [PATCH] edje: change epp installdir

git-svn-id: http://svn.enlightenment.org/svn/e/trunk/edje@57252 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33
---
 configure.ac               | 9 +++------
 src/bin/edje_cc_parse.c.in | 4 ++--
 src/bin/epp/Makefile.am    | 3 ++-
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/configure.ac b/configure.ac
index 3ba0de8..2d528b2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -294,12 +294,9 @@ if test "x$have_edje_cc" = "xyes"; then
    PKG_CHECK_MODULES([EDJE_CC], [ecore-file >= 1.0.0 ecore-evas >= 1.0.0 ecore >= 1.0.0 evas >= 1.0.0 eet >= 1.0.0 eina >= 1.0.0])
    EDJE_CC_LIBS="${EDJE_CC_LIBS} ${LUA_LIBS} ${lua_libs}"
 fi
-AC_PATH_PROG([EPP], [epp])
-AM_CONDITIONAL([BUILD_EPP], [test "x$have_edje_cc" = "xyes" -a -z "$EPP"])
-if test -z "$EPP" ; then
-   EPP=${prefix}/bin/epp
-   AC_SUBST(EPP)
-fi
+AM_CONDITIONAL([BUILD_EPP], [test "x$have_edje_cc" = "xyes"])
+EPPDIR=${prefix}/lib/edje/utils
+AC_SUBST(EPPDIR)
 
 if test "x$have_edje_decc" = "xyes"; then
    PKG_CHECK_MODULES([EDJE_DECC], [ecore-file >= 1.0.0 ecore-evas >= 1.0.0 ecore >= 1.0.0 evas >= 1.0.0 eet >= 1.0.0 eina >= 1.0.0])
diff --git a/src/bin/edje_cc_parse.c.in b/src/bin/edje_cc_parse.c.in
index 94d39aa..1a229fb 100644
--- a/src/bin/edje_cc_parse.c.in
+++ b/src/bin/edje_cc_parse.c.in
@@ -693,9 +693,9 @@ compile(void)
 	 * Run the input through the C pre-processor.
 	 */
         ret = -1;
-   if (ecore_file_exists("@EPP@"))
+   if (ecore_file_exists("@EPPDIR@/epp"))
      {
-        snprintf(buf, sizeof(buf), "@EPP@ -I%s %s -P -o %s - < %s",
+        snprintf(buf, sizeof(buf), "@EPPDIR@/epp -I%s %s -P -o %s - < %s",
                  inc, def, tmpn, file_in);
          ret = system(buf);
      }
diff --git a/src/bin/epp/Makefile.am b/src/bin/epp/Makefile.am
index be671a7..3f11a2a 100644
--- a/src/bin/epp/Makefile.am
+++ b/src/bin/epp/Makefile.am
@@ -18,7 +18,8 @@
 #the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
 MAINTAINERCLEANFILES = Makefile.in
-bin_PROGRAMS = epp
+eppdir = @EPPDIR@
+epp_PROGRAMS = epp
 
 epp_SOURCES = \
 	cpplib.h \
-- 
2.7.4