3 files changed, 23 insertions, 35 deletions
diff --git a/libtool/libtool-cross_1.5.oe b/libtool/libtool-cross_1.5.oe
index d305cd458a..1a5cb67e05 100644
--- a/libtool/libtool-cross_1.5.oe
+++ b/libtool/libtool-cross_1.5.oe
@@ -1,16 +1,16 @@
 include libtool_${PV}.oe
 #inherit cross
-SRC_URI_append = ' file://${FILESDIR}/libdir-la.patch;patch=1 \
+SRC_URI_append = " file://${FILESDIR}/libdir-la.patch;patch=1 \
 		   file://${FILESDIR}/sedvar.patch;patch=1 \
 		   file://${FILESDIR}/tag.patch;patch=1 \
 		   file://${FILESDIR}/libtoolize-staging.patch;patch=1 \
 		   file://${FILESDIR}/prefix.patch;patch=1 \
-		   file://${FILESDIR}/chmod.patch;patch=1'
+		   file://${FILESDIR}/chmod.patch;patch=1"
 S = "${WORKDIR}/libtool-${PV}"
 FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/libtool-${PV}"
 
 prefix = "${CROSS_DIR}"
-exec_prefix=${prefix}
+exec_prefix = "${prefix}"
 
 EXTRA_OECONF_append = " --program-prefix=${TARGET_SYS}-"
 
@@ -27,12 +27,10 @@ do_stage () {
 
 	install -m 0644 libltdl/.libs/libltdl.a ${STAGING_LIBDIR}/
 	install -m 0644 libltdl/.libs/libltdl.lai ${STAGING_LIBDIR}/libltdl.la
-	install -m 0755 libltdl/.libs/libltdl.so.3.1.0 ${STAGING_LIBDIR}/
-	ln -sf libltdl.so.3.1.0 ${STAGING_LIBDIR}/libltdl.so.3
-	ln -sf libltdl.so.3.1.0 ${STAGING_LIBDIR}/libltdl.so
-	install -m 0644 libltdl/ltdl.h ${STAGING_DIR}/target/include/
+	oe_soinstall libltdl/.libs/libltdl.so.3.1.0 ${STAGING_LIBDIR}/
+	install -m 0644 libltdl/ltdl.h ${STAGING_INCDIR}/
 }
 
 do_install () {
-	true
+	:
 }
diff --git a/libtool/libtool_1.4.3.oe b/libtool/libtool_1.4.3.oe
index d3115cb5c5..01419c6c05 100644
--- a/libtool/libtool_1.4.3.oe
+++ b/libtool/libtool_1.4.3.oe
@@ -1,26 +1,20 @@
 PR = "r0"
 
-DESCRIPTION = "Generic library support script\
- This is GNU libtool, a generic library support script.  Libtool hides\
- the complexity of generating special library types (such as shared\
- libraries) behind a consistent interface.  To use libtool, add the\
- new generic library building commands to your Makefile, Makefile.in,\
- or Makefile.am.  See the documentation for details.  Libtool supports\
- building static libraries on all platforms.\
- Libtool supports generation of C, C++ and Java libraries.
+DESCRIPTION = "Generic library support script \
+This is GNU libtool, a generic library support script.  Libtool hides \
+the complexity of generating special library types (such as shared \
+libraries) behind a consistent interface."
 
-DEPENDS=
-
-SRC_URI = ${DEBIAN_MIRROR}/main/libt/${PN}/${PN}_${PV}.orig.tar.gz \
-	  file://${FILESDIR}/debian.patch;patch=1 \
-	  file://${FILESDIR}/libdir.patch;patch=1 \
-	  file://${FILESDIR}/sedvar.patch;patch=1 \
-	  file://${FILESDIR}/libtoolize-staging.patch;patch=1
-S = "${WORKDIR}/${P}"
+SRC_URI = "${DEBIAN_MIRROR}/main/libt/libtool/libtool_${PV}.orig.tar.gz \
+	   file://${FILESDIR}/debian.patch;patch=1 \
+	   file://${FILESDIR}/libdir.patch;patch=1 \
+	   file://${FILESDIR}/sedvar.patch;patch=1 \
+	   file://${FILESDIR}/libtoolize-staging.patch;patch=1"
+S = "${WORKDIR}/libtool-${PV}"
 
 inherit autotools
 
-EXTRA_OECONF = --disable-ltdl-install
+EXTRA_OECONF = "--disable-ltdl-install"
 do_configure_prepend () {
 	./bootstrap
 }
diff --git a/libtool/libtool_1.5.oe b/libtool/libtool_1.5.oe
index e80305c983..2c36f5b626 100644
--- a/libtool/libtool_1.5.oe
+++ b/libtool/libtool_1.5.oe
@@ -1,14 +1,10 @@
-DESCRIPTION = Generic library support script\
- This is GNU libtool, a generic library support script.  Libtool hides\
- the complexity of generating special library types (such as shared\
- libraries) behind a consistent interface.  To use libtool, add the\
- new generic library building commands to your Makefile, Makefile.in,\
- or Makefile.am.  See the documentation for details.  Libtool supports\
- building static libraries on all platforms.\
- Libtool supports generation of C, C++ and Java libraries.
+DESCRIPTION = "Generic library support script \
+This is GNU libtool, a generic library support script.  Libtool hides \
+the complexity of generating special library types (such as shared \
+libraries) behind a consistent interface."
 
-SRC_URI = http://ftp.club.cc.cmu.edu/pub/gnu/libtool/libtool-1.5.tar.gz
-S = "${WORKDIR}/${P}"
+SRC_URI = "http://ftp.club.cc.cmu.edu/pub/gnu/libtool/libtool-${PV}.tar.gz"
+S = "${WORKDIR}/libtool-${PV}"
 
 inherit autotools