Update from Juan Manuel Guerrero.

diff --git a/djgpp/Makefile.maint b/djgpp/Makefile.maint
index 9e114b8b8f1bfce7032f1bca81c34c7e1f153edd..c9dc9589ed5ac4492f74069f5c7b1431ac60f994 100644 (file)
--- a/djgpp/Makefile.maint
+++ b/djgpp/Makefile.maint
@@ -9,7 +9,7 @@ all: README fnchange.lst config.sed
 
 config.sed: config.in fnchange.in
        sed \
-           -e '/plural-1/ d' \
+           -e '/plural-[1-9]\+/ d' \
            -e 's|\.h\.in|\\\\\\\\.h\\\\\\\\.in|' \
            -e 's|\.in\.in|\\\\\\\\.in\\\\\\\\.in|' \
            -e 's|[ ]\+.*/|,|' \

diff --git a/djgpp/config.in b/djgpp/config.in
index dd3dc1e66c1872a59902b682e2ce5027879cf082..b3e26e50b1264e24ed88b2082e4938ce9555072e 100644 (file)
--- a/djgpp/config.in
+++ b/djgpp/config.in
@@ -15,7 +15,7 @@ lispdir = \\$(prefix)/gnu/emacs/site-lisp\
   s,\\.tab\\.c,_tab.c,g\
   s,\\.tab\\.h,_tab.h,g\
   @append_list_of_renamed_files@
-  /^TESTS[     ]*=/ s,plural-1,plural.1,g\
+  /^TESTS[     ]*=/ s,plural-\\([1-9]\\+\\),plural.\\1,g\
   /^install-info-am:/,/^$/ {\
     /@list=/ s,\\\$(INFO_DEPS),& gettext.i,\
     s,file-\\[0-9\\]\\[0-9\\],& \\$\\$file[0-9] \\$\\$file[0-9][0-9],\

diff --git a/djgpp/edtests.bat b/djgpp/edtests.bat
index edae703d67d6b7bf9c1af276eb8cc0fad2927942..eb3e4555588117c55565e8587a52c360cfc69c2f 100644 (file)
--- a/djgpp/edtests.bat
+++ b/djgpp/edtests.bat
@@ -80,5 +80,7 @@ if not errorlevel 1 mv -f ./tests/plural-1 ./tests/plural.1
 sed -f ./djgpp/tscript.sed ./tests/plural.1 > plural.1\r
 update plural.1 ./tests/plural.1\r
 rm -f plural.1\r
+test -f ./tests/plural-2\r
+if not errorlevel 1 mv -f ./tests/plural-2 ./tests/plural.2\r
 touch ./tests/stamp-test\r
 echo Done.\r

diff --git a/djgpp/fnchange.in b/djgpp/fnchange.in
index 7ee3892bf10a74b1228626325f86f8d4ff651188..ead785684c222cddeea8d65e893cd4ea4abb3b3f 100644 (file)
--- a/djgpp/fnchange.in
+++ b/djgpp/fnchange.in
@@ -26,3 +26,4 @@
 @V@/tests/xgettext-9      @V@/tests/xgettext.9
 @V@/tests/xg-test1.ok.po  @V@/tests/xg-test1.ok-po
 @V@/tests/plural-1        @V@/tests/plural.1
+@V@/tests/plural-2        @V@/tests/plural.2