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 /bin/ls | |
parent | ffda191e301f128a62c152fde92b692548367fca (diff) | |
parent | 15fc2873832ea5b9b639e701bbbf2e73af8b6a88 (diff) | |
download | src-ee7b0571c2c18bdec848ed2044223cc88db29bd8.tar.gz src-ee7b0571c2c18bdec848ed2044223cc88db29bd8.zip |
Merge head from 7/28
Notes
Notes:
svn path=/projects/bmake/; revision=270164
Diffstat (limited to 'bin/ls')
-rw-r--r-- | bin/ls/Makefile | 4 | ||||
-rw-r--r-- | bin/ls/Makefile.depend | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/bin/ls/Makefile b/bin/ls/Makefile index 7149d9146b0c..dce204655be0 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/ls/Makefile.depend b/bin/ls/Makefile.depend index fa30ba59a752..549c3a266093 100644 --- a/bin/ls/Makefile.depend +++ b/bin/ls/Makefile.depend @@ -11,7 +11,6 @@ DIRDEPS = \ lib/libc \ lib/libcompiler_rt \ lib/libutil \ - lib/ncurses/ncurses \ lib/ncurses/ncursesw \ |