From 742c31198cc4061a13a1dc3f46cc5f9c9be2741d Mon Sep 17 00:00:00 2001
From: Simon Josefsson <simon@josefsson.org>
Date: Wed, 21 Apr 2010 23:18:24 +0200
Subject: Update gnulib files.

---
 maint.mk | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

(limited to 'maint.mk')

diff --git a/maint.mk b/maint.mk
index 4115dbfe8e..b24093b373 100644
--- a/maint.mk
+++ b/maint.mk
@@ -660,9 +660,10 @@ sc_GFDL_version:
 	  $(_sc_search_regexp)
 
 # Don't use Texinfo @acronym{} as it is not a good idea.
+texinfo_suffix_re_ ?= \.(txi|texi(nfo)?)$$
 sc_texinfo_acronym:
-	@prohibit='@acronym{'						\
-	in_vc_files='\.texi$$'						\
+	@prohibit='@acronym\{'						\
+	in_vc_files='$(texinfo_suffix_re_)'				\
 	halt='found use of Texinfo @acronym{}'				\
 	  $(_sc_search_regexp)
 
@@ -693,16 +694,18 @@ sc_prohibit_cvs_keyword:
 #   perl -pi -0777 -e 's/\n\n+$/\n/' files...
 #
 detect_empty_lines_at_EOF_ =						\
-  foreach my $$f (@ARGV) {						\
-    open F, "<", $$f or (warn "failed to open $$f: $$!\n"), next;	\
-    my $$p = sysseek (F, -2, 2);					\
-    my $$c = "seek failure probably means file has < 2 bytes; ignore";	\
-    my $$two;								\
-    defined $$p and $$p = sysread F, $$two, 2;				\
-    close F;								\
-    $$c = "ignore read failure";					\
-    $$p && $$two eq "\n\n" and (print $$f), $$fail=1;			\
-    } END { exit defined $$fail }
+  foreach my $$f (@ARGV)						\
+    {									\
+      open F, "<", $$f or (warn "failed to open $$f: $$!\n"), next;	\
+      my $$p = sysseek (F, -2, 2);					\
+      my $$c = "seek failure probably means file has < 2 bytes; ignore"; \
+      my $$last_two_bytes;						\
+      defined $$p and $$p = sysread F, $$last_two_bytes, 2;		\
+      close F;								\
+      $$c = "ignore read failure";					\
+      $$p && $$last_two_bytes eq "\n\n" and (print $$f), $$fail=1;	\
+    }									\
+  END { exit defined $$fail }
 sc_prohibit_empty_lines_at_EOF:
 	@perl -le '$(detect_empty_lines_at_EOF_)' $$($(VC_LIST_EXCEPT))	\
           || { echo '$(ME): the above files end with empty line(s)'     \
-- 
cgit v1.2.1