diff options
| author | peter <peter@FreeBSD.org> | 2013-08-11 21:46:06 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 2013-08-11 21:46:06 +0000 |
| commit | 2d178f0d1169dad181209938595398e3c2cc587c (patch) | |
| tree | ae4bfca2cb08a9497a0fdc465f2e0eaaf09566d9 /usr.bin | |
| parent | 35e0e7dfd460512bafb8883702ede64b8a65883d (diff) | |
| download | FreeBSD-src-2d178f0d1169dad181209938595398e3c2cc587c.zip FreeBSD-src-2d178f0d1169dad181209938595398e3c2cc587c.tar.gz | |
Don't build the UTF-8 version of the catalogs without iconv enabled.
Pointy-hat to: peter (don't do things at 4am!)
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/vi/catalog/Makefile | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/usr.bin/vi/catalog/Makefile b/usr.bin/vi/catalog/Makefile index 8d52d85..cfec51e 100644 --- a/usr.bin/vi/catalog/Makefile +++ b/usr.bin/vi/catalog/Makefile @@ -5,13 +5,6 @@ V= ${.CURDIR}/../../../contrib/nvi -.if ${MK_ICONV} == yes -UCAT= dutch english french german polish spanish swedish -.else -# turn on WITH_ICONV=yes if you want UTF-8 -UCAT= -.endif - CAT= dutch english french german polish ru_RU.KOI8-R spanish swedish \ uk_UA.KOI8-U zh_CN.GB2312 @@ -23,7 +16,11 @@ all: dump build-tools: dump -.for c in ${UCAT} +# If we have iconv available, convert the ISO-8859 encoded files +# to UTF-8 as well. +.if ${MK_ICONV} == yes + +.for c in dutch english french german polish spanish swedish CAT+= ${c}.UTF-8 CLEANFILES+=${c}.UTF-8.base $c.UTF-8.base: ${c}.base @@ -45,6 +42,8 @@ uk_UA.UTF-8.base: uk_UA.KOI8-U.base ru_RU.UTF-8.base: ru_RU.KOI8-R.base iconv -f KOI8-R -t UTF-8 ${.ALLSRC} > ${.TARGET} +.endif + .for c in ${CAT} ${c}: ${c}.base @echo "... $c"; \ |
