From: Jim Meyering <meyering@redhat.com>
Date: Wed, 25 Mar 2009 21:49:09 +0000 (+0100)
Subject: tests: don't fail "make syntax-check" on cygwin
X-Git-Tag: v7.2~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b102ed9ba6e529cc3dcf6be63c95d0f93d5499e0;p=thirdparty%2Fcoreutils.git

tests: don't fail "make syntax-check" on cygwin

* maint.mk (NEWS_hash): Remove trailing " -" or " *-".
* cfg.mk (old_NEWS_hash): Regenerate, removing " -".
Reported by Eric Blake.
---

diff --git a/cfg.mk b/cfg.mk
index c6b6e9b1cb..29a03a77c5 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -45,7 +45,7 @@ gnulib_dir = /gnulib
 # Now that we have better (check.mk) tests, make this the default.
 export VERBOSE = yes
 
-old_NEWS_hash = fa6cba1740b3f385520c1b54d90859ca  -
+old_NEWS_hash = fa6cba1740b3f385520c1b54d90859ca
 
 # Ensure that the list of O_ symbols used to compute O_FULLBLOCK is complete.
 dd = $(srcdir)/src/dd.c
diff --git a/maint.mk b/maint.mk
index 54444367ac..554b90a121 100644
--- a/maint.mk
+++ b/maint.mk
@@ -460,9 +460,12 @@ sc_const_long_option:
 	      echo 1>&2 '$(ME): add "const" to the above declarations'; \
 	      exit 1; } || :
 
-NEWS_hash = \
-  $$(sed -n '/^\*.* $(PREV_VERSION_REGEXP) ([0-9-]*)/,$$p' \
-     $(srcdir)/NEWS | grep -v '^Copyright .*Free Software' | md5sum -)
+NEWS_hash =								\
+  $$(sed -n '/^\*.* $(PREV_VERSION_REGEXP) ([0-9-]*)/,$$p'		\
+       $(srcdir)/NEWS							\
+     | grep -v '^Copyright .*Free Software'				\
+     | md5sum -								\
+     | sed 's/ .*//')
 
 # Ensure that we don't accidentally insert an entry into an old NEWS block.
 sc_immutable_NEWS: