1 files changed, 18 insertions, 19 deletions

diff --git a/gettext-tools/tests/lang-gawk b/gettext-tools/tests/lang-gawk
index c93a2f4..6709844 100755
--- a/gettext-tools/tests/lang-gawk
+++ b/gettext-tools/tests/lang-gawk
@@ -12,7 +12,7 @@
 cat <<\EOF > prog.awk
 BEGIN {
   TEXTDOMAIN = "prog"
-  bindtextdomain ("./l-gawk")
+  bindtextdomain ("./")
 
   print _"'Your command, please?', asked the waiter."
 
@@ -23,10 +23,10 @@ BEGIN {
 EOF
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} -o l-gawk-prog.tmp --omit-header --no-location prog.awk || exit 1
-LC_ALL=C tr -d '\r' < l-gawk-prog.tmp > l-gawk-prog.pot || exit 1
+${XGETTEXT} -o prog.tmp --omit-header --no-location prog.awk || exit 1
+LC_ALL=C tr -d '\r' < prog.tmp > prog.pot || exit 1
 
-cat <<EOF > l-gawk-prog.ok
+cat <<EOF > prog.ok
 msgid "'Your command, please?', asked the waiter."
 msgstr ""
 
@@ -42,9 +42,9 @@ msgstr ""
 EOF
 
 : ${DIFF=diff}
-${DIFF} l-gawk-prog.ok l-gawk-prog.pot || exit 1
+${DIFF} prog.ok prog.pot || exit 1
 
-cat <<\EOF > l-gawk-fr.po
+cat <<\EOF > fr.po
 msgid ""
 msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
@@ -67,18 +67,17 @@ msgstr "%2$s remplace %1$s."
 EOF
 
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o l-gawk-fr.po.tmp l-gawk-fr.po l-gawk-prog.pot || exit 1
-LC_ALL=C tr -d '\r' < l-gawk-fr.po.tmp > l-gawk-fr.po.new || exit 1
+${MSGMERGE} -q -o fr.po.tmp fr.po prog.pot || exit 1
+LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new || exit 1
 
 : ${DIFF=diff}
-${DIFF} l-gawk-fr.po l-gawk-fr.po.new || exit 1
+${DIFF} fr.po fr.po.new || exit 1
 
-test -d l-gawk || mkdir l-gawk
-test -d l-gawk/fr || mkdir l-gawk/fr
-test -d l-gawk/fr/LC_MESSAGES || mkdir l-gawk/fr/LC_MESSAGES
+test -d fr || mkdir fr
+test -d fr/LC_MESSAGES || mkdir fr/LC_MESSAGES
 
 : ${MSGFMT=msgfmt}
-${MSGFMT} -o l-gawk/fr/LC_MESSAGES/prog.mo l-gawk-fr.po
+${MSGFMT} -o fr/LC_MESSAGES/prog.mo fr.po
 
 # Test for presence of gawk version 3.1.3 or newer, excluding version 3.1.5.
 (gawk --version) >/dev/null 2>/dev/null \
@@ -135,12 +134,12 @@ if test $LOCALE_FR_UTF8 != none; then
 fi
 
 : ${DIFF=diff}
-cat <<\EOF > l-gawk-prog.ok
+cat <<\EOF > prog.ok
 «Votre commande, s'il vous plait», dit le garçon.
 2 morceaux de gateau
 EUR remplace FF.
 EOF
-cat <<\EOF > l-gawk-prog.oku
+cat <<\EOF > prog.oku
 «Votre commande, s'il vous plait», dit le garçon.
 2 morceaux de gateau
 EUR remplace FF.
@@ -149,12 +148,12 @@ EOF
 : ${LOCALE_FR=fr_FR}
 : ${LOCALE_FR_UTF8=fr_FR.UTF-8}
 if test $LOCALE_FR != none; then
-  LANGUAGE= LC_ALL=$LOCALE_FR gawk -v n=2 -f prog.awk > l-gawk-prog.out || exit 1
-  ${DIFF} l-gawk-prog.ok l-gawk-prog.out || exit 1
+  LANGUAGE= LC_ALL=$LOCALE_FR gawk -v n=2 -f prog.awk > prog.out || exit 1
+  ${DIFF} prog.ok prog.out || exit 1
 fi
 if test $LOCALE_FR_UTF8 != none; then
-  LANGUAGE= LC_ALL=$LOCALE_FR_UTF8 gawk -v n=2 -f prog.awk > l-gawk-prog.out || exit 1
-  ${DIFF} l-gawk-prog.oku l-gawk-prog.out || exit 1
+  LANGUAGE= LC_ALL=$LOCALE_FR_UTF8 gawk -v n=2 -f prog.awk > prog.out || exit 1
+  ${DIFF} prog.oku prog.out || exit 1
 fi
 
 exit 0