[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
typos in Automake (+ patch)
|
From: |
Paul Eggert |
|
Subject: |
typos in Automake (+ patch) |
|
Date: |
04 Sep 2003 12:00:13 -0700 |
|
User-agent: |
Gnus/5.09 (Gnus v5.9.0) Emacs/21.3 |
[I submitted this yesterday but gnu.org bounced it due to mail headers,
so I'm trying again today with a different subject line.]
Here's a proposed patch to fix various typos in Automake.
2003-09-03 Paul Eggert <address@hidden>
* NEWS, aclocal.in, automake.in, automake.texi,
lib/Automake/Channels.pm, lib/am/dejagnu.am, lib/am/depend.am,
lib/am/lisp.am, lib/am/remake-hdr.am, lib/am/texi-vers.am,
lib/ansi2knr.c, lib/depcomp, lib/missing, lib/py-compile,
m4/obsolete.m4, m4/python.m4, tests/backsl4.test,
tests/cond12.test, tests/defs.in, tests/dejagnu7.test,
tests/depacl2.test, tests/dirlist.test, tests/error.test,
tests/getopt.test, tests/gnuwarn.test, tests/include2.test,
tests/libobj10.test, tests/libtool5.test, tests/libtool6.test,
tests/lisp3.test, tests/phony.test, tests/pr220.test,
tests/subcond2.test, tests/subcond3.test, tests/vtexi.test:
Spelling and minor grammar fixes.
diff -pru automake-1.7.6b/NEWS automake-1.7.6b-fix/NEWS
--- automake-1.7.6b/NEWS Mon Sep 1 15:33:15 2003
+++ automake-1.7.6b-fix/NEWS Wed Sep 3 11:47:20 2003
@@ -108,7 +108,7 @@ Bugs fixed in 1.7.2:
depcomp2.test, gnits2.test, gnits3.test, python3.test, texinfo13.test
* Noteworthy manual updates:
- Augment the section about BUILT_SOURCES.
- - Mention that AM_PROG_CC_STDC is a relic that is beter avoided today.
+ - Mention that AM_PROG_CC_STDC is a relic that is better avoided today.
Bugs fixed in 1.7.1:
* Honor `ansi2knr' for files built in subdirectories, or using per-targets
@@ -258,7 +258,7 @@ New in 1.3:
New in 1.2:
* Bug fixes
-* Better DejaGNU support
+* Better DejaGnu support
* Added no-installinfo option
* Added Emacs Lisp support
* Added --no-force option
@@ -294,7 +294,7 @@ New in 1.2:
New in 1.0:
* Bug fixes
* distcheck target runs install and installcheck targets
-* Added preliminary support for DejaGNU.
+* Added preliminary support for DejaGnu.
New in 0.33:
* More bug fixes
diff -pru automake-1.7.6b/aclocal.in automake-1.7.6b-fix/aclocal.in
--- automake-1.7.6b/aclocal.in Wed Jun 4 12:23:21 2003
+++ automake-1.7.6b-fix/aclocal.in Wed Sep 3 11:24:24 2003
@@ -246,7 +246,7 @@ sub scan_configure ()
# Search for things we know about. The "search" sub is
# constructed dynamically by scan_m4_files. The last
- # parenthethical match makes sure we don't match things that
+ # parenthetical match makes sure we don't match things that
# look like macro assignments or AC_SUBSTs.
if (! &search && /(^|\s+)(AM_[A-Z0-9_]+)($|[^\]\)=A-Z0-9_])/)
{
@@ -311,7 +311,7 @@ sub scan_m4_files (@)
}
# Construct a new function that does the searching. We use a
- # function (instead of just evalling $search in the loop) so that
+ # function (instead of just evaluating $search in the loop) so that
# "die" is correctly and easily propagated if run.
my $search = "sub search {\nmy \$found = 0;\n";
foreach my $key (reverse sort keys %map)
@@ -371,7 +371,7 @@ sub add_file ($)
}
# The search function is constructed dynamically by
- # scan_m4_files. The last parenthethical match makes sure we
+ # scan_m4_files. The last parenthetical match makes sure we
# don't match things that look like macro assignments or
# AC_SUBSTs.
if (! &search && /(^|\s+)(AM_[A-Z0-9_]+)($|[^\]\)=A-Z0-9_])/)
diff -pru automake-1.7.6b/automake.in automake-1.7.6b-fix/automake.in
--- automake-1.7.6b/automake.in Sun Aug 24 14:54:57 2003
+++ automake-1.7.6b-fix/automake.in Wed Sep 3 11:49:48 2003
@@ -140,8 +140,8 @@ my $libdir = '@datadir@/@address@hidden@APIVE
# Some regular expressions. One reason to put them here is that it
# makes indentation work better in Emacs.
-# Writting singled-quoted-$-terminated regexes is a pain because
-# perl-mode thinks of $' as the ${'} variable (intead of a $ followed
+# Writing singled-quoted-$-terminated regexes is a pain because
+# perl-mode thinks of $' as the ${'} variable (instead of a $ followed
# by a closing quote. Letting perl-mode think the quote is not closed
# leads to all sort of misindentations. On the other hand, defining
# regexes as double-quoted strings is far less readable. So usually
@@ -1114,7 +1114,7 @@ register_language ('name' => 'java',
################################################################
-# Parse the WARNINGS environnent variable.
+# Parse the WARNINGS environment variable.
&parse_WARNINGS;
# Parse command line.
@@ -1510,10 +1510,10 @@ sub parse_arguments ()
# See if --version or --help is used. We want to process these before
# anything else because the GNU Coding Standards require us to
- # `exit 0' after processing these options, and we can't garanty this
+ # `exit 0' after processing these options, and we can't guarantee this
# if we treat other options first. (Handling other options first
# could produce error diagnostics, and in this condition it is
- # confusing if Automake `exit 0'.)
+ # confusing if Automake does `exit 0'.)
my %options_1st_pass =
(
'version' => \&version,
@@ -1858,7 +1858,7 @@ sub process_option_list
{
my ($config, @list) = @_;
- # FIXME: We should disallow conditional deffinitions of AUTOMAKE_OPTIONS.
+ # FIXME: We should disallow conditional definitions of AUTOMAKE_OPTIONS.
my $where = ($config ?
$seen_init_automake :
$var_location{'AUTOMAKE_OPTIONS'}{'TRUE'});
@@ -2111,7 +2111,7 @@ sub handle_languages
my $obj_compile = $lang->compile;
- # Rewrite each occurence of `AM_$flag' in the compile
+ # Rewrite each occurrence of `AM_$flag' in the compile
# rule into `${derived}_$flag' if it exists.
for my $flag (@{$lang->flags})
{
@@ -2191,7 +2191,7 @@ sub handle_languages
if $source !~ /\$U/;
(my $source_ = $source) =~ s/\$U/_/g;
- # Explicitely clean the _.c files if they are in
+ # Explicitly clean the _.c files if they are in
# a subdirectory. (In the current directory they get
# erased by a `rm -f *_.c' rule.)
$clean_files{$source_} = MOSTLY_CLEAN
@@ -2275,7 +2275,7 @@ sub handle_languages
$lang->finish;
# Flags listed in `->flags' are user variables (per GNU Standards),
- # they should not be overriden in the Makefile...
+ # they should not be overridden in the Makefile...
my @dont_override = @{$lang->flags};
# ... and so is LDFLAGS.
push @dont_override, 'LDFLAGS' if $lang->link;
@@ -2878,7 +2878,7 @@ sub handle_source_transform
push @sources, "\$($var)";
if ($prefix !~ /^nodist_/)
{
- # If the VAR wasn't definined conditionally, we add
+ # If the VAR wasn't defined conditionally, we add
# it to DIST_SOURCES as is. Otherwise we create a
# am__VAR_DIST variable which contains all possible values,
# and add this variable to DIST_SOURCES.
@@ -3635,7 +3635,7 @@ sub scan_texinfo_file
if (/address@hidden +(\S+)/)
{
# Honor only the first @setfilename. (It's possible to have
- # more occurences later if the manual shows examples of how
+ # more occurrences later if the manual shows examples of how
# to use @setfilename...)
next if $outfile;
@@ -3702,9 +3702,9 @@ sub output_texinfo_build_rules ($$@)
$dsfx ||= "";
# We can output two kinds of rules: the "generic" rules
- # use Make suffix rules and are appropritate when
- # $source and $dest lie in the current directory; the "specifix"
- # rules is needed in the other case.
+ # use Make suffix rules and are appropriate when
+ # $source and $dest lie in the current directory; the "specific"
+ # rules are needed in the other case.
#
# The former are output only once (this is not really apparent
# here, but just remember that some logic deeper in Automake will
@@ -3995,7 +3995,7 @@ sub handle_man_pages
return unless %sections;
- # Now for each section, generate an install and unintall rule.
+ # Now for each section, generate an install and uninstall rule.
# Sort sections so output is deterministic.
foreach my $section (sort keys %sections)
{
@@ -4962,14 +4962,14 @@ sub handle_clean
}
-# &depend ($CATEGORY, @DEPENDENDEES)
-# ----------------------------------
-# The target $CATEGORY depends on @DEPENDENDEES.
+# &depend ($CATEGORY, @DEPENDEES)
+# -------------------------------
+# The target $CATEGORY depends on @DEPENDEES.
sub depend
{
- my ($category, @dependendees) = @_;
+ my ($category, @dependees) = @_;
{
- push (@{$dependencies{$category}}, @dependendees);
+ push (@{$dependencies{$category}}, @dependees);
}
}
@@ -6299,8 +6299,8 @@ sub check_ambiguous_conditional ($$$)
# Check for an ambiguous conditional. Return an error message and
# the other condition involved if we have one, two empty strings otherwise.
# WHAT: the thing being defined
-# COND: the condition under which is is being defined
-# CONDS: the conditons under which is had already been defined
+# COND: the condition under which it is being defined
+# CONDS: the conditions under which it had already been defined
sub conditional_ambiguous_p ($$@)
{
my ($var, $cond, @conds) = @_;
@@ -6424,7 +6424,7 @@ sub macro_define ($$$$$$)
{
my ($var, $owner, $type, $cond, $value, $where) = @_;
- # We will adjust the owener of this variable unless told otherwise.
+ # We will adjust the owner of this variable unless told otherwise.
my $adjust_owner = 1;
error $where, "bad characters in variable name `$var'"
@@ -6838,18 +6838,18 @@ sub variable_conditions_recursive ($)
}
@new_conds = variable_conditions_permutations (sort keys %allconds);
- my %uniqify;
+ my %uniquify;
foreach my $cond (@new_conds)
{
my $reduce = variable_conditions_reduce (split (' ', $cond));
next
if $reduce eq 'FALSE';
- $uniqify{$cond} = 1;
+ $uniquify{$cond} = 1;
}
- # Note we cannot just do `return sort keys %uniqify', because this
+ # Note we cannot just do `return sort keys %uniquify', because this
# function is sometimes used in a scalar context.
- my @uniq_list = sort by_condition keys %uniqify;
+ my @uniq_list = sort by_condition keys %uniquify;
return @uniq_list;
}
@@ -6897,11 +6897,11 @@ sub scan_variable_expansions ($)
# Strip comments.
$text =~ s/#.*$//;
- # Record each use of ${stuff} or $(stuff) that do not follow a $.
+ # Record each use of ${stuff} or $(stuff) that does not follow a $.
while ($text =~ /(?<!\$)\$(?:\{([^\}]*)\}|\(([^\)]*)\))/g)
{
my $var = $1 || $2;
- # The occurent may look like $(string1[:subst1=[subst2]]) but
+ # The occurrence may look like $(string1[:subst1=[subst2]]) but
# we want only `string1'.
$var =~ s/:[^:=]*=[^=]*$//;
push @result, $var;
@@ -7532,7 +7532,7 @@ sub register_suffix_rule ($$$)
verb "Sources ending in $src become $dest";
push @suffixes, $src, $dest;
- # When tranforming sources to objects, Automake uses the
+ # When transforming sources to objects, Automake uses the
# %suffix_rules to move from each source extension to
# `.$(OBJEXT)', not to `.o' or `.obj'. However some people
# define suffix rules for `.o' or `.obj', so internally we will
@@ -7575,7 +7575,7 @@ sub register_suffix_rule ($$$)
}
# Similarly, any extension that can be derived into $src
- # can be derived into the same extenstions as $src can.
+ # can be derived into the same extensions as $src can.
my @dest2 = keys %{$suffix_rules->{$src}};
for my $src2 (keys %$suffix_rules)
{
@@ -7601,7 +7601,7 @@ sub register_suffix_rule ($$$)
# -----------------------------------------------------
# Define a new rule. $TARGET is the rule name. $SOURCE
# is the filename the rule comes from. $OWNER is the
-# owener of the rule (TARGET_AUTOMAKE or TARGET_USER).
+# owner of the rule (TARGET_AUTOMAKE or TARGET_USER).
# $COND is the condition string under which the rule is defined.
# $WHERE is where the rule is defined (file name and/or line number).
# Returns a (possibly empty) list of conditions where the rule
@@ -7670,7 +7670,7 @@ sub rule_define ($$$$$)
# already diagnosed as unportable by -Wportability.
if ($target !~ /^[^%]*%[^%]*$/)
{
- ## FIXME: Presently we can't diagnose duplcate user rules
+ ## FIXME: Presently we can't diagnose duplicate user rules
## because we doesn't distinguish rules with commands
## from rules that only add dependencies. E.g.,
## .PHONY: foo
@@ -7733,7 +7733,7 @@ sub rule_define ($$$$$)
# Check ambiguous conditional definitions.
my ($message, $ambig_cond) =
conditional_ambiguous_p ($target, $cond, keys %{$targets{$target}});
- if ($message) # We have an ambiguty.
+ if ($message) # We have an ambiguity.
{
if ($owner == TARGET_USER)
{
@@ -7814,8 +7814,8 @@ sub rule_define ($$$$$)
}
}
- # POSIX allow multiple targets befor the colon, but disallow
- # definitions of multiple Inference rules. It's also
+ # POSIX allows multiple targets before the colon, but disallows
+ # definitions of multiple inference rules. It's also
# disallowed to mix plain targets with inference rules.
msg ('portability', $where,
"Inference rules can have only one target before the colon (POSIX).")
@@ -7859,7 +7859,7 @@ sub check_trailing_slash ($\$)
# &append_comments ($VARIABLE, $SPACING, $COMMENT)
# ------------------------------------------------
-# Apped $COMMENT to the other comments for $VARIABLE, using
+# Append $COMMENT to the other comments for $VARIABLE, using
# $SPACING as separator.
sub append_comments ($$$$)
{
@@ -7917,7 +7917,7 @@ sub read_am_file ($)
elsif (/$COMMENT_PATTERN/o)
{
# Stick comments before the incoming macro or rule. Make
- # sure a blank line preceeds first block of comments.
+ # sure a blank line precedes the first block of comments.
$spacing = "\n" unless $blank;
$blank = 1;
$comment .= $spacing . $_;
@@ -7932,7 +7932,7 @@ sub read_am_file ($)
}
# We save the conditional stack on entry, and then check to make
- # sure it is the same on exit. This lets us conditonally include
+ # sure it is the same on exit. This lets us conditionally include
# other files.
my @saved_cond_stack = @cond_stack;
my $cond = conditional_string (@cond_stack);
@@ -7986,7 +7986,7 @@ sub read_am_file ($)
elsif ($prev_state == IN_COMMENT)
{
# If the line doesn't start with a `#', add it.
- # We do this because a continuated comment like
+ # We do this because a continued comment like
# # A = foo \
# bar \
# baz
@@ -8084,7 +8084,7 @@ sub read_am_file ($)
# Distribute any included file.
# Always use the $(top_srcdir) prefix in DIST_COMMON,
- # otherwise OSF make will implicitely copy the included
+ # otherwise OSF make will implicitly copy the included
# file in the build tree during `make distdir' to satisfy
# the dependency.
# (subdircond2.test and subdircond3.test will fail.)
@@ -8095,7 +8095,7 @@ sub read_am_file ($)
$path =~ s/\$\(srcdir\)\///;
push (@include_stack, "\$\(srcdir\)/$path");
# Always use the $(srcdir) prefix in DIST_COMMON,
- # otherwise OSF make will implicitely copy the included
+ # otherwise OSF make will implicitly copy the included
# file in the build tree during `make distdir' to satisfy
# the dependency.
# (subdircond2.test and subdircond3.test will fail.)
@@ -8336,7 +8336,7 @@ sub file_contents_internal ($$%)
my $discard_rule = 0; # 1 if the current rule should not be output.
# We save the conditional stack on entry, and then check to make
- # sure it is the same on exit. This lets us conditonally include
+ # sure it is the same on exit. This lets us conditionally include
# other files.
my @saved_cond_stack = @cond_stack;
my $cond = conditional_string (@cond_stack);
@@ -8654,14 +8654,14 @@ sub am_primary_prefixes ($$@)
err_var ($varname,
"invalid variable `$varname': `dist' is forbidden");
}
- # Standard directories must be explicitely allowed.
+ # Standard directories must be explicitly allowed.
elsif (! defined $valid{$X} && exists $standard_prefix{$X})
{
err_var ($varname,
"`${X}dir' is not a legitimate directory " .
"for `$primary'");
}
- # A not explicitely valid directory is allowed if Xdir is defined.
+ # A not explicitly valid directory is allowed if Xdir is defined.
elsif (! defined $valid{$X} &&
require_variables_for_macro ($varname, "`$varname' is used",
"${X}dir"))
diff -pru automake-1.7.6b/automake.texi automake-1.7.6b-fix/automake.texi
--- automake-1.7.6b/automake.texi Sun Aug 31 14:17:49 2003
+++ automake-1.7.6b-fix/automake.texi Wed Sep 3 11:41:52 2003
@@ -5021,7 +5021,7 @@ test. To do this you would list its nam
@code{check_PROGRAMS}, and then specify it as you would any other
program.
address@hidden DejaGNU Tests
address@hidden DejaGnu Tests
If @uref{ftp://ftp.gnu.org/gnu/dejagnu/, @samp{dejagnu}} appears in
@code{AUTOMAKE_OPTIONS}, then a @code{dejagnu}-based test suite is
@@ -5267,7 +5267,7 @@ There are a few rules and variables that
@menu
* Tags:: Interfacing to etags and mkid
* Suffixes:: Handling new file extensions
-* Multilibs:: Support for multilibbing.
+* Multilibs:: Support for multilibs.
@end menu
diff -pru automake-1.7.6b/lib/Automake/Channels.pm
automake-1.7.6b-fix/lib/Automake/Channels.pm
--- automake-1.7.6b/lib/Automake/Channels.pm Wed Jun 4 12:23:26 2003
+++ automake-1.7.6b-fix/lib/Automake/Channels.pm Wed Sep 3 11:46:24 2003
@@ -158,7 +158,7 @@ C<$warnings_are_errors> is set.
=item C<exit_code =E<gt> 1>
The value to update C<$exit_code> with when a fatal or error message
-is emited. C<$exit_code> is also updated for warnings output
+is emitted. C<$exit_code> is also updated for warnings output
when @<$warnings_are_errors> is set.
=item C<file =E<gt> \*STDERR>
@@ -215,7 +215,7 @@ use vars qw (%_default_options %_global_
);
# Filled with output messages as keys, to detect duplicates.
-# The value associated to each keys is the number of occurences
+# The value associated with each key is the number of occurrences
# filtered out.
%_local_duplicate_messages = ();
%_global_duplicate_messages = ();
@@ -322,7 +322,7 @@ sub channel_type ($)
# _format_message ($LEADER, $MESSAGE)
# -----------------------------------
-# Split $MESSAGE at new lines and add $LEADER to each line.
+# Split $MESSAGE at newlines and add $LEADER to each line.
sub _format_message ($$)
{
my ($leader, $message) = @_;
@@ -418,7 +418,7 @@ the following would be output:
foo.c:10: unused variable `mumble'
-If C<$message> contains new line caracters, C<$location> is prepended
+If C<$message> contains newline characters, C<$location> is prepended
to each line. For instance
msg 'error', 'somewhere', "1st line\n2nd line";
@@ -558,7 +558,7 @@ By default, when C<msg> is called, messa
Sometimes it is necessary to delay the output of messages.
For instance you might want to make diagnostics before
-channels have been completly configured.
+channels have been completely configured.
After C<buffer_messages(@types)> has been called, messages sent with
C<msg> to a channel whose type is listed in C<@types> will be stored in a
diff -pru automake-1.7.6b/lib/am/dejagnu.am
automake-1.7.6b-fix/lib/am/dejagnu.am
--- automake-1.7.6b/lib/am/dejagnu.am Wed Jun 4 12:23:26 2003
+++ automake-1.7.6b-fix/lib/am/dejagnu.am Wed Sep 3 11:41:52 2003
@@ -16,7 +16,7 @@
## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
## 02111-1307, USA.
-## Flags for DejaGNU.
+## Flags for DejaGnu.
RUNTESTFLAGS =
## Name of tool to use. Default is the same as the package.
@@ -50,7 +50,7 @@ check-DEJAGNU: site.exp
## Life is easiest with an absolute srcdir, so do that.
srcdir=`$(am__cd) $(srcdir) && pwd`; export srcdir; \
EXPECT=$(EXPECT); export EXPECT; \
-## Allow this to work when expect and DejaGNU are in tree.
+## Allow this to work when expect and DejaGnu are in tree.
## Only required when --cygnus in force.
?CYGNUS? if [ -f $(top_builddir)/../expect/expect ]; then \
?CYGNUS? TCL_LIBRARY=`$(am__cd) $(top_srcdir)/../tcl/library && pwd`; \
diff -pru automake-1.7.6b/lib/am/depend.am automake-1.7.6b-fix/lib/am/depend.am
--- automake-1.7.6b/lib/am/depend.am Sun Jul 20 15:50:35 2003
+++ automake-1.7.6b-fix/lib/am/depend.am Wed Sep 3 11:40:50 2003
@@ -17,7 +17,7 @@
## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
## 02111-1307, USA.
-## Depdirs's files are dependency of this Makefile, so we should never
+## This Makefile depends on Depdirs' files, so we should never
## erase them in -am or -recursive rules; that would prevent any other
## rules from being recursive (for instance multilib clean rules are
## recursive).
diff -pru automake-1.7.6b/lib/am/lisp.am automake-1.7.6b-fix/lib/am/lisp.am
--- automake-1.7.6b/lib/am/lisp.am Wed Jun 4 12:23:26 2003
+++ automake-1.7.6b-fix/lib/am/lisp.am Wed Sep 3 11:19:24 2003
@@ -25,9 +25,9 @@
elc-stamp: $(am__ELFILES)
@echo 'WARNING: Warnings can be ignored. :-)'
if test $(EMACS) != no; then \
-## Make sure "$@" isn't empty initialy.
+## Make sure "$@" isn't empty initially.
set x; \
-## Populate "$@" whith elisp files (found in the current directory
+## Populate "$@" with elisp files (found in the current directory
## or in $srcdir).
list='$(am__ELFILES)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
diff -pru automake-1.7.6b/lib/am/remake-hdr.am
automake-1.7.6b-fix/lib/am/remake-hdr.am
--- automake-1.7.6b/lib/am/remake-hdr.am Wed Jun 4 12:23:27 2003
+++ automake-1.7.6b-fix/lib/am/remake-hdr.am Wed Sep 3 11:20:48 2003
@@ -37,7 +37,7 @@ $(srcdir)/%CONFIG_HIN%: %MAINTAINER-MODE
cd $(top_srcdir) && $(AUTOHEADER)
## Autoheader has the bad habit of not changing the time stamp if
## config.hin is unchanged, which breaks Make targets. Since what
-## must not changed gratuitiously is config.h, which is already handled
+## must not changed gratuitously is config.h, which is already handled
## by config.status, there is no reason to make things complex for
## config.hin.
touch $(srcdir)/%CONFIG_HIN%
diff -pru automake-1.7.6b/lib/am/texi-vers.am
automake-1.7.6b-fix/lib/am/texi-vers.am
--- automake-1.7.6b/lib/am/texi-vers.am Wed Jun 4 12:23:27 2003
+++ automake-1.7.6b-fix/lib/am/texi-vers.am Wed Sep 3 10:59:00 2003
@@ -23,7 +23,7 @@ DIST_COMMON += %VTEXI% %STAMPVTI%
## %STAMPVTI% is always newer than %VTEXI%, so this rule is always
## triggered. If you equip this rule with a command, GNU make will
## assume %VTEXI% has been rebuild in the current directory and
-## discard any %VTEXI% file found in a VPATH seatch.
+## discard any %VTEXI% file found in a VPATH search.
%VTEXI%: %MAINTAINER-MODE% %STAMPVTI%
## Depend on configure so that version number updates cause a rebuild.
diff -pru automake-1.7.6b/lib/ansi2knr.c automake-1.7.6b-fix/lib/ansi2knr.c
--- automake-1.7.6b/lib/ansi2knr.c Wed Jun 4 12:23:24 2003
+++ automake-1.7.6b-fix/lib/ansi2knr.c Wed Sep 3 11:37:58 2003
@@ -64,7 +64,7 @@ program under the GPL.
lpd 2000-04-12 backs out Eggert's changes because of bugs:
- concatlits didn't declare the type of its bufend argument;
- - concatlits didn't't recognize when it was inside a comment;
+ - concatlits didn't recognize when it was inside a comment;
- scanstring could scan backward past the beginning of the string; when
- the check for \ + newline in scanstring was unnecessary.
diff -pru automake-1.7.6b/lib/depcomp automake-1.7.6b-fix/lib/depcomp
--- automake-1.7.6b/lib/depcomp Sun Aug 10 05:24:54 2003
+++ automake-1.7.6b-fix/lib/depcomp Wed Sep 3 11:00:58 2003
@@ -299,7 +299,7 @@ tru64)
dashmstdout)
# Important note: in order to support this mode, a compiler *must*
- # always write the proprocessed file to stdout, regardless of -o.
+ # always write the preprocessed file to stdout, regardless of -o.
"$@" || exit $?
# Remove the call to Libtool.
@@ -395,7 +395,7 @@ makedepend)
cpp)
# Important note: in order to support this mode, a compiler *must*
- # always write the proprocessed file to stdout.
+ # always write the preprocessed file to stdout.
"$@" || exit $?
# Remove the call to Libtool.
@@ -437,7 +437,7 @@ cpp)
msvisualcpp)
# Important note: in order to support this mode, a compiler *must*
- # always write the proprocessed file to stdout, regardless of -o,
+ # always write the preprocessed file to stdout, regardless of -o,
# because we must use -o when running libtool.
"$@" || exit $?
IFS=" "
diff -pru automake-1.7.6b/lib/missing automake-1.7.6b-fix/lib/missing
--- automake-1.7.6b/lib/missing Wed Jul 23 12:42:20 2003
+++ automake-1.7.6b-fix/lib/missing Wed Sep 3 11:01:35 2003
@@ -326,7 +326,7 @@ WARNING: I can't seem to be able to run
WARNING: \`$1' is needed, and you do not seem to have it handy on your
system. You might have modified some files without having the
proper tools for further handling them. Check the \`README' file,
- it often tells you about the needed prerequirements for installing
+ it often tells you about the needed prerequisites for installing
this package. You may also peek at any GNU archive site, in case
some other package would contain this missing \`$1' program."
exit 1
diff -pru automake-1.7.6b/lib/py-compile automake-1.7.6b-fix/lib/py-compile
--- automake-1.7.6b/lib/py-compile Wed Jun 4 12:23:25 2003
+++ automake-1.7.6b-fix/lib/py-compile Wed Sep 3 11:07:22 2003
@@ -80,7 +80,7 @@ $PYTHON -O -c "
import sys, os, string, py_compile
files = '''$*'''
-print 'Byte-compiling python modules (optimised versions) ...'
+print 'Byte-compiling python modules (optimized versions) ...'
for file in string.split(files):
$trans
if not os.path.exists(path) or not (len(path) >= 3 and path[-3:] == '.py'):
diff -pru automake-1.7.6b/m4/obsolete.m4 automake-1.7.6b-fix/m4/obsolete.m4
--- automake-1.7.6b/m4/obsolete.m4 Wed Jun 4 12:23:27 2003
+++ automake-1.7.6b-fix/m4/obsolete.m4 Wed Sep 3 10:56:55 2003
@@ -23,7 +23,7 @@
# We put here only the macros whose substitution is not an Automake
# macro; otherwise including this file would trigger dependencies for
-# all the subsitutions. Generally, obsolete Automake macros are
+# all the substitutions. Generally, obsolete Automake macros are
# better AU_DEFUNed in the same file as their replacement, or alone in
# a separate file (see obsol-gt.m4 or obsol-lt.m4 for instance).
diff -pru automake-1.7.6b/m4/python.m4 automake-1.7.6b-fix/m4/python.m4
--- automake-1.7.6b/m4/python.m4 Wed Aug 13 14:28:38 2003
+++ automake-1.7.6b-fix/m4/python.m4 Wed Sep 3 11:47:34 2003
@@ -39,7 +39,7 @@
# environment variable, or create a .pth file (see the python
# documentation for details).
-# If the MINIUMUM-VERSION argument is passed, AM_PATH_PYTHON will
+# If the MINIMUM-VERSION argument is passed, AM_PATH_PYTHON will
# cause an error if the version of python installed on the system
# doesn't meet the requirement. MINIMUM-VERSION should consist of
# numbers and dots only.
@@ -111,7 +111,7 @@ AC_DEFUN([AM_PATH_PYTHON],
dnl pythondir -- where to install python scripts. This is the
dnl site-packages directory, not the python standard library
- dnl directory like in previous automake betas. This behaviour
+ dnl directory like in previous automake betas. This behavior
dnl is more consistent with lispdir.m4 for example.
dnl Query distutils for this directory. distutils does not exist in
dnl Python 1.5, so we fall back to the hardcoded directory if it
@@ -149,7 +149,7 @@ AC_DEFUN([AM_PATH_PYTHON],
# ---------------------------------------------------------------------------
# Run ACTION-IF-TRUE if the Python interpreter PROG has version >= VERSION.
# Run ACTION-IF-FALSE otherwise.
-# This test uses sys.hexversion instead of the string equivalant (first
+# This test uses sys.hexversion instead of the string equivalent (first
# word of sys.version), in order to cope with versions such as 2.2c1.
# hexversion has been introduced in Python 1.5.2; it's probably not
# worth to support older versions (1.5.1 was released on October 31, 1998).
diff -pru automake-1.7.6b/tests/backsl4.test
automake-1.7.6b-fix/tests/backsl4.test
--- automake-1.7.6b/tests/backsl4.test Wed Jun 4 12:23:27 2003
+++ automake-1.7.6b-fix/tests/backsl4.test Wed Sep 3 10:51:28 2003
@@ -27,8 +27,8 @@ set -e
echo AC_OUTPUT >>configure.in
-# Note: trailing whitespaces used during the test should not appear as
-# trailing whitespaces in this file, or they will get stripped by any
+# Note: trailing whitespace used during the test should not appear as
+# trailing whitespace in this file, or it will get stripped by any
# reasonable editor.
echo 'bin_SCRIPTS = foo \ ' >Makefile.am
diff -pru automake-1.7.6b/tests/cond12.test
automake-1.7.6b-fix/tests/cond12.test
--- automake-1.7.6b/tests/cond12.test Wed Jun 4 12:23:27 2003
+++ automake-1.7.6b-fix/tests/cond12.test Wed Sep 3 11:47:41 2003
@@ -18,7 +18,7 @@
# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
# Boston, MA 02111-1307, USA.
-# Test behaviour of variable_conditions_reduce()
+# Test behavior of variable_conditions_reduce()
# This checks the result of variable_conditions_reduce() for a wide variety
# of cases.
@@ -85,7 +85,7 @@ check_reduce(["FOO", "FOO BAR", "BAR"],
check_reduce(["FOO", "FOO BAR", "BAZ", "FOO BAZ"], ["FOO BAR", "FOO BAZ"]);
check_reduce(["FOO", "FOO BAR", "BAZ", "FOO BAZ", "FOO BAZ BAR"], ["FOO BAZ
BAR"]);
-# Duplicated condionals should be removed
+# Duplicated conditionals should be removed.
check_reduce(["FOO", "BAR", "BAR"], ["BAR,FOO"]);
# Equivalent conditionals in different forms should be reduced: which one is
diff -pru automake-1.7.6b/tests/defs.in automake-1.7.6b-fix/tests/defs.in
--- automake-1.7.6b/tests/defs.in Wed Jun 4 12:23:28 2003
+++ automake-1.7.6b-fix/tests/defs.in Wed Sep 3 11:23:44 2003
@@ -288,7 +288,7 @@ FGREP='@FGREP@'
# than another we wait at least 5 seconds between creations.
sleep='sleep 5'
-# The tests call `make -e' but we do not want $srcdir from the evironment
+# The tests call `make -e' but we do not want $srcdir from the environment
# to override the definition from the Makefile.
testsrcdir=$srcdir
unset srcdir
diff -pru automake-1.7.6b/tests/dejagnu7.test
automake-1.7.6b-fix/tests/dejagnu7.test
--- automake-1.7.6b/tests/dejagnu7.test Wed Jun 4 12:23:28 2003
+++ automake-1.7.6b-fix/tests/dejagnu7.test Wed Sep 3 11:41:52 2003
@@ -24,7 +24,7 @@
required=runtest
. ./defs || exit 1
-# Check whether DejaGNU supports --status
+# Check whether DejaGnu supports --status
runtest --help | $FGREP -e --status || exit 77
cat > failtcl << 'END'
diff -pru automake-1.7.6b/tests/depacl2.test
automake-1.7.6b-fix/tests/depacl2.test
--- automake-1.7.6b/tests/depacl2.test Wed Jun 4 12:23:28 2003
+++ automake-1.7.6b-fix/tests/depacl2.test Wed Sep 3 11:00:04 2003
@@ -18,7 +18,7 @@
# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
# Boston, MA 02111-1307, USA.
-# Test to make sure dependencies work when require'd macro is part of
+# Test to make sure dependencies work when required macro is part of
# autoconf.
. ./defs || exit 1
diff -pru automake-1.7.6b/tests/dirlist.test
automake-1.7.6b-fix/tests/dirlist.test
--- automake-1.7.6b/tests/dirlist.test Wed Jun 4 12:23:28 2003
+++ automake-1.7.6b-fix/tests/dirlist.test Wed Sep 3 11:48:33 2003
@@ -49,8 +49,8 @@ $ACLOCAL
grep 'DEFUN.*AM_INIT_GUILE_MODULE' aclocal.m4
# This bug can occur only when we do a VPATH build of Automake
-# (beause of the `-I' passed to aclocal in tests/defs) but it's
-# ok because this is what `make distcheck' does.
+# (because of the `-I' passed to aclocal in tests/defs) but it's
+# OK because this is what `make distcheck' does.
grep 'I should not be included' aclocal.m4 && exit 1
:
diff -pru automake-1.7.6b/tests/error.test automake-1.7.6b-fix/tests/error.test
--- automake-1.7.6b/tests/error.test Wed Jun 4 12:23:28 2003
+++ automake-1.7.6b-fix/tests/error.test Wed Sep 3 10:54:42 2003
@@ -30,7 +30,7 @@ END
# dependency does not.
cat > AM_ONE_MACRO.m4 << 'END'
AC_DEFUN([AM_ONE_MACRO],
-[AC_REQUIRE([AM_UNEXISING_MACRO])])
+[AC_REQUIRE([AM_NONEXISTENT_MACRO])])
END
$ACLOCAL && exit 1
diff -pru automake-1.7.6b/tests/getopt.test
automake-1.7.6b-fix/tests/getopt.test
--- automake-1.7.6b/tests/getopt.test Wed Jun 4 12:23:28 2003
+++ automake-1.7.6b-fix/tests/getopt.test Wed Sep 3 10:49:37 2003
@@ -26,24 +26,24 @@
set -e
# This is expected to fail ...
-$AUTOMAKE -Wnonexistant 2>stderr && exit 1
+$AUTOMAKE -Wnonexistent 2>stderr && exit 1
cat stderr
-grep ':.*nonexistant' stderr
+grep ':.*nonexistent' stderr
# ... but this should not.
-$AUTOMAKE -Wnonexistant --help 2>stderr
+$AUTOMAKE -Wnonexistent --help 2>stderr
cat stderr
-grep ':.*nonexistant' stderr && exit 1
+grep ':.*nonexistent' stderr && exit 1
# Similarly, this should fail ...
-$AUTOMAKE --nonexistant 2>stderr && exit 1
+$AUTOMAKE --nonexistent 2>stderr && exit 1
cat stderr
-grep ':.*nonexistant' stderr
+grep ':.*nonexistent' stderr
# ... but this should not.
-$AUTOMAKE --nonexistant --help 2>stderr
+$AUTOMAKE --nonexistent --help 2>stderr
cat stderr
-grep ':.*nonexistant' stderr && exit 1
+grep ':.*nonexistent' stderr && exit 1
:
diff -pru automake-1.7.6b/tests/gnuwarn.test
automake-1.7.6b-fix/tests/gnuwarn.test
--- automake-1.7.6b/tests/gnuwarn.test Wed Jun 4 12:23:28 2003
+++ automake-1.7.6b-fix/tests/gnuwarn.test Wed Sep 3 11:23:28 2003
@@ -18,7 +18,7 @@
# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
# Boston, MA 02111-1307, USA.
-# Check that Automake warns about user variables being overriden.
+# Check that Automake warns about user variables being overridden.
. ./defs || exit 1
diff -pru automake-1.7.6b/tests/include2.test
automake-1.7.6b-fix/tests/include2.test
--- automake-1.7.6b/tests/include2.test Wed Jun 4 12:23:28 2003
+++ automake-1.7.6b-fix/tests/include2.test Wed Sep 3 11:09:15 2003
@@ -49,7 +49,7 @@ END
$ACLOCAL
$AUTOCONF
$AUTOMAKE
-# Use --srcdir with an obsolute path because it's harder
+# Use --srcdir with an absolute path because it's harder
# to support in `distdir'.
./configure --srcdir `pwd`
$MAKE test
diff -pru automake-1.7.6b/tests/libobj10.test
automake-1.7.6b-fix/tests/libobj10.test
--- automake-1.7.6b/tests/libobj10.test Wed Jun 4 12:23:28 2003
+++ automake-1.7.6b-fix/tests/libobj10.test Wed Sep 3 11:19:44 2003
@@ -18,8 +18,8 @@
# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
# Boston, MA 02111-1307, USA.
-# Do not complain about the inexistence of a source for LIBOBJS if
-# it's in BUILT_SOURCES. Reported by Erez Zadok
+# Do not complain about the nonexistence of a source for LIBOBJS if
+# it's in BUILT_SOURCES. Reported by Erez Zadok.
. ./defs || exit 1
diff -pru automake-1.7.6b/tests/libtool5.test
automake-1.7.6b-fix/tests/libtool5.test
--- automake-1.7.6b/tests/libtool5.test Wed Jun 4 12:23:28 2003
+++ automake-1.7.6b-fix/tests/libtool5.test Wed Sep 3 11:37:36 2003
@@ -18,7 +18,7 @@
# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
# Boston, MA 02111-1307, USA.
-# Make sure it's ok to install a library under differents conditions
+# Make sure it's ok to install a library under different conditions
# in the same directory.
# Report from Harlan Stenn.
diff -pru automake-1.7.6b/tests/libtool6.test
automake-1.7.6b-fix/tests/libtool6.test
--- automake-1.7.6b/tests/libtool6.test Wed Jun 4 12:23:28 2003
+++ automake-1.7.6b-fix/tests/libtool6.test Wed Sep 3 11:37:31 2003
@@ -18,7 +18,7 @@
# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
# Boston, MA 02111-1307, USA.
-# Make sure it's not ok to install a library under differents conditions
+# Make sure it's not ok to install a library under different conditions
# in different directories.
required='libtoolize'
diff -pru automake-1.7.6b/tests/lisp3.test automake-1.7.6b-fix/tests/lisp3.test
--- automake-1.7.6b/tests/lisp3.test Wed Jun 4 12:23:28 2003
+++ automake-1.7.6b-fix/tests/lisp3.test Wed Sep 3 11:45:29 2003
@@ -18,7 +18,7 @@
# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
# Boston, MA 02111-1307, USA.
-# Test that compilings interdependent elisp files works.
+# Test that compiling interdependent elisp files works.
required=emacs
. ./defs || exit 1
diff -pru automake-1.7.6b/tests/phony.test automake-1.7.6b-fix/tests/phony.test
--- automake-1.7.6b/tests/phony.test Wed Jun 4 12:23:28 2003
+++ automake-1.7.6b-fix/tests/phony.test Wed Sep 3 11:38:24 2003
@@ -18,7 +18,7 @@
# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
# Boston, MA 02111-1307, USA.
-# Make sure .PHONY can be given depenencies several times.
+# Make sure .PHONY can be given dependencies several times.
# From Ralf Corsepius.
. ./defs
diff -pru automake-1.7.6b/tests/pr220.test automake-1.7.6b-fix/tests/pr220.test
--- automake-1.7.6b/tests/pr220.test Wed Jun 4 12:23:28 2003
+++ automake-1.7.6b-fix/tests/pr220.test Wed Sep 3 11:26:00 2003
@@ -41,7 +41,7 @@ AC_INIT(main.c)
AM_INIT_AUTOMAKE(test_am, 1.0)
AC_PROG_CC
AC_ARG_ENABLE(foo,
-[ --enanble-foo Enable foo],
+[ --enable-foo Enable foo],
[ if test "foo" = "bar" ; then
AM_CONDITIONAL(NEVER_TRUE, true)
else
diff -pru automake-1.7.6b/tests/subcond2.test
automake-1.7.6b-fix/tests/subcond2.test
--- automake-1.7.6b/tests/subcond2.test Wed Jun 4 12:23:28 2003
+++ automake-1.7.6b-fix/tests/subcond2.test Wed Sep 3 11:23:28 2003
@@ -80,7 +80,7 @@ result: source
cp $(srcdir)/source result
END
-# We want in opt/ the same Makefile as in src/. Let's exercize `include'.
+# We want in opt/ the same Makefile as in src/. Let's exercise `include'.
cat >opt/Makefile.am << 'END'
include ../src/Makefile.am
END
diff -pru automake-1.7.6b/tests/subcond3.test
automake-1.7.6b-fix/tests/subcond3.test
--- automake-1.7.6b/tests/subcond3.test Wed Jun 4 12:23:28 2003
+++ automake-1.7.6b-fix/tests/subcond3.test Wed Sep 3 11:23:26 2003
@@ -81,7 +81,7 @@ result: source
cp $(srcdir)/source result
END
-# We want in opt/ the same Makefile as in src/. Let's exercize `include'.
+# We want in opt/ the same Makefile as in src/. Let's exercise `include'.
cat >opt/Makefile.am << 'END'
include ../src/Makefile.am
END
diff -pru automake-1.7.6b/tests/vtexi.test automake-1.7.6b-fix/tests/vtexi.test
--- automake-1.7.6b/tests/vtexi.test Wed Jun 4 12:23:28 2003
+++ automake-1.7.6b-fix/tests/vtexi.test Wed Sep 3 10:56:41 2003
@@ -51,7 +51,7 @@ grep '^textutils\.info:.*version\.texi$'
# Test for bug reported by Lars Hecking:
# When running the first version of configure.ac aware automake,
-# @CONFIGURE_AC@ was not properly substitued.
+# @CONFIGURE_AC@ was not properly substituted.
$EGREP '^stamp-vti:.*textutils\.texi( .*)?$' Makefile.in
$EGREP '^stamp-vti:.*\$\(top_srcdir\)/configure( .*)?$' Makefile.in
- typos in Automake (+ patch),
Paul Eggert <=