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/partedit | |
| 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/partedit')
| -rw-r--r-- | usr.sbin/bsdinstall/partedit/Makefile | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/usr.sbin/bsdinstall/partedit/Makefile b/usr.sbin/bsdinstall/partedit/Makefile index 328259c..fb75888 100644 --- a/usr.sbin/bsdinstall/partedit/Makefile +++ b/usr.sbin/bsdinstall/partedit/Makefile @@ -5,8 +5,8 @@ PROG= partedit LINKS= ${BINDIR}/partedit ${BINDIR}/autopart \ ${BINDIR}/partedit ${BINDIR}/scriptedpart SYMLINKS= ${BINDIR}/partedit /usr/sbin/sade -DPADD= ${LIBGEOM} ${LIBUTIL} ${LIBDIALOG} ${LIBM} -LDADD= -lgeom -lutil -ldialog -lm +DPADD= ${LIBGEOM} ${LIBNCURSESW} ${LIBUTIL} ${LIBDIALOG} ${LIBM} +LDADD= -lgeom -lncursesw -lutil -ldialog -lm PARTEDIT_ARCH= ${MACHINE} .if ${MACHINE} == "i386" || ${MACHINE} == "amd64" @@ -22,14 +22,4 @@ SRCS= diskeditor.c partedit.c gpart_ops.c partedit_${PARTEDIT_ARCH}.c \ WARNS?= 3 MAN= sade.8 -.include <src.opts.mk> - -.if ${MK_NCURSESW} == "no" -DPADD+= ${LIBNCURSES} -LDADD+= -lncurses -.else -DPADD+= ${LIBNCURSESW} -LDADD+= -lncursesw -.endif - .include <bsd.prog.mk> |
