From 31116d6c7e368c42bcfdf2dba2000b2203f08e85 Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard@openedhand.com>
Date: Fri, 10 Feb 2006 11:38:23 +0000
Subject: Update bbclasses from OE

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@266 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 openembedded/classes/base.bbclass | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'openembedded/classes/base.bbclass')

diff --git a/openembedded/classes/base.bbclass b/openembedded/classes/base.bbclass
index c5359b20f..9b8782859 100644
--- a/openembedded/classes/base.bbclass
+++ b/openembedded/classes/base.bbclass
@@ -171,9 +171,8 @@ oe_libinstall() {
 	if [ -z "$dir" ]; then
 		dir=`pwd`
 	fi
-	if [ -d "$dir/.libs" ]; then
-		dir=$dir/.libs
-	fi
+	dotlai=$libname.lai
+	dir=$dir`(cd $dir; find -name "$dotlai") | sed "s/^\.//;s/\/$dotlai\$//;q"`
 	olddir=`pwd`
 	__runcmd cd $dir
 
@@ -191,7 +190,6 @@ oe_libinstall() {
 	if [ -f "$dota" -o -n "$require_static" ]; then
 		__runcmd install -m 0644 $dota $destpath/
 	fi
-	dotlai=$libname.lai
 	if [ -f "$dotlai" -a -n "$libtool" ]; then
 		if test -n "$staging_install"
 		then
@@ -724,9 +722,9 @@ python __anonymous () {
 	
 	pn = bb.data.getVar('PN', d, 1)
 
-	cvsdate = bb.data.getVar('CVSDATE_%s' % pn, d, 1)
-	if cvsdate != None:
-		bb.data.setVar('CVSDATE', cvsdate, d)
+	srcdate = bb.data.getVar('SRCDATE_%s' % pn, d, 1)
+	if srcdate != None:
+		bb.data.setVar('SRCDATE', srcdate, d)
 
 	use_nls = bb.data.getVar('USE_NLS_%s' % pn, d, 1)
 	if use_nls != None:
-- 
cgit v1.2.3