GNUmakefile: handle "stable" target, not "major"

* top/GNUmakefile (_is-dist-target): s/major/stable/ to match the
lists in maint.mk and announce-gen.  Without this, "make stable"
would fail to ensure that $(VERSION) is up to date.
(cherry picked from commit fdaeccfb8561f0727fb7473eec5085cb2a86b4e6)

diff --git a/ChangeLog b/ChangeLog
index 66e5c73..b68d22a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-10-15  Jim Meyering  <meyering@redhat.com>
+
+       GNUmakefile: handle "stable" target, not "major"
+       * top/GNUmakefile (_is-dist-target): s/major/stable/ to match the
+       lists in maint.mk and announce-gen.  Without this, "make stable"
+       would fail to ensure that $(VERSION) is up to date.
+
 2010-10-14  Bruno Haible  <bruno@clisp.org>
 
        vasnprintf: Don't set errno to 0.

diff --git a/NEWS.stable b/NEWS.stable
index 6fdf09b..7c7f2df 100644 (file)
--- a/NEWS.stable
+++ b/NEWS.stable
@@ -13,6 +13,7 @@ with the following additional commits:
     * [b6d1430]->[fef7abe] termios: fix compilation on mingw
     * [74b1e48]->[7bf74f7] socketlib: Fix.
     * [d239853]->[ced7fa1] vasnprintf: Don't set errno to 0.
+    * [fdaeccf]->[] GNUmakefile: handle "stable" target, not "major"
 __NEXTCOMMITMARKER__
 
 ----------------------------------------------------------------------

diff --git a/top/GNUmakefile b/top/GNUmakefile
index 97fea36..0394d98 100644 (file)
--- a/top/GNUmakefile
+++ b/top/GNUmakefile
@@ -57,7 +57,7 @@ _have-git-version-gen := \
   $(shell test -f $(srcdir)/$(_build-aux)/git-version-gen && echo yes)
 ifeq ($(_have-git-version-gen)0,yes$(MAKELEVEL))
   _is-dist-target ?= $(filter-out %clean, \
-    $(filter maintainer-% dist% alpha beta major,$(MAKECMDGOALS)))
+    $(filter maintainer-% dist% alpha beta stable,$(MAKECMDGOALS)))
   _is-install-target ?= $(filter-out %check, $(filter install%,$(MAKECMDGOALS)))
   ifneq (,$(_is-dist-target)$(_is-install-target))
     _curr-ver := $(shell cd $(srcdir)                          \