From: Koen Kooi <koen@openembedded.org>
Date: Thu, 1 Apr 2010 14:47:35 +0000 (+0200)
Subject: glib 1.2: move to new style staging
X-Git-Tag: Release-2010-05/1~152^2~39
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=77ac4e474c74299d3a0226a5f5975387881adb38;p=openembedded.git

glib 1.2: move to new style staging
---

diff --git a/recipes/glib-1.2/glib-1.2_1.2.10.bb b/recipes/glib-1.2/glib-1.2_1.2.10.bb
index 72eca3a16a..309b5bfa5e 100644
--- a/recipes/glib-1.2/glib-1.2_1.2.10.bb
+++ b/recipes/glib-1.2/glib-1.2_1.2.10.bb
@@ -4,7 +4,7 @@ SECTION = "libs"
 PRIORITY = "optional"
 LICENSE = "LGPL"
 DEPENDS = "glib-1.2-native"
-PR = "r3"
+PR = "r4"
 
 LEAD_SONAME = "libglib-1.2.*"
 
@@ -31,15 +31,11 @@ do_configure_prepend () {
 	rm -f ltconfig acinclude.m4 libtool ltmain.sh
 }
 
-do_stage () {
-	oe_libinstall -so libglib ${STAGING_LIBDIR}
-	oe_libinstall -so -C gmodule libgmodule ${STAGING_LIBDIR}
-	oe_libinstall -so -C gthread libgthread ${STAGING_LIBDIR}
-	autotools_stage_includes
-	install -d ${STAGING_INCDIR}/glib-1.2
-	install -m 0644 glibconfig.h glib.h ${STAGING_INCDIR}/glib-1.2/
-	install -d ${STAGING_DATADIR}/aclocal
-	install -m 0644 ${S}/glib.m4 ${STAGING_DATADIR}/aclocal/glib-1.2.m4
+do_install_append () {
+	install -d ${D}${includedir}/glib-1.2
+	install -m 0644 glibconfig.h glib.h ${D}${includedir}/glib-1.2/
+	install -d ${D}${datadir}/aclocal
+	install -m 0644 ${S}/glib.m4 ${D}${datadir}/aclocal/glib-1.2.m4
 }
 
 FILES_${PN}-dev += "${libdir}/glib/include/glibconfig.h"