Set LC_ALL=C rather than unsetting LC_COLLATE for sort.

4 files changed, 57 insertions, 50 deletions

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index fe5a8b9..a08f5d8 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+2008-08-04  Alan Modra  <amodra@bigpond.net.au>
+
+	* Makefile.am (SRC-POTFILES.in, BLD-POTFILES.in): Set LC_ALL=C.
+	* Makefile.in: Regenerate.
+	* po/SRC-POTFILES.in: Regenerate.
+
 2008-08-02  Alan Modra  <amodra@bigpond.net.au>
 
 	* elf32-spu.c (mark_overlay_section): Move code calculating
diff --git a/bfd/Makefile.am b/bfd/Makefile.am
index 0fd2fe9..befb9f1 100644
--- a/bfd/Makefile.am
+++ b/bfd/Makefile.am
@@ -698,12 +698,12 @@ BLD_POTFILES = $(BUILD_CFILES) $(BUILD_HFILES)
 
 po/SRC-POTFILES.in: @MAINT@ Makefile $(SRC_POTFILES)
 	for file in $(SRC_POTFILES); do echo $$file; done \
-	  | LC_COLLATE= sort > tmp.src \
+	  | LC_ALL=C sort > tmp.src \
 	  && mv tmp.src $(srcdir)/po/SRC-POTFILES.in
 
 po/BLD-POTFILES.in: @MAINT@ Makefile $(BLD_POTFILES)
 	for file in $(BLD_POTFILES); do echo $$file; done \
-	  | LC_COLLATE= sort > tmp.bld \
+	  | LC_ALL=C sort > tmp.bld \
 	  && mv tmp.bld $(srcdir)/po/BLD-POTFILES.in
 
 all diststuff: info
diff --git a/bfd/Makefile.in b/bfd/Makefile.in
index 6c0a9cd..8509f1e 100644
--- a/bfd/Makefile.in
+++ b/bfd/Makefile.in
@@ -994,15 +994,15 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \
-	      cd $(srcdir) && $(AUTOMAKE) --foreign  \
+	      echo ' cd $(srcdir) && $(AUTOMAKE) --cygnus '; \
+	      cd $(srcdir) && $(AUTOMAKE) --cygnus  \
 		&& exit 0; \
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --cygnus  Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  Makefile
+	  $(AUTOMAKE) --cygnus  Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -1321,12 +1321,12 @@ uninstall-info: uninstall-info-recursive
 
 po/SRC-POTFILES.in: @MAINT@ Makefile $(SRC_POTFILES)
 	for file in $(SRC_POTFILES); do echo $$file; done \
-	  | LC_COLLATE= sort > tmp.src \
+	  | LC_ALL=C sort > tmp.src \
 	  && mv tmp.src $(srcdir)/po/SRC-POTFILES.in
 
 po/BLD-POTFILES.in: @MAINT@ Makefile $(BLD_POTFILES)
 	for file in $(BLD_POTFILES); do echo $$file; done \
-	  | LC_COLLATE= sort > tmp.bld \
+	  | LC_ALL=C sort > tmp.bld \
 	  && mv tmp.bld $(srcdir)/po/BLD-POTFILES.in
 
 all diststuff: info
diff --git a/bfd/po/SRC-POTFILES.in b/bfd/po/SRC-POTFILES.in
index afe567a..af13921 100644
--- a/bfd/po/SRC-POTFILES.in
+++ b/bfd/po/SRC-POTFILES.in
@@ -1,19 +1,19 @@
 aix386-core.c
 aix5ppc-core.c
-aout0.c
-aout32.c
-aout64.c
 aout-adobe.c
 aout-arm.c
 aout-cris.c
-aoutf1.h
 aout-ns32k.c
 aout-sparcle.c
 aout-target.h
 aout-tic30.c
+aout0.c
+aout32.c
+aout64.c
+aoutf1.h
 aoutx.h
-archive64.c
 archive.c
+archive64.c
 archures.c
 armnetbsd.c
 bfd.c
@@ -25,20 +25,16 @@ cache.c
 cf-i386lynx.c
 cf-sparclynx.c
 cisco-core.c
-coff64-rs6000.c
 coff-alpha.c
 coff-apollo.c
 coff-arm.c
 coff-aux.c
-coffcode.h
-coffgen.c
 coff-go32.c
 coff-h8300.c
 coff-h8500.c
 coff-i386.c
 coff-i860.c
 coff-i960.c
-cofflink.c
 coff-m68k.c
 coff-m88k.c
 coff-maxq.c
