Module Name: src
Committed By: christos
Date: Wed May 1 14:52:01 UTC 2024
Modified Files:
src/sys/conf: newvers.mk newvers.sh
Log Message:
PR/58220: Kouichi Hashikawa: use ${TOOL_AWK}
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/conf/newvers.mk
cvs rdiff -u -r1.63 -r1.64 src/sys/conf/newvers.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/conf/newvers.mk
diff -u src/sys/conf/newvers.mk:1.3 src/sys/conf/newvers.mk:1.4
--- src/sys/conf/newvers.mk:1.3 Fri Apr 5 18:27:25 2024
+++ src/sys/conf/newvers.mk Wed May 1 10:52:01 2024
@@ -1,4 +1,4 @@
-# $NetBSD: newvers.mk,v 1.3 2024/04/05 22:27:25 christos Exp $
+# $NetBSD: newvers.mk,v 1.4 2024/05/01 14:52:01 christos Exp $
MKREPRO?=no
@@ -17,7 +17,8 @@ newvers: vers.o
vers.o: ${SYSTEM_OBJ:O} Makefile $S/conf/newvers.sh \
$S/conf/osrelease.sh ${_NETBSD_VERSION_DEPENDS}
${_MKMSG_CREATE} vers.c
- TOOL_DATE=${TOOL_DATE} ${HOST_SH} $S/conf/newvers.sh ${_NVFLAGS}
+ TOOL_AWK=${TOOL_AWK} TOOL_DATE=${TOOL_DATE} \
+ ${HOST_SH} $S/conf/newvers.sh ${_NVFLAGS}
${_MKTARGET_COMPILE}
${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c vers.c
${COMPILE_CTFCONVERT}
Index: src/sys/conf/newvers.sh
diff -u src/sys/conf/newvers.sh:1.63 src/sys/conf/newvers.sh:1.64
--- src/sys/conf/newvers.sh:1.63 Fri Apr 5 18:27:25 2024
+++ src/sys/conf/newvers.sh Wed May 1 10:52:01 2024
@@ -1,6 +1,6 @@
#!/bin/sh -
#
-# $NetBSD: newvers.sh,v 1.63 2024/04/05 22:27:25 christos Exp $
+# $NetBSD: newvers.sh,v 1.64 2024/05/01 14:52:01 christos Exp $
#
# Copyright (c) 1984, 1986, 1990, 1993
# The Regents of the University of California. All rights reserved.
@@ -134,7 +134,7 @@ source_lines()
else
cat
fi \
- | awk '{
+ | "${AWK}" '{
# awk does not care about whether or not the last line
# of input ends with a newline.
# Convert <backslash> to <backslash><backslash>.
@@ -154,6 +154,7 @@ if [ ! -e version ]; then
fi
DATE=${TOOL_DATE:-date}
+AWK=${TOOL_AWK:-awk}
Rflag=false
nflag=false
timestamp=
