Update for new BUILD_DIR and SRC_DIR variables

[hvlinux.git] / stage1 / pkg / gettext

diff --git a/stage1/pkg/gettext b/stage1/pkg/gettext
index afe372d..cf4b78d 100644 (file)
--- a/stage1/pkg/gettext
+++ b/stage1/pkg/gettext
@@ -1,33 +1,18 @@
 #!/bin/bash
 
-hvconfig_pre()
-{
-    CONFIGURE_OPTS="\
-        ${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:
 hvconfig_cache()
 {
-cat > ${LFS_TMP}/${PACKAGE}-build/config.cache << EOF
+cat > ${BUILD_DIR}/config.cache << EOF
 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
+    cp -v src/msgfmt ${TOOLS_DIR}/bin
 }