Optimize locale data Makefiles as well as make their style more consistent.

6 files changed, 99 insertions, 121 deletions

diff --git a/share/colldef/Makefile b/share/colldef/Makefile
index 60e15be..25349ea 100644
--- a/share/colldef/Makefile
+++ b/share/colldef/Makefile
@@ -5,45 +5,41 @@ CLEANFILES+= ${LOCALES:S/$/.out/g}
 
 LOCALES=	bg_BG.CP1251 \
 		cs_CZ.ISO8859-2 \
-		de_DE.ISO8859-15 \
 		de_DE.ISO8859-1 \
+		de_DE.ISO8859-15 \
 		el_GR.ISO8859-7 \
-		es_ES.ISO8859-15 \
 		es_ES.ISO8859-1 \
+		es_ES.ISO8859-15 \
 		et_EE.ISO8859-15 \
 		hi_IN.ISCII-DEV \
-		is_IS.ISO8859-15 \
 		is_IS.ISO8859-1 \
-		la_LN.US-ASCII \
-		la_LN.ISO8859-15 \
+		is_IS.ISO8859-15 \
 		la_LN.ISO8859-1 \
+		la_LN.ISO8859-15 \
 		la_LN.ISO8859-2 \
 		la_LN.ISO8859-4 \
+		la_LN.US-ASCII \
 		lt_LT.ISO8859-4 \
 		ru_RU.CP866 \
 		ru_RU.ISO8859-5 \
 		ru_RU.KOI8-R \
-		sv_SE.ISO8859-15 \
 		sv_SE.ISO8859-1 \
+		sv_SE.ISO8859-15 \
 		uk_UA.ISO8859-5 \
 		uk_UA.KOI8-U
 
 LOCALEDIR=      ${DESTDIR}/usr/share/locale
 
-ASCIILINKS = \
-	en_AU.US-ASCII en_CA.US-ASCII en_GB.US-ASCII en_NZ.US-ASCII \
-	en_US.US-ASCII ko_KR.eucKR ja_JP.eucJP ja_JP.SJIS zh_CN.eucCN
-
-ZHLINKS =    zh_TW.Big5
-
-LATIN1LINKS = \
-	af_ZA da_DK en_AU en_CA en_GB en_NZ en_US fi_FI \
-	fr_BE fr_CA fr_CH fr_FR it_CH it_IT nl_BE nl_NL no_NO \
-	pt_PT
+ASCIILINKS=	en_AU.US-ASCII en_CA.US-ASCII en_GB.US-ASCII en_NZ.US-ASCII \
+		en_US.US-ASCII ko_KR.eucKR ja_JP.eucJP ja_JP.SJIS zh_CN.eucCN
+DELINKS=	de_AT de_CH
+ZHLINKS=	zh_TW.Big5
 
-LATIN2LINKS = hr_HR hu_HU pl_PL sl_SI
+LATIN1LINKS=	af_ZA da_DK en_AU en_CA en_GB en_NZ en_US fi_FI \
+		fr_BE fr_CA fr_CH fr_FR it_CH it_IT nl_BE nl_NL no_NO \
+		pt_PT
 
-DELINKS = de_AT de_CH
+LATIN2LINKS=	hr_HR hu_HU pl_PL sl_SI
 
 .SUFFIXES: .src .out
 
@@ -91,8 +87,6 @@ afterinstall:
 .for link in ${LATIN1LINKS}
 	ln -fs ../la_LN.ISO8859-1/LC_COLLATE \
 	       ${LOCALEDIR}/${link}.ISO8859-1/LC_COLLATE
-.endfor
-.for link in ${LATIN1LINKS}
 	ln -fs ../la_LN.ISO8859-15/LC_COLLATE \
 	       ${LOCALEDIR}/${link}.ISO8859-15/LC_COLLATE
 .endfor
@@ -103,8 +97,6 @@ afterinstall:
 .for link in ${DELINKS}
 	ln -fs ../de_DE.ISO8859-1/LC_COLLATE \
 	       ${LOCALEDIR}/${link}.ISO8859-1/LC_COLLATE