@@ -49,7 +45,6 @@ coff-sh.c
 coff-sparc.c
 coff-stgo32.c
 coff-svm68k.c
-coffswap.h
 coff-tic30.c
 coff-tic4x.c
 coff-tic54x.c
@@ -60,6 +55,12 @@ coff-we32k.c
 coff-x86_64.c
 coff-z80.c
 coff-z8k.c
+coff64-rs6000.c
+coffcode.h
+coffgen.c
+cofflink.c
+coffswap.h
+compress.c
 corefile.c
 cpu-alpha.c
 cpu-arc.c
@@ -140,12 +141,20 @@ efi-bsdrv-x86_64.c
 efi-rtdrv-ia32.c
 efi-rtdrv-ia64.c
 efi-rtdrv-x86_64.c
+elf-attrs.c
+elf-bfd.h
+elf-eh-frame.c
+elf-hppa.h
+elf-m10200.c
+elf-m10300.c
+elf-strtab.c
+elf-vxworks.c
+elf.c
 elf32-am33lin.c
 elf32-arc.c
 elf32-arm.c
 elf32-avr.c
 elf32-bfin.c
-elf32.c
 elf32-cr16.c
 elf32-cr16c.c
 elf32-cris.c
@@ -183,10 +192,10 @@ elf32-pj.c
 elf32-ppc.c
 elf32-s390.c
 elf32-score.c
-elf32-sh64.c
-elf32-sh64-com.c
-elf32-sh.c
 elf32-sh-symbian.c
+elf32-sh.c
+elf32-sh64-com.c
+elf32-sh64.c
 elf32-sparc.c
 elf32-spu.c
 elf32-v850.c
@@ -194,8 +203,8 @@ elf32-vax.c
 elf32-xc16x.c
 elf32-xstormy16.c
 elf32-xtensa.c
+elf32.c
 elf64-alpha.c
-elf64.c
 elf64-gen.c
 elf64-hppa.c
 elf64-hppa.h
@@ -206,19 +215,11 @@ elf64-s390.c
 elf64-sh64.c
 elf64-sparc.c
 elf64-x86-64.c
-elf-attrs.c
-elf-bfd.h
-elf.c
+elf64.c
 elfcode.h
 elfcore.h
-elf-eh-frame.c
-elf-hppa.h
 elflink.c
-elf-m10200.c
-elf-m10300.c
 elfn32-mips.c
-elf-strtab.c
-elf-vxworks.c
 elfxx-mips.c
 elfxx-sparc.c
 epoc-pe-arm.c
@@ -270,16 +271,16 @@ mipsbsd.c
 mmo.c
 netbsd.h
 newsos3.c
+nlm-target.h
+nlm.c
 nlm32-alpha.c
-nlm32.c
 nlm32-i386.c
 nlm32-ppc.c
 nlm32-sparc.c
+nlm32.c
 nlm64.c
-nlm.c
 nlmcode.h
 nlmswap.h
-nlm-target.h
 ns32k.h
 ns32knetbsd.c
 oasys.c
@@ -287,29 +288,29 @@ opncls.c
 osf-core.c
 pc532-mach.c
 pdp11.c
-pe-arm.c
 pe-arm-wince.c
+pe-arm.c
+pe-i386.c
+pe-mcore.c
+pe-mips.c
+pe-ppc.c
+pe-sh.c
+pe-x86_64.c
+pef-traceback.h
 pef.c
 pef.h
-pef-traceback.h
-pe-i386.c
-pei-arm.c
 pei-arm-wince.c
-peicode.h
+pei-arm.c
 pei-i386.c
 pei-mcore.c
 pei-mips.c
 pei-ppc.c
 pei-sh.c
 pei-x86_64.c
-pe-mcore.c
-pe-mips.c
-pe-ppc.c
-pe-sh.c
-pe-x86_64.c
+peicode.h
 ppcboot.c
-reloc16.c
 reloc.c
+reloc16.c
 riscix.c
 sco5-core.c
 section.c
@@ -320,8 +321,8 @@ sparclinux.c
 sparclynx.c
 sparcnetbsd.c
 srec.c
-stabs.c
 stab-syms.c
+stabs.c
 sunos.c
 syms.c
 targets.c
@@ -332,14 +333,14 @@ vaxbsd.c
 vaxnetbsd.c
 versados.c
 version.h
-vms.c
 vms-gsd.c
-vms.h
 vms-hdr.c
 vms-misc.c
 vms-tir.c
-xcofflink.c
+vms.c
+vms.h
 xcoff-target.h
+xcofflink.c
 xsym.c
 xsym.h
 xtensa-isa.c