diff options
| author | brooks <brooks@FreeBSD.org> | 2014-05-15 16:44:25 +0000 |
|---|---|---|
| committer | brooks <brooks@FreeBSD.org> | 2014-05-15 16:44:25 +0000 |
| commit | 274f59a96f2fc906e0cec15a4d1acaeeb3b8eee5 (patch) | |
| tree | a7f4de34a03e6224cc5904f3b4f74de437f0859f /gnu | |
| parent | 14cb90d9b6dc36cd3f273b2847581b8efd885155 (diff) | |
| download | FreeBSD-src-274f59a96f2fc906e0cec15a4d1acaeeb3b8eee5.zip FreeBSD-src-274f59a96f2fc906e0cec15a4d1acaeeb3b8eee5.tar.gz | |
Revert r261296. This removes the WITHOUT_NCURSESW option.
It was the wrong direction. We will instead remove use of the
non-wide-character supporting libncurses.
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/usr.bin/dialog/Makefile | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/gnu/usr.bin/dialog/Makefile b/gnu/usr.bin/dialog/Makefile index a7e0a57..f9281c8 100644 --- a/gnu/usr.bin/dialog/Makefile +++ b/gnu/usr.bin/dialog/Makefile @@ -3,21 +3,11 @@ DIALOG= ${.CURDIR}/../../../contrib/dialog PROG= dialog -DPADD= ${LIBDIALOG} ${LIBM} -LDADD= -ldialog -lm +DPADD= ${LIBDIALOG} ${LIBNCURSESW} ${LIBM} +LDADD= -ldialog -lncursesw -lm CFLAGS+= -I${.CURDIR} -I${DIALOG} .PATH: ${DIALOG} WARNS?= 6 -.include <src.opts.mk> - -.if ${MK_NCURSESW} == "no" -DPADD+= ${LIBNCURSES} -LDADD+= -lncurses -.else -DPADD+= ${LIBNCURSESW} -LDADD+= -lncursesw -.endif - .include <bsd.prog.mk> |
