diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-12-27 16:33:27 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-12-27 16:33:27 +0000 |
| commit | 064374be911f72dfaec8a75f06da1f9fc1827712 (patch) | |
| tree | ad96fd1f1b9b57a50005db7803f6b79e748bb820 /gen-locales.mk | |
| parent | 4dc1e6e42f1f602e1d2227e112f2db8dce9da763 (diff) | |
| parent | 7c7d34a16f08f84427b3f617313d9633423ad5eb (diff) | |
Merge commit 'refs/top-bases/t/hurdsig-global-dispositions' into t/hurdsig-global-dispositions
Diffstat (limited to 'gen-locales.mk')
| -rw-r--r-- | gen-locales.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gen-locales.mk b/gen-locales.mk index fd88b5bef1..9c523d2a05 100644 --- a/gen-locales.mk +++ b/gen-locales.mk @@ -1,8 +1,8 @@ # defines target $(gen-locales) that generates the locales given in $(LOCALES) -LOCALE_SRCS := $(shell echo "$(LOCALES)"|sed 's/\([^ .]*\)[^ ]*/\1/g') +LOCALE_SRCS := $(shell echo "$(LOCALES)"|sed 's/\([^ .]*\)[^@ ]*\(@[^ ]*\)\?/\1\2/g') CHARMAPS := $(shell echo "$(LOCALES)" | \ - sed -e 's/[^ .]*[.]\([^ ]*\)/\1/g' -e s/SJIS/SHIFT_JIS/g) + sed -e 's/[^ .]*[.]\([^@ ]*\)\(@[^@ ]*\)*/\1/g' -e s/SJIS/SHIFT_JIS/g) CTYPE_FILES = $(addsuffix /LC_CTYPE,$(LOCALES)) gen-locales := $(addprefix $(common-objpfx)localedata/,$(CTYPE_FILES)) |