From: Alexandre Duret-Lutz <adl@gnu.org>
Date: Sat, 17 Jul 2004 10:56:24 +0000 (+0000)
Subject: * tests/installdir.test: installdirs-local should appear three times,
X-Git-Tag: Release-1-8d~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5f7451cd82085d03028985883fb2c2714a9542f9;p=thirdparty%2Fautomake.git

* 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 5771b5d67..32798f620 100644
--- 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 cc87444a3..189983227 100755
--- 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