[oe-commits] Saul Wold : tcl: fix tclConfig.sh to point to the correct private headers

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: 300760193c6bcfd20f1d4908f912bebd53e86281
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=300760193c6bcfd20f1d4908f912bebd53e86281

Author: Saul Wold <sgw at linux.intel.com>
Date:   Thu Dec  5 08:26:20 2013 -0800

tcl: fix tclConfig.sh to point to the correct private headers

When building expect with rm_work enabled, it was not finding the correct private
header files because they were removed from the WORKDIR, this fixes the tclConfig.sh
to point to the sysroot private area instead.

This also fixes the -L directory to point to STAGING_LIBDIR instead if INCDIR!

[YOCTO #5620]

Signed-off-by: Saul Wold <sgw at linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta/recipes-devtools/tcltk/tcl_8.6.1.bb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta/recipes-devtools/tcltk/tcl_8.6.1.bb b/meta/recipes-devtools/tcltk/tcl_8.6.1.bb
index 10186c4..0d6468a 100644
--- a/meta/recipes-devtools/tcltk/tcl_8.6.1.bb
+++ b/meta/recipes-devtools/tcltk/tcl_8.6.1.bb
@@ -48,11 +48,13 @@ do_compile_prepend() {
 do_install() {
 	autotools_do_install install-private-headers
 	ln -sf ./tclsh${VER} ${D}${bindir}/tclsh
+	sed -i "s+-L${B}+-L${STAGING_LIBDIR}+g" tclConfig.sh
 	sed -i "s+${WORKDIR}+${STAGING_INCDIR}+g" tclConfig.sh
 	sed -i "s,-L${libdir},-L=${libdir},g" tclConfig.sh
 	sed -i "s,-I${includedir},-I=${includedir},g" tclConfig.sh 
 	install -d ${D}${bindir_crossscripts}
 	install -m 0755 tclConfig.sh ${D}${bindir_crossscripts}
+	install -m 0755 tclConfig.sh ${D}${libdir}
 	cd ..
 	for dir in compat generic unix
 	do