From d2d2644610e1948728bf4055382238e5eb4390c8 Mon Sep 17 00:00:00 2001 From: Pavel Roskin Date: Wed, 18 Dec 2002 23:31:34 +0000 Subject: [PATCH] Lots of typo fixes in the comments. --- automake.in | 50 +++++++++++++++++++++++++------------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/automake.in b/automake.in index 59b411399..6299b8554 100755 --- a/automake.in +++ b/automake.in @@ -127,7 +127,7 @@ use Carp; ## ----------- ## # Parameters set by configure. Not to be changed. NOTE: assign -# VERSION as string so that eg version 0.30 will print correctly. +# VERSION as string so that e.g. version 0.30 will print correctly. my $VERSION = '@VERSION@'; my $PACKAGE = '@PACKAGE@'; my $libdir = '@datadir@/@PACKAGE@-@APIVERSION@'; @@ -135,8 +135,8 @@ my $libdir = '@datadir@/@PACKAGE@-@APIVERSION@'; # 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 @@ -1115,7 +1115,7 @@ register_language ('name' => 'java', ################################################################ -# Parse the WARNINGS environnent variable. +# Parse the WARNINGS environment variable. &parse_WARNINGS; # Parse command line. @@ -1410,7 +1410,7 @@ sub var_SUFFIXES_trigger ($$) # -------------------------- # If $CATEGORY is mumble, turn on the mumble channel. # If it's no-mumble, turn mumble off. -# Alse handle `all' and `none' for completeness. +# Else handle `all' and `none' for completeness. sub switch_warning ($) { my ($cat) = @_; @@ -1782,8 +1782,8 @@ sub generate_makefile # For the purpose of ordering, 1.4 is the same as 1.4.0, but 1.4g is # the same as 1.4.99g. The FORK identifier is ignored in the # ordering, except when it looks like -pMINOR[ALPHA]: some versions -# were labelled like 1.4-p3a, this is the same as an alpha release -# labelled 1.4.3a. Yes it's horrible, but Automake did not support +# were labeled like 1.4-p3a, this is the same as an alpha release +# labeled 1.4.3a. Yes, it's horrible, but Automake did not support # two-dot versions in the past. # version_split (VERSION) @@ -2418,7 +2418,7 @@ sub handle_single_transform_list ($$$$@) my $renamed = 0; my ($linker, $object); - # This records whether we've seen a derived source file (eg, + # This records whether we've seen a derived source file (e.g. # yacc output). my $derived_source = 0; @@ -2561,7 +2561,7 @@ sub handle_single_transform_list ($$$$@) # Each item on this list is a string consisting of # four space-separated values: the derived flag prefix - # (eg, for `foo_CFLAGS', it is `foo'), the name of the + # (e.g. for `foo_CFLAGS', it is `foo'), the name of the # source file, the base name of the output file, and # the extension for the object file. push (@{$lang_specific_files{$lang->name}}, $val); @@ -2701,7 +2701,7 @@ sub handle_single_transform_list ($$$$@) # $NODEFINE is a boolean: if true, $OBJVAR will not be defined (but # work done to determine the linker will be). # $ONE_FILE is the canonical (transformed) name of object to build -# $OBJ is the object extension (ie either `.o' or `.lo'). +# $OBJ is the object extension (i.e. either `.o' or `.lo'). # $PARENT is the variable in which $VAR is used, or $VAR if not applicable. # $TOPPARENT is the _SOURCES variable being processed. # $WHERE context into which this definition is done @@ -2861,7 +2861,7 @@ sub subobjname (@) # Arguments are: # canonical (transformed) name of object to build # actual name of object to build -# object extension (ie either `.o' or `$o'. +# object extension (i.e. either `.o' or `$o'. # Return result is name of linker variable that must be used. # Empty return means just use `LINK'. sub handle_source_transform @@ -3025,8 +3025,8 @@ sub handle_lib_objects_cond # Assume we have a file of some sort, and push it onto the # dependency list. Autoconf substitutions are not pushed; - # rarely is a new dependency substituted into (eg) foo_LDADD - # -- but "bad things (eg -lX11) are routinely substituted. + # rarely is a new dependency substituted into e.g. foo_LDADD + # -- but "bad things (e.g. -lX11) are routinely substituted. # Note that LIBOBJS and ALLOCA are exceptions to this rule, # and handled specially below. push (@dep_list, $lsearch) @@ -3632,7 +3632,7 @@ sub handle_scripts { # NOTE we no longer automatically clean SCRIPTS, because it is # useful to sometimes distribute scripts verbatim. This happens - # eg in Automake itself. + # e.g. in Automake itself. &am_install_var ('-candist', 'scripts', 'SCRIPTS', 'bin', 'sbin', 'libexec', 'pkgdata', 'noinst', 'check'); @@ -5936,7 +5936,7 @@ sub register_language (%) # derive_suffix ($EXT, $OBJ) # -------------------------- # This function is used to find a path from a user-specified suffix $EXT -# to $OBJ or to some other suffix we recognize internally, eg `cc'. +# to $OBJ or to some other suffix we recognize internally, e.g. `cc'. sub derive_suffix ($$) { my ($source_ext, $obj) = @_; @@ -6243,7 +6243,7 @@ sub macro_define ($$$$$$) prog_error "$where is not a reference" unless ref $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; err $where, "bad characters in variable name `$var'" @@ -7337,7 +7337,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 the location where the rule is defined. # Returns a (possibly empty) list of conditions where the rule @@ -7582,7 +7582,7 @@ sub target_defined # &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 ($$$$) { @@ -8262,8 +8262,8 @@ sub file_contents ($$%) # $REGEXP # &transform (%PAIRS) # ------------------- -# Foreach ($TOKEN, $VAL) in %PAIRS produce a replacement expression suitable -# for file_contents which: +# For each ($TOKEN, $VAL) in %PAIRS produce a replacement expression +# suitable for file_contents which: # - replaces %$TOKEN% with $VAL, # - enables/disables ?$TOKEN? and ?!$TOKEN?, # - replaces %?$TOKEN% with TRUE or FALSE. @@ -8353,8 +8353,8 @@ sub append_exeext ($) # * `zar_PRIMARY' is a variable. # # As a side effect, it looks for misspellings. It is an error to have -# a variable ending in a "reserved" suffix whose prefix is unknown, eg -# "bni_PROGRAMS". However, unusual prefixes are allowed if a variable +# a variable ending in a "reserved" suffix whose prefix is unknown, e.g. +# "bin_PROGRAMS". However, unusual prefixes are allowed if a variable # of the same name (with "dir" appended) exists. For instance, if the # variable "zardir" is defined, then "zar_PROGRAMS" becomes valid. # This is to provide a little extra flexibility in those cases which @@ -8419,7 +8419,7 @@ sub am_primary_prefixes ($$@) # Handle `where_HOW' variable magic. Does all lookups, generates # install code, and possibly generates code to define the primary # variable. The first argument is the name of the .am file to munge, -# the second argument is the primary variable (eg HEADERS), and all +# the second argument is the primary variable (e.g. HEADERS), and all # subsequent arguments are possible installation locations. # # Returns list of [$location, $value] pairs, where @@ -8717,7 +8717,7 @@ sub require_file_internal ($$@) $errdir = $dir unless $errdir; # Use different name for "error filename". Otherwise on - # an error the bad file will be reported as eg + # an error the bad file will be reported as e.g. # `../../install-sh' when using the default # config_aux_path. $errfile = $errdir . '/' . $file; @@ -9061,7 +9061,7 @@ sub require_variables ($$$@) # INTEGER # require_variables_for_macro ($MACRO, $REASON, @VARIABLES) # --------------------------------------------------------- -# Same as require_variables, but take a macro mame as first argument. +# Same as require_variables, but take a macro name as first argument. sub require_variables_for_macro ($$@) { my ($macro, $reason, @args) = @_; -- 2.47.2