evas: stage modules to arch-based directories

diff --git a/packages/efl/evas-fb_0.9.9.025.bb b/packages/efl/evas-fb_0.9.9.025.bb
index 7ccecab..df49075 100644 (file)
--- a/packages/efl/evas-fb_0.9.9.025.bb
+++ b/packages/efl/evas-fb_0.9.9.025.bb
@@ -1,6 +1,6 @@
 include evas.inc
 DEPENDS = "freetype libpng jpeg eet"
-PR = "r3"
+PR = "r4"
 
 EXTRA_OECONF = "--enable-fb         \
                --disable-directfb          \

diff --git a/packages/efl/evas-fb_20060113.bb b/packages/efl/evas-fb_20060113.bb
index 1a889a2..6472e42 100644 (file)
--- a/packages/efl/evas-fb_20060113.bb
+++ b/packages/efl/evas-fb_20060113.bb
@@ -1,6 +1,6 @@
 include evas.inc
 DEPENDS = "freetype libpng jpeg eet"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "${E_CVS};module=e17/libs/evas;date=${PV} \
            file://pkg.m4"

diff --git a/packages/efl/evas-native_0.9.9.025.bb b/packages/efl/evas-native_0.9.9.025.bb
index fafaaf2..cbcbe30 100644 (file)
--- a/packages/efl/evas-native_0.9.9.025.bb
+++ b/packages/efl/evas-native_0.9.9.025.bb
@@ -3,6 +3,3 @@ inherit native
 DEPENDS = "freetype-native libpng-native jpeg-native eet-native"
 PROVIDES = "evas-native"
 
-do_install() {
-  autotools_do_install
-}
\ No newline at end of file

diff --git a/packages/efl/evas-x11_0.9.9.025.bb b/packages/efl/evas-x11_0.9.9.025.bb
index dc99b96..3dea60c 100644 (file)
--- a/packages/efl/evas-x11_0.9.9.025.bb
+++ b/packages/efl/evas-x11_0.9.9.025.bb
@@ -1,6 +1,6 @@
 include evas.inc
 DEPENDS += "libx11 libxext freetype"
-PR = "r5"
+PR = "r6"
 
 EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11  \
                --x-libraries=${STAGING_LIBDIR} \

diff --git a/packages/efl/evas-x11_20060113.bb b/packages/efl/evas-x11_20060113.bb
index c10bd77..a6ac7c2 100644 (file)
--- a/packages/efl/evas-x11_20060113.bb
+++ b/packages/efl/evas-x11_20060113.bb
@@ -1,6 +1,6 @@
 include evas.inc
 DEPENDS += "libx11 libxext freetype"
-PR = "r5"
+PR = "r6"
 
 SRC_URI = "${E_CVS};module=e17/libs/evas;date=${PV}"
 S = "${WORKDIR}/evas"

diff --git a/packages/efl/evas.inc b/packages/efl/evas.inc
index bffd066..582e7c3 100644 (file)
--- a/packages/efl/evas.inc
+++ b/packages/efl/evas.inc
@@ -33,8 +33,8 @@ do_stage_append() {
        modules=`find modules -name ".libs"`
        for module in $modules
        do
-               install -d ${STAGING_LIBDIR}/evas/`dirname $module`
-               install -m 0755 $module/module.so ${STAGING_LIBDIR}/evas/`dirname $module`/module.so
+               install -d ${STAGING_LIBDIR}/evas/`dirname $module`/${TARGET_OS}-gnu-${TARGET_ARCH}
+               install -m 0755 $module/module.so ${STAGING_LIBDIR}/evas/`dirname $module`/${TARGET_OS}-gnu-${TARGET_ARCH}/module.so
        done
 }