aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--binutils/ChangeLog6
-rw-r--r--binutils/doc/Makefile.am2
-rw-r--r--binutils/doc/Makefile.in4
3 files changed, 9 insertions, 3 deletions
diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 840fc4d..2db388d 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,9 @@
+2020-03-06 Simon Marchi <simon.marchi@efficios.com>
+
+ PR 25491
+ * doc/Makefile.am: Rename MOSTLYCLEANFILES to MAINTAINERCLEANFILES.
+ * doc/Makefile.in: Re-generate.
+
2020-03-06 Nick Clifton <nickc@redhat.com>
* objcopy.c (check_new_section_flags): New function. Reject the
diff --git a/binutils/doc/Makefile.am b/binutils/doc/Makefile.am
index a1e07ec..af6370a 100644
--- a/binutils/doc/Makefile.am
+++ b/binutils/doc/Makefile.am
@@ -162,7 +162,7 @@ cxxfilt.man: $(binutils_TEXI)
mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1)
rm -f $(DEMANGLER_NAME).pod
-MOSTLYCLEANFILES = $(man_MANS) binutils.info cxxfilt.man
+MAINTAINERCLEANFILES = $(man_MANS) binutils.info cxxfilt.man
$(DEMANGLER_NAME).1: cxxfilt.man Makefile
if test -f cxxfilt.man; then \
diff --git a/binutils/doc/Makefile.in b/binutils/doc/Makefile.in
index b0e7b7b..b00260b 100644
--- a/binutils/doc/Makefile.in
+++ b/binutils/doc/Makefile.in
@@ -429,7 +429,7 @@ AM_MAKEINFOFLAGS = -I "$(srcdir)" -I "$(top_srcdir)/../libiberty" \
TEXI2DVI = texi2dvi -I "$(srcdir)" -I "$(top_srcdir)/../libiberty" \
-I "$(top_srcdir)/../bfd/doc" -I ../../bfd/doc
-MOSTLYCLEANFILES = $(man_MANS) binutils.info cxxfilt.man
+MAINTAINERCLEANFILES = $(man_MANS) binutils.info cxxfilt.man
all: all-am
.SUFFIXES:
@@ -712,7 +712,6 @@ install-strip:
"INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
fi
mostlyclean-generic:
- -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
clean-generic:
@@ -723,6 +722,7 @@ distclean-generic:
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild."
+ -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
clean: clean-am
clean-am: clean-aminfo clean-generic clean-libtool mostlyclean-am