Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/share/mk properly prefix ${X11INCDIR} uses with ${DESTDIR}.



details:   https://anonhg.NetBSD.org/src/rev/fc008867721d
branches:  trunk
changeset: 372714:fc008867721d
user:      mrg <mrg%NetBSD.org@localhost>
date:      Wed Dec 21 20:09:35 2022 +0000

description:
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.

XXX: pullup-10

diffstat:

 share/mk/bsd.x11.mk |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (20 lines):

diff -r 5f36434c55df -r fc008867721d share/mk/bsd.x11.mk
--- a/share/mk/bsd.x11.mk       Wed Dec 21 19:08:22 2022 +0000
+++ b/share/mk/bsd.x11.mk       Wed Dec 21 20:09:35 2022 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.x11.mk,v 1.146 2022/12/19 01:51:29 mrg Exp $
+#      $NetBSD: bsd.x11.mk,v 1.147 2022/12/21 20:09:35 mrg Exp $
 
 .include <bsd.init.mk>
 
@@ -46,8 +46,8 @@
 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 \



Home | Main Index | Thread Index | Old Index