Remove hardcoded staging layout assumptions

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3116 311d38ba-8fff-0310-9ca6-ca027cbcb966

2 files changed, 2 insertions, 2 deletions

diff --git a/meta/packages/hal/hal_0.5.9.1.bb b/meta/packages/hal/hal_0.5.9.1.bb
index 1698b7e050..6c7bcebd3f 100644
--- a/meta/packages/hal/hal_0.5.9.1.bb
+++ b/meta/packages/hal/hal_0.5.9.1.bb
@@ -19,7 +19,7 @@ S = "${WORKDIR}/hal-${PV}"
 inherit autotools pkgconfig
 
 EXTRA_OECONF = "--with-hwdata=${datadir}/hwdata \
-                --with-expat=${STAGING_LIBDIR}/.. \
+                --with-expat=${STAGING_DIR_HOST}${layout_prefix} \
                 --with-dbus-sys=${sysconfdir}/dbus-1/system.d \
                 --with-hotplug=${sysconfdir}/hotplug.d \
                 --disable-docbook-docs \
diff --git a/meta/packages/hal/hal_git.bb b/meta/packages/hal/hal_git.bb
index 8d4aea834d..44be44f980 100644
--- a/meta/packages/hal/hal_git.bb
+++ b/meta/packages/hal/hal_git.bb
@@ -19,7 +19,7 @@ S = "${WORKDIR}/git"
 inherit autotools pkgconfig
 
 EXTRA_OECONF = "--with-hwdata=${datadir}/hwdata \
-                --with-expat=${STAGING_LIBDIR}/.. \
+                --with-expat=${STAGING_DIR_HOST}${layout_prefix} \
                 --with-dbus-sys=${sysconfdir}/dbus-1/system.d \
                 --with-hotplug=${sysconfdir}/hotplug.d \
                 --disable-docbook-docs \