From 576dfa342a13f992bca9bfa24a2a080a92acf65f Mon Sep 17 00:00:00 2001
From: Philip Balister <philip@balister.org>
Date: Wed, 18 Jun 2008 13:26:20 +0000
Subject: libtool : Updates from poky.

---
 packages/libtool/libtool-cross_2.2.4.bb | 5 +----
 packages/libtool/libtool_2.2.4.bb       | 7 +++++--
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'packages/libtool')

diff --git a/packages/libtool/libtool-cross_2.2.4.bb b/packages/libtool/libtool-cross_2.2.4.bb
index a8dadc25d2..9b3c6d78ea 100644
--- a/packages/libtool/libtool-cross_2.2.4.bb
+++ b/packages/libtool/libtool-cross_2.2.4.bb
@@ -1,7 +1,7 @@
 require libtool.inc
 require libtool_${PV}.bb
 
-PR = "r21"
+PR = "r23"
 PACKAGES = ""
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libtool-${PV}"
 SRC_URI_append = " file://cross_compile.patch;patch=1 \
@@ -28,9 +28,6 @@ do_compile () {
 
 do_stage () {
 	install -m 0755 ${HOST_SYS}-libtool ${bindir}/${HOST_SYS}-libtool
-	install -m 0644 libltdl/ltdl.h ${STAGING_INCDIR}/
-	install -d ${STAGING_INCDIR}/libltdl
-	install -m 0644 libltdl/libltdl/*.h ${STAGING_INCDIR}/libltdl/
 	install -d ${STAGING_DATADIR}/libtool ${STAGING_DATADIR}/aclocal
 	install -c ${S}/libltdl/config/config.guess ${STAGING_DATADIR}/libtool/
 	install -c ${S}/libltdl/config/config.sub ${STAGING_DATADIR}/libtool/
diff --git a/packages/libtool/libtool_2.2.4.bb b/packages/libtool/libtool_2.2.4.bb
index 6739802fb7..c8380d161c 100644
--- a/packages/libtool/libtool_2.2.4.bb
+++ b/packages/libtool/libtool_2.2.4.bb
@@ -1,6 +1,6 @@
 require libtool.inc
 
-PR = "r12"
+PR = "r14"
 
 DEFAULT_PREFERENCE = "-1"
 
@@ -18,5 +18,8 @@ inherit autotools
 EXTRA_AUTORECONF = "--exclude=libtoolize"
 
 do_stage () {
-	autotools_stage_all
+       install -d ${STAGING_INCDIR}/libltdl
+       install -m 0644 libltdl/ltdl.h ${STAGING_INCDIR}/
+       install -m 0644 libltdl/libltdl/*.h ${STAGING_INCDIR}/libltdl/
+       oe_libinstall -a -so -C libltdl libltdl ${STAGING_LIBDIR}
 }
-- 
cgit v1.2.3