-.endfor
-.for link in ${DELINKS}
 	ln -fs ../de_DE.ISO8859-15/LC_COLLATE \
 	       ${LOCALEDIR}/${link}.ISO8859-15/LC_COLLATE
 .endfor
diff --git a/share/mklocale/Makefile b/share/mklocale/Makefile
index bba1e21..303bc31 100644
--- a/share/mklocale/Makefile
+++ b/share/mklocale/Makefile
@@ -5,15 +5,15 @@ CLEANFILES+= ${LOCALES:S/$/.out/g}
 
 LOCALES=	bg_BG.CP1251 \
 		el_GR.ISO8859-7 \
-		ja_JP.eucJP \
-		ja_JP.SJIS \
 		hi_IN.ISCII-DEV \
+		ja_JP.SJIS \
+		ja_JP.eucJP \
 		ko_KR.eucKR \
-		la_LN.US-ASCII \
 		la_LN.ISO8859-1 \
+		la_LN.ISO8859-15 \
 		la_LN.ISO8859-2 \
 		la_LN.ISO8859-4 \
-		la_LN.ISO8859-15 \
+		la_LN.US-ASCII \
 		ru_RU.CP866 \
 		ru_RU.ISO8859-5 \
 		ru_RU.KOI8-R \
@@ -23,20 +23,14 @@ LOCALES=	bg_BG.CP1251 \
 
 LOCALEDIR=	${DESTDIR}/usr/share/locale
 
-ASCIILINKS = en_AU en_CA en_GB en_NZ en_US
-
-LATIN1LINKS = \
-	af_ZA da_DK de_AT de_CH de_DE en_AU en_CA en_GB en_NZ en_US \
-	es_ES fi_FI fr_BE fr_CA fr_CH fr_FR is_IS it_CH it_IT nl_BE \
-	nl_NL no_NO pt_PT sv_SE
-
-LATIN15LINKS = ${LATIN1LINKS} et_EE
-
-LATIN2LINKS = cs_CZ hr_HR hu_HU pl_PL sl_SI sk_SK
-
-LATIN4LINKS = lt_LT
-
-LATIN5LINKS = uk_UA
+ASCIILINKS=	en_AU en_CA en_GB en_NZ en_US
+LATIN1LINKS=	af_ZA da_DK de_AT de_CH de_DE en_AU en_CA en_GB en_NZ en_US \
+		es_ES fi_FI fr_BE fr_CA fr_CH fr_FR is_IS it_CH it_IT nl_BE \
+		nl_NL no_NO pt_PT sv_SE
+LATIN15LINKS=	${LATIN1LINKS} et_EE
+LATIN2LINKS=	cs_CZ hr_HR hu_HU pl_PL sl_SI sk_SK
+LATIN4LINKS=	lt_LT
+LATIN5LINKS=	uk_UA
 
 .SUFFIXES: .src .out
 
diff --git a/share/monetdef/Makefile b/share/monetdef/Makefile
index 06c2ef0..d5feb6e 100644
--- a/share/monetdef/Makefile
+++ b/share/monetdef/Makefile
@@ -18,13 +18,15 @@ LOCALES=        af_ZA.ISO8859-1 \
 		es_ES.ISO8859-1 \
 		et_EE.ISO8859-15 \
 		fi_FI.ISO8859-1 \
-		fr_FR.ISO8859-1 \
 		fr_CA.ISO8859-1 \
+		fr_FR.ISO8859-1 \
 		hi_IN.ISCII-DEV \
 		hr_HR.ISO8859-2 \
 		hu_HU.ISO8859-2 \
 		is_IS.ISO8859-1 \
 		it_IT.ISO8859-1 \
+		ja_JP.eucJP \
+		ko_KR.eucKR \
 		nl_NL.ISO8859-1 \
 		no_NO.ISO8859-1 \
 		pl_PL.ISO8859-2 \
@@ -38,15 +40,13 @@ LOCALES=        af_ZA.ISO8859-1 \
 		tr_TR.ISO8859-9 \
 		uk_UA.ISO8859-5 \
 		uk_UA.KOI8-U \
-		ko_KR.eucKR \
-		ja_JP.eucJP \
-		zh_TW.Big5 \
-		zh_CN.eucCN
+		zh_CN.eucCN \
+		zh_TW.Big5
 
 LOCALEDIR=      ${DESTDIR}/usr/share/locale
 
-ASCIILINKS    = en_AU en_CA en_GB en_NZ en_US
-8859_15_LINKS = af_ZA da_DK de_AT de_DE en_AU en_CA en_GB en_NZ en_US \
+ASCIILINKS=	en_AU en_CA en_GB en_NZ en_US
+LATIN15LINKS=	af_ZA da_DK de_AT de_DE en_AU en_CA en_GB en_NZ en_US \
 		es_ES fi_FI fr_CA fr_FR is_IS is_IS it_IT nl_NL no_NO \
 		pt_PT sv_SE
 
@@ -62,7 +62,7 @@ afterinstall:
 	${INSTALL} ${COPY} -m 644 -o ${BINOWN} -g ${BINGRP} ${lang}.out \
 		${LOCALEDIR}/${lang}/LC_MONETARY
 .endfor
-.for link in ${8859_15_LINKS}
+.for link in ${LATIN15LINKS}
 	ln -sf ../${link}.ISO8859-1/LC_MONETARY \
 	       ${LOCALEDIR}/${link}.ISO8859-15/LC_MONETARY
 .endfor
diff --git a/share/msgdef/Makefile b/share/msgdef/Makefile
index fc438ac..54b86bf 100644
--- a/share/msgdef/Makefile
+++ b/share/msgdef/Makefile
@@ -3,7 +3,7 @@
 NOMAN=YES
 CLEANFILES+= ${LOCALES:S/$/.out/g}
 
-LOCALES=        af_ZA.ISO8859-1 \
+LOCALES=	af_ZA.ISO8859-1 \
 		bg_BG.CP1251 \
 		cs_CZ.ISO8859-2 \
 		da_DK.ISO8859-1 \
@@ -39,20 +39,16 @@ LOCALES=        af_ZA.ISO8859-1 \
 		zh_TW.Big5 \
 		zh_CN.eucCN
 
-ASCIILINKS =    en_CA en_GB en_US
-8859_15_LINKS = af_ZA da_DK de_DE en_CA en_GB en_US es_ES fi_FI fr_CH \
-		fr_FR is_IS is_IS it_IT nl_NL no_NO pt_PT sv_SE
+LOCALEDIR=	${DESTDIR}/usr/share/locale
 
-ENGLISH=        en_GB
-ENGLISHLINKS=   en_AU en_NZ
-FRENCH=         fr_FR
-FRENCHLINKS=    fr_CA
-GERMAN=         de_DE
-GERMANLINKS=    de_AT
-CZECH=          cs_CZ
-CZECHLINKS=     sk_SK
+ASCIILINKS=	en_CA en_GB en_US
+LATIN15LINKS=	af_ZA da_DK de_DE en_CA en_GB en_US es_ES fi_FI fr_CH \
+		fr_FR is_IS it_IT nl_NL no_NO pt_PT sv_SE
 
-LOCALEDIR=      ${DESTDIR}/usr/share/locale
+GB_LINKS=	en_AU en_NZ
+FR_LINKS=	fr_CA
+DE_LINKS=	de_AT
+CZ_LINKS=	sk_SK
 
 .SUFFIXES: .src .out
 
@@ -68,32 +64,32 @@ afterinstall:
 	${INSTALL} ${COPY} -m 644 -o ${BINOWN} -g ${BINGRP} ${lang}.out \
 			   ${LOCALEDIR}/${lang}/LC_MESSAGES
 .endfor
-.for link in ${8859_15_LINKS}
+.for link in ${LATIN15LINKS}
 	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 \
+.for link in ${GB_LINKS}
+	ln -sf ../en_GB.ISO8859-1/LC_MESSAGES \
 		${LOCALEDIR}/${link}.ISO8859-1/LC_MESSAGES
-	ln -sf ../${ENGLISH}.ISO8859-1/LC_MESSAGES \
+	ln -sf ../en_GB.ISO8859-1/LC_MESSAGES \
 		${LOCALEDIR}/${link}.ISO8859-15/LC_MESSAGES
-	ln -sf ../${ENGLISH}.ISO8859-1/LC_MESSAGES \
+	ln -sf ../en_GB.ISO8859-1/LC_MESSAGES \
 		${LOCALEDIR}/${link}.US-ASCII/LC_MESSAGES
 .endfor
-.for link in ${FRENCHLINKS}
-	ln -sf ../${FRENCH}.ISO8859-1/LC_MESSAGES \
+.for link in ${FR_LINKS}
+	ln -sf ../fr_FR.ISO8859-1/LC_MESSAGES \
 		${LOCALEDIR}/${link}.ISO8859-1/LC_MESSAGES
-	ln -sf ../${FRENCH}.ISO8859-1/LC_MESSAGES \
+	ln -sf ../fr_FR.ISO8859-1/LC_MESSAGES \
 		${LOCALEDIR}/${link}.ISO8859-15/LC_MESSAGES
 .endfor
-.for link in ${GERMANLINKS}
-	ln -sf ../${GERMAN}.ISO8859-1/LC_MESSAGES \
+.for link in ${DE_LINKS}
+	ln -sf ../de_DE.ISO8859-1/LC_MESSAGES \
 		${LOCALEDIR}/${link}.ISO8859-1/LC_MESSAGES
-	ln -sf ../${GERMAN}.ISO8859-1/LC_MESSAGES \
+	ln -sf ../de_DE.ISO8859-1/LC_MESSAGES \
 		${LOCALEDIR}/${link}.ISO8859-15/LC_MESSAGES
 .endfor
-.for link in ${CZECHLINKS}
-	ln -sf ../${CZECH}.ISO8859-2/LC_MESSAGES \
+.for link in ${CZ_LINKS}
+	ln -sf ../cs_CZ.ISO8859-2/LC_MESSAGES \
 		${LOCALEDIR}/${link}.ISO8859-2/LC_MESSAGES
 .endfor
 .for link in ${ASCIILINKS}
diff --git a/share/numericdef/Makefile b/share/numericdef/Makefile
index 5b50da4..f497698 100644
--- a/share/numericdef/Makefile
+++ b/share/numericdef/Makefile
@@ -3,7 +3,7 @@
 NOMAN=YES
 CLEANFILES+= ${LOCALES:S/$/.out/g}
 
-LOCALES=        af_ZA.ISO8859-1 \
+LOCALES=	af_ZA.ISO8859-1 \
 		bg_BG.CP1251 \
 		cs_CZ.ISO8859-2 \
 		da_DK.ISO8859-1 \
@@ -19,6 +19,8 @@ LOCALES=        af_ZA.ISO8859-1 \
 		hu_HU.ISO8859-2 \
 		is_IS.ISO8859-1 \
 		it_IT.ISO8859-1 \
+		ja_JP.eucJP \
+		ko_KR.eucKR \
 		nl_NL.ISO8859-1 \
 		no_NO.ISO8859-1 \
 		pl_PL.ISO8859-2 \
@@ -32,25 +34,19 @@ LOCALES=        af_ZA.ISO8859-1 \
 		tr_TR.ISO8859-9 \
 		uk_UA.ISO8859-5 \
 		uk_UA.KOI8-U \
-		ko_KR.eucKR \
-		ja_JP.eucJP \
-		zh_TW.Big5 \
-		zh_CN.eucCN
+		zh_CN.eucCN \
+		zh_TW.Big5
 
-LOCALEDIR=      ${DESTDIR}/usr/share/locale
+LOCALEDIR=	${DESTDIR}/usr/share/locale
 
