Module Name: src
Committed By: mrg
Date: Mon Jun 19 07:21:17 UTC 2023
Modified Files:
src/external/mit/xorg/lib/libXt: Makefile
Log Message:
transform XFILESEARCHPATHDEFAULT in the pkg-config file.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/mit/xorg/lib/libXt/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/lib/libXt/Makefile
diff -u src/external/mit/xorg/lib/libXt/Makefile:1.7 src/external/mit/xorg/lib/libXt/Makefile:1.8
--- src/external/mit/xorg/lib/libXt/Makefile:1.7 Thu Jul 11 05:44:07 2019
+++ src/external/mit/xorg/lib/libXt/Makefile Mon Jun 19 07:21:17 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2019/07/11 05:44:07 mrg Exp $
+# $NetBSD: Makefile,v 1.8 2023/06/19 07:21:17 mrg Exp $
.include <bsd.own.mk>
@@ -32,7 +32,8 @@ CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11
CPPFLAGS+= -DUSE_POLL -DUSE_SNPRINTF -DLIBXT -I.
CPPFLAGS+= -DHAVE_ASPRINTF -D_CONST_X_STRING
-CPPFLAGS.Intrinsic.c= -DXFILESEARCHPATHDEFAULT=\"${X11LIBDIR}/%L/%T/%N%C%S:${X11LIBDIR}/%l/%T/%N%C%S:${X11LIBDIR}/%T/%N%C%S:${X11LIBDIR}/%L/%T/%N%S:${X11LIBDIR}/%l/%T/%N%S:${X11LIBDIR}/%T/%N%S\"
+XFILESEARCHPATHDEFAULT=${X11LIBDIR}/%L/%T/%N%C%S:${X11LIBDIR}/%l/%T/%N%C%S:${X11LIBDIR}/%T/%N%C%S:${X11LIBDIR}/%L/%T/%N%S:${X11LIBDIR}/%l/%T/%N%S:${X11LIBDIR}/%T/%N%S
+CPPFLAGS.Intrinsic.c= -DXFILESEARCHPATHDEFAULT=\"${XFILESEARCHPATHDEFAULT}\"
CPPFLAGS.Error.c= -DERRORDB=\"${X11LIBDIR}/XtErrorDB\" \
-DXTERROR_PREFIX=\"\" -DXTWARNING_PREFIX=\"\"
CPPFLAGS.TMkey.c= -DXKB
@@ -306,5 +307,8 @@ PKGDIST= ${LIB}
CWARNFLAGS.clang+= -Wno-tautological-compare
+PKGCONFIG_SED_FLAGS+= \
+ -e "s,@XFILESEARCHPATHDEFAULT@,${XFILESEARCHPATHDEFAULT},"
+
.include <bsd.x11.mk>
.include <bsd.lib.mk>
