diff options
| author | Simon Marchi <simon.marchi@polymtl.ca> | 2019-09-18 09:10:59 -0400 |
|---|---|---|
| committer | Simon Marchi <simon.marchi@efficios.com> | 2019-09-18 09:10:59 -0400 |
| commit | 95103a84198f9f0147005e270cea48a9806abd16 (patch) | |
| tree | c5b3f3151c19f4df7bdca2bb2da8180d66972d37 /binutils/doc | |
| parent | e0b2a78c83207340f6c4b5dbe02bec850dbb7def (diff) | |
| download | gdb-95103a84198f9f0147005e270cea48a9806abd16.zip gdb-95103a84198f9f0147005e270cea48a9806abd16.tar.gz gdb-95103a84198f9f0147005e270cea48a9806abd16.tar.bz2 | |
binutils: doc: remove stale things from Makefile
The `install-data-local: install-info` part: the comment refers to when
the Makefile had the cygnus option. It no longer uses that, so the info
file should get installed without that rule. I verified that `make
install` still installed $(prefix)/share/info/binutils.info.
The `DISTCLEANFILES` part: the comment talks about Automake 1.9, we are
using 1.15.1, which doesn't appear to have this problem. binutils.info
is built fine without this snippet.
Note: with my automake 1,15.1 (built from source), I get a spurious diff
in Makefile.in, where the
runstatedir = @runstatedir@
line gets removed. I am not sure why, but I haven't included it.
binutils/ChangeLog:
* doc/Makefile.am (install-data-loca): Remove target.
(DISTCLEANFILES): Remove variable.
* doc/Makefile.in: Re-generate.
Diffstat (limited to 'binutils/doc')
| -rw-r--r-- | binutils/doc/Makefile.am | 11 | ||||
| -rw-r--r-- | binutils/doc/Makefile.in | 24 |
2 files changed, 7 insertions, 28 deletions
diff --git a/binutils/doc/Makefile.am b/binutils/doc/Makefile.am index 49958d2..248e7cd 100644 --- a/binutils/doc/Makefile.am +++ b/binutils/doc/Makefile.am @@ -174,19 +174,8 @@ $(DEMANGLER_NAME).1: cxxfilt.man Makefile -e 's/cxxfilt/$(DEMANGLER_NAME)/' < $$man \ > $(DEMANGLER_NAME).1 -# We want install to imply install-info as per GNU standards, despite the -# cygnus option. -install-data-local: install-info - MAINTAINERCLEANFILES = binutils.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 = binutils.info -endif - # Maintenance # We need it for the taz target in ../../Makefile.in. diff --git a/binutils/doc/Makefile.in b/binutils/doc/Makefile.in index a0777d8..7683875 100644 --- a/binutils/doc/Makefile.in +++ b/binutils/doc/Makefile.in @@ -428,11 +428,6 @@ TEXI2DVI = texi2dvi -I "$(srcdir)" -I "$(top_srcdir)/../libiberty" \ MOSTLYCLEANFILES = $(DEMANGLER_NAME).1 MAINTAINERCLEANFILES = binutils.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. -@GENINSRC_NEVER_TRUE@DISTCLEANFILES = binutils.info all: all-am .SUFFIXES: @@ -722,7 +717,6 @@ clean-generic: distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -748,7 +742,7 @@ info: info-am info-am: $(INFO_DEPS) info-local -install-data-am: install-data-local install-info-am install-man +install-data-am: install-info-am install-man install-dvi: install-dvi-am @@ -896,12 +890,12 @@ uninstall-man: uninstall-man1 clean-libtool cscopelist-am ctags-am dist-info distclean \ distclean-generic distclean-libtool distdir dvi dvi-am html \ html-am info info-am info-local install install-am \ - install-data install-data-am install-data-local install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-man1 install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-aminfo \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-man1 \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-aminfo \ maintainer-clean-generic mostlyclean mostlyclean-aminfo \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ tags-am uninstall uninstall-am uninstall-dvi-am \ @@ -1027,10 +1021,6 @@ $(DEMANGLER_NAME).1: cxxfilt.man Makefile -e 's/cxxfilt/$(DEMANGLER_NAME)/' < $$man \ > $(DEMANGLER_NAME).1 -# We want install to imply install-info as per GNU standards, despite the -# cygnus option. -install-data-local: install-info - # Maintenance # We need it for the taz target in ../../Makefile.in. |