From: Peter Eisentraut Date: Tue, 27 Dec 2011 18:22:51 +0000 (+0200) Subject: Sort compendium lists for msgmerge X-Git-Tag: REL9_2_BETA1~651 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=54d792f3e5a31d993aeee420e98adab0a0419e43;p=postgresql 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 c95c3a496f..60f73ba487 100644 --- 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