summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Wemm <peter@FreeBSD.org>2013-08-11 21:46:06 +0000
committerPeter Wemm <peter@FreeBSD.org>2013-08-11 21:46:06 +0000
commit6c43122a42aa8889921916b319ed3203c19315b9 (patch)
treeae4bfca2cb08a9497a0fdc465f2e0eaaf09566d9
parentae8ab0e2c4a07345686acbe974778fb98b110c2c (diff)
Notes
-rw-r--r--usr.bin/vi/catalog/Makefile15
1 files changed, 7 insertions, 8 deletions
diff --git a/usr.bin/vi/catalog/Makefile b/usr.bin/vi/catalog/Makefile
index 8d52d85c4bdc..cfec51eb904b 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"; \