(update-elclist): Impose a fixed collation for sorting.

(ELCFILES): Update.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 33a7651ad93d2817ec5e7876cbdbc40eef349ccb..60eb38d26133ddef186ca9918998a655ea1faf19 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2008-06-03  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * Makefile.in (update-elclist): Impose a fixed collation for sorting.
+       (ELCFILES): Update.
+
 2008-06-03  Miles Bader  <miles@gnu.org>
 
        * face-remap.el: New file.

diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index 2fa71c9a52e232e9a086b8626b4a475400bf727f..d8dbadb0b2508ccf386793b6c549d0469d99949b 100644 (file)
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -162,7 +162,7 @@ update-elclist:
        echo "/^ELCFILES/,/^$$/c\\" > temp.sed
        echo "ELCFILES =" | sed -e 's/$$/ \\\\\\/' >> temp.sed
        exclude=`echo $(COMPILE_FIRST) | sed -e 's, ,\\\\|,g' -e 's,\/,\\\\/,g'`; \
-       ls $(lisp)/*.elc $(lisp)/*/*.elc | sed -e "/$$exclude/d" -e "s|^$(lisp)|        \$$(lisp)|" -e 's/$$/ \\\\\\/' -e '$$ s/ \\\\//' >> temp.sed
+       LC_COLLATE=C ls $(lisp)/*.elc $(lisp)/*/*.elc | sed -e "/$$exclude/d" -e "s|^$(lisp)|   \$$(lisp)|" -e 's/$$/ \\\\\\/' -e '$$ s/ \\\\//' >> temp.sed
        echo "" >> temp.sed
        -sed -f temp.sed $(lisp)/Makefile.in > temp-elcfiles || rm temp-elcfiles
        rm temp.sed
@@ -704,11 +704,11 @@ ELCFILES = \
        $(lisp)/language/ethio-util.elc \
        $(lisp)/language/ethiopic.elc \
        $(lisp)/language/european.elc \
+       $(lisp)/language/hanja-util.elc \
        $(lisp)/language/ind-util.elc \
        $(lisp)/language/indian.elc \
        $(lisp)/language/japan-util.elc \
        $(lisp)/language/korea-util.elc \
-       $(lisp)/language/hanja-util.elc \
        $(lisp)/language/lao-util.elc \
        $(lisp)/language/thai-util.elc \
        $(lisp)/language/thai-word.elc \
@@ -871,30 +871,19 @@ ELCFILES = \
        $(lisp)/nxml/rng-xsd.elc \
        $(lisp)/nxml/xmltok.elc \
        $(lisp)/nxml/xsd-regexp.elc \
-       $(lisp)/obsolete/auto-show.elc \
        $(lisp)/obsolete/awk-mode.elc \
-       $(lisp)/obsolete/bg-mouse.elc \
        $(lisp)/obsolete/fast-lock.elc \
-       $(lisp)/obsolete/float.elc \
-       $(lisp)/obsolete/hilit19.elc \
-       $(lisp)/obsolete/hscroll.elc \
        $(lisp)/obsolete/iso-acc.elc \
        $(lisp)/obsolete/iso-insert.elc \
        $(lisp)/obsolete/iso-swed.elc \
        $(lisp)/obsolete/lazy-lock.elc \
-       $(lisp)/obsolete/lselect.elc \
-       $(lisp)/obsolete/mlsupport.elc \
        $(lisp)/obsolete/old-whitespace.elc \
-       $(lisp)/obsolete/ooutline.elc \
        $(lisp)/obsolete/options.elc \
-       $(lisp)/obsolete/profile.elc \
        $(lisp)/obsolete/rnews.elc \
        $(lisp)/obsolete/rnewspost.elc \
-       $(lisp)/obsolete/rsz-mini.elc \
        $(lisp)/obsolete/sc.elc \
        $(lisp)/obsolete/scribe.elc \
        $(lisp)/obsolete/swedish.elc \
-       $(lisp)/obsolete/uncompress.elc \
        $(lisp)/obsolete/x-menu.elc \
        $(lisp)/org/org-agenda.elc \
        $(lisp)/org/org-archive.elc \