diff options
| author | brooks <brooks@FreeBSD.org> | 2013-01-24 17:00:11 +0000 |
|---|---|---|
| committer | brooks <brooks@FreeBSD.org> | 2013-01-24 17:00:11 +0000 |
| commit | df93558da4a5bc8c85c61b0256dbf6df6660643c (patch) | |
| tree | 824932bb894df7cb1aa1d28558c085b917b684c3 | |
| parent | 94e6ca822dcdde4f67df9402f57d5031106b551a (diff) | |
| download | FreeBSD-src-df93558da4a5bc8c85c61b0256dbf6df6660643c.zip FreeBSD-src-df93558da4a5bc8c85c61b0256dbf6df6660643c.tar.gz | |
Don't link two different things to the same paths. As tiebreaker I've
picked the link that was installed last so as to not change the behavior.
The one exception is sr_YU.ISO8859-2/LC_MONETARY where a file was being
replaced by a link.
| -rw-r--r-- | share/monetdef/Makefile | 4 | ||||
| -rw-r--r-- | share/msgdef/Makefile | 2 | ||||
| -rw-r--r-- | share/numericdef/Makefile | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/share/monetdef/Makefile b/share/monetdef/Makefile index 972f149..4f0adcc 100644 --- a/share/monetdef/Makefile +++ b/share/monetdef/Makefile @@ -110,11 +110,11 @@ ISO8859-1_ISO8859-15= af_ZA ca_AD ca_ES ca_FR ca_IT da_DK de_AT de_CH de_DE \ fi_FI fr_BE fr_CA fr_CH fr_FR \ is_IS it_IT it_CH nl_BE nl_NL nb_NO nn_NO no_NO sv_SE ISO8859-1_US-ASCII= en_AU en_CA en_GB en_NZ en_US -ISO8859-1_UTF-8= af_ZA ca_AD ca_ES ca_FR ca_IT da_DK de_AT de_CH de_DE \ +ISO8859-1_UTF-8= af_ZA ca_ES da_DK de_AT de_CH de_DE \ en_AU en_CA en_NZ en_US es_ES \ fi_FI fr_BE fr_CA fr_FR is_IS it_IT nl_BE \ nl_NL nb_NO nn_NO no_NO pt_BR sv_SE -ISO8859-2_UTF-8= hr_HR hu_HU ro_RO sk_SK sl_SI sr_YU +ISO8859-2_UTF-8= hr_HR hu_HU ro_RO sk_SK sl_SI ISO8859-7_UTF-8= el_GR ISO8859-9_UTF-8= tr_TR ISO8859-13_ISO8859-4= lt_LT diff --git a/share/msgdef/Makefile b/share/msgdef/Makefile index 069498f..59a5383 100644 --- a/share/msgdef/Makefile +++ b/share/msgdef/Makefile @@ -112,7 +112,7 @@ ISO8859-1_ISO8859-15= af_ZA ca_ES da_DK de_DE en_CA en_GB en_US es_ES \ ${NL_LINKS} ${NO_LINKS} ISO8859-1_US-ASCII= ${GB_LINKS} en_CA en_GB en_US ISO8859-1_UTF-8= af_ZA ca_ES da_DK de_DE en_CA en_GB en_US es_ES eu_ES \ - fi_FI fr_BE fr_CH fr_FR is_IS it_IT nb_NO nl_NL nn_NO no_NO \ + fi_FI fr_BE fr_CH fr_FR is_IS it_IT nl_NL no_NO \ pt_PT sv_SE ISO8859-2_ISO8859-2= ${CZ_LINKS} ISO8859-2_UTF-8= cs_CZ hr_HR hu_HU pl_PL ro_RO sl_SI diff --git a/share/numericdef/Makefile b/share/numericdef/Makefile index 2dc12f8..baf99de 100644 --- a/share/numericdef/Makefile +++ b/share/numericdef/Makefile @@ -93,7 +93,7 @@ eucJP_UTF-8= ja_JP eucKR_CP949= ko_KR eucKR_UTF-8= ko_KR ISO8859-1_ISO8859-15= af_ZA ca_ES da_DK de_CH de_DE en_US es_ES eu_ES \ - fi_FI fr_BE fr_FR is_IS it_CH it_IT nl_NL no_NO pt_PT sv_SE \ + fi_FI fr_BE fr_FR is_IS it_IT nl_NL no_NO pt_PT sv_SE \ ${BE_LINKS} ${CA_LINKS} ${DE_LINKS} ${FR_LINKS} ${GB_LINKS} \ ${IT_LINKS} ${NO_LINKS} ${US_LINKS} ISO8859-1_ISO8859-1= ${BE_LINKS} ${CA_LINKS} ${DE_LINKS} ${FR_LINKS} \ |
