Module Name: src
Committed By: martin
Date: Sun Jul 30 12:06:55 UTC 2023
Modified Files:
src/share/mk [netbsd-10]: bsd.x11.mk
Log Message:
Pull up following revision(s) (requested by mrg in ticket #261):
share/mk/bsd.x11.mk: revision 1.147
properly prefix ${X11INCDIR} uses with ${DESTDIR}.
this fixes a build issue seen where the host pixman.h was included,
and has been problem ever since tsutsui fixed my original code (from
2008) about 29 months ago. i'm surprised this has not been seen
anywhere else in that time.
To generate a diff of this commit:
cvs rdiff -u -r1.145.2.3 -r1.145.2.4 src/share/mk/bsd.x11.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.x11.mk
diff -u src/share/mk/bsd.x11.mk:1.145.2.3 src/share/mk/bsd.x11.mk:1.145.2.4
--- src/share/mk/bsd.x11.mk:1.145.2.3 Sat Apr 1 15:22:46 2023
+++ src/share/mk/bsd.x11.mk Sun Jul 30 12:06:55 2023
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.x11.mk,v 1.145.2.3 2023/04/01 15:22:46 martin Exp $
+# $NetBSD: bsd.x11.mk,v 1.145.2.4 2023/07/30 12:06:55 martin Exp $
.include <bsd.init.mk>
@@ -46,8 +46,8 @@ X11FLAGS.EXTENSION= ${X11FLAGS.BASE_EXTE
X11FLAGS.DIX= -DHAVE_DIX_CONFIG_H -D_BSD_SOURCE -DHAS_FCHOWN \
-DHAS_STICKY_DIR_BIT -D_POSIX_THREAD_SAFE_FUNCTIONS=200112L \
-DHAVE_XORG_CONFIG_H
-X11INCS.DIX= -I${X11INCDIR}/freetype2 \
- -I${X11INCDIR}/pixman-1 \
+X11INCS.DIX= -I${DESTDIR}${X11INCDIR}/freetype2 \
+ -I${DESTDIR}${X11INCDIR}/pixman-1 \
-I$(X11SRCDIR.xorg-server)/include \
-I$(X11SRCDIR.xorg-server)/Xext \
-I$(X11SRCDIR.xorg-server)/composite \
