From ab49553ba3b59427d0b20ce531223f4dd86f4839 Mon Sep 17 00:00:00 2001
From: Jean-Marc Lasgouttes <lasgouttes@lyx.org>
Date: Tue, 2 Dec 2003 15:23:37 +0000
Subject: [PATCH] fix file order in lyx.pot

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8185 a592a061-630c-0410-9148-cb99ea01b6c8
---
 po/ChangeLog      | 4 ++++
 po/Makefile.in.in | 7 ++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/po/ChangeLog b/po/ChangeLog
index 43107ad6b1..46a17151b8 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2003-11-28  Michael Schmitt  <michael.schmitt@teststep.org>
+
+	* Makefile.in.in: always create pot files with LC_ALL="C"
+
 2003-11-14  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
 
 	* Makefile.in.in (xforms_l10n.pot): skip entries in symbol font
diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index 4c3333e398..ca9311fd33 100644
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -197,11 +197,12 @@ Makefile: Makefile.in.in $(top_builddir)/config.status POTFILES.in
 	       $(SHELL) ./config.status
 
 ${srcdir}/POTFILES.in: $(POTFILE_IN_DEPS)
+	LC_ALL=C ; export LC_ALL ; \
 	rm -f $@-t \
 	&& ( cd $(top_srcdir); \
 	     grep -l "_(\".*\")" `find src -name \*.[hHC] -print` |\
 	     sed -e '/xforms.forms/d' | \
-	     LC_COLLATE=C sort | uniq ) > $@-t \
+	     sort | uniq ) > $@-t \
 	&& mv $@-t $@
 
 
@@ -211,6 +212,7 @@ l10n_pots: $(srcdir)/xforms_l10n.pot $(srcdir)/qt_l10n.pot $(srcdir)/layouts_l10
 
 $(srcdir)/xforms_l10n.pot: $(top_srcdir)/src/frontends/xforms/forms/*.fd
 	cd ${srcdir} ; \
+	LC_ALL=C ; export LC_ALL ; \
 	awk ' \
 	     BEGIN { \
 		     print "#, fuzzy"; \
@@ -236,6 +238,7 @@ $(srcdir)/xforms_l10n.pot: $(top_srcdir)/src/frontends/xforms/forms/*.fd
 
 $(srcdir)/qt_l10n.pot: $(top_srcdir)/src/frontends/qt2/ui/*.ui
 	cd ${srcdir} ; \
+	LC_ALL=C ; export LC_ALL ; \
 	awk ' \
 	     /<string>/ { \
 	             line=$$0; \
@@ -253,6 +256,7 @@ $(srcdir)/qt_l10n.pot: $(top_srcdir)/src/frontends/qt2/ui/*.ui
 
 $(srcdir)/layouts_l10n.pot: $(top_srcdir)/lib/layouts/*.layout $(top_srcdir)/lib/layouts/*.inc
 	cd ${srcdir} ; \
+	LC_ALL=C ; export LC_ALL ; \
 	awk ' \
 	    /^Style / { \
 		line=$$0; \
@@ -285,6 +289,7 @@ $(srcdir)/languages_l10n.pot: $(top_srcdir)/lib/languages
 
 $(srcdir)/ui_l10n.pot: $(top_srcdir)/lib/ui/*.ui
 	cd ${srcdir} ; \
+	LC_ALL=C ; export LC_ALL ; \
 	awk ' \
 	    /^[^#]*Submenu/ { \
 		line=$$0; \