# HG changeset patch
# User Jim Meyering <meyering@redhat.com>
# Date 1254384570 -7200
# Node ID b7b81ca175f482e447f369df3da655a0140f6885
# Parent  d741ba7b38040009de514644da120820d09e9259
maint.mk: requiring "make major" was annoying, for a "minor" release.

What is intended is "stable", to contrast with alpha and beta,
so require "make stable", not "make major".
* build-aux/announce-gen (%valid_release_types): s/major/stable/.
(get_tool_versions): Likewise.
* top/maint.mk (ALL_RECURSIVE_TARGETS): s/major/stable/

diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2009-10-01  Jim Meyering  <meyering@redhat.com>
+
+	maint.mk: requiring "make major" was annoying, for a "minor" release.
+	What is intended is "stable", to contrast with alpha and beta,
+	so require "make stable", not "make major".
+	* build-aux/announce-gen (%valid_release_types): s/major/stable/.
+	(get_tool_versions): Likewise.
+	* top/maint.mk (ALL_RECURSIVE_TARGETS): s/major/stable/
+
 2009-09-30  Ben Pfaff  <blp@gnu.org>
 
 	Fix broken build of replacement for Windows tmpfile().
diff --git a/build-aux/announce-gen b/build-aux/announce-gen
--- a/build-aux/announce-gen
+++ b/build-aux/announce-gen
@@ -33,7 +33,7 @@
 
 (my $ME = $0) =~ s|.*/||;
 
-my %valid_release_types = map {$_ => 1} qw (alpha beta major);
+my %valid_release_types = map {$_ => 1} qw (alpha beta stable);
 my @archive_suffixes = ('tar.gz', 'tar.bz2', 'tar.lzma', 'tar.xz');
 
 sub usage ($)
@@ -468,7 +468,7 @@
   print_news_deltas ($_, $prev_version, $curr_version)
     foreach @news_file;
 
-  $release_type eq 'major'
+  $release_type eq 'stable'
     or print_changelog_deltas ($package_name, $prev_version);
 
   exit 0;
diff --git a/top/maint.mk b/top/maint.mk
--- a/top/maint.mk
+++ b/top/maint.mk
@@ -696,11 +696,11 @@
 	  : ;								\
 	fi
 
-.PHONY: alpha beta major
-ALL_RECURSIVE_TARGETS += alpha beta major
-alpha beta major: $(local-check) writable-files no-submodule-changes
-	test $@ = major						\
-	  && { echo $(VERSION) | grep -E '^[0-9]+(\.[0-9]+)+$$'	\
+.PHONY: alpha beta stable
+ALL_RECURSIVE_TARGETS += alpha beta stable
+alpha beta stable: $(local-check) writable-files no-submodule-changes
+	test $@ = stable						\
+	  && { echo $(VERSION) | grep -E '^[0-9]+(\.[0-9]+)+$$'		\
 	       || { echo "invalid version string: $(VERSION)" 1>&2; exit 1;};}\
 	  || :
 	$(MAKE) vc-diff-check