summaryrefslogtreecommitdiff
path: root/bfd
diff options
context:
space:
mode:
Diffstat (limited to 'bfd')
-rw-r--r--bfd/ChangeLog5
-rw-r--r--bfd/doc/Makefile.am2
-rw-r--r--bfd/doc/Makefile.in6
3 files changed, 9 insertions, 4 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index bdbdf69d5aa..46e314d9707 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2018-06-21 Alan Modra <amodra@gmail.com>
+
+ * doc/Makefile.am (AUTOMAKE_OPTIONS): Add "foreign".
+ * doc/Makefile.in: Regenerate.
+
2018-06-20 Renlin Li <renlin.li@arm.com>
* elfxx-aarch64.c (_bfd_aarch64_elf_resolve_relocation): Use PG_OFFSET
diff --git a/bfd/doc/Makefile.am b/bfd/doc/Makefile.am
index 9b3a0ff2e7b..400cfcc7924 100644
--- a/bfd/doc/Makefile.am
+++ b/bfd/doc/Makefile.am
@@ -17,7 +17,7 @@
# <http://www.gnu.org/licenses/>.
#
-AUTOMAKE_OPTIONS = info-in-builddir no-texinfo.tex
+AUTOMAKE_OPTIONS = info-in-builddir no-texinfo.tex foreign
DOCFILES = aoutx.texi archive.texi archures.texi \
bfdt.texi cache.texi coffcode.texi \
diff --git a/bfd/doc/Makefile.in b/bfd/doc/Makefile.in
index aab0f62c02b..0ccbb99ed64 100644
--- a/bfd/doc/Makefile.in
+++ b/bfd/doc/Makefile.in
@@ -393,7 +393,7 @@ top_srcdir = @top_srcdir@
wordsize = @wordsize@
zlibdir = @zlibdir@
zlibinc = @zlibinc@
-AUTOMAKE_OPTIONS = 1.9 info-in-builddir no-texinfo.tex
+AUTOMAKE_OPTIONS = info-in-builddir no-texinfo.tex foreign
DOCFILES = aoutx.texi archive.texi archures.texi \
bfdt.texi cache.texi coffcode.texi \
core.texi elf.texi elfcode.texi format.texi \
@@ -510,9 +510,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu doc/Makefile
+ $(AUTOMAKE) --foreign doc/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \