merge of '0c89fbedbb59ef7e1b229b833813e59080b4952a'

     and '3fcc18f194a4f1bcbe8cb8c4a82dc5c59d63eaf1'

1 files changed, 21 insertions, 0 deletions

diff --git a/classes/binconfig.bbclass b/classes/binconfig.bbclass
index 34021845ee..ad33c0e498 100644
--- a/classes/binconfig.bbclass
+++ b/classes/binconfig.bbclass
@@ -27,6 +27,27 @@ def is_native(d):
 
 BINCONFIG_GLOB ?= "*-config"
 
+do_install_append() {
+
+        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
+
+	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)}