From: Jim Meyering <jim@meyering.net>
Date: Sat, 20 Jul 2002 14:24:29 +0000 (+0000)
Subject: (news-r1, news-r2): Define.  Better regexp.
X-Git-Tag: TEXTUTILS-2_0_22~9
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a82d360478f83f7dc095176e25f8af0c2274b680;p=thirdparty%2Fcoreutils.git

(news-r1, news-r2): Define.  Better regexp.
(announcement): Use them here.  Also makes the line length < 80.
---

diff --git a/Makefile.maint b/Makefile.maint
index 9f9f7465dd..825974d9fa 100644
--- a/Makefile.maint
+++ b/Makefile.maint
@@ -225,6 +225,9 @@ rel-check:
 prev-tgz = $(PACKAGE)-$(PREV_VERSION).tar.gz
 xd-delta = $(PACKAGE)-$(PREV_VERSION)-$(VERSION).xdelta
 
+news-r1 = /^[^ ].*$(THIS_VERSION_REGEXP)[]:]/
+news-r2 = /^[^ ].*$(PREV_VERSION_REGEXP)[]:]/
+
 rel-files = $(xd-delta) $(distdir).tar.bz2 $(distdir).tar.gz
 announcement: NEWS ChangeLog $(rel-files)
 	@( \
@@ -253,7 +256,7 @@ announcement: NEWS ChangeLog $(rel-files)
 	  echo "$(xdelta-sha1)  $(xd-delta)"; \
 	  echo; \
 	  echo NEWS:; \
-	  sed -n "/$(THIS_VERSION_REGEXP)[]:]/,/$(PREV_VERSION_REGEXP)[]:]/p" NEWS \
+	  sed -n "$(news-r1),(news-r2)p" NEWS \
 	    | grep -v '^\['; \
 	  echo; \
 	  echo ChangeLog entries:; \