Mon Jul 20 13:55:08 2020 UTC ()
Fix typos in ${X11INCS.DIX} include paths. PR/55500


(tsutsui)
diff -r1.134 -r1.135 src/share/mk/bsd.x11.mk
cvs diff -r1.134 -r1.135 src/share/mk/bsd.x11.mk (expand / switch to unified diff)

--- src/share/mk/bsd.x11.mk 2020/02/23 10:28:16 1.134
+++ src/share/mk/bsd.x11.mk 2020/07/20 13:55:08 1.135
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: bsd.x11.mk,v 1.134 2020/02/23 10:28:16 mrg Exp $ 1# $NetBSD: bsd.x11.mk,v 1.135 2020/07/20 13:55:08 tsutsui Exp $
2 2
3.include <bsd.init.mk> 3.include <bsd.init.mk>
4 4
5BINDIR= ${X11BINDIR} 5BINDIR= ${X11BINDIR}
6LIBDIR= ${X11USRLIBDIR} 6LIBDIR= ${X11USRLIBDIR}
7MANDIR= ${X11MANDIR} 7MANDIR= ${X11MANDIR}
8 8
9COPTS+= -fno-strict-aliasing 9COPTS+= -fno-strict-aliasing
10 10
11.include <bsd.sys.mk> 11.include <bsd.sys.mk>
12 12
13.if !defined(NOSSP) && (${USE_SSP:Uno} != "no") 13.if !defined(NOSSP) && (${USE_SSP:Uno} != "no")
14CPPFLAGS+= -DNO_ALLOCA 14CPPFLAGS+= -DNO_ALLOCA
@@ -36,28 +36,28 @@ X11FLAGS.BASE_EXTENSION= -DMITMISC -DXTE @@ -36,28 +36,28 @@ X11FLAGS.BASE_EXTENSION= -DMITMISC -DXTE
36 -DRES 36 -DRES
37 37
38X11FLAGS.PERVASIVE_EXTENSION= -DSHAPE -DXINPUT -DXKB -DLBX -DXAPPGROUP \ 38X11FLAGS.PERVASIVE_EXTENSION= -DSHAPE -DXINPUT -DXKB -DLBX -DXAPPGROUP \
39 -DXCSECURITY -DTOGCUP -DXF86BIGFONT \ 39 -DXCSECURITY -DTOGCUP -DXF86BIGFONT \
40 -DDPMSExtension -DPIXPRIV -DPANORAMIX \ 40 -DDPMSExtension -DPIXPRIV -DPANORAMIX \
41 -DRENDER -DRANDR -DXFIXES -DDAMAGE \ 41 -DRENDER -DRANDR -DXFIXES -DDAMAGE \
42 -DCOMPOSITE -DXEVIE 42 -DCOMPOSITE -DXEVIE
43X11FLAGS.EXTENSION= ${X11FLAGS.BASE_EXTENSION} \ 43X11FLAGS.EXTENSION= ${X11FLAGS.BASE_EXTENSION} \
44 ${X11FLAGS.PERVASIVE_EXTENSION} 44 ${X11FLAGS.PERVASIVE_EXTENSION}
45 45
46X11FLAGS.DIX= -DHAVE_DIX_CONFIG_H -D_BSD_SOURCE -DHAS_FCHOWN \ 46X11FLAGS.DIX= -DHAVE_DIX_CONFIG_H -D_BSD_SOURCE -DHAS_FCHOWN \
47 -DHAS_STICKY_DIR_BIT -D_POSIX_THREAD_SAFE_FUNCTIONS=200112L \ 47 -DHAS_STICKY_DIR_BIT -D_POSIX_THREAD_SAFE_FUNCTIONS=200112L \
48 -DHAVE_XORG_CONFIG_H 48 -DHAVE_XORG_CONFIG_H
49X11INCS.DIX= -I${X11INCSDIR}/freetype2 \ 49X11INCS.DIX= -I${X11INCDIR}/freetype2 \
50 -I${X11INCSDIR}/pixman-1 \ 50 -I${X11INCDIR}/pixman-1 \
51 -I$(X11SRCDIR.xorg-server)/include \ 51 -I$(X11SRCDIR.xorg-server)/include \
52 -I$(X11SRCDIR.xorg-server)/Xext \ 52 -I$(X11SRCDIR.xorg-server)/Xext \
53 -I$(X11SRCDIR.xorg-server)/composite \ 53 -I$(X11SRCDIR.xorg-server)/composite \
54 -I$(X11SRCDIR.xorg-server)/damageext \ 54 -I$(X11SRCDIR.xorg-server)/damageext \
55 -I$(X11SRCDIR.xorg-server)/xfixes \ 55 -I$(X11SRCDIR.xorg-server)/xfixes \
56 -I$(X11SRCDIR.xorg-server)/Xi \ 56 -I$(X11SRCDIR.xorg-server)/Xi \
57 -I$(X11SRCDIR.xorg-server)/mi \ 57 -I$(X11SRCDIR.xorg-server)/mi \
58 -I$(X11SRCDIR.xorg-server)/miext/shadow \ 58 -I$(X11SRCDIR.xorg-server)/miext/shadow \
59 -I$(X11SRCDIR.xorg-server)/miext/damage \ 59 -I$(X11SRCDIR.xorg-server)/miext/damage \
60 -I$(X11SRCDIR.xorg-server)/render \ 60 -I$(X11SRCDIR.xorg-server)/render \
61 -I$(X11SRCDIR.xorg-server)/randr \ 61 -I$(X11SRCDIR.xorg-server)/randr \
62 -I$(X11SRCDIR.xorg-server)/fb \ 62 -I$(X11SRCDIR.xorg-server)/fb \
63 -I$(X11SRCDIR.xorg-server)/../include 63 -I$(X11SRCDIR.xorg-server)/../include