From 86837548f17e6a9b67cf33bb3d26d66cc8d6bc22 Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering@redhat.com>
Date: Mon, 19 May 2008 19:39:30 +0200
Subject: adjust AUTHORS and check-AUTHORS rule to accommodate
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* AUTHORS: Add coding: utf-8 comment at end.
Spell François' and Torbjörn's names properly.
* src/Makefile.am: Parse AUTHORS file more carefully.
Use perl to join now-split lines.
Use en_US.UTF-8 to generate --version output.
---
 src/Makefile.am | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/Makefile.am b/src/Makefile.am
index 8d1cfcfd3..c8cfe5eee 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -350,10 +350,11 @@ check-AUTHORS: $(all_programs)
 	  elif test "$$i" = test; then			\
 	    exe='[';					\
 	  fi;						\
-	  ./$$exe --version				\
+	  LC_ALL=en_US.UTF-8 ./$$exe --version			\
+	    | perl -0 -pi -e 's/,\n/, /gm'		\
 	    |sed -n '/Written by /{ s//'"$$i"': /; s/,* and /, /; s/\.$$//; p; }'; \
 	done > $(au_actual)
-	sed -n '/:/p' $(top_srcdir)/AUTHORS > $(au_dotdot)
+	sed -n '/^[^ ][^ ]*:/p' $(top_srcdir)/AUTHORS > $(au_dotdot)
 	diff $(au_actual) $(au_dotdot) && rm -f $(au_actual) $(au_dotdot)
 
 # Make sure we don't define any S_IS* macros in src/*.c files.
-- 
cgit v1.2.3-70-g09d2