-ASCIILINKS =    en_US
-8859_15_LINKS = af_ZA da_DK de_DE en_US es_ES fi_FI fr_FR is_IS is_IS \
+ASCIILINKS=	en_US
+LATIN15LINKS=	af_ZA da_DK de_DE en_US es_ES fi_FI fr_FR is_IS \
 		it_IT nl_NL no_NO pt_PT sv_SE
 
-USENGLISH=      en_US
-USENGLISHLINKS= en_CA en_GB
-GBENGLISH=      en_GB
-GBENGLISHLINKS= en_AU en_NZ
-FRENCH=         fr_FR
-FRENCHLINKS=    fr_CA fr_CH
-GERMAN=         de_DE
-GERMANLINKS=    de_AT
+US_LINKS=	en_CA en_GB
+GB_LINKS=	en_AU en_NZ
+FR_LINKS=	fr_CA fr_CH
+DE_LINKS=	de_AT
 
 .SUFFIXES: .src .out
 
@@ -64,36 +60,36 @@ afterinstall:
 	${INSTALL} ${COPY} -m 644 -o ${BINOWN} -g ${BINGRP} ${lang}.out \
 			   ${LOCALEDIR}/${lang}/LC_NUMERIC
 .endfor
-.for link in ${8859_15_LINKS}
+.for link in ${LATIN15LINKS}
 	ln -sf ../${link}.ISO8859-1/LC_NUMERIC \
 	       ${LOCALEDIR}/${link}.ISO8859-15/LC_NUMERIC
 .endfor
-.for link in ${USENGLISHLINKS}
-	ln -sf ../${USENGLISH}.ISO8859-1/LC_NUMERIC \
+.for link in ${US_LINKS}
+	ln -sf ../en_US.ISO8859-1/LC_NUMERIC \
 		${LOCALEDIR}/${link}.ISO8859-1/LC_NUMERIC
-	ln -sf ../${USENGLISH}.ISO8859-1/LC_NUMERIC \
+	ln -sf ../en_US.ISO8859-1/LC_NUMERIC \
 		${LOCALEDIR}/${link}.ISO8859-15/LC_NUMERIC
-	ln -sf ../${USENGLISH}.ISO8859-1/LC_NUMERIC \
+	ln -sf ../en_US.ISO8859-1/LC_NUMERIC \
 		${LOCALEDIR}/${link}.US-ASCII/LC_NUMERIC
 .endfor
-.for link in ${GBENGLISHLINKS}
-	ln -sf ../${GBENGLISH}.ISO8859-1/LC_NUMERIC \
+.for link in ${GB_LINKS}
+	ln -sf ../en_GB.ISO8859-1/LC_NUMERIC \
 		${LOCALEDIR}/${link}.ISO8859-1/LC_NUMERIC
-	ln -sf ../${GBENGLISH}.ISO8859-1/LC_NUMERIC \
+	ln -sf ../en_GB.ISO8859-1/LC_NUMERIC \
 		${LOCALEDIR}/${link}.ISO8859-15/LC_NUMERIC
-	ln -sf ../${GBENGLISH}.ISO8859-1/LC_NUMERIC \
+	ln -sf ../en_GB.ISO8859-1/LC_NUMERIC \
 		${LOCALEDIR}/${link}.US-ASCII/LC_NUMERIC
 .endfor
-.for link in ${FRENCHLINKS}
-	ln -sf ../${FRENCH}.ISO8859-1/LC_NUMERIC \
+.for link in ${FR_LINKS}
+	ln -sf ../fr_FR.ISO8859-1/LC_NUMERIC \
 		${LOCALEDIR}/${link}.ISO8859-1/LC_NUMERIC
-	ln -sf ../${FRENCH}.ISO8859-1/LC_NUMERIC \
+	ln -sf ../fr_FR.ISO8859-1/LC_NUMERIC \
 		${LOCALEDIR}/${link}.ISO8859-15/LC_NUMERIC
 .endfor
