Source-Changes-HG archive

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

[src/trunk]: src/external/mit/xorg/lib/libXt transform XFILESEARCHPATHDEFAULT...



details:   https://anonhg.NetBSD.org/src/rev/4d88b5d8871a
branches:  trunk
changeset: 376457:4d88b5d8871a
user:      mrg <mrg%NetBSD.org@localhost>
date:      Mon Jun 19 07:21:17 2023 +0000

description:
transform XFILESEARCHPATHDEFAULT in the pkg-config file.

diffstat:

 external/mit/xorg/lib/libXt/Makefile |  8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diffs (28 lines):

diff -r 7238dd1f3b96 -r 4d88b5d8871a external/mit/xorg/lib/libXt/Makefile
--- a/external/mit/xorg/lib/libXt/Makefile      Mon Jun 19 04:30:27 2023 +0000
+++ b/external/mit/xorg/lib/libXt/Makefile      Mon Jun 19 07:21:17 2023 +0000
@@ -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>



Home | Main Index | Thread Index | Old Index