d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Back out recent replacement of LC_MESSAGES file with directory.

Browse Source 
Requested by:   ache
This commit is contained in:
Alexey Zelkin 2001-12-24 11:49:49 +00:00
parent ec60ea2faa
commit 0388ec7cac
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=88459
4 changed files with 24 additions and 183 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
etc/Makefile
View File

@ -168,7 +168,6 @@ distribution:
distrib-dirs:
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
-rm -f ${DESTDIR}/usr/share/locale/*/LC_MESSAGES
mtree -deU ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BSD.usr.dist -p ${DESTDIR}/usr
mtree -deU ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BSD.include.dist \
-p ${DESTDIR}/usr/include

160
etc/mtree/BSD.usr.dist
View File

@ -482,324 +482,164 @@
..
locale
af_ZA.ISO8859-1
LC_MESSAGES
..
..
af_ZA.ISO8859-15
LC_MESSAGES
..
..
bg_BG.CP1251
LC_MESSAGES
..
..
cs_CZ.ISO8859-2
LC_MESSAGES
..
..
da_DK.ISO8859-1
LC_MESSAGES
..
..
da_DK.ISO8859-15
LC_MESSAGES
..
..
de_AT.ISO8859-1
LC_MESSAGES
..
..
de_AT.ISO8859-15
LC_MESSAGES
..
..
de_CH.ISO8859-1
LC_MESSAGES
..
..
de_CH.ISO8859-15
LC_MESSAGES
..
..
de_DE.ISO8859-1
LC_MESSAGES
..
..
de_DE.ISO8859-15
LC_MESSAGES
..
..
el_GR.ISO8859-7
LC_MESSAGES
..
..
en_AU.ISO8859-1
LC_MESSAGES
..
..
en_AU.ISO8859-15
LC_MESSAGES
..
..
en_AU.US-ASCII
LC_MESSAGES
..
..
en_CA.ISO8859-1
LC_MESSAGES
..
..
en_CA.ISO8859-15
LC_MESSAGES
..
..
en_CA.US-ASCII
LC_MESSAGES
..
..
en_GB.ISO8859-1
LC_MESSAGES
..
..
en_GB.ISO8859-15
LC_MESSAGES
..
..
en_GB.US-ASCII
LC_MESSAGES
..
..
en_NZ.ISO8859-1
LC_MESSAGES
..
..
en_NZ.ISO8859-15
LC_MESSAGES
..
..
en_NZ.US-ASCII
LC_MESSAGES
..
..
en_US.ISO8859-1
LC_MESSAGES
..
..
en_US.ISO8859-15
LC_MESSAGES
..
..
en_US.US-ASCII
LC_MESSAGES
..
..
es_ES.ISO8859-1
LC_MESSAGES
..
..
es_ES.ISO8859-15
LC_MESSAGES
..
..
et_EE.ISO8859-15
LC_MESSAGES
..
..
fi_FI.ISO8859-1
LC_MESSAGES
..
..
fi_FI.ISO8859-15
LC_MESSAGES
..
..
fr_BE.ISO8859-1
LC_MESSAGES
..
..
fr_BE.ISO8859-15
LC_MESSAGES
..
..
fr_CA.ISO8859-1
LC_MESSAGES
..
..
fr_CA.ISO8859-15
LC_MESSAGES
..
..
fr_CH.ISO8859-1
LC_MESSAGES
..
..
fr_CH.ISO8859-15
LC_MESSAGES
..
..
fr_FR.ISO8859-1
LC_MESSAGES
..
..
fr_FR.ISO8859-15
LC_MESSAGES
..
..
hi_IN.ISCII-DEV
LC_MESSAGES
..
..
hr_HR.ISO8859-2
LC_MESSAGES
..
..
hu_HU.ISO8859-2
LC_MESSAGES
..
..
is_IS.ISO8859-1
LC_MESSAGES
..
..
is_IS.ISO8859-15
LC_MESSAGES
..
..
it_CH.ISO8859-1
LC_MESSAGES
..
..
it_CH.ISO8859-15
LC_MESSAGES
..
..
it_IT.ISO8859-1
LC_MESSAGES
..
..
it_IT.ISO8859-15
LC_MESSAGES
..
..
ja_JP.SJIS
LC_MESSAGES
..
..
ja_JP.eucJP
LC_MESSAGES
..
..
ko_KR.eucKR
LC_MESSAGES
..
..
la_LN.ISO8859-1
LC_MESSAGES
..
..
la_LN.ISO8859-15
LC_MESSAGES
..
..
la_LN.ISO8859-2
LC_MESSAGES
..
..
la_LN.ISO8859-4
LC_MESSAGES
..
..
la_LN.US-ASCII
LC_MESSAGES
..
..
lt_LT.ISO8859-4
LC_MESSAGES
..
..
nl_BE.ISO8859-1
LC_MESSAGES
..
..
nl_BE.ISO8859-15
LC_MESSAGES
..
..
nl_NL.ISO8859-1
LC_MESSAGES
..
..
nl_NL.ISO8859-15
LC_MESSAGES
..
..
no_NO.ISO8859-1
LC_MESSAGES
..
..
no_NO.ISO8859-15
LC_MESSAGES
..
..
pl_PL.ISO8859-2
LC_MESSAGES
..
..
pt_PT.ISO8859-1
LC_MESSAGES
..
..
pt_PT.ISO8859-15
LC_MESSAGES
..
..
ru_RU.CP866
LC_MESSAGES
..
..
ru_RU.ISO8859-5
LC_MESSAGES
..
..
ru_RU.KOI8-R
LC_MESSAGES
..
..
sk_SK.ISO8859-2
LC_MESSAGES
..
..
sl_SI.ISO8859-2
LC_MESSAGES
..
..
sv_SE.ISO8859-1
LC_MESSAGES
..
..
sv_SE.ISO8859-15
LC_MESSAGES
..
..
tr_TR.ISO8859-9
LC_MESSAGES
..
..
uk_UA.ISO8859-5
LC_MESSAGES
..
..
uk_UA.KOI8-U
LC_MESSAGES
..
..
zh_CN.eucCN
LC_MESSAGES
..
..
zh_TW.Big5
LC_MESSAGES
..
..
..
man

2
lib/libc/locale/lmessages.c
View File

@ -60,7 +60,7 @@ __messages_load_locale(const char *name) {
_messages_locale.nostr = empty;
return __part_load_locale(name, &_messages_using_locale,
_messages_locale_buf, "LC_MESSAGES/SYS_LC_MESSAGES",
_messages_locale_buf, "LC_MESSAGES",
LCMESSAGES_SIZE_FULL, LCMESSAGES_SIZE_MIN,
(const char **)&_messages_locale);
}

44
share/msgdef/Makefile
View File

@ -62,41 +62,43 @@ LOCALEDIR= ${DESTDIR}/usr/share/locale
all: ${LOCALES:S/$/.out/g}
afterinstall:
# HACK: remove LC_MESSAGES directories before installing LC_MESSAGES file
-rm -rf ${LOCALEDIR}/*/LC_MESSAGES
.for lang in ${LOCALES}
${INSTALL} ${COPY} -m 644 -o ${BINOWN} -g ${BINGRP} ${lang}.out \
${LOCALEDIR}/${lang}/LC_MESSAGES/SYS_LC_MESSAGES
${LOCALEDIR}/${lang}/LC_MESSAGES
.endfor
.for link in ${8859_15_LINKS}
ln -sf ../../${link}.ISO8859-1/LC_MESSAGES/SYS_LC_MESSAGES \
${LOCALEDIR}/${link}.ISO8859-15/LC_MESSAGES/SYS_LC_MESSAGES
ln -sf ../${link}.ISO8859-1/LC_MESSAGES \
${LOCALEDIR}/${link}.ISO8859-15/LC_MESSAGES
.endfor
.for link in ${ENGLISHLINKS}
ln -sf ../../${ENGLISH}.ISO8859-1/LC_MESSAGES/SYS_LC_MESSAGES \
${LOCALEDIR}/${link}.ISO8859-1/LC_MESSAGES/SYS_LC_MESSAGES
ln -sf ../../${ENGLISH}.ISO8859-1/LC_MESSAGES/SYS_LC_MESSAGES \
${LOCALEDIR}/${link}.ISO8859-15/LC_MESSAGES/SYS_LC_MESSAGES
ln -sf ../../${ENGLISH}.ISO8859-1/LC_MESSAGES/SYS_LC_MESSAGES \
${LOCALEDIR}/${link}.US-ASCII/LC_MESSAGES/SYS_LC_MESSAGES
ln -sf ../${ENGLISH}.ISO8859-1/LC_MESSAGES \
${LOCALEDIR}/${link}.ISO8859-1/LC_MESSAGES
ln -sf ../${ENGLISH}.ISO8859-1/LC_MESSAGES \
${LOCALEDIR}/${link}.ISO8859-15/LC_MESSAGES
ln -sf ../${ENGLISH}.ISO8859-1/LC_MESSAGES \
${LOCALEDIR}/${link}.US-ASCII/LC_MESSAGES
.endfor
.for link in ${FRENCHLINKS}
ln -sf ../../${FRENCH}.ISO8859-1/LC_MESSAGES/SYS_LC_MESSAGES \
${LOCALEDIR}/${link}.ISO8859-1/LC_MESSAGES/SYS_LC_MESSAGES
ln -sf ../../${FRENCH}.ISO8859-1/LC_MESSAGES/SYS_LC_MESSAGES \
${LOCALEDIR}/${link}.ISO8859-15/LC_MESSAGES/SYS_LC_MESSAGES
ln -sf ../${FRENCH}.ISO8859-1/LC_MESSAGES \
${LOCALEDIR}/${link}.ISO8859-1/LC_MESSAGES
ln -sf ../${FRENCH}.ISO8859-1/LC_MESSAGES \
${LOCALEDIR}/${link}.ISO8859-15/LC_MESSAGES
.endfor
.for link in ${GERMANLINKS}
ln -sf ../../${GERMAN}.ISO8859-1/LC_MESSAGES/SYS_LC_MESSAGES \
${LOCALEDIR}/${link}.ISO8859-1/LC_MESSAGES/SYS_LC_MESSAGES
ln -sf ../../${GERMAN}.ISO8859-1/LC_MESSAGES/SYS_LC_MESSAGES \
${LOCALEDIR}/${link}.ISO8859-15/LC_MESSAGES/SYS_LC_MESSAGES
ln -sf ../${GERMAN}.ISO8859-1/LC_MESSAGES \
${LOCALEDIR}/${link}.ISO8859-1/LC_MESSAGES
ln -sf ../${GERMAN}.ISO8859-1/LC_MESSAGES \
${LOCALEDIR}/${link}.ISO8859-15/LC_MESSAGES
.endfor
.for link in ${CZECHLINKS}
ln -sf ../../${CZECH}.ISO8859-2/LC_MESSAGES/SYS_LC_MESSAGES \
${LOCALEDIR}/${link}.ISO8859-2/LC_MESSAGES/SYS_LC_MESSAGES
ln -sf ../${CZECH}.ISO8859-2/LC_MESSAGES \
${LOCALEDIR}/${link}.ISO8859-2/LC_MESSAGES
.endfor
.for link in ${ASCIILINKS}
ln -sf ../../${link}.ISO8859-1/LC_MESSAGES/SYS_LC_MESSAGES \
${LOCALEDIR}/${link}.US-ASCII/LC_MESSAGES/SYS_LC_MESSAGES
ln -sf ../${link}.ISO8859-1/LC_MESSAGES \
${LOCALEDIR}/${link}.US-ASCII/LC_MESSAGES
.endfor
.include <bsd.prog.mk>