changeset 30452:5fef7ee1d85a

maint: Merge stable to default.
author Kai T. Ohlhus <k.ohlhus@gmail.com>
date Wed, 08 Dec 2021 14:14:04 +0900
parents 81bb1204f906 (current diff) 0e553bb97d31 (diff)
children 3d5ed9eef306
files NEWS etc/NEWS.7
diffstat 1 files changed, 7 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile.am	Tue Dec 07 16:26:09 2021 +0100
+++ b/Makefile.am	Wed Dec 08 14:14:04 2021 +0900
@@ -145,13 +145,13 @@
   BUGS \
   ChangeLog \
   HG-ID \
-  INSTALL.OCTAVE
+  INSTALL.OCTAVE \
+  NEWS
 
 EXTRA_DIST += \
   CITATION \
   COPYING \
   INSTALL \
-  NEWS \
   README \
   octave.doap \
   run-octave.in \
@@ -326,9 +326,7 @@
   .gdbinit
 
 MAINTAINERCLEANFILES += \
-  $(BUILT_DISTFILES) \
-  ChangeLog \
-  HG-ID
+  $(BUILT_DISTFILES)
 
 CONFIG_FILES = @ac_config_headers@ @ac_config_files@
 
@@ -393,6 +391,10 @@
 .gdbinit: etc/gdbinit
 	$(AM_V_GEN)$(gdbinit-install-rule)
 
+NEWS: etc/NEWS.7
+	$(AM_V_GEN)cp $< $@
+.PHONY: NEWS
+
 define changelog-from-hg-log
   rm -f $@-t && \
   if [ -d $(srcdir)/.hg ]; then \