Date: Sun, 11 Aug 2013 21:46:06 +0000 (UTC) From: Peter Wemm <peter@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r254230 - head/usr.bin/vi/catalog Message-ID: <201308112146.r7BLk6Hp045307@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: peter Date: Sun Aug 11 21:46:06 2013 New Revision: 254230 URL: http://svnweb.freebsd.org/changeset/base/254230 Log: Don't build the UTF-8 version of the catalogs without iconv enabled. Pointy-hat to: peter (don't do things at 4am!) Modified: head/usr.bin/vi/catalog/Makefile Modified: head/usr.bin/vi/catalog/Makefile ============================================================================== --- head/usr.bin/vi/catalog/Makefile Sun Aug 11 21:21:02 2013 (r254229) +++ head/usr.bin/vi/catalog/Makefile Sun Aug 11 21:46:06 2013 (r254230) @@ -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"; \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201308112146.r7BLk6Hp045307>