I'm cherry-picking the following patches from master to branch-1-10.
Cheers,
Ralf
commit 3fd022a024101b622ffb98facb9e1fb75727bd30
Author: Ralf Wildenhues <ralf.wildenh...@gmx.de>
Date: Sun Apr 19 10:08:52 2009 +0200
Correctly treat all assignments with bogus trailing comments.
Before this patch, automake would silently fail to diagnose and
to copy into the output those variable assignments which are
preceded by a comment, and end in backslash newline comment.
* automake.in (read_am_file): When determining whether an
escaped newline followed by a comment is an error, correctly use
the parser state, not the contents of a saved comment, which
could still be carried over from a comment before an assignment.
* NEWS: Update.
* tests/commen11.test: New test.
* tests/Makefile.am: Update.
Report by Karl Berry.
Signed-off-by: Ralf Wildenhues <ralf.wildenh...@gmx.de>
commit 1b421d29658eff17137c69977fa7071d4f1f2950
Author: Karl Berry <k...@freefriends.org>
Date: Tue Apr 14 21:43:08 2009 +0200
manual: improve markup: itemize list in `Extending'.
* doc/automake.texi (Extending): Use `...@item's for user override
semantics.
Signed-off-by: Ralf Wildenhues <ralf.wildenh...@gmx.de>
commit d96e2ff2b6db84363f3642066310a1ae010ec2aa
Author: Jim Meyering <meyer...@redhat.com>
Date: Fri Apr 10 16:25:05 2009 +0200
Fix grammar in comments and documentation.
* doc/automake.texi (API versioning): Fix grammar.
* automake.in: Fix grammar in comment.
* lib/Automake/ChannelDefs.pm: Likewise.
* tests/ext2.test: Likewise.
Signed-off-by: Ralf Wildenhues <ralf.wildenh...@gmx.de>
commit 024733ba820e0459a2aa97fe2b4b7366b2c8096d
Author: Jim Meyering <meyer...@redhat.com>
Date: Tue Mar 31 21:11:06 2009 +0200
Avoid test failure due to paranoid TAR_OPTIONS envvar setting.
* tests/txinfo18.test: Don't let a TAR_OPTIONS=--keep-old-files
environment variable setting cause test failure. Fixed in
texi2dvi 4.13.
Signed-off-by: Ralf Wildenhues <ralf.wildenh...@gmx.de>
commit a51b7a0c68693f4ca73a52cd0af5bba412b08de5
Author: Jim Meyering <meyer...@redhat.com>
Date: Wed Apr 1 10:16:02 2009 +0200
Use more common spelling in diagnostic: s/canonic/canonical/.
* automake.in (check_typos): s/canonic/canonical/.
Signed-off-by: Ralf Wildenhues <ralf.wildenh...@gmx.de>
commit ec575a36205c4fa504e853379b0cc43be7bbe7dd
Author: Ralf Wildenhues <ralf.wildenh...@gmx.de>
Date: Sun Mar 29 00:53:40 2009 +0100
Fix maintainer-check failure.
* Makefile.am (maintainer-check): Do not complain if DESTDIR is
passed as argument to `make'.
Signed-off-by: Ralf Wildenhues <ralf.wildenh...@gmx.de>
commit 9e2f8a181c06f2de69589fa95dba81a3e7cc5b19
Author: Ralf Wildenhues <ralf.wildenh...@gmx.de>
Date: Sun Mar 29 00:39:17 2009 +0100
Fix latex warning in manual.
* doc/automake.texi (Cross-Compilation): Fix underfull hbox.
Signed-off-by: Ralf Wildenhues <ralf.wildenh...@gmx.de>
commit eb87b2714faaec287fc16aa34080268ba580c68c
Author: Ralf Wildenhues <ralf.wildenh...@gmx.de>
Date: Wed Apr 1 10:12:59 2009 +0200
Sync auxiliary files from upstream.
* INSTALL, lib/INSTALL, lib/config.guess, lib/config.sub,
lib/texinfo.tex: Sync from upstream.
Signed-off-by: Ralf Wildenhues <ralf.wildenh...@gmx.de>
commit ceaee4225a82bbfe990bd133b55b413871d60453
Author: Ralf Wildenhues <ralf.wildenh...@gmx.de>
Date: Sat Mar 28 18:03:15 2009 +0100
Ensure that empty directory variables work with empty content variables.
This test ensures that, if both $(wheredir) and $(where_HOW) are
the empty string, then the `install' and `uninstall' rules behave
sanely, for several directory variables `wheredir' and several
primaries `HOW'.
* tests/instdir.test: New test.
* tests/Makefile.am: Update.
Signed-off-by: Ralf Wildenhues <ralf.wildenh...@gmx.de>
