about summary refs log tree commit diff
diff options
context:
space:
mode:
authorCarlos O'Donell <carlos_odonell@mentor.com>2012-06-13 16:50:29 -0700
committerCarlos O'Donell <carlos@systemhalted.org>2012-06-24 22:19:22 +0000
commit91fdff8d8524b333820685410540f9185b71c75e (patch)
tree1486c4c7a1c5e9678951ada1707f2a8768a5f226
parent48f6b23f2b5371f53fa27d35dc13be309979d9e1 (diff)
downloadglibc-91fdff8d8524b333820685410540f9185b71c75e.tar.gz
glibc-91fdff8d8524b333820685410540f9185b71c75e.tar.xz
glibc-91fdff8d8524b333820685410540f9185b71c75e.zip
Set default charset to UTF-8 for libc.pot.
(cherry picked from commit 771766df5ad38fdce118d4b3a4a7a7825e19fb96)
-rw-r--r--ChangeLog4
-rw-r--r--po/Makefile1
2 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index c00418583c..02e183116c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-06-13  Carlos O'Donell  <carlos_odonell@mentor.com>
+
+	* po/Makefile (libc.pot): Use UTF-8 charset.
+
 2012-06-21  Joseph Myers  <joseph@codesourcery.com>
 
 	[BZ #14167]
diff --git a/po/Makefile b/po/Makefile
index 55314e0b4f..2dd49b2b36 100644
--- a/po/Makefile
+++ b/po/Makefile
@@ -61,6 +61,7 @@ libc.pot: header.pot libc.pot.files
 	set `date -R`; disp="$$6"; \
 	sed -e 's/VERSION/$(version)/' \
 	    -e "s/DATE/`date +'%Y-%m-%d %H:%M'$$disp`/" \
+	    -e "s/CHARSET/UTF-8/" \
 	    $< > $@.new
 	egrep -v '\.ksh$$' $(word 2,$^) > $(objdir)/tmp-libc.pot-files
 	cd ..; $(XGETTEXT) --keyword=_ --keyword=N_ \