diff options
| author | phantom <phantom@FreeBSD.org> | 2002-01-08 13:42:52 +0000 |
|---|---|---|
| committer | phantom <phantom@FreeBSD.org> | 2002-01-08 13:42:52 +0000 |
| commit | 024413e7ac1e24ef5198f9eed50b8daa09998596 (patch) | |
| tree | eb8af66e4a579fff5532d7393f7c76e1a81ff773 | |
| parent | 94cf97175fa2458d561886abcd0b802e3f0a5772 (diff) | |
| download | FreeBSD-src-024413e7ac1e24ef5198f9eed50b8daa09998596.zip FreeBSD-src-024413e7ac1e24ef5198f9eed50b8daa09998596.tar.gz | |
Correctly handle cases of deprecated locales which are supposed
to have backward compatibility symbolic links.
This code should check existence of deprecated locales and
fix them using following scheme:
. if new locale directory exisists and is a symlink -- remove it
. if old locale directory exists and not a symlink -- rename it to
its new name
This should allow to mtree(1) and existing locale aliases make(1)
rules to setup locale dirs correctly (avoid self-referenced symlinks)
BTW, this commit brings in backward compatibility support for ru_SU
locales (aliased to appropriate ru_RU ones).
| -rw-r--r-- | etc/Makefile | 13 | ||||
| -rw-r--r-- | etc/locale.deprecated | 11 |
2 files changed, 24 insertions, 0 deletions
diff --git a/etc/Makefile b/etc/Makefile index 1f3444b..02b7439 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -166,6 +166,19 @@ distribution: .endif distrib-dirs: + -set - `grep "^[a-zA-Z]" ${.CURDIR}/locale.deprecated`; \ + while [ $$# -gt 0 ] ; \ + do \ + for dir in /usr/share/locale \ + /usr/share/nls \ + /usr/local/share/nls; \ + do \ + test -d ${DESTDIR}/$${dir} && cd ${DESTDIR}/$${dir}; \ + test -L "$$2" && rm -rf "$$2"; \ + test \! -L "$$1" && test -d "$$1" && mv "$$1" "$$2"; \ + done; \ + shift; shift; \ + done mtree -deU ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BSD.root.dist -p ${DESTDIR}/ mtree -deU ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BSD.var.dist -p ${DESTDIR}/var mtree -deU ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BSD.usr.dist -p ${DESTDIR}/usr diff --git a/etc/locale.deprecated b/etc/locale.deprecated new file mode 100644 index 0000000..4a695d1 --- /dev/null +++ b/etc/locale.deprecated @@ -0,0 +1,11 @@ +# $FreeBSD$ +# +# List of deprecated locales +# +# Make sure that deprecated locale directories and their replacements +# are set up correctly. +# +ru_SU.KOI8-R ru_RU.KOI8-R +ru_SU.ISO_8859-1 ru_RU.ISO8859-1 +ru_SU.CP866 ru_RU.CP866 +ru_RU.ISO_8859-1 ru_RU.ISO8859-1 |
