[oe-commits] Richard Purdie : tcl: Fix dangerous do_install staging references

[git at git.openembedded.org]

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

Author: Richard Purdie <richard.purdie at linuxfoundation.org>
Date:   Thu Sep 27 23:05:27 2012 +0100

tcl: Fix dangerous do_install staging references

Nothing should ever be poking files directly into the staging/sysroot
directories, it should always go through ${D}.

This patch ensures this recipe does this and hence fixes various
potential build issues such as lack of sstate tracking of files.

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

---

 meta/recipes-devtools/tcltk/tcl_8.5.11.bb |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-devtools/tcltk/tcl_8.5.11.bb b/meta/recipes-devtools/tcltk/tcl_8.5.11.bb
index e5fe7d3..fab6057 100644
--- a/meta/recipes-devtools/tcltk/tcl_8.5.11.bb
+++ b/meta/recipes-devtools/tcltk/tcl_8.5.11.bb
@@ -44,7 +44,7 @@ do_compile_prepend() {
 
 do_install() {
 	autotools_do_install
-	oe_libinstall -so libtcl8.5 ${STAGING_LIBDIR}
+	oe_libinstall -so libtcl8.5 ${D}${libdir}
 	ln -sf ./tclsh8.5 ${D}${bindir}/tclsh
 	sed -i "s+${WORKDIR}+${STAGING_INCDIR}+g" tclConfig.sh
 	sed -i "s,-L${libdir},-L=${libdir},g" tclConfig.sh
@@ -54,8 +54,8 @@ do_install() {
 	cd ..
 	for dir in compat generic unix
 	do
-		install -d ${STAGING_INCDIR}/tcl${PV}/$dir
-		install -m 0644 $dir/*.h ${STAGING_INCDIR}/tcl${PV}/$dir/
+		install -d ${D}${includedir}/tcl${PV}/$dir
+		install -m 0644 $dir/*.h ${D}${includedir}/tcl${PV}/$dir/
 	done
 }