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
index 50500fd3f6449b8c774ed84e4e74d7c619aaeb4d..3cecf35b190e8f81b459e038ffcd6dfee043282b 100644 (file)
--- 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
index d4e289a9e310ad145d66741273354dedfbd308c0..972b88146321b0997b4ab1fcfc99df07f2e1f514 100755 (executable)
--- a/build-aux/announce-gen
+++ b/build-aux/announce-gen
@@ -33,7 +33,7 @@ use POSIX qw(strftime);
 
 (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 @@ EOF
   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
index fe6b3ffce660b6b03ead2dbab993b2a516c7cab9..68bd8f9153719b21b912d7f6e3121d598f37f067 100644 (file)
--- a/top/maint.mk
+++ b/top/maint.mk
@@ -696,11 +696,11 @@ no-submodule-changes:
          : ;                                                           \
        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