]> CyberLeo.Net >> Repos - FreeBSD/stable/10.git/commit
Fix a stable/10-specific mismerge in r322096; the MK_NCURSESW handling
authormarius <marius@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Sat, 5 Aug 2017 14:49:40 +0000 (14:49 +0000)
committermarius <marius@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Sat, 5 Aug 2017 14:49:40 +0000 (14:49 +0000)
commit4ff559f59416a6802d1ba1dae384cbbeaf029bc6
treea77402c1141ba2d4cc464beb22711ad105f7f356
parent57fc90ee519b724a0d244d1d9a355a64711d8644
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.

git-svn-id: svn://svn.freebsd.org/base/stable/10@322098 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
usr.sbin/tzsetup/Makefile