diff options
| author | Akim Demaille <akim@lrde.epita.fr> | 2012-07-19 17:32:01 +0200 |
|---|---|---|
| committer | Akim Demaille <akim@lrde.epita.fr> | 2012-07-19 17:39:13 +0200 |
| commit | 3eb4f1a3e62807125a815dc572da9204b5b51865 (patch) | |
| tree | 4b26a70460d3922290c7d94bd22cbd5f00e933ce /Makefile.am | |
| parent | 9553083c729070877095948ba2d48553690ac9e9 (diff) | |
| parent | d0d3313d10a28aa6fe77f158d61b84424aa9b3ce (diff) | |
| download | bison-3eb4f1a3e62807125a815dc572da9204b5b51865.tar.gz | |
Merge remote-tracking branch 'origin/maint'
* origin/maint:
maint: update gnu-web-doc-update.
maint: post-release administrivia
version 2.6
maint: prepare for release 2.6
maint: post-release administrivia
version 2.5.91
maint: prepare NEWS.
maint: fix spaces.
tests: adjust to case where the C compiler is actually a C++ compiler
tests: fix dependencies
doc: fix Texinfo command
maint: Valgrind on OS X.
tests: be sure that backups are safe.
maint: dead comment.
tests: refactor for legibility.
tests: refactor the bison invocations.
maint: fix syntax-check ignore patterns.
gnulib: update
gnulib: update.
gnulib: update
Conflicts:
build-aux/Makefile.am
cfg.mk
tests/Makefile.am
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am index ab3460d8..a9861190 100644 --- a/Makefile.am +++ b/Makefile.am @@ -96,6 +96,7 @@ gen-ChangeLog: --strip-cherry-pick \ --no-cluster \ --amend=$(srcdir)/build-aux/git-log-fix \ + --srcdir=$(srcdir) \ --since=$(gen_start_date) > $$cl.tmp && \ mv -f $$cl.tmp $$cl; \ fi |