diff options
| author | brooks <brooks@FreeBSD.org> | 2014-07-17 18:24:34 +0000 |
|---|---|---|
| committer | brooks <brooks@FreeBSD.org> | 2014-07-17 18:24:34 +0000 |
| commit | ea5a037d1f7b17969046da0165700dcc51245472 (patch) | |
| tree | 3ff2151befbc35e13a819af1c5dc8b2239bd1183 /bin | |
| parent | 1dcd5569710eaeea64703d6bb3affedc5cc74ce1 (diff) | |
| download | FreeBSD-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 'bin')
| -rw-r--r-- | bin/csh/Makefile | 4 | ||||
| -rw-r--r-- | bin/ls/Makefile | 4 | ||||
| -rw-r--r-- | bin/sh/Makefile | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/bin/csh/Makefile b/bin/csh/Makefile index c8845f9..9f305b4 100644 --- a/bin/csh/Makefile +++ b/bin/csh/Makefile @@ -40,8 +40,8 @@ MLINKS= csh.1 tcsh.1 # utilities of the same name are handled with the associated manpage, # builtin.1 in share/man/man1/. -DPADD= ${LIBTERMCAP} ${LIBCRYPT} -LDADD= -ltermcap -lcrypt +DPADD= ${LIBTERMCAPW} ${LIBCRYPT} +LDADD= -ltermcapw -lcrypt LINKS= ${BINDIR}/csh ${BINDIR}/tcsh diff --git a/bin/ls/Makefile b/bin/ls/Makefile index 7149d91..dce2046 100644 --- a/bin/ls/Makefile +++ b/bin/ls/Makefile @@ -11,8 +11,8 @@ LDADD= -lutil .if !defined(RELEASE_CRUNCH) && \ ${MK_LS_COLORS} != no CFLAGS+= -DCOLORLS -DPADD+= ${LIBTERMCAP} -LDADD+= -ltermcap +DPADD+= ${LIBTERMCAPW} +LDADD+= -ltermcapw .endif .include <bsd.prog.mk> diff --git a/bin/sh/Makefile b/bin/sh/Makefile index 6a982bc..ad43d33 100644 --- a/bin/sh/Makefile +++ b/bin/sh/Makefile @@ -18,8 +18,8 @@ SRCS= ${SHSRCS} ${GENSRCS} ${GENHDRS} # utilities of the same name are handled with the associated manpage, # builtin.1 in share/man/man1/. -DPADD= ${LIBEDIT} ${LIBTERMCAP} -LDADD= -ledit -ltermcap +DPADD= ${LIBEDIT} ${LIBTERMCAPW} +LDADD= -ledit -ltermcapw CFLAGS+=-DSHELL -I. -I${.CURDIR} # for debug: |
