From 5f7451cd82085d03028985883fb2c2714a9542f9 Mon Sep 17 00:00:00 2001 From: Alexandre Duret-Lutz Date: Sat, 17 Jul 2004 10:56:24 +0000 Subject: [PATCH] * tests/installdir.test: installdirs-local should appear three times, since the change from 2004-07-11 will make it PHONY. --- ChangeLog | 3 +++ tests/installdir.test | 10 ++++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5771b5d..32798f6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2004-07-17 Alexandre Duret-Lutz + * 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 cc87444..1899832 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 -- 2.7.4