[src/trunk]: src/share/mk define XORG_SERVER_SUBDIR to either xorg-server or ...

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/f3700943a0c5
branches:  trunk
changeset: 345825:f3700943a0c5
user:      mrg <mrg%NetBSD.org@localhost>
date:      Fri Jun 10 03:36:55 2016 +0000

description:
define XORG_SERVER_SUBDIR to either xorg-server or xorg-server.old.

diffstat:

 share/mk/bsd.own.mk |  13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)

diffs (29 lines):

diff -r 6c79a219c9c4 -r f3700943a0c5 share/mk/bsd.own.mk
--- a/share/mk/bsd.own.mk       Fri Jun 10 01:14:00 2016 +0000
+++ b/share/mk/bsd.own.mk       Fri Jun 10 03:36:55 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.own.mk,v 1.930 2016/06/10 00:17:48 mrg Exp $
+#      $NetBSD: bsd.own.mk,v 1.931 2016/06/10 03:36:55 mrg Exp $
 
 # This needs to be before bsd.init.mk
 .if defined(BSD_MK_COMPAT_FILE)
@@ -1358,9 +1358,18 @@
 X11SRCDIR.${_proto}proto?=             ${X11SRCDIRMIT}/${_proto}proto/dist
 .endfor
 
+# During transition from xorg-server 1.10 to 1.18
+.if 1
+XORG_SERVER_SUBDIR?=xorg-server
+.else
+XORG_SERVER_SUBDIR?=xorg-server.old
+.endif
+
+X11SRCDIR.xorg-server?=                ${X11SRCDIRMIT}/${XORG_SERVER_SUBDIR}/dist
+
 .for _dir in \
        xtrans fontconfig freetype evieext mkfontscale bdftopcf \
-       xkbcomp xorg-cf-files imake xorg-server xbiff xkeyboard-config \
+       xkbcomp xorg-cf-files imake xbiff xkeyboard-config \
        xbitmaps appres xeyes xev xedit sessreg pixman \
        beforelight bitmap editres makedepend fonttosfnt fslsfonts fstobdf \
        glu glw mesa-demos MesaGLUT MesaLib MesaLib7 \