2 files changed, 19 insertions, 24 deletions

diff --git a/meta/packages/gtk+/gdk-pixbuf-csource-native_2.12.7.bb b/meta/packages/gtk+/gdk-pixbuf-csource-native_2.12.7.bb
index 338d66e9f0..5c0c84a582 100644
--- a/meta/packages/gtk+/gdk-pixbuf-csource-native_2.12.7.bb
+++ b/meta/packages/gtk+/gdk-pixbuf-csource-native_2.12.7.bb
@@ -23,12 +23,9 @@ do_compile() {
         cd gdk-pixbuf && oe_runmake
 }
 
-do_stage() {
-        cd gdk-pixbuf && oe_runmake install
-        find ${libdir} -name "libpixbufloader-*.la" -exec rm \{\} \;
-}
-
 do_install() {
-        :
+        cd gdk-pixbuf
+        oe_runmake 'DESTDIR=${D}' install
+        find ${D}${libdir} -name "libpixbufloader-*.la" -exec rm \{\} \;
 }
 
diff --git a/meta/packages/gtk+/gtk+.inc b/meta/packages/gtk+/gtk+.inc
index 3e1806f00f..e8fe233382 100644
--- a/meta/packages/gtk+/gtk+.inc
+++ b/meta/packages/gtk+/gtk+.inc
@@ -7,7 +7,7 @@ PRIORITY = "optional"
 DEPENDS = "glib-2.0 pango atk jpeg libpng libxext libxcursor gtk-doc-native libxrandr \
            libgcrypt libxdamage libxrender libxcomposite cairo"
 
-inherit autotools pkgconfig pkgconfig_stage
+inherit autotools pkgconfig
 
 FILES_${PN} = "${bindir}/gdk-pixbuf-query-loaders \
         ${bindir}/gtk-update-icon-cache \
@@ -42,28 +42,26 @@ RRECOMMENDS_${PN} = "${BASE_RRECOMMENDS}"
 RRECOMMENDS_${PN}_linux = "${GLIBC_RRECOMMENDS}"
 RRECOMMENDS_${PN}_linux-gnueabi = "${GLIBC_RRECOMMENDS}"
 
-do_stage () {
-        oe_libinstall -so -C gtk libgtk-x11-2.0 ${STAGING_LIBDIR}
-        oe_libinstall -so -C gdk libgdk-x11-2.0 ${STAGING_LIBDIR}
-        oe_libinstall -so -C contrib/gdk-pixbuf-xlib libgdk_pixbuf_xlib-2.0 ${STAGING_LIBDIR}
-        oe_libinstall -so -C gdk-pixbuf libgdk_pixbuf-2.0 ${STAGING_LIBDIR}
+do_install () {
+        autotools_do_install
 
-        autotools_stage_includes
-
-        mkdir -p ${STAGING_LIBDIR}/gtk-2.0/include
-        install -m 0644 gdk/gdkconfig.h ${STAGING_LIBDIR}/gtk-2.0/include/gdkconfig.h
-
-        install -m 0644 m4macros/gtk-2.0.m4 ${STAGING_DATADIR}/aclocal/
+        install -d ${D}${sysconfdir}/gtk-2.0
 
-        install -m 0644 gtk/gtkfilechooserprivate.h ${STAGING_INCDIR}/gtk-2.0/gtk/
-        install -m 0644 gtk/gtkfilechooserutils.h   ${STAGING_INCDIR}/gtk-2.0/gtk/
-        install -m 0644 gtk/gtkfilesystemmodel.h    ${STAGING_INCDIR}/gtk-2.0/gtk/
+        mkdir -p ${D}${libdir}/gtk-2.0/include
+        install -m 0644 gdk/gdkconfig.h ${D}${libdir}/gtk-2.0/include/gdkconfig.h
 
-        install -m 755 gtk/gtk-builder-convert ${STAGING_BINDIR_NATIVE}
+        install -m 0644 gtk/gtkfilechooserprivate.h ${D}${includedir}/gtk-2.0/gtk/
+        install -m 0644 gtk/gtkfilechooserutils.h   ${D}${includedir}/gtk-2.0/gtk/
+        install -m 0644 gtk/gtkfilesystemmodel.h    ${D}${includedir}/gtk-2.0/gtk/
 }
 
-do_install_append () {
-        install -d ${D}${sysconfdir}/gtk-2.0
+SYSROOT_PREPROCESS_FUNCS += "gtk_sysroot_preprocess"
+
+gtk_sysroot_preprocess () {
+        if [ -e ${D}${bindir}/gtk-builder-convert ]; then
+                install -d ${SYSROOT_DESTDIR}${STAGING_BINDIR_CROSS}/
+                install -m 755 ${D}${bindir}/gtk-builder-convert ${SYSROOT_DESTDIR}${STAGING_BINDIR_CROSS}/
+        fi
 }
 
 postinst_prologue() {