glib-native-2.6.5: Revert autotools_stage_all change.

diff --git a/packages/glib-2.0/glib-2.0-native_2.6.5.bb b/packages/glib-2.0/glib-2.0-native_2.6.5.bb
index ad7cb48..785261e 100644 (file)
--- a/packages/glib-2.0/glib-2.0-native_2.6.5.bb
+++ b/packages/glib-2.0/glib-2.0-native_2.6.5.bb
@@ -8,7 +8,7 @@ SECTION = "libs"
 PRIORITY = "optional"
 MAINTAINER = "Philip Blundell <pb@handhelds.org>"
 DEPENDS = "gtk-doc-native"
-PR = "r2"
+PR = "r3"
 
 EXTRA_OECONF = "--disable-debug"
 
@@ -26,11 +26,22 @@ do_configure_prepend () {
 }
 
 do_stage () {
-       autotools_stage_all
        install -m 0755 gobject/glib-mkenums ${STAGING_BINDIR}/
        install -m 0755 gobject/.libs/glib-genmarshal ${STAGING_BINDIR}/
        install -m 0755 glib-gettextize ${STAGING_BINDIR}/
+       oe_libinstall -so -C glib libglib-2.0 ${STAGING_LIBDIR}
+       oe_libinstall -so -C gmodule libgmodule-2.0 ${STAGING_LIBDIR}
+       oe_libinstall -so -C gthread libgthread-2.0 ${STAGING_LIBDIR}
+       oe_libinstall -so -C gobject libgobject-2.0 ${STAGING_LIBDIR}
+       autotools_stage_includes
+       install -d ${STAGING_INCDIR}/glib-2.0/glib
        install -m 0755 ${S}/glibconfig.h ${STAGING_INCDIR}/glib-2.0/glibconfig.h
+       install -d ${STAGING_DATADIR}/aclocal
+       install -m 0644 ${S}/m4macros/glib-2.0.m4 ${STAGING_DATADIR}/aclocal/glib-2.0.m4
+       install -m 0644 ${S}/m4macros/glib-gettext.m4 ${STAGING_DATADIR}/aclocal/glib-gettext.m4
+       install -d ${STAGING_DATADIR}/glib-2.0/gettext/po
+       install -m 0755 mkinstalldirs ${STAGING_DATADIR}/glib-2.0/gettext/
+       install -m 0644 po/Makefile.in.in ${STAGING_DATADIR}/glib-2.0/gettext/po/
 }
 
 do_install () {