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 /usr.sbin/bsdinstall/distextract | |
| 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 'usr.sbin/bsdinstall/distextract')
| -rw-r--r-- | usr.sbin/bsdinstall/distextract/Makefile | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/usr.sbin/bsdinstall/distextract/Makefile b/usr.sbin/bsdinstall/distextract/Makefile index e359bba..f84c4d7 100644 --- a/usr.sbin/bsdinstall/distextract/Makefile +++ b/usr.sbin/bsdinstall/distextract/Makefile @@ -2,20 +2,10 @@ BINDIR= /usr/libexec/bsdinstall PROG= distextract -DPADD= ${LIBARCHIVE} ${LIBDIALOG} ${LIBM} -LDADD= -larchive -ldialog -lm +DPADD= ${LIBARCHIVE} ${LIBNCURSESW} ${LIBDIALOG} ${LIBM} +LDADD= -larchive -lncursesw -ldialog -lm WARNS?= 6 MAN= -.include <src.opts.mk> - -.if ${MK_NCURSESW} == "no" -DPADD+= ${LIBNCURSES} -LDADD+= -lncurses -.else -DPADD+= ${LIBNCURSESW} -LDADD+= -lncursesw -.endif - .include <bsd.prog.mk> |