-.for link in ${GERMANLINKS}
-	ln -sf ../${GERMAN}.ISO8859-1/LC_NUMERIC \
+.for link in ${DE_LINKS}
+	ln -sf ../de_DE.ISO8859-1/LC_NUMERIC \
 		${LOCALEDIR}/${link}.ISO8859-1/LC_NUMERIC
-	ln -sf ../${GERMAN}.ISO8859-1/LC_NUMERIC \
+	ln -sf ../de_DE.ISO8859-1/LC_NUMERIC \
 		${LOCALEDIR}/${link}.ISO8859-15/LC_NUMERIC
 .endfor
 .for link in ${ASCIILINKS}
diff --git a/share/timedef/Makefile b/share/timedef/Makefile
index a7946f8..5e7cf00 100644
--- a/share/timedef/Makefile
+++ b/share/timedef/Makefile
@@ -19,39 +19,39 @@ LOCALES=	bg_BG.CP1251 \
 		hr_HR.ISO8859-2 \
 		hu_HU.ISO8859-2 \
 		is_IS.ISO8859-1 \
-		ja_JP.eucJP     \
-		ja_JP.SJIS      \
+		ja_JP.eucJP \
+		ja_JP.SJIS \
 		it_IT.ISO8859-1 \
-		ko_KR.eucKR     \
+		ko_KR.eucKR \
 		la_LN.ISO8859-1 \
 		lt_LT.ISO8859-4 \
 		nl_NL.ISO8859-1 \
 		no_NO.ISO8859-1 \
 		pl_PL.ISO8859-2 \
 		pt_PT.ISO8859-1 \
-		ru_RU.CP866     \
+		ru_RU.CP866 \
 		ru_RU.ISO8859-5 \
-		ru_RU.KOI8-R    \
+		ru_RU.KOI8-R \
 		sk_SK.ISO8859-2 \
 		sl_SI.ISO8859-2 \
 		sv_SE.ISO8859-1 \
 		tr_TR.ISO8859-9 \
 		uk_UA.ISO8859-5 \
-		uk_UA.KOI8-U    \
-		zh_CN.eucCN     \
+		uk_UA.KOI8-U \
+		zh_CN.eucCN \
 		zh_TW.Big5
 
 LOCALEDIR=      ${DESTDIR}/usr/share/locale
 
-8859_15_LINKS = da_DK de_AT de_DE en_GB en_US es_ES fi_FI fr_FR is_IS \
+LATIN15LINKS=	da_DK de_AT de_DE en_GB en_US es_ES fi_FI fr_FR is_IS \
 		it_IT la_LN nl_NL no_NO pt_PT sv_SE
-DE_LINKS =      de_CH
-FR_LINKS =      fr_BE fr_CA fr_CH
-IT_LINKS =      it_CH
-LN_LINKS =      la_LN.US-ASCII la_LN.ISO8859-2 la_LN.ISO8859-4
-NL_LINKS =      nl_BE
-US_LINKS =      en_CA
-GB_LINKS =      en_AU en_NZ
+DE_LINKS=	de_CH
+FR_LINKS=	fr_BE fr_CA fr_CH
+IT_LINKS=	it_CH
+LN_LINKS=	la_LN.US-ASCII la_LN.ISO8859-2 la_LN.ISO8859-4
+NL_LINKS=	nl_BE
+US_LINKS=	en_CA
+GB_LINKS=	en_AU en_NZ
 
 .SUFFIXES: .src .out
 
@@ -65,7 +65,7 @@ afterinstall:
 		${INSTALL} ${COPY} -m 644 -o ${BINOWN} -g ${BINGRP} $$l.out \
 			   ${LOCALEDIR}/$$l/LC_TIME; \
 	done
-	for l in ${8859_15_LINKS}; do \
+	for l in ${LATIN15LINKS}; do \
 		ln -fs ../$$l.ISO8859-1/LC_TIME \
 		       ${LOCALEDIR}/$$l.ISO8859-15/LC_TIME; \
 	done