SHF_GNU_MBIND requires ELFOSABI_GNU

[external/binutils.git] / binutils / doc / Makefile.am

diff --git a/binutils/doc/Makefile.am b/binutils/doc/Makefile.am
index 0848ee5..49958d2 100644 (file)
--- a/binutils/doc/Makefile.am
+++ b/binutils/doc/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to generate Makefile.in
 #
-#   Copyright (C) 2012-2018 Free Software Foundation, Inc.
+#   Copyright (C) 2012-2019 Free Software Foundation, Inc.
 #
 # This file is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -17,7 +17,7 @@
 # <http://www.gnu.org/licenses/>.
 #
 
-AUTOMAKE_OPTIONS = cygnus
+AUTOMAKE_OPTIONS = info-in-builddir no-texinfo.tex foreign
 
 # What version of the manual you want; "all" includes everything
 CONFIG=all
@@ -35,7 +35,6 @@ man_MANS = \
        addr2line.1 \
        ar.1 \
        dlltool.1 \
-       nlmconv.1 \
        nm.1 \
        objcopy.1 \
        objdump.1 \
@@ -79,13 +78,6 @@ dlltool.1:   $(binutils_TEXI) $(binutils_TEXINFOS)
                mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1)
        rm -f dlltool.pod
 
-nlmconv.1:     $(binutils_TEXI) $(binutils_TEXINFOS)
-       touch $@
-       -$(TEXI2POD) $(MANCONF) -Dnlmconv < $(binutils_TEXI) > nlmconv.pod
-       -($(POD2MAN) nlmconv.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \
-               mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1)
-       rm -f nlmconv.pod
-
 nm.1:  $(binutils_TEXI) $(binutils_TEXINFOS)
        touch $@
        -$(TEXI2POD) $(MANCONF) -Dnm < $(binutils_TEXI) > nm.pod