From: Pádraig Brady <P@draigBrady.com>
Date: Tue, 18 Nov 2014 03:29:07 +0000 (+0000)
Subject: maint: run strftime syntax check on newer systems
X-Git-Tag: v8.24~187
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f43c072a04ba881debf35ccdb509ee0a145b255c;p=thirdparty%2Fcoreutils.git

maint: run strftime syntax check on newer systems

* cfg.mk (sc_strftime_check): Adjust regex to handle
newer glibc info formatting with different indentation
and quoting.
---

diff --git a/cfg.mk b/cfg.mk
index 4bc3792191..7347322652 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -336,8 +336,8 @@ sc_strftime_check:
 	  grep '^  %.  ' $(srcdir)/src/date.c | sort			\
 	    | $(extract_char) > $@-src;					\
 	  { echo N;							\
-	    info libc date calendar format 2>/dev/null|grep '^    `%.'\'\
-	      | $(extract_char); } | sort > $@-info;			\
+	    info libc date calendar format 2>/dev/null			\
+	      | grep "^ *['\`]%.'$$"| $(extract_char); }| sort >$@-info;\
 	  if test $$(stat --format %s $@-info) != 2; then		\
 	    diff -u $@-src $@-info || exit 1;				\
 	  else								\