Update tcl for new ipkg() -d option

diff --git a/stage3/hv-install-1 b/stage3/hv-install-1
index 2054516..ca9ad05 100755 (executable)
--- a/stage3/hv-install-1
+++ b/stage3/hv-install-1
@@ -27,7 +27,9 @@ ipkg ${EXPAT}
 ipkg -j ${APR} "--disable-static --with-installbuilddir=/usr/share/apr-1/build"
 ipkg ${APR_UTIL} "--with-apr=/usr --with-gdbm=/usr -with-openssl=/usr"
 ipkg ${NEON} "--with-ssl"
-ipkg -s tcl ${TCL}
+ipkg -s tcl -d unix ${TCL} "\
+        --enable-threads \
+        --mandir=/usr/share/man"
 CFLAGS="${CFLAGS} -DSQLITE_ENABLE_FTS3=1 -DSQLITE_SECURE_DELETE -DSQLITE_ENABLE_UNLOCK_NOTIFY=1 \
     -DSQLITE_ENABLE_COLUMN_METADATA=1" \
     ipkg ${SQLITE}

diff --git a/stage3/pkg/tcl b/stage3/pkg/tcl
index 4c7ac0f..8acbdbf 100644 (file)
--- a/stage3/pkg/tcl
+++ b/stage3/pkg/tcl
@@ -1,16 +1,8 @@
 #!/bin/bash
 
-hvconfig()
-{
-    cd ${LFS_TMP}/${PACKAGE}/unix
-    ./configure \
-        --prefix=/usr \
-        --enable-threads \
-        --mandir=/usr/share/man
-}
-
 hvbuild()
 {
+    cd ${BUILD_DIR}
     make
 
     # Removes references to the build directory and replaces them with saner