From: Koen Kooi <koen@openembedded.org>
Date: Thu, 1 Apr 2010 06:33:50 +0000 (+0200)
Subject: libxaw 1.0.7: convert to new style staging
X-Git-Tag: Release-2010-05/1~152^2~94
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1547e1f3c8cf8e17dde87532be2c1078b91f8f03;p=openembedded.git

libxaw 1.0.7: convert to new style staging
---

diff --git a/recipes/xorg-lib/libxaw_1.0.7.bb b/recipes/xorg-lib/libxaw_1.0.7.bb
index 8a9245d218..5451cdc76d 100644
--- a/recipes/xorg-lib/libxaw_1.0.7.bb
+++ b/recipes/xorg-lib/libxaw_1.0.7.bb
@@ -3,15 +3,15 @@ require xorg-lib-common.inc
 DESCRIPTION = "X Athena Widget Set"
 DEPENDS += "xproto virtual/libx11 libxext xextproto libxt libxmu libxpm libxp printproto libxau"
 PROVIDES = "xaw"
-PR = "r1"
+PR = "r2"
 PE = "1"
 
 XORG_PN = "libXaw"
 
-do_stage_append () {
-	ln -sf libXaw6.so.6 ${STAGING_LIBDIR}/libXaw.so.6
-	ln -sf libXaw7.so.7 ${STAGING_LIBDIR}/libXaw.so.7
-	ln -sf libXaw7.so.7 ${STAGING_LIBDIR}/libXaw.so
+do_install_append () {
+	ln -sf libXaw6.so.6 ${D}${libdir}/libXaw.so.6
+	ln -sf libXaw7.so.7 ${D}${libdir}/libXaw.so.7
+	ln -sf libXaw7.so.7 ${D}${libdir}/libXaw.so
 }
 
 PACKAGES =+ "libxaw6 libxaw7 libxaw8"
@@ -19,6 +19,6 @@ PACKAGES =+ "libxaw6 libxaw7 libxaw8"
 # disable docs as groff detection doesn't work on some hosts while cross compilling
 EXTRA_OECONF += " --disable-docs "
 
-FILES_libxaw6 = "${libdir}/libXaw6.so.6*"
-FILES_libxaw7 = "${libdir}/libXaw7.so.7*"
+FILES_libxaw6 = "${libdir}/libXaw*.so.6*"
+FILES_libxaw7 = "${libdir}/libXaw*.so.7*"
 FILES_libxaw8 = "${libdir}/libXaw8.so.8*"