Re: automake po / pot file integration: first tests available

[Stefano Lattarini]

And the attached patch should be squashed in previous patch n.3.

Sorry for the noise,
   Stefano

From 97c6d5fb46f7f98dce21cd38b1e83b5ea1f2ffdc Mon Sep 17 00:00:00 2001
From: Stefano Lattarini <address@hidden>
Date: Mon, 6 Sep 2010 15:20:47 +0200
Subject: [PATCH] SquashMe

---
 ChangeLog                |    3 ++-
 tests/pot-copyright.test |    8 ++++----
 tests/pot-download1.test |   10 +++++-----
 tests/pot-empty.test     |   10 +++++-----
 4 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2f7c6a1..351324f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,8 @@
 2010-09-06  Stefano Lattarini  <address@hidden>
 
        Fixlets for internationalization tests.
-       * tests/pot-copyright.test: Add trailing `:' command.
+       * tests/pot-copyright.test: Add trailing `:' command.  Use
+       `$MAKE', not bare `make'.
        * tests/pot-empty.test: Likewise.
        * tests/pot-download1.test: Likewise.  Use `Exit', not `exit'.
        ($required): Remove gzip, as we must take it for granted anyway.
diff --git a/tests/pot-copyright.test b/tests/pot-copyright.test
index 9fe7318..fb11367 100755
--- a/tests/pot-copyright.test
+++ b/tests/pot-copyright.test
@@ -82,13 +82,13 @@ for builddir in . sub; do
   instdir="`pwd`/instdir"
   cd $builddir
   $sourcedir/configure --prefix="$instdir"
-  make
+  $MAKE
 
   # Check that "make dist" creates the expected .pot file.
   # (It is created under $sourcedir, because the .pot file is distributed.
   # Cf. the GNU standards, node "Makefile Basics".)
 
-  make dist
+  $MAKE dist
 
   test -f $sourcedir/posub/foo-bar.pot
   test $builddir = '.' || test ! -f posub/foo-bar.pot
@@ -97,10 +97,10 @@ for builddir in . sub; do
   rm -f actual
 
   # Sanity check.
-  make distcheck
+  $MAKE distcheck
 
   # Clean up.
-  make distclean
+  $MAKE distclean
   rm -rf "$instdir"
   cd $sourcedir
 done
diff --git a/tests/pot-download1.test b/tests/pot-download1.test
index d377389..01aead1 100755
--- a/tests/pot-download1.test
+++ b/tests/pot-download1.test
@@ -56,24 +56,24 @@ for builddir in . sub; do
   instdir="`pwd`/instdir"
   cd $builddir
   LINGUAS="de" $sourcedir/configure --prefix="$instdir"
-  make
+  $MAKE
 
   # Check that after "make install", a German translation has been installed.
-  make install
+  $MAKE install
   test -f "$instdir"/share/locale/de/LC_MESSAGES/clisp.mo
 
   # Check that after "make dist", the tarball does not include the German
   # translation.
-  make dist
+  $MAKE dist
   gzip -d -c < pot-download1-1.0.tar.gz | tar tf - > filelist
   grep '^pot-download1-1\.0/clisp-de\.po$' filelist && Exit 1
   rm -f filelist
 
   # Sanity check.
-  make distcheck
+  $MAKE distcheck
 
   # Clean up.
-  make distclean
+  $MAKE distclean
   rm -rf "$instdir"
   cd $sourcedir
 done
diff --git a/tests/pot-empty.test b/tests/pot-empty.test
index b106ff2..46611aa 100755
--- a/tests/pot-empty.test
+++ b/tests/pot-empty.test
@@ -57,13 +57,13 @@ for builddir in . sub; do
   instdir="`pwd`/instdir"
   cd $builddir
   $sourcedir/configure --prefix="$instdir"
-  make
-  make dist
+  $MAKE
+  $MAKE dist
 
   # Check that no .pot file was created.
   test ! -f posub/foo-bar.pot
 
-  make install
+  $MAKE install
 
   # Check that still, no .pot file was created.
   test ! -f posub/foo-bar.pot
@@ -72,10 +72,10 @@ for builddir in . sub; do
   test ! -d "$instdir"/share/locale/de/LC_MESSAGES
 
   # Sanity check.
-  make distcheck
+  $MAKE distcheck
 
   # Clean up.
-  make distclean
+  $MAKE distclean
   rm -rf "$instdir"
   cd $sourcedir
 done
-- 
1.7.1