summaryrefslogtreecommitdiffstats
path: root/usr.bin/vi
diff options
context:
space:
mode:
authorbrooks <brooks@FreeBSD.org>2014-07-17 18:24:34 +0000
committerbrooks <brooks@FreeBSD.org>2014-07-17 18:24:34 +0000
commitea5a037d1f7b17969046da0165700dcc51245472 (patch)
tree3ff2151befbc35e13a819af1c5dc8b2239bd1183 /usr.bin/vi
parent1dcd5569710eaeea64703d6bb3affedc5cc74ce1 (diff)
downloadFreeBSD-src-ea5a037d1f7b17969046da0165700dcc51245472.zip
FreeBSD-src-ea5a037d1f7b17969046da0165700dcc51245472.tar.gz
Replace all uses of libncurses and libtermcap with their wide character
variants. This allows usable file system images (i.e. those with both a shell and an editor) to be created with only one copy of the curses library. Exp-run: antoine PR: 189842 Discussed with: bapt Sponsored by: DARPA, AFRL
Diffstat (limited to 'usr.bin/vi')
-rw-r--r--usr.bin/vi/Makefile5
1 files changed, 0 insertions, 5 deletions
diff --git a/usr.bin/vi/Makefile b/usr.bin/vi/Makefile
index e3ee3f6e..6ed95ee 100644
--- a/usr.bin/vi/Makefile
+++ b/usr.bin/vi/Makefile
@@ -36,14 +36,9 @@ CFLAGS+=-I${.CURDIR} -I${SRCDIR} -I${SRCDIR}/regex
DPADD= ${LIBUTIL}
LDADD= -lutil
-.if defined(RESCUE) || defined(RELEASE_CRUNCH)
-DPADD+= ${LIBNCURSES}
-LDADD+= -lncurses
-.else
CFLAGS+= -DUSE_WIDECHAR
DPADD+= ${LIBNCURSESW}
LDADD+= -lncursesw
-.endif
.if ${MK_ICONV} == "yes" && !defined(RESCUE) && !defined(RELEASE_CRUNCH)
CFLAGS+= -DUSE_ICONV
OpenPOWER on IntegriCloud