From ffe4a7642353aee1d9400d5c1b26961e2453a9e6 Mon Sep 17 00:00:00 2001
From: Cedric BAIL <cedric.bail@free.fr>
Date: Tue, 17 Aug 2010 13:29:23 +0000
Subject: [PATCH] 	* edje: fix edje external module path.

SVN revision: 51251
---
 configure.ac                   | 12 +++++++++---
 src/edje_externals/Makefile.am |  2 +-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index d69f6bf..e621f07 100644
--- a/configure.ac
+++ b/configure.ac
@@ -63,17 +63,23 @@ VMIN=v_min
 AC_SUBST(VMAJ)
 AC_SUBST(VMIN)
 
+EDJE_VERSION="1.0.0"
+
 case "$host_os" in
   mingw32ce* | cegcc*)
     MODULE_ARCH="$host_os-$host_cpu"
+    MODULE_EDJE="$host_os-$host_cpu"
     ;;
   *)
-    MODULE_ARCH="$host_os-$host_cpu-relname"
+    MODULE_ARCH="$host_os-$host_cpu-v_maj.v_min.v_mic"
+    MODULE_EDJE="$host_os-$host_cpu-${EDJE_VERSION}"
     ;;
 esac
 AC_SUBST(release_info)
 AC_SUBST(MODULE_ARCH)
 AC_DEFINE_UNQUOTED(MODULE_ARCH, "$MODULE_ARCH", "Module architecture")
+AC_SUBST(MODULE_EDJE)
+AC_DEFINE_UNQUOTED(MODULE_EDJE, "$MODULE_EDJE", "Edje module architecture")
 
 EFL_SHARED_EXTENSION="${shrext_cmds}"
 AC_DEFINE_UNQUOTED(EFL_SHARED_EXTENSION, "${EFL_SHARED_EXTENSION}", "Shared extension")
@@ -170,7 +176,7 @@ PKG_CHECK_MODULES([ELEMENTARY],
     ecore-evas >= 1.0.0
     ecore-file >= 1.0.0
     ecore-imf >= 1.0.0
-    edje >= 1.0.0
+    edje >= ${EDJE_VERSION}
    ]
 )
 
@@ -185,7 +191,7 @@ AC_ARG_WITH(eet-eet,
 ])
 AC_SUBST(eet_eet)
         
-requirement_elm="edje >= 1.0.0 ecore-file >= 1.0.0 ecore-evas >= 1.0.0 ecore >= 1.0.0 evas >= 1.0.0 eet >= 1.4.0 eina >= 1.0.0 ${requirement_elm}"
+requirement_elm="edje >= ${EDJE_VERSION} ecore-file >= 1.0.0 ecore-evas >= 1.0.0 ecore >= 1.0.0 evas >= 1.0.0 eet >= 1.4.0 eina >= 1.0.0 ${requirement_elm}"
 
 have_elementary_x="no"
 want_elementary_x="auto"
diff --git a/src/edje_externals/Makefile.am b/src/edje_externals/Makefile.am
index ef8cbaa..fd81c47 100644
--- a/src/edje_externals/Makefile.am
+++ b/src/edje_externals/Makefile.am
@@ -21,7 +21,7 @@ if ELEMENTARY_WINDOWS_BUILD
 AM_CPPFLAGS += -DELEMENTARY_BUILD
 endif
 
-pkgdir = $(libdir)/edje
+pkgdir = $(libdir)/edje/modules/$(MODULE_EDJE)
 pkg_LTLIBRARIES = elm.la
 
 elm_la_SOURCES = private.h \
-- 
2.7.4