gnome build fixes

BKrev: 40b61573sXg39SzVAIkYqHMdRPMh5g

3 files changed, 34 insertions, 2 deletions

diff --git a/gnome/gconf_2.6.1.oe b/gnome/gconf_2.6.1.oe
index aa0088946c..f17592c77c 100644
--- a/gnome/gconf_2.6.1.oe
+++ b/gnome/gconf_2.6.1.oe
@@ -4,6 +4,8 @@ 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 gettext"
 
+FILES_${PN} += " ${libdir}/GConf/*"
+
 S = "${WORKDIR}/GConf-${PV}"
 
 EXTRA_OECONF = "--disable-gtk-doc"
diff --git a/gnome/gnome-vfs_2.6.0.oe b/gnome/gnome-vfs_2.6.0.oe
index 5b86a9e5a5..3b43495c52 100644
--- a/gnome/gnome-vfs_2.6.0.oe
+++ b/gnome/gnome-vfs_2.6.0.oe
@@ -28,7 +28,11 @@ gnome-vfs.h \
 gnome-vfs-cancellation.h \
 gnome-vfs-xfer.h \
 gnome-vfs-monitor.h \
-gnome-vfs-types.h"
+gnome-vfs-types.h \
+gnome-vfs-volume-monitor.h \
+gnome-vfs-drive.h \
+gnome-vfs-volume.h \
+gnome-vfs-enum-types.h"
 
 GNOME_VFS_MODULE_HEADERS = " \
 gnome-vfs-mime-info.h \
diff --git a/gnome/libgnome_2.6.1.1.oe b/gnome/libgnome_2.6.1.1.oe
index 6271ae23c5..f16555ef67 100644
--- a/gnome/libgnome_2.6.1.1.oe
+++ b/gnome/libgnome_2.6.1.1.oe
@@ -1,8 +1,34 @@
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/libgnome/2.6/libgnome-${PV}.tar.bz2 \
 	   file://makefile.patch;patch=1"
 
-inherit autotools libtool
+inherit autotools libtool pkgconfig
 
 DEPENDS = "gnome-vfs libbonobo"
 
 EXTRA_OECONF = "--disable-gtk-doc"
+
+HEADERS = " \
+libgnometypebuiltins.h \
+gnome-config.h \
+gnome-sound.h \
+gnome-triggers.h \
+gnome-program.h \
+gnome-help.h \
+gnome-i18n.h \
+gnome-exec.h \
+gnome-gconf.h \
+gnome-url.h \
+gnome-util.h \
+gnome-macros.h \
+gnome-score.h \
+gnome-init.h \
+libgnome.h \
+"
+
+do_stage() {
+	install -d ${STAGING_INCDIR}/libgnome-2.0/libgnome
+	for i in ${HEADERS}; do
+		install -m 0644 libgnome/$i ${STAGING_INCDIR}/libgnome-2.0/libgnome/$i
+	done
+	oe_libinstall -C libgnome -a -so libgnome-2 ${STAGING_LIBDIR}
+}