From 228a5837f1f3ab6922f80265102fc073faad8ab1 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 14 Dec 2006 13:35:17 +0000 Subject: orbit2/gconf: Convert to use STAGING_BINDIR_NATIVE git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1039 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- meta/packages/gnome/gconf_2.6.1.bb | 2 +- meta/packages/gnome/orbit2_2.10.2.bb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/packages/gnome/gconf_2.6.1.bb b/meta/packages/gnome/gconf_2.6.1.bb index 7a2ef334e..2ef0913d8 100644 --- a/meta/packages/gnome/gconf_2.6.1.bb +++ b/meta/packages/gnome/gconf_2.6.1.bb @@ -4,7 +4,7 @@ DESCRIPTION = "GNOME configuration database system" SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/GConf/2.6/GConf-${PV}.tar.bz2 \ file://backends.patch;patch=1" DEPENDS = "orbit2 glib-2.0 libxml2 gtk+" -ORBIT_IDL_SRC = "${STAGING_BINDIR}/orbit-idl-2" +ORBIT_IDL_SRC = "${STAGING_BINDIR_NATIVE}/orbit-idl-2" FILES_${PN} += " ${libdir}/GConf/*" PR = "r1" diff --git a/meta/packages/gnome/orbit2_2.10.2.bb b/meta/packages/gnome/orbit2_2.10.2.bb index 83d6f0ec1..4ac412941 100644 --- a/meta/packages/gnome/orbit2_2.10.2.bb +++ b/meta/packages/gnome/orbit2_2.10.2.bb @@ -15,7 +15,7 @@ S = "${WORKDIR}/ORBit2-${PV}" inherit autotools pkgconfig EXTRA_OECONF = "--disable-gtk-doc" -EXTRA_OEMAKE = "IDL_COMPILER='${STAGING_BINDIR}/orbit-idl-2'" +EXTRA_OEMAKE = "IDL_COMPILER='${STAGING_BINDIR_NATIVE}/orbit-idl-2'" do_configure_prepend() { mkdir -p m4 @@ -24,7 +24,7 @@ do_configure_prepend() { } do_compile_append () { - sed 's:^orbit_idl=.*/:orbit_idl=${STAGING_BINDIR}/:' < ORBit-2.0.pc > ORBit-2.0.pc.new + sed 's:^orbit_idl=.*/:orbit_idl=${STAGING_BINDIR_NATIVE}/:' < ORBit-2.0.pc > ORBit-2.0.pc.new mv ORBit-2.0.pc.new ORBit-2.0.pc } -- cgit v1.2.3