* tests/installdir.test: installdirs-local should appear three times,

since the change from 2004-07-11 will make it PHONY.

diff --git a/ChangeLog b/ChangeLog
index 5771b5d674b8466b718d91db880f00e49e91299e..32798f620efab4497f32f5ba4ddc851eea3c7f56 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2004-07-17  Alexandre Duret-Lutz  <adl@gnu.org>
 
+       * tests/installdir.test: installdirs-local should appear three times,
+       since the change from 2004-07-11 will make it PHONY.
+
        * lib/am/distdir.am (distdir): Always use $(DIST_SUBDIRS) now
        that it is always defined.  This is less confusing for users
        reading the generated Makefiles.

diff --git a/tests/installdir.test b/tests/installdir.test
index cc87444a33e4e04f6d7482a3cbcd5bb459cc49dc..189983227b2f24550f15e07ee783c6aaadf73fbd 100755 (executable)
--- a/tests/installdir.test
+++ b/tests/installdir.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2001, 2002  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2004  Free Software Foundation, Inc.
 #
 # This file is part of GNU Automake.
 #
@@ -22,12 +22,14 @@
 
 . ./defs || exit 1
 
+set -e
+
 cat > Makefile.am << 'END'
 installdirs-local:
        @echo here
 END
 
-$ACLOCAL || exit 1
-$AUTOMAKE || exit 1
+$ACLOCAL
+$AUTOMAKE
 
-test `grep installdirs-local Makefile.in | wc -l` -eq 2
+test `grep installdirs-local Makefile.in | wc -l` -eq 3