From c9b64474aaa993a545aab4ab986f9d110d03ab71 Mon Sep 17 00:00:00 2001
From: Lucas De Marchi <lucas.demarchi@profusion.mobi>
Date: Wed, 9 Jan 2013 22:31:54 +0000
Subject: [PATCH] efl/edje: move epp under MODULE_ARCH

epp is invoked by edje_cc and should include the MODULE_ARCH dir.



SVN revision: 82488
---
 src/Makefile_Edje.am         | 2 +-
 src/bin/edje/edje_cc_parse.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Makefile_Edje.am b/src/Makefile_Edje.am
index f653c0f595..6539c30087 100644
--- a/src/Makefile_Edje.am
+++ b/src/Makefile_Edje.am
@@ -190,7 +190,7 @@ bin_edje_edje_watch_CPPFLAGS = $(EDJE_COMMON_CPPFLAGS)
 bin_edje_edje_watch_LDADD = $(EDJE_COMMON_USER_LDADD)
 
 # EPP (Edje's CPP)
-eppdir = $(libdir)/edje/utils
+eppdir = $(libdir)/edje/utils/$(MODULE_ARCH)
 epp_PROGRAMS = bin/edje/epp/epp
 bin_edje_epp_epp_SOURCES = \
 bin/edje/epp/cpplib.h \
diff --git a/src/bin/edje/edje_cc_parse.c b/src/bin/edje/edje_cc_parse.c
index d2ce018ce7..1cf0f49301 100644
--- a/src/bin/edje/edje_cc_parse.c
+++ b/src/bin/edje/edje_cc_parse.c
@@ -817,7 +817,7 @@ compile(void)
           }
 
         if (buf2[0] == '\0')
-          snprintf(buf2, sizeof(buf2), "%s/edje/utils/epp" EPP_EXT,
+          snprintf(buf2, sizeof(buf2), "%s/edje/utils/" MODULE_ARCH "/epp" EPP_EXT,
                    eina_prefix_lib_get(pfx));
         if (ecore_file_exists(buf2))
           {