summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2006-12-14 13:35:17 +0000
committerRichard Purdie <richard@openedhand.com>2006-12-14 13:35:17 +0000
commit228a5837f1f3ab6922f80265102fc073faad8ab1 (patch)
treebd677a97ccdb5b91146edd014ee8066ca192eb26
parent6c2f9c0feef56cfc703907db32b2c52ef1631c1c (diff)
downloadpoky-228a5837f1f3ab6922f80265102fc073faad8ab1.tar.gz
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
-rw-r--r--meta/packages/gnome/gconf_2.6.1.bb2
-rw-r--r--meta/packages/gnome/orbit2_2.10.2.bb4
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 7a2ef334e4..2ef0913d8f 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"
4SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/GConf/2.6/GConf-${PV}.tar.bz2 \ 4SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/GConf/2.6/GConf-${PV}.tar.bz2 \
5 file://backends.patch;patch=1" 5 file://backends.patch;patch=1"
6DEPENDS = "orbit2 glib-2.0 libxml2 gtk+" 6DEPENDS = "orbit2 glib-2.0 libxml2 gtk+"
7ORBIT_IDL_SRC = "${STAGING_BINDIR}/orbit-idl-2" 7ORBIT_IDL_SRC = "${STAGING_BINDIR_NATIVE}/orbit-idl-2"
8 8
9FILES_${PN} += " ${libdir}/GConf/*" 9FILES_${PN} += " ${libdir}/GConf/*"
10PR = "r1" 10PR = "r1"
diff --git a/meta/packages/gnome/orbit2_2.10.2.bb b/meta/packages/gnome/orbit2_2.10.2.bb
index 83d6f0ec15..4ac4129414 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}"
15inherit autotools pkgconfig 15inherit autotools pkgconfig
16 16
17EXTRA_OECONF = "--disable-gtk-doc" 17EXTRA_OECONF = "--disable-gtk-doc"
18EXTRA_OEMAKE = "IDL_COMPILER='${STAGING_BINDIR}/orbit-idl-2'" 18EXTRA_OEMAKE = "IDL_COMPILER='${STAGING_BINDIR_NATIVE}/orbit-idl-2'"
19 19
20do_configure_prepend() { 20do_configure_prepend() {
21 mkdir -p m4 21 mkdir -p m4
@@ -24,7 +24,7 @@ do_configure_prepend() {
24} 24}
25 25
26do_compile_append () { 26do_compile_append () {
27 sed 's:^orbit_idl=.*/:orbit_idl=${STAGING_BINDIR}/:' < ORBit-2.0.pc > ORBit-2.0.pc.new 27 sed 's:^orbit_idl=.*/:orbit_idl=${STAGING_BINDIR_NATIVE}/:' < ORBit-2.0.pc > ORBit-2.0.pc.new
28 mv ORBit-2.0.pc.new ORBit-2.0.pc 28 mv ORBit-2.0.pc.new ORBit-2.0.pc
29} 29}
30 30