summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>2008-08-05 15:10:37 +0000
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>2008-08-05 15:10:37 +0000
commit4fac4d5426739560565e8c4fde22fbdd7d8bdc2b (patch)
treee89c941b9dc9825ad77adb48cb51932b2efc3f06
parent8d3d48b239e4c7b31abe321ea072aca0b6eb6750 (diff)
gconf: fix compilation for version 2.6.1
* remove autotools_stage_all. For some reason it does not work * I would have thought that FILES_${PN}-dbg and FILES_gconf-dbg are the same for the gconf package. bitbake seems to think otherwise, so I'm renaming to actually fix bug 3505.
-rw-r--r--packages/gnome/gconf_2.6.1.bb9
1 files changed, 6 insertions, 3 deletions
diff --git a/packages/gnome/gconf_2.6.1.bb b/packages/gnome/gconf_2.6.1.bb
index fc2089e091..9b9db4abb4 100644
--- a/packages/gnome/gconf_2.6.1.bb
+++ b/packages/gnome/gconf_2.6.1.bb
@@ -3,7 +3,7 @@ SECTION = "x11/gnome"
LICENSE = "LGPL"
DEPENDS = "orbit2 glib-2.0 libxml2"
ORBIT_IDL_SRC = "${STAGING_BINDIR_NATIVE}/orbit-idl-2"
-PR = "r1"
+PR = "r2"
S = "${WORKDIR}/GConf-${PV}"
@@ -20,7 +20,10 @@ do_compile() {
}
do_stage() {
- autotools_stage_all
+ oe_libinstall -so -C gconf libgconf-2 ${STAGING_LIBDIR}
+ install -d ${STAGING_INCDIR}/gconf/2/gconf/
+ ( cd gconf; for i in ${HEADERS}; do install -m 0644 $i ${STAGING_INCDIR}/gconf/2/gconf/$i; done )
+ install -m 0644 gconf.m4 ${STAGING_DATADIR}/aclocal/gconf-2.m4
}
do_install() {
@@ -28,4 +31,4 @@ do_install() {
}
FILES_${PN} += " ${libdir}/GConf/*"
-FILES_gconf-dbg += "${libdir}/*/*/.debug"
+FILES_${PN}-dbg += "${libdir}/*/*/.debug"