diff options
| author | Jim Meyering <jim@meyering.net> | 2005-10-16 10:57:58 +0000 |
|---|---|---|
| committer | Jim Meyering <jim@meyering.net> | 2005-10-16 10:57:58 +0000 |
| commit | a7ffedd7081cdd7ef4164d514f757e9c48022f04 (patch) | |
| tree | 92dfd7cef4dc24a1c871fb6174346b471b0fc881 | |
| parent | 2487210cb4a8c898947e2ba1d846381189f1a1ae (diff) | |
| download | coreutils-a7ffedd7081cdd7ef4164d514f757e9c48022f04.tar.xz | |
(VERSION_REGEXP): New variable.
(news-date-check, changelog-check): Use tighter regular expressions.
| -rw-r--r-- | Makefile.maint | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/Makefile.maint b/Makefile.maint index 2d757c423..859eba6be 100644 --- a/Makefile.maint +++ b/Makefile.maint @@ -35,6 +35,7 @@ ifeq ($(origin prev_version_file), undefined) endif PREV_VERSION := $(shell cat $(prev_version_file)) +VERSION_REGEXP = $(subst .,\.,$(VERSION)) tag-package = $(shell echo "$(PACKAGE)" | tr '[:lower:]' '[:upper:]') tag-this-version = $(subst .,_,$(VERSION)) @@ -298,15 +299,17 @@ makefile-check: news-date-check: NEWS today=`date +%Y-%m-%d`; \ - if head NEWS | grep '^\*.*'$$today >/dev/null; then \ + if head NEWS | grep '^\*.* $(VERSION_REGEXP) \($$today\)' \ + >/dev/null; then \ :; \ else \ - echo "today's date is not in NEWS" 1>&2; \ + echo "version or today's date is not in NEWS" 1>&2; \ exit 1; \ fi changelog-check: - if head ChangeLog | grep 'Version $(VERSION)' >/dev/null; then \ + if head ChangeLog | grep 'Version $(VERSION_REGEXP)\.$' \ + >/dev/null; then \ :; \ else \ echo "$(VERSION) not in ChangeLog" 1>&2; \ |