summaryrefslogtreecommitdiff
path: root/automake.in
diff options
context:
space:
mode:
authorStefano Lattarini <stefano.lattarini@gmail.com>2012-07-23 12:27:15 +0200
committerStefano Lattarini <stefano.lattarini@gmail.com>2012-07-23 12:27:15 +0200
commit47388dbc2c169a4f594801fdb8660ff8e31ef300 (patch)
tree893acc3ae5f93453cf3aee71c6d5dfaeb050e514 /automake.in
parent094b83a641e3b5b4aedf8820cb2af9d1c32cb476 (diff)
parent15fa9fba94f55e8aa5508d23d23413d04a2ffe79 (diff)
downloadautomake-47388dbc2c169a4f594801fdb8660ff8e31ef300.tar.gz
Merge branch 'maint'
* maint: self tests: avoid spurious failures on older bash tests: remove t/parallel-tests-many.sh (fixes spurious failure) typofix: in a comment in the automake script news: minor fixlets and reordering Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Diffstat (limited to 'automake.in')
-rw-r--r--automake.in2
1 files changed, 1 insertions, 1 deletions
diff --git a/automake.in b/automake.in
index 15d545d81..4858a39b2 100644
--- a/automake.in
+++ b/automake.in
@@ -6849,7 +6849,7 @@ sub transform ($$)
# preprocess_file ($MAKEFILE, [%TRANSFORM])
# -----------------------------------------
# Load a $MAKEFILE, apply the %TRANSFORM, and return the result.
-# No extra parsing of post-processing is done (i.e., recognition of
+# No extra parsing or post-processing is done (i.e., recognition of
# rules declaration or of make variables definitions).
sub preprocess_file ($%)
{