Mercurial > octave

changeset 22042:21c12b837089

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
build: don't delete distributed docs on 'make clean' or 'make distclean' (bug #45646) * Makefile.am (clean-aminfo): Disable built-in Automake target that deletes Texinfo documentation on 'make clean'. * doc/module.mk (doc-maintainer-clean): Delete all built Texinfo documentation on 'make maintainer-clean'. * doc/interpreter/module.mk (doc_DISTCLEANFILES): Remove $(OCTAVE_HTML_STAMP) from the list.
author Mike Miller <mtmiller@octave.org>
date Tue, 05 Jul 2016 15:45:38 -0700
parents 26c0e65e6b77
children 7d28674f6ff0
files Makefile.am doc/interpreter/module.mk doc/module.mk
diffstat 3 files changed, 7 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile.am	Tue Jul 05 12:15:04 2016 -0700
+++ b/Makefile.am	Tue Jul 05 15:45:38 2016 -0700
@@ -429,6 +429,12 @@
 
 maintainer-clean-local: doc-maintainer-clean
 
+## The 'clean-aminfo' target is defined by Automake >= 1.11.  We want to
+## distribute all Texinfo docs with the source distribution and not delete
+## them on 'clean', so we override this target to do nothing by default.
+
+clean-aminfo:
+
 define move_if_change_rule
   if [ -s $(1) ]; then \
     ${SHELL} ${top_srcdir}/build-aux/move-if-change $(1) $(2); \
--- a/doc/interpreter/module.mk	Tue Jul 05 12:15:04 2016 -0700
+++ b/doc/interpreter/module.mk	Tue Jul 05 15:45:38 2016 -0700
@@ -350,9 +350,6 @@
   $(LOGOS) \
   $(TXI_SRC)
 
-doc_DISTCLEANFILES += \
-  $(OCTAVE_HTML_STAMP)
-
 doc_MAINTAINERCLEANFILES += \
   AUTHORS \
   $(BUILT_DOC_IMAGES) \
--- a/doc/module.mk	Tue Jul 05 12:15:04 2016 -0700
+++ b/doc/module.mk	Tue Jul 05 15:45:38 2016 -0700
@@ -69,3 +69,4 @@
 
 doc-maintainer-clean: doc-distclean
 	rm -f $(doc_MAINTAINERCLEANFILES)
+	rm -rf $(DVIS) $(HTMLS) $(PDFS) $(PSS)