Module Name: src Committed By: mrg Date: Sat Aug 20 00:36:03 UTC 2016
Modified Files: src/share/mk: bsd.own.mk Log Message: HAVE_XORG_SERVER_VER is always set, if not earlier, immediately above. To generate a diff of this commit: cvs rdiff -u -r1.943 -r1.944 src/share/mk/bsd.own.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/share/mk/bsd.own.mk diff -u src/share/mk/bsd.own.mk:1.943 src/share/mk/bsd.own.mk:1.944 --- src/share/mk/bsd.own.mk:1.943 Fri Aug 19 03:59:30 2016 +++ src/share/mk/bsd.own.mk Sat Aug 20 00:36:03 2016 @@ -1,4 +1,4 @@ -# $NetBSD: bsd.own.mk,v 1.943 2016/08/19 03:59:30 mrg Exp $ +# $NetBSD: bsd.own.mk,v 1.944 2016/08/20 00:36:03 mrg Exp $ # This needs to be before bsd.init.mk .if defined(BSD_MK_COMPAT_FILE) @@ -1391,7 +1391,7 @@ X11SRCDIR.${_proto}proto?= ${X11SRCDIRM # During transition from xorg-server 1.10 to 1.18 HAVE_XORG_SERVER_VER?=110 -.if ${HAVE_XORG_SERVER_VER:U0} == "118" +.if ${HAVE_XORG_SERVER_VER} == "118" XORG_SERVER_SUBDIR?=xorg-server . if ${MACHINE} == "amd64" || ${MACHINE} == "i386" HAVE_XORG_GLAMOR?= yes