From: Jim Meyering <meyering@redhat.com>
Date: Sun, 11 Apr 2010 08:37:31 +0000 (+0200)
Subject: maint.mk: detect_empty_lines_at_EOF_: avoid FP for an empty file
X-Git-Tag: v0.1~4280
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=2237d05df83cb4fc2adffaca11e0de3c2c5f28b1;p=gnulib.git

maint.mk: detect_empty_lines_at_EOF_: avoid FP for an empty file

* top/maint.mk (detect_empty_lines_at_EOF_): Don't confuse an
empty file with one that ends in an empty line.
---

diff --git a/ChangeLog b/ChangeLog
index d79dcbf56..1fdfa06e1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-04-11  Jim Meyering  <meyering@redhat.com>
+
+	maint.mk: detect_empty_lines_at_EOF_: avoid FP for an empty file
+	* top/maint.mk (detect_empty_lines_at_EOF_): Don't confuse an
+	empty file with one that ends in an empty line.
+
 2010-04-10  Bruno Haible  <bruno@clisp.org>
 
 	mkdir: Make it work on mingw64.
diff --git a/top/maint.mk b/top/maint.mk
index 6bfb4c1a7..b71304dc4 100644
--- a/top/maint.mk
+++ b/top/maint.mk
@@ -674,7 +674,7 @@ sc_prohibit_cvs_keyword:
 #   perl -pi -0777 -e 's/\n\n+$/\n/' files...
 #
 detect_empty_lines_at_EOF_ =						\
-  /^==> ([^\n]+) <==\n\n/m and (print "$$1\n"), $$fail = 1;		\
+  /^==> ([^\n]+) <==\n\n\n/m and (print "$$1\n"), $$fail = 1;		\
   END { exit defined $$fail }
 sc_prohibit_empty_lines_at_EOF:
 	@tail -n1 $$($(VC_LIST_EXCEPT)) /dev/null			\