Update tk for new ipkg() -d option

diff --git a/stage4/hv-install-1 b/stage4/hv-install-1
index e3c1212776b05c17ca9824ade6f71e59eb5ef71f..487ed34120ae8732b4dfb9e2cd68359f5afd8ccd 100755 (executable)
--- a/stage4/hv-install-1
+++ b/stage4/hv-install-1
@@ -94,7 +94,9 @@ rscr once "Configuring X.org" configure-xorg
 
 ipkg ${XTERM}
 ipkg -m acnb ${T1LIB}
-ipkg -s tk ${TK}
+ipkg -s tk -d unix ${TK} "\
+        --enable-threads \
+        --mandir=/usr/share/man"
 
 # Re-installing python now that tk is present???
 ipkg ${PYTHON} "--enable-shared"

diff --git a/stage4/pkg/tk b/stage4/pkg/tk
index e91c15ce3826f2902fd278a2ee32694bf8f439b9..4b7be3e09f574968c72492a8e5dd7c6913c1e804 100644 (file)
--- a/stage4/pkg/tk
+++ b/stage4/pkg/tk
@@ -1,14 +1,5 @@
 #!/bin/bash
 
-hvconfig()
-{
-    cd ${LFS_TMP}/${PACKAGE}/unix
-    ./configure \
-        --prefix=/usr \
-        --enable-threads \
-        --mandir=/usr/share/man
-}
-
 hvbuild()
 {
     make