Bump to autoconf 2.69 and automake 1.15.1

[deliverable/binutils-gdb.git] / gprof / Makefile.am

diff --git a/gprof/Makefile.am b/gprof/Makefile.am
index 84837abd1b6342bd134aa37123f8571db3a9d2b0..b44e5b353d101e7f10f7b34941a52690cab7bf70 100644 (file)
--- a/gprof/Makefile.am
+++ b/gprof/Makefile.am
@@ -17,7 +17,7 @@
 # <http://www.gnu.org/licenses/>.
 #
 
-AUTOMAKE_OPTIONS = 1.11 foreign no-dist no-texinfo.tex
+AUTOMAKE_OPTIONS = foreign no-dist no-texinfo.tex info-in-builddir
 ACLOCAL_AMFLAGS = -I .. -I ../config -I ../bfd
 TEXINFO_TEX = ../texinfo/texinfo.tex
 
@@ -103,10 +103,3 @@ gprof.1: $(srcdir)/gprof.texi config.texi
        rm -f gprof.pod
 
 MAINTAINERCLEANFILES = gprof.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 = gprof.info
-endif