Fix segfault with evince

[hvlinux.git] / stage1 / pkg / gettext

diff --git a/stage1/pkg/gettext b/stage1/pkg/gettext
index 6bd0d9a..cf4b78d 100644 (file)
--- a/stage1/pkg/gettext
+++ b/stage1/pkg/gettext
@@ -5,33 +5,14 @@
 # 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
-
-    FINAL_CFG_OPTS="\
-      --prefix=/tools \
-      --build=${CLFS_HOST} \
-      --host=${CLFS_TARGET} \
-      ${CONFIGURE_OPTS}"
-
-    echo "Running configure with options:"
-    echo "  <${FINAL_CFG_OPTS}>"
-
-    CC="${CC} ${CLFS_BUILDFLAGS}" CXX="${CXX} ${CLFS_BUILDFLAGS}" \
-        ./configure ${FINAL_CFG_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
 }