1 files changed, 20 insertions, 14 deletions

diff --git a/meta/recipes-devtools/tcltk/tcl_8.6.1.bb b/meta/recipes-devtools/tcltk/tcl_8.6.1.bb
index 9d35da10a1..27f73f2ce2 100644
--- a/meta/recipes-devtools/tcltk/tcl_8.6.1.bb
+++ b/meta/recipes-devtools/tcltk/tcl_8.6.1.bb
@@ -1,19 +1,21 @@
 SUMMARY = "Tool Command Language"
-LICENSE = "BSD-3-Clause"
-SECTION = "devel/tcltk"
 HOMEPAGE = "http://tcl.sourceforge.net"
-DEPENDS = "tcl-native zlib"
+SECTION = "devel/tcltk"
+
+# http://www.tcl.tk/software/tcltk/license.html
+LICENSE = "tcl & BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://../license.terms;md5=3c6f62c07835353e36f0db550ccfb65a \
     file://../compat/license.terms;md5=3c6f62c07835353e36f0db550ccfb65a \
     file://../library/license.terms;md5=3c6f62c07835353e36f0db550ccfb65a \
     file://../macosx/license.terms;md5=3c6f62c07835353e36f0db550ccfb65a \
     file://../tests/license.terms;md5=3c6f62c07835353e36f0db550ccfb65a \
     file://../win/license.terms;md5=3c6f62c07835353e36f0db550ccfb65a \
-    "
+"
 
-BASE_SRC_URI = "${SOURCEFORGE_MIRROR}/tcl/tcl${PV}-src.tar.gz \
-                file://tcl-add-soname.patch"
+DEPENDS = "tcl-native zlib"
 
+BASE_SRC_URI = "${SOURCEFORGE_MIRROR}/tcl/${BPN}${PV}-src.tar.gz \
+                file://tcl-add-soname.patch"
 SRC_URI = "${BASE_SRC_URI} \
            file://fix_non_native_build_issue.patch \
            file://fix_issue_with_old_distro_glibc.patch \
@@ -21,24 +23,26 @@ SRC_URI = "${BASE_SRC_URI} \
            file://tcl-remove-hardcoded-install-path.patch \
            file://alter-includedir.patch \
            file://run-ptest \
-          "
+"
 SRC_URI[md5sum] = "aae4b701ee527c6e4e1a6f9c7399882e"
 SRC_URI[sha256sum] = "16ee769248e64ba1cae6b4834fcc4e4edd7470d881410e8d58f7dd1434343514"
 
 SRC_URI_class-native = "${BASE_SRC_URI}"
 
-S = "${WORKDIR}/tcl${PV}/unix"
+S = "${WORKDIR}/${BPN}${PV}/unix"
 
-VER = "8.6.1"
+VER = "${PV}"
 
-inherit autotools ptest
+inherit autotools ptest binconfig
 
 DEPENDS_class-native = "zlib-native"
 
 EXTRA_OECONF = "--enable-threads --disable-rpath --libdir=${libdir}"
 
 do_configure() {
-        ( cd ${S}; gnu-configize )
+        cd ${S}
+        gnu-configize
+        cd ${B}
         oe_runconf
 }
 
@@ -53,13 +57,12 @@ do_install() {
         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 
+        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
+        for dir in compat generic unix; do
                 install -d ${D}${includedir}/${BPN}${VER}/$dir
                 install -m 0644 ${S}/../$dir/*.h ${D}${includedir}/${BPN}${VER}/$dir/
         done
@@ -91,5 +94,8 @@ do_install_ptest() {
         cp -r ${S}/../tests ${D}${PTEST_PATH}
 }
 
+# Fix some paths that might be used by Tcl extensions
+BINCONFIG_GLOB = "*Config.sh"
+
 # Fix the path in sstate
 SSTATE_SCAN_FILES += "*Config.sh"