diff options
| author | Ralf Wildenhues <Ralf.Wildenhues@gmx.de> | 2006-10-20 17:17:57 +0000 |
|---|---|---|
| committer | Ralf Wildenhues <Ralf.Wildenhues@gmx.de> | 2006-10-20 17:17:57 +0000 |
| commit | dd3de3aaa211e6809515b0b5fe65068a0ce6b911 (patch) | |
| tree | c2e7a9bc764c24692297edff9c96f927be9b95e2 /lib/Automake/Variable.pm | |
| parent | 34a2a4df7abacf3aac463634500623506ecfe7f0 (diff) | |
| download | automake-dd3de3aaa211e6809515b0b5fe65068a0ce6b911.tar.gz | |
* doc/automake.texi (Dist, Dependency Tracking Evolution):
Fix some typos.
* lib/Automake/Condition.pm: Likewise.
* lib/Automake/DisjConditions.pm: Likewise.
* lib/Automake/ItemDef.pm: Likewise.
* lib/Automake/Options.pm: Likewise.
* lib/Automake/Rule.pm: Likewise.
* lib/Automake/VarDef.pm: Likewise.
* lib/Automake/Variable.pm: Likewise.
* lib/Automake/Wrap.pm: Likewise.
* lib/Automake/XFile.pm: Likewise.
* m4/substnot.m4: Likewise.
Diffstat (limited to 'lib/Automake/Variable.pm')
| -rw-r--r-- | lib/Automake/Variable.pm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/Automake/Variable.pm b/lib/Automake/Variable.pm index 3d23bec40..3334927ef 100644 --- a/lib/Automake/Variable.pm +++ b/lib/Automake/Variable.pm @@ -193,7 +193,7 @@ my %_ac_macro_for_var = # The name of the configure.ac file. my $configure_ac = find_configure_ac; -# Variables that can be overriden without complaint from -Woverride +# Variables that can be overridden without complaint from -Woverride my %_silent_variable_override = (AM_MAKEINFOHTMLFLAGS => 1, AR => 1, @@ -743,7 +743,7 @@ sub scan_variable_expansions ($) while ($text =~ /(?<!\$)\$(?:\{([^\}]*)\}|\(([^\)]*)\))/g) { my $var = $1 || $2; - # The occurence 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; @@ -789,7 +789,7 @@ C<$varname>: the name of the variable being defined. C<$owner>: owner of the variable (one of C<VAR_MAKEFILE>, C<VAR_CONFIGURE>, or C<VAR_AUTOMAKE>, defined by L<Automake::VarDef>). -Variables can be overriden, provided the new owner is not weaker +Variables can be overridden, provided the new owner is not weaker (C<VAR_AUTOMAKE> < C<VAR_CONFIGURE> < C<VAR_MAKEFILE>). C<$type>: the type of the assignment (C<''> for C<FOO = bar>, @@ -1263,12 +1263,12 @@ following arguments: traversing $val, -- the item (i.e., filename) to process $cond, -- the Condition for the $var definition we are - examinating (ignoring the recursion context) + examining (ignoring the recursion context) $full_cond) -- the full Condition, taking into account conditions inherited from parent variables during recursion -If C<inner_expand> is set, variable references occuring in filename +If C<inner_expand> is set, variable references occurring in filename (as in C<$(BASE).ext>) are expansed before the filename is passed to C<&fun_item>. @@ -1489,7 +1489,7 @@ sub _hash_varname ($) # _hash_values (@VALUES) # ---------------------- -# Hash @VALUES for %_gen_varname. @VALUES shoud be a list +# Hash @VALUES for %_gen_varname. @VALUES should be a list # of pairs: ([$cond, @values], [$cond, @values], ...). # See _gen_varname() below. sub _hash_values (@) |