nonworking: Attempt to fix up various random broken staging references whilst in...

diff --git a/packages/nonworking/docbook/docbook_4.2.bb b/packages/nonworking/docbook/docbook_4.2.bb
index 5bd2aa0..ee1ab67 100644 (file)
--- a/packages/nonworking/docbook/docbook_4.2.bb
+++ b/packages/nonworking/docbook/docbook_4.2.bb
@@ -5,9 +5,9 @@ installfiles = calstblx.dtd ChangeLog dbgenent.mod dbnotnx.mod docbook.cat docbo
 catalog.xml dbcentx.mod dbhierx.mod dbpoolx.mod docbook.dcl docbookx.dtd soextblx.dtd
 
 do_stage () {
-       install -d ${STAGING_DIR}/share/sgml/docbook_${PV}
+       install -d ${STAGING_DATADIR}/sgml/docbook_${PV}
        for i in ${installfiles}; do
-               install -m 0644 $i ${STAGING_DIR}/share/sgml/docbook_${PV}
+               install -m 0644 $i ${STAGING_DATADIR}/sgml/docbook_${PV}
        done
 }
 

diff --git a/packages/nonworking/lufs/lufs_0.9.7.bb b/packages/nonworking/lufs/lufs_0.9.7.bb
index 58c1aa1..c56410f 100644 (file)
--- a/packages/nonworking/lufs/lufs_0.9.7.bb
+++ b/packages/nonworking/lufs/lufs_0.9.7.bb
@@ -6,11 +6,10 @@ LICENSE = "GPL"
 SRC_URI = "${SOURCEFORGE_MIRROR}/lufs/lufs-${PV}.tar.gz"
 S = "${WORKDIR}/lufs-${PV}"
 
-inherit autotools
+inherit autotools module
 
-KERNEL_VERSION = "`cat ${STAGING_DIR}/target/kernel/kernel-version`"
-KERNEL_SOURCE = "`cat ${STAGING_DIR}/target/kernel/kernel-source`"
-KERNEL_PATH = "${STAGING_DIR}/target/kernel"
+KERNEL_SOURCE = "${STAGING_KERNEL_DIR}"
+KERNEL_PATH = "${STAGING_KERNEL_DIR}"
 
-EXTRA_OECONF = " --with-kernel=${KERNEL_VERSION} --with-kheaders=${STAGING_DIR}/target/kernel/include"
+EXTRA_OECONF = " --with-kernel=${KERNEL_VERSION} --with-kheaders=${STAGING_KERNEL_DIR}/include"
 

diff --git a/packages/nonworking/pixdev/pixdev-stable_0.1.bb b/packages/nonworking/pixdev/pixdev-stable_0.1.bb
index 9542c66..78a658d 100644 (file)
--- a/packages/nonworking/pixdev/pixdev-stable_0.1.bb
+++ b/packages/nonworking/pixdev/pixdev-stable_0.1.bb
@@ -17,7 +17,7 @@ do_compile() {
        if [ -z "$CONFIG" ]; then CONFIG=defconfig; fi
 
        oe_runmake $CONFIG
-       oe_runmake MWDIR=${STAGING_DIR}/target/ "TARGET_CROSS=${TARGET_PREFIX}" all
+       oe_runmake MWDIR=${STAGING_DIR_TARGET} "TARGET_CROSS=${TARGET_PREFIX}" all
 }
 
 do_install() {

diff --git a/packages/nonworking/python/python-gsl_0.2.0.bb b/packages/nonworking/python/python-gsl_0.2.0.bb
index ddb9015..a0bc000 100644 (file)
--- a/packages/nonworking/python/python-gsl_0.2.0.bb
+++ b/packages/nonworking/python/python-gsl_0.2.0.bb
@@ -11,4 +11,4 @@ S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 inherit distutils
 
-export STAGING=${STAGING_DIR}
+#export STAGING=${STAGING_DIR}

diff --git a/packages/nonworking/xfree86/xfree86_4.3.0.bb b/packages/nonworking/xfree86/xfree86_4.3.0.bb
index 02ef88f..4c7c966 100644 (file)
--- a/packages/nonworking/xfree86/xfree86_4.3.0.bb
+++ b/packages/nonworking/xfree86/xfree86_4.3.0.bb
@@ -38,7 +38,7 @@ XCURSORGEN=/usr/local/X11R6/bin/xcursorgen
 EXTRA_OEMAKE="-C ${S} CC='${BUILD_CC}' \
              CROSSCOMPILEDIR='${WORKDIR}/XXcompiler' \
              EXTRA_LDOPTIONS='${LDFLAGS}' \
-             EXTRA_INCLUDES='-I${STAGING_DIR}/target/include' "
+             EXTRA_INCLUDES='-I${STAGING_INCDIR}' "
 do_compile() {
     sed -e "s/^\#define KdriveServerExtraDefines -DITSY -DMAXSCREENS=2 -DXResExtension.*/\#define KdriveServerExtraDefines -DITSY -DMAXSCREENS=2 -DXResExtension ${FULL_OPTIMIZATION}/" < ${FILESDIR}/host.def > ${S}/config/cf/host.def;