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/autotools.bbclass | 31 ++++++++++++++++++++++++-------
 1 file changed, 24 insertions(+), 7 deletions(-)

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

diff --git a/openembedded/classes/autotools.bbclass b/openembedded/classes/autotools.bbclass
index 8d448ce0d..927e3432b 100644
--- a/openembedded/classes/autotools.bbclass
+++ b/openembedded/classes/autotools.bbclass
@@ -151,15 +151,32 @@ autotools_stage_includes() {
 }
 
 autotools_stage_all() {
-	if [ "${INHIBIT_AUTO_STAGE}" != "1" ]
+	if [ "${INHIBIT_AUTO_STAGE}" = "1" ]
 	then
-		rm -rf ${STAGE_TEMP}
-		mkdir -p ${STAGE_TEMP}
-		oe_runmake DESTDIR="${STAGE_TEMP}" install
-		cp -pPR ${STAGE_TEMP}/${includedir}/* ${STAGING_INCDIR}
-		cp -pPR ${STAGE_TEMP}/${libdir}/* ${STAGING_LIBDIR}
-		rm -rf ${STAGE_TEMP}
+		return
+	fi
+	rm -rf ${STAGE_TEMP}
+	mkdir -p ${STAGE_TEMP}
+	oe_runmake DESTDIR="${STAGE_TEMP}" install
+	if [ -d ${STAGE_TEMP}/${includedir} ]; then
+		cp -fpPR ${STAGE_TEMP}/${includedir}/* ${STAGING_INCDIR}
+	fi
+	if [ -d ${STAGE_TEMP}/${libdir} ]
+	then
+		for i in ${STAGE_TEMP}/${libdir}/*.la
+		do
+			if [ ! -f "$i" ]; then
+				cp -fpPR ${STAGE_TEMP}/${libdir}/* ${STAGING_LIBDIR}
+				break
+			fi
+			oe_libinstall -so $(basename $i .la) ${STAGING_LIBDIR}
+		done
+	fi
+	if [ -d ${STAGE_TEMP}/${datadir}/aclocal ]; then
+		install -d ${STAGING_DATADIR}/aclocal
+		cp -fpPR ${STAGE_TEMP}/${datadir}/aclocal/* ${STAGING_DATADIR}/aclocal
 	fi
+	rm -rf ${STAGE_TEMP}
 }
 
 EXPORT_FUNCTIONS do_configure do_install
-- 
cgit v1.2.3