Mon Nov 2 00:25:46 2020 UTC ()
transform @xkb_base@ instead of __xkb_base__ now.

should fix build issues reported on -current.


(mrg)
diff -r1.13 -r1.14 src/external/mit/xorg/lib/xkeyboard-config/Makefile
cvs diff -r1.13 -r1.14 src/external/mit/xorg/lib/xkeyboard-config/Makefile (expand / switch to unified diff)

--- src/external/mit/xorg/lib/xkeyboard-config/Makefile 2019/03/11 06:25:55 1.13
+++ src/external/mit/xorg/lib/xkeyboard-config/Makefile 2020/11/02 00:25:46 1.14
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1# $NetBSD: Makefile,v 1.13 2019/03/11 06:25:55 mrg Exp $ 1# $NetBSD: Makefile,v 1.14 2020/11/02 00:25:46 mrg Exp $
2 2
3.include <bsd.own.mk> 3.include <bsd.own.mk>
4 4
5# XXX when updating to a new xkeyboard-config, regenerate with xsltproc 5# XXX when updating to a new xkeyboard-config, regenerate with xsltproc
6MAN= xkeyboard-config.7 6MAN= xkeyboard-config.7
7 7
8SUBDIR= compat geometry keycodes rules symbols types 8SUBDIR= compat geometry keycodes rules symbols types
9 9
10NOOBJ= # defined 10NOOBJ= # defined
11 11
12PKGCONFIG= xkeyboard-config 12PKGCONFIG= xkeyboard-config
13 13
14X11EXTRAMANTRANSFORMS+= \ 14X11EXTRAMANTRANSFORMS+= \
15 __xkb_base__ ${X11LIBDIR}/xkb 15 @xkb_base@ ${X11LIBDIR}/xkb
16 16
17.include <bsd.x11.mk> 17.include <bsd.x11.mk>
18.include <bsd.prog.mk> 18.include <bsd.prog.mk>
19.include <bsd.subdir.mk> 19.include <bsd.subdir.mk>