merge of '9ebe19c38b13611632684c440b048e45471bf916'

     and 'e0d42dfa54011bb501a5a723ec0554c757bfc933'

1 files changed, 23 insertions, 0 deletions

diff --git a/classes/binconfig.bbclass b/classes/binconfig.bbclass
index 34021845ee..317e080fc5 100644
--- a/classes/binconfig.bbclass
+++ b/classes/binconfig.bbclass
@@ -27,6 +27,29 @@ def is_native(d):
 
 BINCONFIG_GLOB ?= "*-config"
 
+do_install_append() {
+
+    #the 'if' protects native packages, since we can't easily check for bb.data.inherits_class('native', d) in shell 
+    if [ -e ${D}${bindir} ] ; then
+        for config in `find ${S} -name '${BINCONFIG_GLOB}'`; do
+                cat $config | sed \
+		-e 's:${STAGING_LIBDIR}:${libdir}:g;' \ 
+		-e 's:${STAGING_INCDIR}:${includedir}:g;' \
+		-e 's:${STAGING_DATADIR}:${datadir}:' \
+		-e 's:${STAGING_LIBDIR}/..:${prefix}:' > ${D}${bindir}/`basename $config`
+        done
+    fi	
+
+	for lafile in `find ${D} -name *.la` ; do
+		sed -i \
+		    -e 's:${STAGING_LIBDIR}:${libdir}:g;' \
+		    -e 's:${STAGING_INCDIR}:${includedir}:g;' \
+		    -e 's:${STAGING_DATADIR}:${datadir}:' \
+		    -e 's:${STAGING_LIBDIR}/..:${prefix}:' \
+		    $lafile
+	done	    
+}
+
 do_stage_append() {
 	for config in `find ${S} -name '${BINCONFIG_GLOB}'`; do
 		configname=`basename $config`${@is_native(d)}