Update gettext for new ipkg() -d option

diff --git a/stage1/hv-install-2 b/stage1/hv-install-2
index 8b7b955..dcd147d 100755 (executable)
--- a/stage1/hv-install-2
+++ b/stage1/hv-install-2
@@ -32,7 +32,7 @@ ipkg ${FINDUTILS}
 ipkg ${FILE_PKG}
 ipkg ${FLEX}
 ipkg ${GAWK}
-ipkg ${GETTEXT}
+ipkg -d gettext-tools ${GETTEXT} "--disable-shared"
 ipkg ${GREP} "\
     --disable-perl-regexp \
     --without-included-regex"

diff --git a/stage1/pkg/gettext b/stage1/pkg/gettext
index 902439f..91be892 100644 (file)
--- a/stage1/pkg/gettext
+++ b/stage1/pkg/gettext
@@ -1,10 +1,5 @@
 #!/bin/bash
 
-hvconfig_pre()
-{
-    CONFIGURE_OPTS+=" --disable-shared"
-}
-
 # When cross-compiling the Gettext configure script assumes we don't have a
 # working wcwidth when we do. The following will fix possible compilation
 # errors because of this assumption:
@@ -15,16 +10,8 @@ gl_cv_func_wcwidth_works=yes
 EOF
 }
 
-hvconfig()
-{
-    cd ${LFS_TMP}/${PACKAGE}/gettext-tools
-    ./configure ${CONFIGURE_OPTS}
-}
-
 hvbuild()
 {
-    cd ${LFS_TMP}/${PACKAGE}/gettext-tools
-
     ${HVMAKE} -C gnulib-lib
     ${HVMAKE} -C src msgfmt
     cp -v src/msgfmt /tools/bin