enca, motion, iperf, gdk-pixbuf, gtk+-directfb, python-sword: Use staging prefix...

diff --git a/packages/enca/enca_1.9.bb b/packages/enca/enca_1.9.bb
index ddd7acef82ef36759fa244bbef36f3d864b87db3..548a8245238e1399f0c3690e507008396e0d2224 100644 (file)
--- a/packages/enca/enca_1.9.bb
+++ b/packages/enca/enca_1.9.bb
@@ -13,7 +13,7 @@ SRC_URI = "http://www.sourcefiles.org/Networking/Tools/Miscellanenous/enca-${PV}
 
 inherit autotools
 
-EXTRA_OECONF="--with-libiconv-prefix=${STAGING_DIR}"
+EXTRA_OECONF="--with-libiconv-prefix=${STAGING_DIR_HOST}${layout_exec_prefix}"
 
 do_configure_append() {
        sed -i s:-I/usr/include::g Makefile

diff --git a/packages/gtk+/gdk-pixbuf_2.10.14.bb b/packages/gtk+/gdk-pixbuf_2.10.14.bb
index ecd2d51d49ca8846b0e461521456848dcec057cf..7d3e7dc92a86b76ec8553c9663051f3d61418d52 100644 (file)
--- a/packages/gtk+/gdk-pixbuf_2.10.14.bb
+++ b/packages/gtk+/gdk-pixbuf_2.10.14.bb
@@ -73,7 +73,7 @@ do_compile() {
 
 do_stage() {
        oe_libinstall -C gdk-pixbuf -so libgdk_pixbuf-2.0 ${STAGING_LIBDIR}
-       cd gdk-pixbuf && oe_runmake install DESTDIR=${STAGING_DIR}/usr
+       cd gdk-pixbuf && oe_runmake install DESTDIR=${STAGING_DIR_HOST}${layout_exec_prefix}
        autotools_stage_includes
 #      install -d -m 0755 ${STAGING_LIBDIR}/gtk-2.0/include
 #      install -m 0644 gdk/gdkconfig.h ${STAGING_LIBDIR}/gtk-2.0/include/gdkconfig.h

diff --git a/packages/gtk+/gtk+-directfb_2.10.14.bb b/packages/gtk+/gtk+-directfb_2.10.14.bb
index e77f24638de064b54691a4526915d8e22b9b4cc6..6fcaf299dc864d093c9b52fd1e5000d20bc5d133 100644 (file)
--- a/packages/gtk+/gtk+-directfb_2.10.14.bb
+++ b/packages/gtk+/gtk+-directfb_2.10.14.bb
@@ -44,7 +44,7 @@ SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.10/gtk+-${PV}.tar.bz2 \
 #         file://gtk-doc.patch;patch=1 \
 "
 EXTRA_OECONF =" \
-                --prefix=${STAGING_DIR} \
+                --prefix=${STAGING_DIR_HOST}${layout_prefix} \
                 --with-gdktarget=directfb \
                 --without-x \
                 --without-libtiff \

diff --git a/packages/iperf/iperf_2.0.2.bb b/packages/iperf/iperf_2.0.2.bb
index c54bafe70d87e762bdd012359c2cd96b2eb92bc2..28d009ad5871b93db3bada07a4e6fddb7574ae6c 100644 (file)
--- a/packages/iperf/iperf_2.0.2.bb
+++ b/packages/iperf/iperf_2.0.2.bb
@@ -14,7 +14,7 @@ S="${WORKDIR}/iperf-${PV}"
 # --disable-threads is needed on epia/x86 with uclibc
 do_configure() {
        gnu-configize
-       oe_runconf --exec-prefix=${STAGING_DIR}  --disable-threads
+       oe_runconf --exec-prefix=${STAGING_DIR_HOST}${layout_exec_prefix}  --disable-threads
 }
 
 do_compile() {

diff --git a/packages/motion/motion_3.2.9.bb b/packages/motion/motion_3.2.9.bb
index 1010e7f046960ca8f4b64d6fa0069611cbf58277..f5f5b62708fa32d86ac11e7c33ed51cad17802e8 100644 (file)
--- a/packages/motion/motion_3.2.9.bb
+++ b/packages/motion/motion_3.2.9.bb
@@ -16,4 +16,4 @@ inherit autotools
 EXTRA_OECONF = " --with-ffmpeg=${STAGING_LIBDIR} \
                  --with-mysql-lib=${STAGING_LIBDIR} \
                  --with-mysql-include=${STAGING_INCDIR}/mysql \
-                 --with-pgsql=${STAGING_DIR} "
+                 --with-pgsql=${STAGING_DIR_HOST}${layout_exec_prefix} "

diff --git a/packages/python/python-sword_1.5.10.bb b/packages/python/python-sword_1.5.10.bb
index a18cf894666c8b27ff4c90544665bbb6c7572aa8..4769a8814f9f537e8092421a610c3c9c45e1443a 100644 (file)
--- a/packages/python/python-sword_1.5.10.bb
+++ b/packages/python/python-sword_1.5.10.bb
@@ -11,7 +11,7 @@ SRC_URI = "http://crosswire.org/ftpmirror/pub/sword/source/v1.5/sword-${PV}.tar.
 
 S = "${WORKDIR}/${SRCNAME}-${PV}/bindings/swig/package"
 
-EXTRA_OECONF = "--with-sword-dir=${STAGING_DIR}/${HOST_SYS}"
+EXTRA_OECONF = "--with-sword-dir=${STAGING_DIR_HOST}${layout_exec_prefix}"
 
 inherit distutils autotools