Put list of character sets supported by LC_CTYPE into a separate

Makefile snippet so it can be included elsewhere in the tree.
ok bluhm espie

2 files changed, 31 insertions, 48 deletions

diff --git a/share/locale/ctype/Makefile b/share/locale/ctype/Makefile
index e141cbb16b7..90c606945c2 100644
--- a/share/locale/ctype/Makefile
+++ b/share/locale/ctype/Makefile
@@ -5,65 +5,43 @@ NOMAN=	# defined
 # pull LOCALEDIR and other declarations
 .include <bsd.own.mk>
 
-LOCALES += UTF-8
- LOCALESRC_UTF-8 = en_US.UTF-8
-
-LOCALES += CP1251
- LOCALESRC_CP1251 = bg_BG.CP1251
-
-LOCALES += ISO8859-1
- LOCALESRC_ISO8859-1 = en_US.ISO_8859-1
-
-LOCALES += ISO8859-15
- LOCALESRC_ISO8859-15 = en_US.DIS_8859-15
-
-LOCALES += ISO8859-2
- LOCALESRC_ISO8859-2 = en_US.ISO_8859-2
-
-LOCALES += ISO8859-7
- LOCALESRC_ISO8859-7 = el_GR.ISO8859-7
-
-LOCALES += ARMSCII-8
- LOCALESRC_ARMSCII-8 = hy_AM.ARMSCII-8
-
-LOCALES += ISO8859-4
- LOCALESRC_ISO8859-4 = en_US.ISO_8859-4
-
-LOCALES += ISO8859-13
- LOCALESRC_ISO8859-13 = lt_LT.ISO8859-13
-
-LOCALES += CP866
- LOCALESRC_CP866 = ru_RU.CP866
-
-LOCALES += KOI8-R
- LOCALESRC_KOI8-R = ru_RU.KOI8-R
-
-LOCALES += ISO8859-5
- LOCALESRC_ISO8859-5 = ru_RU.ISO_8859-5
-
-LOCALES += KOI8-U
- LOCALESRC_KOI8-U = uk_UA.KOI8-U
-
-all: ${LOCALES:S/$/.out/g}
-realall: ${LOCALES:S/$/.out/g}
-
-CLEANFILES+=	${LOCALES:S/$/.out/g}
-
-FILES=	${LOCALES:S/$/.out/g}
-.for locale in ${LOCALES}
+# pull in LOCALECHARSETS
+.include "${.CURDIR}/Makefile.inc"
+
+LOCALESRC_ARMSCII-8 = hy_AM.ARMSCII-8
+LOCALESRC_CP1251 = bg_BG.CP1251
+LOCALESRC_CP866 = ru_RU.CP866
+LOCALESRC_ISO8859-1 = en_US.ISO_8859-1
+LOCALESRC_ISO8859-2 = en_US.ISO_8859-2
+LOCALESRC_ISO8859-4 = en_US.ISO_8859-4
+LOCALESRC_ISO8859-5 = ru_RU.ISO_8859-5
+LOCALESRC_ISO8859-7 = el_GR.ISO8859-7
+LOCALESRC_ISO8859-13 = lt_LT.ISO8859-13
+LOCALESRC_ISO8859-15 = en_US.DIS_8859-15
+LOCALESRC_KOI8-R = ru_RU.KOI8-R
+LOCALESRC_KOI8-U = uk_UA.KOI8-U
+LOCALESRC_UTF-8 = en_US.UTF-8
+
+all: ${LOCALECHARSETS:S/$/.out/g}
+realall: ${LOCALECHARSETS:S/$/.out/g}
+
+CLEANFILES+=	${LOCALECHARSETS:S/$/.out/g}
+
+FILES=	${LOCALECHARSETS:S/$/.out/g}
+.for locale in ${LOCALECHARSETS}
 FILESDIR_${locale}.out=	${LOCALEDIR}/${locale}
 FILESNAME_${locale}.out=	LC_CTYPE
 .endfor
 
 install:
-.for locale in ${LOCALES}
+.for locale in ${LOCALECHARSETS}
 	install -o ${LOCALEOWN} -g ${LOCALEGRP} -m ${DIRMODE} -d \
 	    ${DESTDIR}${LOCALEDIR}/${locale}
 	install -o ${LOCALEOWN} -g ${LOCALEGRP} -m ${LOCALEMODE} \
 	    ${locale}.out ${DESTDIR}${LOCALEDIR}/${locale}/LC_CTYPE
 .endfor
 
-.for locale in ${LOCALES}
+.for locale in ${LOCALECHARSETS}
 ${locale}.out: ${LOCALESRC_${locale}}.src
 	${CPP} -I${.CURDIR} < ${.CURDIR}/${LOCALESRC_${locale}}.src | \
 	    sed -e '/^#/d' | mklocale -o ${.TARGET}
diff --git a/share/locale/ctype/Makefile.inc b/share/locale/ctype/Makefile.inc
new file mode 100644
index 00000000000..c1de15a4f3c
--- /dev/null
+++ b/share/locale/ctype/Makefile.inc
@@ -0,0 +1,5 @@
+# $OpenBSD: Makefile.inc,v 1.1 2013/06/03 14:14:27 stsp Exp $
+
+# Charsets supported by LC_CTYPE locale
+LOCALECHARSETS=	ARMSCII-8 CP1251 CP866 ISO8859-1 ISO8859-13 ISO8859-15 \
+		ISO8859-2 ISO8859-4 ISO8859-5 ISO8859-7 KOI8-R KOI8-U UTF-8