rdesktop, elf2flt, primstumbler, xmms-embedded: Remove hardcoded staging references

diff --git a/packages/prismstumbler/prismstumbler_0.7.3+0.7.4pre1.bb b/packages/prismstumbler/prismstumbler_0.7.3+0.7.4pre1.bb
index 7b60122..22309f9 100644 (file)
--- a/packages/prismstumbler/prismstumbler_0.7.3+0.7.4pre1.bb
+++ b/packages/prismstumbler/prismstumbler_0.7.3+0.7.4pre1.bb
@@ -20,12 +20,12 @@ inherit autotools pkgconfig
 
 EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11 \
                --x-libraries=${STAGING_LIBDIR} \
-               --with-libgps=${STAGING_DIR}/${HOST_SYS} \
-               --with-libpcap=${STAGING_DIR}/${HOST_SYS} \
+               --with-libgps=${STAGING_EXECPREFIXDIR} \
+               --with-libpcap=${STAGING_EXECPREFIXDIR} \
                --with-sqlite-includes=${STAGING_INCDIR} \
                --with-sqlite-libs=${STAGING_LIBDIR} \
                --without-athena --enable-dbus \
-                --with-libiw=${STAGING_DIR}/${HOST_SYS}"
+                --with-libiw=${STAGING_EXECPREFIXDIR}"
 
 CFLAGS =+ "-I${S}/include"
 LDFLAGS += "-lz"

diff --git a/packages/prismstumbler/prismstumbler_0.7.3.bb b/packages/prismstumbler/prismstumbler_0.7.3.bb
index 29a112d..5bddcf3 100644 (file)
--- a/packages/prismstumbler/prismstumbler_0.7.3.bb
+++ b/packages/prismstumbler/prismstumbler_0.7.3.bb
@@ -17,7 +17,7 @@ inherit autotools pkgconfig
 
 EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11 \
                --x-libraries=${STAGING_LIBDIR} \
-               --with-libpcap=${STAGING_DIR}/${HOST_SYS} \
+               --with-libpcap=${STAGING_EXECPREFIXDIR} \
                --with-sqlite-includes=${STAGING_INCDIR} \
                --with-sqlite-libs=${STAGING_LIBDIR} \
                --without-athena \

diff --git a/packages/rdesktop/rdesktop_1.3.1.bb b/packages/rdesktop/rdesktop_1.3.1.bb
index 12ff1c5..f54c675 100644 (file)
--- a/packages/rdesktop/rdesktop_1.3.1.bb
+++ b/packages/rdesktop/rdesktop_1.3.1.bb
@@ -22,8 +22,8 @@ do_configure() {
        --bindir=${bindir} \
        --mandir=${mandir} \
        --sharedir=${datadir} \
-       --with-x=${STAGING_DIR}/${HOST_SYS} \
-       --with-openssl=${STAGING_DIR}/${HOST_SYS} \
+       --with-x=${STAGING_EXECPREFIXDIR} \
+       --with-openssl=${STAGING_EXECPREFIXDIR} \
        --with-oss \
        --without-debug
 }

diff --git a/packages/rdesktop/rdesktop_1.4.1.bb b/packages/rdesktop/rdesktop_1.4.1.bb
index 7581647..da1794b 100644 (file)
--- a/packages/rdesktop/rdesktop_1.4.1.bb
+++ b/packages/rdesktop/rdesktop_1.4.1.bb
@@ -11,4 +11,4 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/rdesktop/rdesktop-${PV}.tar.gz \
 
 inherit autotools
 
-EXTRA_OECONF = "--with-openssl=${STAGING_LIBDIR}/.. "
+EXTRA_OECONF = "--with-openssl=${STAGING_EXECPREFIXDIR} "

diff --git a/packages/rdesktop/rdesktop_1.5.0.bb b/packages/rdesktop/rdesktop_1.5.0.bb
index de270e1..12385c1 100644 (file)
--- a/packages/rdesktop/rdesktop_1.5.0.bb
+++ b/packages/rdesktop/rdesktop_1.5.0.bb
@@ -10,4 +10,4 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/rdesktop/rdesktop-${PV}.tar.gz"
 
 inherit autotools
 
-EXTRA_OECONF = "--with-openssl=${STAGING_LIBDIR}/.. "
+EXTRA_OECONF = "--with-openssl=${STAGING_EXECPREFIXDIR} "

diff --git a/packages/uclibc/elf2flt_svn.bb b/packages/uclibc/elf2flt_svn.bb
index 0fac49d..3af893a 100644 (file)
--- a/packages/uclibc/elf2flt_svn.bb
+++ b/packages/uclibc/elf2flt_svn.bb
@@ -9,7 +9,7 @@ SRC_URI = "svn://sources.blackfin.uclinux.org/toolchain/trunk;module=${PN}"
 
 S = "${WORKDIR}/${PN}"
 
-EXTRA_OECONF = " --with-libbfd=${STAGING_DIR}/${TARGET_SYS}/lib/libbfd.a \
-                 --with-libiberty=${STAGING_DIR}/${TARGET_SYS}/lib/libiberty.a \
-                 --with-bfd-include-dir=${STAGING_DIR}/${TARGET_SYS}/include \
+EXTRA_OECONF = " --with-libbfd=${STAGING_LIBDIR}/libbfd.a \
+                 --with-libiberty=${STAGING_LIBDIR}/libiberty.a \
+                 --with-bfd-include-dir=${STAGING_INCDIR} \
                "

diff --git a/packages/xmms-embedded/xmms-embedded_20040327.bb b/packages/xmms-embedded/xmms-embedded_20040327.bb
index c525f62..4d5ea6a 100644 (file)
--- a/packages/xmms-embedded/xmms-embedded_20040327.bb
+++ b/packages/xmms-embedded/xmms-embedded_20040327.bb
@@ -31,7 +31,7 @@ do_configure_prepend() {
 }
 
 do_compile() {
-       oe_runmake "STAGING_DIR=${STAGING_DIR}/${HOST_SYS}"
+       oe_runmake "STAGING_DIR=${STAGING_EXECPREFIXDIR}"
 }
 
 do_install() {