adjust AUTHORS and check-AUTHORS rule to accommodate

* 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.

diff --git a/AUTHORS b/AUTHORS
index 807857f..bee9c2b 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -4,7 +4,7 @@ each followed by the name(s) of its author(s).
 arch: David MacKenzie, Karel Zak
 base64: Simon Josefsson
 basename: FIXME unknown
-cat: Torbjorn Granlund, Richard M. Stallman
+cat: Torbjörn Granlund, Richard M. Stallman
 chcon: Russell Coker, Jim Meyering
 chgrp: David MacKenzie, Jim Meyering
 chmod: David MacKenzie, Jim Meyering
@@ -12,16 +12,16 @@ chown: David MacKenzie, Jim Meyering
 chroot: Roland McGrath
 cksum: Q. Frank Xia
 comm: Richard Stallman, David MacKenzie
-cp: Torbjorn Granlund, David MacKenzie, Jim Meyering
+cp: Torbjörn Granlund, David MacKenzie, Jim Meyering
 csplit: Stuart Kemp, David MacKenzie
 cut: David Ihnat, David MacKenzie, Jim Meyering
 date: David MacKenzie
 dd: Paul Rubin, David MacKenzie, Stuart Kemp
-df: Torbjorn Granlund, David MacKenzie, Paul Eggert
+df: Torbjörn Granlund, David MacKenzie, Paul Eggert
 dir: Richard Stallman, David MacKenzie
 dircolors: H. Peter Anvin
 dirname: David MacKenzie, Jim Meyering
-du: Torbjorn Granlund, David MacKenzie, Paul Eggert, Jim Meyering
+du: Torbjörn Granlund, David MacKenzie, Paul Eggert, Jim Meyering
 echo: FIXME unknown
 env: Richard Mlynarik, David MacKenzie
 expand: David MacKenzie
@@ -58,7 +58,7 @@ pinky: Joseph Arceneaux, David MacKenzie, Kaveh Ghazi
 pr: Pete TerMaat, Roland Huebner
 printenv: David MacKenzie, Richard Mlynarik
 printf: David MacKenzie
-ptx: F. Pinard
+ptx: François Pinard
 pwd: Jim Meyering
 readlink: Dmitry V. Levin
 rm: Paul Rubin, David MacKenzie, Richard Stallman, Jim Meyering
@@ -74,7 +74,7 @@ shred: Colin Plumb
 shuf: Paul Eggert
 sleep: Jim Meyering, Paul Eggert
 sort: Mike Haertel, Paul Eggert
-split: Torbjorn Granlund, Richard M. Stallman
+split: Torbjörn Granlund, Richard M. Stallman
 stat: Michael Meskes
 stty: David MacKenzie
 su: David MacKenzie
@@ -100,3 +100,7 @@ wc: Paul Rubin, David MacKenzie
 who: Joseph Arceneaux, David MacKenzie, Michael Stone
 whoami: Richard Mlynarik
 yes: David MacKenzie
+
+;; Local Variables:
+;; coding: utf-8
+;; End:

diff --git a/src/Makefile.am b/src/Makefile.am
index 8d1cfcf..c8cfe5e 100644 (file)
--- 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.