Sort compendium lists for msgmerge

That way, the result of a msgmerge is more deterministic and not
dependent on the order in which the files are found.

diff --git a/src/nls-global.mk b/src/nls-global.mk
index c95c3a496fa19d56f5fb7b8e4a58679a1486c76c..60f73ba487d76684164810fa4e3abf2b2359c2e0 100644 (file)
--- a/src/nls-global.mk
+++ b/src/nls-global.mk
@@ -120,8 +120,8 @@ init-po: po/$(CATALOG_NAME).pot
 # For performance reasons, only calculate these when the user actually
 # requested update-po or a specific file.
 ifneq (,$(filter update-po %.po.new,$(MAKECMDGOALS)))
-ALL_LANGUAGES := $(shell find $(top_srcdir) -name '*.po' -print | sed 's,^.*/\([^/]*\).po$$,\1,' | sort -u)
-all_compendia := $(shell find $(top_srcdir) -name '*.po' -print)
+ALL_LANGUAGES := $(shell find $(top_srcdir) -name '*.po' -print | sed 's,^.*/\([^/]*\).po$$,\1,' | LC_ALL=C sort -u)
+all_compendia := $(shell find $(top_srcdir) -name '*.po' -print | LC_ALL=C sort)
 else
 ALL_LANGUAGES = $(AVAIL_LANGUAGES)
 all_compendia = FORCE