aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2008-10-31 15:12:51 +0000
committerUlrich Drepper <drepper@redhat.com>2008-10-31 15:12:51 +0000
commita5ff533ea135b92ddbbe9fc4e9a52c967586b578 (patch)
tree2204d7ed43b55139fb190b2d6fce6f4fc2741ee9 /localedata/Makefile
parent[BZ #6980] (diff)
downloadglibc-a5ff533ea135b92ddbbe9fc4e9a52c967586b578.tar.gz
glibc-a5ff533ea135b92ddbbe9fc4e9a52c967586b578.tar.bz2
glibc-a5ff533ea135b92ddbbe9fc4e9a52c967586b578.zip
[BZ #6974]
* sunrpc/rpc_main.c (mkfile_output): Properly handle filename without dot. Properly terminate the string with a null byte. Based on a patch by Aurelien Jarno <aurelien@aurel32.net>.
Diffstat (limited to 'localedata/Makefile')
-rw-r--r--localedata/Makefile7
1 files changed, 4 insertions, 3 deletions
diff --git a/localedata/Makefile b/localedata/Makefile
index 4bb0e32df5..0566792d00 100644
--- a/localedata/Makefile
+++ b/localedata/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1996-2002, 2003, 2005, 2007 Free Software Foundation, Inc.
+# Copyright (C) 1996-2003, 2005, 2007, 2008 Free Software Foundation, Inc.
# This file is part of the GNU C Library.
# The GNU C Library is free software; you can redistribute it and/or
@@ -41,7 +41,8 @@ test-srcs := collate-test xfrm-test tst-fmon tst-rpmatch tst-trans \
tst-mbswcs1 tst-mbswcs2 tst-mbswcs3 tst-mbswcs4 tst-mbswcs5 \
tst-ctype tst-wctype tst-langinfo tst-numeric
test-input := de_DE.ISO-8859-1 en_US.ISO-8859-1 da_DK.ISO-8859-1 \
- hr_HR.ISO-8859-2 sv_SE.ISO-8859-1 tr_TR.UTF-8 fr_FR.UTF-8
+ hr_HR.ISO-8859-2 sv_SE.ISO-8859-1 tr_TR.UTF-8 fr_FR.UTF-8 \
+ si_LK.UTF-8
test-input-data = $(addsuffix .in, $(basename $(test-input)))
test-output := $(foreach s, .out .xout, \
$(addsuffix $s, $(basename $(test-input))))
@@ -134,7 +135,7 @@ LOCALES := de_DE.ISO-8859-1 de_DE.UTF-8 en_US.ANSI_X3.4-1968 \
hr_HR.ISO-8859-2 sv_SE.ISO-8859-1 ja_JP.SJIS fr_FR.ISO-8859-1 \
vi_VN.TCVN5712-1 nb_NO.ISO-8859-1 nn_NO.ISO-8859-1 \
tr_TR.UTF-8 cs_CZ.UTF-8 zh_TW.EUC-TW fa_IR.UTF-8 fr_FR.UTF-8 \
- ja_JP.UTF-8
+ ja_JP.UTF-8 si_LK.UTF-8
LOCALE_SRCS := $(shell echo "$(LOCALES)"|sed 's/\([^ .]*\)[^ ]*/\1/g')
CHARMAPS := $(shell echo "$(LOCALES)" | \
sed -e 's/[^ .]*[.]\([^ ]*\)/\1/g' -e s/SJIS/SHIFT_JIS/g)