Module Name: src
Committed By: mrg
Date: Fri Jun 10 03:36:55 UTC 2016
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
define XORG_SERVER_SUBDIR to either xorg-server or xorg-server.old.
To generate a diff of this commit:
cvs rdiff -u -r1.930 -r1.931 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.930 src/share/mk/bsd.own.mk:1.931
--- src/share/mk/bsd.own.mk:1.930 Fri Jun 10 00:17:48 2016
+++ src/share/mk/bsd.own.mk Fri Jun 10 03:36:55 2016
@@ -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.${_lib}?= ${X11SRCDIRMIT}/lib
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 \
