Fixed compilation of gettext

Makefile

 all:
 	tar xf gettext-0.20.1.tar.xz
-	cd gettext-0.20.1 && sed -i '/^TESTS =/d' gettext-runtime/tests/Makefile.in
-	cd gettext-0.20.1 && sed -i 's/test-lock..EXEEXT.//' gettext-tools/gnulib-tests/Makefile.in
 	cd gettext-0.20.1 && ./configure --build=$(CLFS_TARGET) --prefix=/usr --disable-static --docdir=/usr/share/doc/gettext-0.20.1
 	$(MAKE) -C gettext-0.20.1
 	if [[ ! "$(BUILD_OPTIONS)" =~ no-tests ]] ; then \

build.xml

@@ -5,7 +5,7 @@
   <exec executable="tar" failonerror="true">
    <arg line="xf packages/gettext/gettext-0.20.1.tar.xz -C ${builddir}"/>
   </exec>
-  <exec executable="./configure" dir="${makedir}/gettext-tools" failonerror="true">
+  <exec executable="./configure" dir="${makedir}/libtextstyle" failonerror="true">
    <env key="EMACS" value="no"/>
    <env key="PATH" path="${PATH}"/>
    <env key="CC" value="${CLFS_TARGET}-gcc"/>
@@ -17,7 +17,7 @@
    <env key="STRIP" value="${CLFS_TARGET}-strip"/>
    <arg line="--prefix=${sysrootdir}/tools --build=${CLFS_HOST} --host=${CLFS_TARGET} --disable-shared"/>
   </exec>
-  <exec executable="make" dir="${makedir}/gettext-tools" failonerror="true">
+  <exec executable="make" dir="${makedir}/libtextstyle" failonerror="true">
    <env key="PATH" path="${PATH}"/>
    <env key="CC" value="${CLFS_TARGET}-gcc"/>
    <env key="CXX" value="${CLFS_TARGET}-g++"/>
@@ -26,9 +26,9 @@
    <env key="RANLIB" value="${CLFS_TARGET}-ranlib"/>
    <env key="LD" value="${CLFS_TARGET}-ld"/>
    <env key="STRIP" value="${CLFS_TARGET}-strip"/>
-   <arg line="-C gnulib-lib"/>
   </exec>
-  <exec executable="make" dir="${makedir}/gettext-tools" failonerror="true">
+  <exec executable="./configure" dir="${makedir}/gettext-tools" failonerror="true">
+   <env key="EMACS" value="no"/>
    <env key="PATH" path="${PATH}"/>
    <env key="CC" value="${CLFS_TARGET}-gcc"/>
    <env key="CXX" value="${CLFS_TARGET}-g++"/>
@@ -37,7 +37,7 @@
    <env key="RANLIB" value="${CLFS_TARGET}-ranlib"/>
    <env key="LD" value="${CLFS_TARGET}-ld"/>
    <env key="STRIP" value="${CLFS_TARGET}-strip"/>
-   <arg line="-C intl pluralx.c"/>
+   <arg line="--prefix=${sysrootdir}/tools --build=${CLFS_HOST} --host=${CLFS_TARGET} --disable-shared"/>
   </exec>
   <exec executable="make" dir="${makedir}/gettext-tools" failonerror="true">
    <env key="PATH" path="${PATH}"/>
@@ -48,7 +48,6 @@
    <env key="RANLIB" value="${CLFS_TARGET}-ranlib"/>
    <env key="LD" value="${CLFS_TARGET}-ld"/>
    <env key="STRIP" value="${CLFS_TARGET}-strip"/>
-   <arg line="-C src msgfmt msgmerge xgettext"/>
   </exec>
   <exec executable="cp" dir="${makedir}/gettext-tools" failonerror="true">
    <arg line="-v src/msgfmt ${sysrootdir}/tools/bin"/>