X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=bfd%2FChangeLog;h=3677a059380ba19d309fc7d3e3ad2718d1b0fd3e;hb=d0ac1c44885daf68f631befa37e3f3bad318fbbf;hp=356c7d2808dca44a5ab983ae09e3e626725a5cff;hpb=d856f9a8d64ef35b66000c42981f2f66f133d794;p=deliverable%2Fbinutils-gdb.git

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 356c7d2808..3677a05938 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,20 @@
+2018-06-19  Simon Marchi  <simon.marchi@ericsson.com>
+
+	* Makefile.am (AUTOMAKE_OPTIONS): Remove 1.11.
+	(INCLUDES): Rename to ...
+	(AM_CPPFLAGS): ... this.
+	* configure.ac: Remove AC_PREREQ.
+	* doc/Makefile.am (AUTOMAKE_OPTIONS): Remove 1.9, cygnus, add
+	info-in-builddir no-texinfo.tex.
+	(info_TEXINFOS): Rename bfd.texinfo to bfd.texi.
+	* doc/bfd.texinfo: Rename to ...
+	* doc/bfd.texi: ... this.
+	* Makefile.in: Re-generate.
+	* aclocal.m4: Re-generate.
+	* config.in: Re-generate.
+	* configure: Re-generate.
+	* doc/Makefile.in: Re-generate.
+
 2018-06-18  Mephi  <mephi42@gmail.com>
 
 	PR 23297