Synch with Emacs trunk:

[gnus] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 766ab90..9c7c7cb 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,6 @@
 prefix = @prefix@
+# Avoid "WARNING:  Makefile.in seems to ignore the --datarootdir setting":
+datarootdir = @datarootdir@
 datadir = @datadir@
 lispdir = @lispdir@
 srcdir = @srcdir@
@@ -9,6 +11,8 @@ XEMACS = @EMACS@
 
 GZIP_PROG = gzip -f
 
+SED_I = sed -i -e
+
 # # # # # # # # # # Release variables (for maintainer only):
 #
 # Files removed from `cvs export' output before creating the tar-ball:
@@ -22,21 +26,20 @@ CODENAME =
 # Codename initial (lower case), e.g. 'n' for "No Gnus".
 CIN =
 # Files with hard-coded versions numbers:
-RELEASE_COMMIT_FILES = ChangeLog README \
-  lisp/ChangeLog lisp/gnus.el \
-  texi/ChangeLog texi/gnus.texi texi/message.texi texi/gnus-faq.texi
-# Pattern matching previous version(s):
-OLD_PATTERN = \(5.10.[0-9]*\|0\.[1-9][0-9]*\)
+RELEASE_COMMIT_FILES = ChangeLog \
+  etc/ChangeLog lisp/ChangeLog texi/ChangeLog \
+  README lisp/gnus.el \
+  texi/gnus.texi texi/message.texi texi/gnus-faq.texi
+# Pattern matching previous version numbers:
+OLD_PATTERN = \(5\.[0-9][0-9]\.[0-9]*\|5\.[0-9][0-9]\|0\.[1-9][0-9]*\)
+# Codename pattern
+CODENAME_PATTERN = [A-Z]*[a-z]* *
 # CVS tag of the previous version:
 OLD_TAG     = v5-10-6
 # CVS tag of the current release:
 TAG  = v5-10
 #
-# Procedure:
-# - release-bump-version
-# - release-commit
-# - release-files or release-files-signed
-#
+COMMIT_STRING = $(CODENAME)Gnus v$(VERSION) is released.
 # # # # # # # # # # End of release variables
 
 all: lick info
@@ -103,11 +106,13 @@ release-check-settings:
        @echo "COMMITTER = '$(COMMITTER)'"
        @echo "  (example: 'Foo Bar  <foo.bar@somewh