Merge branch 'org.openembedded.dev' of git://git.openembedded.org/openembedded into...

[vuplus_openembedded] / classes / binconfig.bbclass

diff --git a/classes/binconfig.bbclass b/classes/binconfig.bbclass
index 5ce9ff6..5789903 100644 (file)
--- a/classes/binconfig.bbclass
+++ b/classes/binconfig.bbclass
@@ -1,5 +1,7 @@
 inherit base
 
+FILES_${PN}-dev += "${bindir}/*-config"
+
 # The namespaces can clash here hence the two step replace
 def get_binconfig_mangle(d):
        import bb.data
@@ -9,8 +11,8 @@ def get_binconfig_mangle(d):
                s += " -e 's:=%s${libdir}:=\\1OELIBDIR:;'" % optional_quote
                s += " -e 's:=%s${includedir}:=\\1OEINCDIR:;'" % optional_quote
                s += " -e 's:=%s${datadir}:=\\1OEDATADIR:'" % optional_quote
-               s += " -e 's:=%s${prefix}:=\\1OEPREFIX:'" % optional_quote
-               s += " -e 's:=%s${exec_prefix}:=\\1OEEXECPREFIX:'" % optional_quote
+               s += " -e 's:=%s${prefix}/:=\\1OEPREFIX/:'" % optional_quote
+               s += " -e 's:=%s${exec_prefix}/:=\\1OEEXECPREFIX/:'" % optional_quote
                s += " -e 's:-L${libdir}:-LOELIBDIR:;'"
                s += " -e 's:-I${includedir}:-IOEINCDIR:;'"
                s += " -e 's:OELIBDIR:${STAGING_LIBDIR}:;'"
@@ -39,7 +41,7 @@ do_install_append() {
         done
     fi 
 
-       for lafile in `find ${D} -name *.la` ; do
+       for lafile in `find ${D} -name "*.la"` ; do
                sed -i \
                    -e 's:${STAGING_LIBDIR}:${libdir}:g;' \
                    -e 's:${STAGING_INCDIR}:${includedir}:g;' \