From: Stefano Lattarini Date: Sun, 7 Nov 2010 14:06:34 +0000 (+0100) Subject: Merge branch 'pluseq-fix' into maint X-Git-Tag: ng-0.5a~345^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=551b1133da2b17fb3d2171346fd4af86f05ad5fe;p=thirdparty%2Fautomake.git Merge branch 'pluseq-fix' into maint --- 551b1133da2b17fb3d2171346fd4af86f05ad5fe diff --cc ChangeLog index e3559dc9f,3e36f4ddf..a3569580c --- a/ChangeLog +++ b/ChangeLog @@@ -1,11 -1,16 +1,24 @@@ + 2010-11-07 Stefano Lattarini + + Fix a bug in variable concatanation with `+='. + * lib/Automake/VarDef.pm (append): Since the content of the + "appended-to" variable is going to be unconditionally normalized + later, simply separate the appended value with a single whitespace + character, instead of trying to be uselesssly smarter by using + escaped newlines. This fixes a bug in which extra backslashes + where erroneously inserted in the variable's final value. + * tests/pluseq11.test: New test, exposing the bug. + * tests/Makefile.am (TESTS): Update. + Reported by Andy Wingo. + +2010-11-06 Stefano Lattarini + + Fix bug in rules for creating vala vapi/header files. + * automake.in (lang_vala_finish_target): Add forgotten "fi" in an + if control structure in a generated make rules. Bug introduced + by previous commit `v1.11-221-gd7c1679', and revealed by failure + of test `vala2.test'. + 2010-11-01 Ralf Wildenhues Fix and document rules to not touch the tree with `make -n'.