diff options
author | Simon J. Gerraty <sjg@FreeBSD.org> | 2014-08-19 06:50:54 +0000 |
---|---|---|
committer | Simon J. Gerraty <sjg@FreeBSD.org> | 2014-08-19 06:50:54 +0000 |
commit | ee7b0571c2c18bdec848ed2044223cc88db29bd8 (patch) | |
tree | b04f4bd7cd887f50e7d98af35f46b9834ff86c80 /usr.bin/less | |
parent | ffda191e301f128a62c152fde92b692548367fca (diff) | |
parent | 15fc2873832ea5b9b639e701bbbf2e73af8b6a88 (diff) | |
download | src-test-ee7b0571c2c18bdec848ed2044223cc88db29bd8.tar.gz src-test-ee7b0571c2c18bdec848ed2044223cc88db29bd8.zip |
Merge head from 7/28
Notes
Notes:
svn path=/projects/bmake/; revision=270164
Diffstat (limited to 'usr.bin/less')
-rw-r--r-- | usr.bin/less/Makefile | 4 | ||||
-rw-r--r-- | usr.bin/less/Makefile.depend | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/usr.bin/less/Makefile b/usr.bin/less/Makefile index 3bfadfae3efbd..22147cd564fd3 100644 --- a/usr.bin/less/Makefile +++ b/usr.bin/less/Makefile @@ -8,8 +8,8 @@ SRCS= main.c screen.c brac.c ch.c charset.c cmdbuf.c command.c cvt.c \ signal.c tags.c ttyin.c version.c SCRIPTS=lesspipe.sh zless.sh SCRIPTSNAME_lesspipe.sh=lesspipe.sh -DPADD= ${LIBTERMCAP} -LDADD= -ltermcap +DPADD= ${LIBTERMCAPW} +LDADD= -ltermcapw LINKS= ${BINDIR}/less ${BINDIR}/more \ ${BINDIR}/zless ${BINDIR}/bzless \ ${BINDIR}/zless ${BINDIR}/xzless \ diff --git a/usr.bin/less/Makefile.depend b/usr.bin/less/Makefile.depend index 4f4df6520bd46..3a6e381333c65 100644 --- a/usr.bin/less/Makefile.depend +++ b/usr.bin/less/Makefile.depend @@ -3,6 +3,7 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} DIRDEPS = \ + bin/cat.host \ gnu/lib/csu \ gnu/lib/libgcc \ include \ @@ -10,7 +11,6 @@ DIRDEPS = \ lib/${CSU_DIR} \ lib/libc \ lib/libcompiler_rt \ - lib/ncurses/ncurses \ lib/ncurses/ncursesw \ |