Author: marius
Date: Sat Aug 5 14:49:40 2017
New Revision: 322098
URL: https://svnweb.freebsd.org/changeset/base/322098
Log:
Fix a stable/10-specific mismerge in r322096; the MK_NCURSESW handling
should be within the MK_DIALOG block as libncurses{,w} isn't required
when building tzsetup(8) without dialog(3) support.
Modified:
stable/10/usr.sbin/tzsetup/Makefile
Modified: stable/10/usr.sbin/tzsetup/Makefile
==============================================================================
--- stable/10/usr.sbin/tzsetup/Makefile Sat Aug 5 12:59:03 2017
(r322097)
+++ stable/10/usr.sbin/tzsetup/Makefile Sat Aug 5 14:49:40 2017
(r322098)
@@ -12,14 +12,13 @@ WARNS?= 3
CFLAGS+= -I${.CURDIR}/../../contrib/dialog -DHAVE_DIALOG
DPADD= ${LIBDIALOG} ${LIBM}
LDADD= -ldialog -lm
-.endif
-
.if ${MK_NCURSESW} == "no"
DPADD+= ${LIBNCURSES}
LDADD+= -lncurses
.else
DPADD+= ${LIBNCURSESW}
LDADD+= -lncursesw
+.endif
.endif
.include <bsd.prog.mk>
_______________________________________________
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"
