X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage1%2Fpkg%2Fgettext;h=cf4b78d6f688673d226e632d136e6bae4676351e;hb=fc7d8c678ca78bef7c6e7eaeeb579269b7c501be;hp=7bcd57a0422168976e5c15b85c1d9342f221823a;hpb=b5bfb2006502b57fab234345a2393fd04e6d55ad;p=hvlinux.git

diff --git a/stage1/pkg/gettext b/stage1/pkg/gettext
index 7bcd57a..cf4b78d 100644
--- a/stage1/pkg/gettext
+++ b/stage1/pkg/gettext
@@ -1,37 +1,18 @@
 #!/bin/bash
 
-CONFIGURE_OPTS="\
-    --prefix=/tools \
-    --build=${CLFS_HOST} \
-    --host=${CLFS_TARGET} \
-    ${CONFIGURE_OPTS}"
-
 # 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
-
-    echo "Running configure with options:"
-    echo "  <${CONFIGURE_OPTS}>"
-
-    CC="${CC} ${CLFS_BUILDFLAGS}" CXX="${CXX} ${CLFS_BUILDFLAGS}" \
-        ./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
 }