diff options
| author | Brooks Davis <brooks@FreeBSD.org> | 2014-05-15 16:44:25 +0000 |
|---|---|---|
| committer | Brooks Davis <brooks@FreeBSD.org> | 2014-05-15 16:44:25 +0000 |
| commit | 525e2a83f64124d4af12f24b1adaf552314b42df (patch) | |
| tree | a7f4de34a03e6224cc5904f3b4f74de437f0859f /usr.sbin/bsdinstall/partedit | |
| parent | eba21a2dc3bfb909ebefcf66ccb76293458f6a12 (diff) | |
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.
Notes
Notes:
svn path=/head/; revision=266157
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 328259c1ec11..fb758884a572 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> |