base.bbclass: Improve .la file conversion from installed=yes to installed=no

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

1 files changed, 4 insertions, 1 deletions

diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index 06a49814d2..8f46d3e2b9 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -315,7 +315,10 @@ oe_libinstall() {
                         # stop libtool using the final directory name for libraries
                         # in staging:
                         __runcmd rm -f $destpath/$libname.la
-                        __runcmd sed -e 's/^installed=yes$/installed=no/' -e '/^dependency_libs=/s,${WORKDIR}[[:alnum:]/\._+-]*/\([[:alnum:]\._+-]*\),${STAGING_LIBDIR}/\1,g' $dotlai >$destpath/$libname.la
+                        __runcmd sed -e 's/^installed=yes$/installed=no/' \
+                                     -e '/^dependency_libs=/s,${WORKDIR}[[:alnum:]/\._+-]*/\([[:alnum:]\._+-]*\),${STAGING_LIBDIR}/\1,g' \
+                                     -e "/^dependency_libs=/s,\([[:space:]']*\)${libdir},\1${STAGING_LIBDIR},g" \
+                                     $dotlai >$destpath/$libname.la
                 else
                         __runcmd install -m 0644 $dotlai $destpath/$libname.la
                 fi