2006-03-21 Stepan Kasal * automake.in (libtool_new_api): Fix a typo in the comment. * lib/Automake/Makefile.am (Config.pm): Likewise. * lib/am/depend2.am: Likewise. * tests/xsource.test: With `set -e', `|| exit 1' is no longer needed. Index: automake.in =================================================================== RCS file: /cvsroot/automake/automake/automake.in,v retrieving revision 1.1613 diff -u -p -r1.1613 automake.in --- automake.in 3 Oct 2005 20:52:27 -0000 1.1613 +++ automake.in 31 Dec 2005 15:00:04 -0000 @@ -353,7 +353,7 @@ my $ac_gettext_location; # Lists of tags supported by Libtool. my %libtool_tags = (); # 1 if Libtool uses LT_SUPPORTED_TAG. If it does, then it also -# use AC_REQUIRE_AUX_FILE. +# uses AC_REQUIRE_AUX_FILE. my $libtool_new_api = 0; # Most important AC_CANONICAL_* macro seen so far. Index: lib/Automake/Makefile.am =================================================================== RCS file: /cvsroot/automake/automake/lib/Automake/Makefile.am,v retrieving revision 1.22 diff -u -r1.22 Makefile.am --- lib/Automake/Makefile.am 14 May 2005 20:28:51 -0000 1.22 +++ lib/Automake/Makefile.am 20 Mar 2006 22:24:01 -0000 @@ -58,7 +58,7 @@ -e "s,address@hidden@],Generated from $$in.in; do not edit by hand.,g" \ -e 's,address@hidden@],$(datadir),g' -## This file depend on Makefile so it is rebuilt if $(VERSION), +## This file depends on Makefile so it is rebuilt if $(VERSION), ## $(datadir) or other do_subst'ituted variables change. ## Use chmod a-w to prevent people from editing the wrong file by accident. Config.pm: Config.in Makefile Index: lib/am/depend2.am =================================================================== RCS file: /cvsroot/automake/automake/lib/am/depend2.am,v retrieving revision 1.59 diff -u -r1.59 depend2.am --- lib/am/depend2.am 14 May 2005 20:28:52 -0000 1.59 +++ lib/am/depend2.am 20 Mar 2006 22:24:02 -0000 @@ -38,7 +38,7 @@ ## Verbosity of FASTDEP rules ## -------------------------- -## (1) Some people want to see what happen during make. They think +## (1) Some people want to see what happens during make. They think ## @-commands are evil because hiding things hinders debugging. ## (2) Other people want to see only the important commands--those that ## may produce diagnostics, such as compiler invocations. They Index: ChangeLog =================================================================== RCS file: /cvsroot/automake/automake/ChangeLog,v retrieving revision 1.2850 diff -u -r1.2850 ChangeLog --- ChangeLog 20 Mar 2006 20:31:26 -0000 1.2850 +++ ChangeLog 20 Mar 2006 22:40:04 -0000 @@ -142,7 +142,7 @@ 2006-01-05 Stepan Kasal Alexandre Duret-Lutz - * automake.in (top_srcdir): New global. + * automake.in (topsrcdir): New global. (generate_makefile): Compute it. (fill_dist_dirs): New function extracted from handle_dist. (handle_dist, handle_configure): Use fill_dist_dirs. Index: tests/xsource.test =================================================================== RCS file: /cvsroot/automake/automake/tests/xsource.test,v retrieving revision 1.7 diff -u -r1.7 xsource.test --- tests/xsource.test 14 May 2005 20:28:56 -0000 1.7 +++ tests/xsource.test 20 Mar 2006 23:12:49 -0000 @@ -40,6 +40,6 @@ : > z.c : > x/z.c -$ACLOCAL || exit 1 +$ACLOCAL AUTOMAKE_fails $FGREP 'z.$(OBJEXT)' stderr