libtool: changed staging - will unbreak pulseaudio

- stage headers/library in libtool
- $TARGET_ARCH-libtool and m4 macros in libtool-cross


git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4639 311d38ba-8fff-0310-9ca6-ca027cbcb966

2 files changed, 9 insertions, 5 deletions

diff --git a/meta/packages/libtool/libtool-cross_2.2.4.bb b/meta/packages/libtool/libtool-cross_2.2.4.bb
index 2f93b6825b..bc39d8d4b0 100644
--- a/meta/packages/libtool/libtool-cross_2.2.4.bb
+++ b/meta/packages/libtool/libtool-cross_2.2.4.bb
@@ -1,7 +1,7 @@
 require libtool.inc
 require libtool_${PV}.bb
 
-PR = "r22"
+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/meta/packages/libtool/libtool_2.2.4.bb b/meta/packages/libtool/libtool_2.2.4.bb
index 024a54faa1..f33932d057 100644
--- a/meta/packages/libtool/libtool_2.2.4.bb
+++ b/meta/packages/libtool/libtool_2.2.4.bb
@@ -1,6 +1,6 @@
 require libtool.inc
 
-PR = "r13"
+PR = "r14"
 
 SRC_URI = "${GNU_MIRROR}/libtool/libtool-${PV}.tar.gz \
            file://dolt.m4"
@@ -15,3 +15,10 @@ FILES_libltdl-dbg = "${libdir}/.debug/"
 inherit autotools
 
 EXTRA_AUTORECONF = "--exclude=libtoolize"
+
+do_stage() {
+        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}
+}