diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2013-01-21 14:52:37 +0100 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2013-01-21 14:52:37 +0100 |
| commit | 63fe125a2e835955b8d0ba0d658208ebf63285f2 (patch) | |
| tree | 1002e7bc6bb45278c061b21f89756d0599988d73 /Makefile.am | |
| parent | 2c0fe206d94f1b2a8ee4d40e5b1841d003fd7319 (diff) | |
| parent | 655e268ddfae52ec1eef5558f95cd1c72c362649 (diff) | |
| download | automake-63fe125a2e835955b8d0ba0d658208ebf63285f2.tar.gz | |
Merge branch 'branch-1.13.2' into maint
That branch is for the "emergency" bug-fixing release 1.13.2.
* branch-1.13.2:
maint: update copyright in files generated by automake and aclocal
tests: avoid a spurious failure when running inside Emacs
tests: make two new test executable
m4: rename an m4 file to a more appropriate name
NEWS: update w.r.t. recent documentation fixes
compat: reinstate AM_CONFIG_HEADER and AM_PROG_CC_STDC
docs: parallel-tests is no longer experimental
docs: serial-tests are not deprecated, just discouraged
NEWS: we are not going to remove AM_PROG_MKDIR_P in Automake 1.14
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index 64e9d4869..fa3dd3f3d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -282,7 +282,7 @@ dist_automake_ac_DATA = \ m4/minuso.m4 \ m4/missing.m4 \ m4/mkdirp.m4 \ - m4/obsolete-err.m4 \ + m4/obsolete.m4 \ m4/options.m4 \ m4/python.m4 \ m4/runlog.m4 \ |