(ASSORT): New var.

(check-README, ../AUTHORS): Use it.

diff --git a/src/Makefile.am b/src/Makefile.am
index 68a0ca6f5a25649d174f4cdc9a274724f461dc43..0f949c79b18001fd0d7de8a7323e955461807923 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -211,6 +211,11 @@ all_programs = \
     $(bin_SCRIPTS) \
   $(EXTRA_PROGRAMS)
 
+# Sort in traditional ASCII order, regardless of the current locale;
+# otherwise we may get into trouble with distinct strings that the
+# current locale considers to be equal.
+ASSORT = LC_ALL=C sort
+
 pm = progs-makefile
 pr = progs-readme
 # Ensure that the list of programs in README matches the list
@@ -220,7 +225,7 @@ check: check-README check-misc
 check-README:
        rm -rf $(pr) $(pm)
        echo $(all_programs) \
-         | tr -s ' ' '\n' | sort -u > $(pm)
+         | tr -s ' ' '\n' | $(ASSORT) -u > $(pm) && \
        sed -n '/^The programs .* are:/,/^[a-zA-Z]/p' $(top_srcdir)/README \
          | sed -n '/^   */s///p' | tr -s ' ' '\n' > $(pr)
        diff $(pm) $(pr) && rm -rf $(pr) $(pm)
@@ -259,6 +264,6 @@ s2 = '/^\#define AUTHORS \\\\/{;n;$(sed_filter);p;q;}'
              prog=`echo $$i|sed 's/\.c$$//'`;          \
              echo "$$prog: $$a";                       \
            fi;                                         \
-         done | sort -u ) > $@-t
+         done | $(ASSORT) -u ) > $@-t
        chmod a-w $@-t
        mv $@-t $@