Mercurial > octave

changeset 31589:01143c6ab610

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: merge stable to default
author Rik <rik@octave.org>
date Tue, 29 Nov 2022 11:08:20 -0800
parents 87a8c7e2f20f (current diff) 7c020b18e299 (diff)
children d6f9be74b208
files
diffstat 3 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile.am	Tue Nov 29 14:06:07 2022 +0100
+++ b/Makefile.am	Tue Nov 29 11:08:20 2022 -0800
@@ -391,8 +391,8 @@
 	$(AM_V_GEN)$(gdbinit-install-rule)
 
 NEWS: etc/NEWS.$(OCTAVE_MAJOR_VERSION).md
-	$(AM_V_GEN)cp $< $@
-.PHONY: NEWS
+	$(AM_V_GEN)rm -f $@ && \
+	cp $< $@
 
 define changelog-from-hg-log
   rm -f $@-t && \
--- a/doc/interpreter/octave.texi	Tue Nov 29 14:06:07 2022 +0100
+++ b/doc/interpreter/octave.texi	Tue Nov 29 11:08:20 2022 -0800
@@ -115,8 +115,7 @@
 @vskip 0pt plus 1filll
 Copyright @copyright{} 1996-2022 The Octave Project Developers
 
-@c FIXME The next sentence needs manual updating with each major release.
-This is the eighth edition of the Octave documentation, and is consistent
+This is edition @value{EDITION} of the Octave documentation, and is consistent
 with version @value{VERSION} of Octave.
 
 Permission is granted to make and distribute verbatim copies of
--- a/test/Makefile.am	Tue Nov 29 14:06:07 2022 +0100
+++ b/test/Makefile.am	Tue Nov 29 11:08:20 2022 -0800
@@ -239,7 +239,8 @@
   $(GENERATED_TEST_FILES)
 
 DISTCLEANFILES += \
-  fntests.log
+  fntests.log \
+  $(DIRSTAMP_FILES)
 
 clean-local: test-clean