* edje: fix edje external module path.

git-svn-id: http://svn.enlightenment.org/svn/e/trunk/emotion@51251 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/configure.ac b/configure.ac
index c6c1394..83ae06d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -54,20 +54,26 @@ VMAJ=v_maj
 AC_SUBST(VMAJ)
 
 ### Needed information
+EDJE_VERSION="1.0.0"
 
 case "$host_os" in
    mingw* | cegcc*)
+      MODULE_EDJE="$host_os-$host_cpu"
       want_xine="no"
       want_gstreamer="yes"
       want_vlc="no"
       ;;
    *)
+      MODULE_EDJE="$host_os-$host_cpu-${EDJE_VERSION}"
       want_xine="yes"
       want_gstreamer="yes"
       want_vlc="yes"
       ;;
 esac
 
+AC_SUBST(MODULE_EDJE)
+AC_DEFINE_UNQUOTED(MODULE_EDJE, "$MODULE_EDJE", "Edje module architecture")
+
 requirement_emotion=""
 
 ### Additional options to configure
@@ -112,7 +118,7 @@ PKG_CHECK_MODULES(EMOTION, [eina >= 1.0.0 evas >= 1.0.0 ecore >= 1.0.0])
 requirement_emotion="ecore >= 1.0.0 evas >= 1.0.0 eina >= 1.0.0"
 
 if test "x${have_emotion_test}" = "xyes" ; then
-   PKG_CHECK_MODULES(EMOTION_BIN, [evas >= 1.0.0 ecore >= 1.0.0 ecore-evas >= 1.0.0 edje >= 1.0.0])
+   PKG_CHECK_MODULES(EMOTION_BIN, [evas >= 1.0.0 ecore >= 1.0.0 ecore-evas >= 1.0.0 edje >= ${EDJE_VERSION}])
 fi
 
 PKG_CHECK_MODULES(ECORE_X, [ecore-x >= 1.0.0], [have_ecore_x="yes"], [have_ecore_x="no"])

diff --git a/src/edje_external/Makefile.am b/src/edje_external/Makefile.am
index ff3b5c9..177090a 100644 (file)
--- a/src/edje_external/Makefile.am
+++ b/src/edje_external/Makefile.am
@@ -9,7 +9,7 @@ AM_CPPFLAGS = \
 @EFL_EMOTION_BUILD@ \
 @EDJE_EXTERNAL_CFLAGS@
 
-pkgdir = $(libdir)/edje
+pkgdir = $(libdir)/edje/modules/$(MODULE_EDJE)
 pkg_LTLIBRARIES = emotion.la
 
 emotion_la_SOURCES = emotion.c