From 89679b98e28d3400e6ceddc1c6bac1da671071fb Mon Sep 17 00:00:00 2001
From: Philipp Zabel <philipp.zabel@gmail.com>
Date: Mon, 26 Dec 2005 09:57:00 +0000
Subject: autotools.bbclass, base.bbclass: modify autotools_stage_all to use
 oe_libinstall and install aclocal macros, too

---
 classes/base.bbclass | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'classes/base.bbclass')

diff --git a/classes/base.bbclass b/classes/base.bbclass
index c5359b20f8..b0ca9358bd 100644
--- a/classes/base.bbclass
+++ b/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
-- 
cgit v1.2.3