Module Name: src
Committed By: martin
Date: Wed Apr 17 18:02:23 UTC 2024
Modified Files:
src/share/mk [netbsd-10]: bsd.x11.mk
Log Message:
Pull up following revision(s) (requested by riastradh in ticket #654):
share/mk/bsd.lib.mk: revision 1.398
share/mk/bsd.lib.mk: revision 1.399
share/mk/bsd.x11.mk: revision 1.152
(via patch)
PR/58104: Kouichi Hashikawa: Use ${TOOL_AWK}
Back-out unintented commit.
To generate a diff of this commit:
cvs rdiff -u -r1.145.2.5 -r1.145.2.6 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.5 src/share/mk/bsd.x11.mk:1.145.2.6
--- src/share/mk/bsd.x11.mk:1.145.2.5 Thu Oct 26 15:23:02 2023
+++ src/share/mk/bsd.x11.mk Wed Apr 17 18:02:23 2024
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.x11.mk,v 1.145.2.5 2023/10/26 15:23:02 martin Exp $
+# $NetBSD: bsd.x11.mk,v 1.145.2.6 2024/04/17 18:02:23 martin Exp $
.include <bsd.init.mk>
@@ -145,7 +145,7 @@ __XKBDEFRULES__= '"xorg"'
XLOCALE.DEFINES= -DXLOCALEDIR=\"${X11LIBDIR}/locale\" \
-DXLOCALELIBDIR=\"${X11LIBDIR}/locale\"
-PRINT_PACKAGE_VERSION= awk '/^PACKAGE_VERSION=/ { \
+PRINT_PACKAGE_VERSION= ${TOOL_AWK} '/^PACKAGE_VERSION=/ { \
match($$1, "([0-9]+\\.)+[0-9]+"); \
version = substr($$1, RSTART, RLENGTH); \
} END { print version }'
