.

diff --git a/man/Makefile.in b/man/Makefile.in
index 7a3958b8c5cf4016a8d5f79396fe9ef7ab11fe47..ef1d2dd64abbac4888a94cbeedaabf9e37b55566 100644 (file)
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -181,10 +181,15 @@ SUFFIXES = .x .1
 t = $*.td
 mapped_name = `echo $*|sed 's/install/ginstall/; s/test/[/'`
 
+# 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
+
 programs = \
   echo 'spy:;@echo $$(all_programs)'                                   \
     | MAKEFLAGS= $(MAKE) -s -C $(srcdir)/../src -f Makefile -f - spy   \
-    | fmt -1 | sort -u | grep -v '\['
+    | fmt -1 | $(ASSORT) -u | grep -v '\['
 
 subdir = man
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -492,8 +497,8 @@ check-local: check-x-vs-1 check-programs-vs-x
 check-x-vs-1:
        PATH=../src$(PATH_SEPARATOR)$$PATH; export PATH;                \
        t=ls-files.$$$$;                                                \
-       (cd $(srcdir) && ls -1 *.x) | sed 's/\.x$$//' | sort > $$t;     \
-       echo $(dist_man_MANS) | fmt -w1 | sed 's/\.1$$//' | sort -u     \
+       (cd $(srcdir) && ls -1 *.x) | sed 's/\.x$$//' | $(ASSORT) > $$t;\
+       echo $(dist_man_MANS) | fmt -w1 | sed 's/\.1$$//' | $(ASSORT)   \
          | diff - $$t || { rm $$t; exit 1; };                          \
        rm $$t
 

diff --git a/src/Makefile.in b/src/Makefile.in
index 08663cf571ed246bc315b1c6b5dc8f744b9d0435..72979b9db1da8c3e25f41c727710e445b092ceb4 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -280,6 +280,11 @@ all_programs = \
   $(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
 
@@ -1587,7 +1592,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)
@@ -1619,7 +1624,7 @@ check-misc:
              prog=`echo $$i|sed 's/\.c$$//'`;          \
              echo "$$prog: $$a";                       \
            fi;                                         \
-         done | sort -u ) > $@-t
+         done | $(ASSORT) -u ) > $@-t
        chmod a-w $@-t
        mv $@-t $@
 # Tell versions [3.59,3.63) of GNU make to not export all variables.

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 4d972ca3f9c2b0cba392289b3ec3927aa6b820c2..96ee63575d9dfb17a8eee4db045ba1f277b38dec 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -152,10 +152,15 @@ sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 
+# 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
+
 all_programs = \
   echo 'spy:;@echo $$(all_programs)'                                   \
     | MAKEFLAGS= $(MAKE) -s -C ../src -f Makefile -f - spy             \
-    | fmt -1 | sort -u
+    | fmt -1 | $(ASSORT) -u
 
 
 TESTS = help-version