Rename files, to avoid havoc with GNU make.

diff --git a/tests/ChangeLog b/tests/ChangeLog
index 222c4482d957f1fe97f1631d18092550cc51a7cf..1529a6c948fae3618f61f2a51bbfd8a3c4b53437 100644 (file)
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,15 @@
+2001-11-11  Bruno Haible  <haible@clisp.cons.org>
+
+       Avoid an implicit pattern rule ("%.out : %") in GNU make.
+       * msguniq-a.in: Renamed from msguniq-1.in.
+       * msguniq-a.out: Renamed from msguniq-1.out.
+       * Makefile.am (EXTRA_DIST): Distribute msguniq-a.in, msguniq-a.out
+       instead of msguniq-1.in, msguniq-1.out.
+       * msgcomm-23: Update.
+       * msguniq-1: Likewise.
+       * msguniq-2: Update. Make it work if $builddir != $srcdir.
+       * msguniq-3: Likewise.
+
 2001-11-11  Bruno Haible  <haible@clisp.cons.org>
 
        * Makefile.am (xg-test1.ok.po): Pass --no-location to xgettext.

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 98ae419c1b2b0f12723b40a45d6b5f299fe51551..68bc49a573ea0dc44700a34332c4345b6b46c50f 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -42,7 +42,7 @@ TESTS = gettext-1 gettext-2 \
        format-ycp-1 format-ycp-2 \
        plural-1 plural-2
 
-EXTRA_DIST = $(TESTS) test.mo xg-test1.ok.po msguniq-1.in msguniq-1.out
+EXTRA_DIST = $(TESTS) test.mo xg-test1.ok.po msguniq-a.in msguniq-a.out
 
 XGETTEXT = ../src/xgettext
 

diff --git a/tests/msgcomm-23 b/tests/msgcomm-23
index 8a76edd188c6ae3f3ce9f0bc2b0854d4cc9fe162..9bc0b4a159f20654c5a145777b329577c32e94a6 100755 (executable)
--- a/tests/msgcomm-23
+++ b/tests/msgcomm-23
@@ -6,15 +6,15 @@ tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
 tmpfiles="$tmpfiles mcomm-23.in1 mcomm-23.in2"
-cp ${top_srcdir}/tests/msguniq-1.in mcomm-23.in1
-cp ${top_srcdir}/tests/msguniq-1.in mcomm-23.in2
+cp ${top_srcdir}/tests/msguniq-a.in mcomm-23.in1
+cp ${top_srcdir}/tests/msguniq-a.in mcomm-23.in2
 
 tmpfiles="$tmpfiles mcomm-23.out"
 : ${MSGCOMM=msgcomm}
 ${MSGCOMM} -w 1000 mcomm-23.in1 mcomm-23.in2 -o mcomm-23.out
 
 : ${DIFF=diff}
-${DIFF} ${top_srcdir}/tests/msguniq-1.out mcomm-23.out
+${DIFF} ${top_srcdir}/tests/msguniq-a.out mcomm-23.out
 result=$?
 
 rm -fr $tmpfiles

diff --git a/tests/msguniq-1 b/tests/msguniq-1
index af51f82f867df0a949e07d78068b8ae98d595809..c466cadb20274032906ec89d4df9d91ce8034b5e 100755 (executable)
--- a/tests/msguniq-1
+++ b/tests/msguniq-1
@@ -3,12 +3,12 @@
 tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
-tmpfiles="$tmpfiles muniq-1.out"
+tmpfiles="$tmpfiles msguniq-1.out"
 : ${MSGUNIQ-msguniq}
-${MSGUNIQ} -w 1000 ${top_srcdir}/tests/msguniq-1.in -o muniq-1.out
+${MSGUNIQ} -w 1000 ${top_srcdir}/tests/msguniq-a.in -o msguniq-1.out
 
 : ${DIFF=diff}
-${DIFF} ${top_srcdir}/tests/msguniq-1.out muniq-1.out
+${DIFF} ${top_srcdir}/tests/msguniq-a.out msguniq-1.out
 result=$?
 
 rm -fr $tmpfiles

diff --git a/tests/msguniq-2 b/tests/msguniq-2
index 80fda1edca3b2e2ca782127dcbd7bda2eed5b61c..ad514868a418e3d1f4d3021b698b7474ad16b381 100755 (executable)
--- a/tests/msguniq-2
+++ b/tests/msguniq-2
@@ -5,7 +5,7 @@ trap 'rm -fr $tmpfiles' 1 2 3 15
 
 tmpfiles="$tmpfiles msguniq-2.out"
 : ${MSGUNIQ-msguniq}
-${MSGUNIQ} -w 1000 -u msguniq-1.in -o msguniq-2.out
+${MSGUNIQ} -w 1000 -u ${top_srcdir}/tests/msguniq-a.in -o msguniq-2.out
 
 tmpfiles="$tmpfiles msguniq-2.ok"
 cat <<\EOF > msguniq-2.ok

diff --git a/tests/msguniq-3 b/tests/msguniq-3
index f9bdcb2f71fe85e3c106dcaf65311ecd9e6d43b5..c83a0e52af1ab2c58797ac51254ba6f04bd0ef0e 100755 (executable)
--- a/tests/msguniq-3
+++ b/tests/msguniq-3
@@ -5,7 +5,7 @@ trap 'rm -fr $tmpfiles' 1 2 3 15
 
 tmpfiles="$tmpfiles msguniq-3.out"
 : ${MSGUNIQ-msguniq}
-${MSGUNIQ} -w 1000 -d msguniq-1.in -o msguniq-3.out
+${MSGUNIQ} -w 1000 -d ${top_srcdir}/tests/msguniq-a.in -o msguniq-3.out
 
 tmpfiles="$tmpfiles msguniq-3.ok"
 cat <<\EOF > msguniq-3.ok