Sun May 1 23:02:32 2022 UTC ()
bsd.x11.mk: Add xlocaledir substitution.


(uwe)
diff -r1.142 -r1.143 src/share/mk/bsd.x11.mk
cvs diff -r1.142 -r1.143 src/share/mk/bsd.x11.mk (expand / switch to unified diff)

--- src/share/mk/bsd.x11.mk 2021/12/06 17:52:00 1.142
+++ src/share/mk/bsd.x11.mk 2022/05/01 23:02:32 1.143
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: bsd.x11.mk,v 1.142 2021/12/06 17:52:00 abs Exp $ 1# $NetBSD: bsd.x11.mk,v 1.143 2022/05/01 23:02:32 uwe 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
@@ -422,26 +422,27 @@ _X11MANTRANSFORMS_BOTH=\ @@ -422,26 +422,27 @@ _X11MANTRANSFORMS_BOTH=\
422 logdir /var/log \ 422 logdir /var/log \
423 sysconfdir /etc \ 423 sysconfdir /etc \
424 apploaddir ${X11ROOTDIR}/lib/X11/app-defaults \ 424 apploaddir ${X11ROOTDIR}/lib/X11/app-defaults \
425 bindir ${X11BINDIR} \ 425 bindir ${X11BINDIR} \
426 datadir ${X11LIBDIR} \ 426 datadir ${X11LIBDIR} \
427 libdir ${X11ROOTDIR}/lib \ 427 libdir ${X11ROOTDIR}/lib \
428 mandir ${X11MANDIR} \ 428 mandir ${X11MANDIR} \
429 projectroot ${X11ROOTDIR} \ 429 projectroot ${X11ROOTDIR} \
430 xkbconfigroot ${X11LIBDIR}/xkb \ 430 xkbconfigroot ${X11LIBDIR}/xkb \
431 vendorversion ${XORGVERSION:C/ /%/gW} \ 431 vendorversion ${XORGVERSION:C/ /%/gW} \
432 XCONFIGFILE xorg.conf \ 432 XCONFIGFILE xorg.conf \
433 xconfigfile xorg.conf \ 433 xconfigfile xorg.conf \
434 XCONFIGFILEMAN 'xorg.conf(5)' \ 434 XCONFIGFILEMAN 'xorg.conf(5)' \
 435 xlocaledir ${X11LIBDIR}/locale \
435 xorgversion ${XORGVERSION:C/ /%/gW} \ 436 xorgversion ${XORGVERSION:C/ /%/gW} \
436 XSERVERNAME Xorg \ 437 XSERVERNAME Xorg \
437 xservername Xorg 438 xservername Xorg
438 439
439.for __def__ __value__ in ${_X11MANTRANSFORMS_BOTH} 440.for __def__ __value__ in ${_X11MANTRANSFORMS_BOTH}
440_X11MANTRANSFORM+= \ 441_X11MANTRANSFORM+= \
441 __${__def__}__ ${__value__} \ 442 __${__def__}__ ${__value__} \
442 @${__def__}@ ${__value__} 443 @${__def__}@ ${__value__}
443.endfor 444.endfor
444 445
445_X11MANTRANSFORM+= \ 446_X11MANTRANSFORM+= \
446 447
447_X11MANTRANSFORMCMD= ${TOOL_SED} -e 's/\\$$/\\ /' ${.IMPSRC} 448_X11MANTRANSFORMCMD= ${TOOL_SED} -e 's/\\$$/\\ /' ${.IMPSRC}