summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@rpsys.net>2008-02-28 13:26:06 +0000
committerRichard Purdie <rpurdie@rpsys.net>2008-02-28 13:26:06 +0000
commitad4192d3f44206460eab2ebeeadf65776f98cfea (patch)
treeb85be5e8412feddbe0e482e69cf07e0fafe07b11
parent52a8aa712d2a391082505407bdde6a721de44286 (diff)
enca, motion, iperf, gdk-pixbuf, gtk+-directfb, python-sword: Use staging prefix/exec_prefix
-rw-r--r--packages/enca/enca_1.9.bb2
-rw-r--r--packages/gtk+/gdk-pixbuf_2.10.14.bb2
-rw-r--r--packages/gtk+/gtk+-directfb_2.10.14.bb2
-rw-r--r--packages/iperf/iperf_2.0.2.bb2
-rw-r--r--packages/motion/motion_3.2.9.bb2
-rw-r--r--packages/python/python-sword_1.5.10.bb2
6 files changed, 6 insertions, 6 deletions
diff --git a/packages/enca/enca_1.9.bb b/packages/enca/enca_1.9.bb
index ddd7acef82..548a824523 100644
--- 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 ecd2d51d49..7d3e7dc92a 100644
--- 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 e77f24638d..6fcaf299dc 100644
--- 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 c54bafe70d..28d009ad58 100644
--- 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 1010e7f046..f5f5b62708 100644
--- 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 a18cf89466..4769a8814f 100644
--- 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