Bump to autoconf 2.69 and automake 1.15.1

[deliverable/binutils-gdb.git] / gas / doc / Makefile.am

diff --git a/gas/doc/Makefile.am b/gas/doc/Makefile.am
index c9c3405272a3e42505552f221505de344f4f348a..594226aa82399dcc3d3945bba5135d42dc2356e6 100644 (file)
--- a/gas/doc/Makefile.am
+++ b/gas/doc/Makefile.am
@@ -17,12 +17,12 @@
 # <http://www.gnu.org/licenses/>.
 #
 
-AUTOMAKE_OPTIONS = 1.8 cygnus
+AUTOMAKE_OPTIONS = info-in-builddir no-texinfo.tex
 
 # What version of the manual you want; "all" includes everything
 CONFIG=all
 
-# Options to extract the man page from as.texinfo
+# Options to extract the man page from as.texi
 MANCONF = -Dman
 
 TEXI2POD = perl $(BASEDIR)/etc/texi2pod.pl $(AM_MAKEINFOFLAGS)
@@ -32,7 +32,7 @@ POD2MAN = pod2man --center="GNU Development Tools" \
 
 man_MANS = as.1
 
-info_TEXINFOS = as.texinfo
+info_TEXINFOS = as.texi
 as_TEXINFOS = asconfig.texi $(CPU_DOCS)
 
 AM_MAKEINFOFLAGS = -I "$(srcdir)" -I "$(top_srcdir)/../libiberty" \
@@ -120,9 +120,9 @@ info-local: $(MANS)
 # Build the man page from the texinfo file
 # The sed command removes the no-adjust Nroff command so that
 # the man output looks standard.
-as.1: $(srcdir)/as.texinfo asconfig.texi $(CPU_DOCS)
+as.1: $(srcdir)/as.texi asconfig.texi $(CPU_DOCS)
        touch $@
-       -$(TEXI2POD) $(MANCONF) < $(srcdir)/as.texinfo > as.pod
+       -$(TEXI2POD) $(MANCONF) < $(srcdir)/as.texi > as.pod
        -($(POD2MAN) as.pod | \
                sed -e '/^.if n .na/d' > $@.T$$$$ && \
                mv -f $@.T$$$$ $@) || \
@@ -130,10 +130,3 @@ as.1: $(srcdir)/as.texinfo asconfig.texi $(CPU_DOCS)
        rm -f as.pod
 
 MAINTAINERCLEANFILES += as.info
-
-# Automake 1.9 will only build info files in the objdir if they are
-# mentioned in DISTCLEANFILES.  It doesn't have to be unconditional,
-# though, so we use a bogus condition.
-if GENINSRC_NEVER
-DISTCLEANFILES = as.info
-endif