ChangeLog:

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

diff --git a/gas/doc/Makefile.am b/gas/doc/Makefile.am
index 0fdd756c4e7c248cded0061bc6166c3d9877f8c8..cef2366248d950337216cd7b858f1219620fdef6 100644 (file)
--- a/gas/doc/Makefile.am
+++ b/gas/doc/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to generate Makefile.in
 
-AUTOMAKE_OPTIONS = cygnus
+AUTOMAKE_OPTIONS = 1.8 cygnus
 
 # What version of the manual you want; "all" includes everything
 CONFIG=all
@@ -38,6 +38,7 @@ CPU_DOCS = \
        c-i860.texi \
        c-i960.texi \
        c-ip2k.texi \
+       c-m32c.texi \
        c-m32r.texi \
        c-m68hc11.texi \
        c-m68k.texi \
@@ -58,30 +59,33 @@ CPU_DOCS = \
        c-xtensa.texi \
        c-z8k.texi
 
-gasver.texi: Makefile
+gasver.texi: $(srcdir)/../../bfd/configure
        rm -f $@
-       echo '@set VERSION $(VERSION)' > $@
+       eval `grep '^ *VERSION=' $(srcdir)/../../bfd/configure`; \
+         echo "@set VERSION $$VERSION" > $@
 
-as.info: $(srcdir)/as.texinfo asconfig.texi gasver.texi $(CPU_DOCS)
+$(srcdir)/as.info: $(srcdir)/as.texinfo asconfig.texi gasver.texi $(CPU_DOCS)
 as.dvi: $(srcdir)/as.texinfo asconfig.texi gasver.texi $(CPU_DOCS)
 
 # We want install to imply install-info as per GNU standards, despite the
 # cygnus option.
-install: install-info
-install-info: install-info-am
+install-data-local: install-info
 
 # This one isn't ready for prime time yet.  Not even a little bit.
 
 noinst_TEXINFOS = internals.texi
 
-DISTCLEANFILES = asconfig.texi
+MAINTAINERCLEANFILES = asconfig.texi gasver.texi
 
-MAINTAINERCLEANFILES = gasver.texi
+BASEDIR = $(srcdir)/../..
+BFDDIR = $(BASEDIR)/bfd
+
+CONFIG_STATUS_DEPENDENCIES = $(BFDDIR)/configure.in
 
 # Maintenance
 
 # We need it for the taz target in ../../Makefile.in.
-info: $(MANS)
+info-local: $(MANS)
 
 # Build the man page from the texinfo file
 # The sed command removes the no-adjust Nroff command so that