Set SRCDIR according to build type and s/X11SRC/XSRCDIR

ok robert@

diff --git a/distrib/syspatch/bsd.syspatch.mk b/distrib/syspatch/bsd.syspatch.mk
index cdfd7d0..2c6e178 100644 (file)
--- a/distrib/syspatch/bsd.syspatch.mk
+++ b/distrib/syspatch/bsd.syspatch.mk
@@ -1,4 +1,4 @@
-#      $OpenBSD: bsd.syspatch.mk,v 1.12 2017/06/06 20:34:07 ajacoutot Exp $
+#      $OpenBSD: bsd.syspatch.mk,v 1.13 2017/06/20 18:32:26 ajacoutot Exp $
 #
 # Copyright (c) 2016-2017 Robert Nagy <robert@openbsd.org>
 #
@@ -48,17 +48,16 @@ PATCH_ARGS= -d ${SRCDIR} -z .orig --forward --quiet -E ${PATCH_STRIP}
 # miscellaneous variables
 SYSPATCH_DIR=  ${FAKE}/var/syspatch/${SYSPATCH_SHRT}
 FAKE=          ${FAKEROOT}/syspatch/${SYSPATCH_SHRT}
-SRCDIR=                ${BSDSRCDIR}
 SUBDIR?=
 
 _PATCH_COOKIE= ${ERRATA}/.patch_done
 _BUILD_COOKIE= ${ERRATA}/.build_done
 _FAKE_COOKIE=  ${ERRATA}/.fake_done
 
-.if ${BUILD:L:Msrc}
+.if ${BUILD:L:Msrc} || ${BUILD:L:Mkernel}
 SRCDIR=                ${BSDSRCDIR}
 .elif ${BUILD:L:Mxenocara}
-SRCDIR=                ${X11SRC}
+SRCDIR=                ${XSRCDIR}
 MTREE_FILES+=  /etc/mtree/BSD.x11.dist
 .endif