From ea7b5c7aff24b73f4f3a67b3ddb7c4d82803f6d7 Mon Sep 17 00:00:00 2001 From: apb Date: Mon, 27 Oct 2008 20:58:08 +0000 Subject: [PATCH] Use ${TOOL_AWK}, no ${AWK}. --- regress/sys/kern/ipf/Makefile | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/regress/sys/kern/ipf/Makefile b/regress/sys/kern/ipf/Makefile index 7435c6029da6..0588b5d9bcbe 100644 --- a/regress/sys/kern/ipf/Makefile +++ b/regress/sys/kern/ipf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2008/06/02 11:48:38 darrenr Exp $ +# $NetBSD: Makefile,v 1.20 2008/10/27 20:58:08 apb Exp $ # # (C)opyright 1993-1996 by Darren Reed. # @@ -47,47 +47,47 @@ bpf: bpf1 bpf-f1 f1 f2 f3 f4 f5 f6 f7 f8 f9 f10 f11 f12 f13 f14 f19: @${HOST_SH} ${.CURDIR}/dotest ${.CURDIR} \ - `${AWK} "/^$@ / { print; } " ${.CURDIR}/test.format` + `${TOOL_AWK} "/^$@ / { print; } " ${.CURDIR}/test.format` f15 f16 f17 f18 f20 f24: @${HOST_SH} ${.CURDIR}/mtest ${.CURDIR} \ - `${AWK} "/^$@ / { print; } " ${.CURDIR}/test.format` + `${TOOL_AWK} "/^$@ / { print; } " ${.CURDIR}/test.format` i1 i2 i3 i4 i5 i6 i7 i8 i9 i10 i11 i12 i13 i14 i15 i16 i17 i18 i19 i20 i21 bpf1: @${HOST_SH} ${.CURDIR}/itest ${.CURDIR} \ - `${AWK} "/^$@ / { print; } " ${.CURDIR}/test.format` + `${TOOL_AWK} "/^$@ / { print; } " ${.CURDIR}/test.format` n1 n2 n3 n4 n5 n6 n7 n8 n9 n10 n11 n12 n13 n14 n16 n17: @${HOST_SH} ${.CURDIR}/nattest ${.CURDIR} \ - `${AWK} "/^$@ / { print; } " ${.CURDIR}/test.format` + `${TOOL_AWK} "/^$@ / { print; } " ${.CURDIR}/test.format` ni2 ni3 ni4 ni5 ni7 ni8 ni9 ni10 ni11 ni12 ni13 ni14 ni15 ni16 ni19 ni20: @${HOST_SH} ${.CURDIR}/natipftest ${.CURDIR} single \ - `${AWK} "/^$@ / { print; } " ${.CURDIR}/test.format` + `${TOOL_AWK} "/^$@ / { print; } " ${.CURDIR}/test.format` ni1 ni6 ni21 ni23: @${HOST_SH} ${.CURDIR}/natipftest ${.CURDIR} multi \ - `${AWK} "/^$@ / { print; } " ${.CURDIR}/test.format` + `${TOOL_AWK} "/^$@ / { print; } " ${.CURDIR}/test.format` in1 in2 in3 in4 in5 in6: @${HOST_SH} ${.CURDIR}/intest ${.CURDIR} \ - `${AWK} "/^$@ / { print; } " ${.CURDIR}/test.format` + `${TOOL_AWK} "/^$@ / { print; } " ${.CURDIR}/test.format` l1: @${HOST_SH} ${.CURDIR}/logtest ${.CURDIR} \ - `${AWK} "/^$@ / { print; } " ${.CURDIR}/test.format` + `${TOOL_AWK} "/^$@ / { print; } " ${.CURDIR}/test.format` ipv6.1 ipv6.2 ipv6.3 ipv6.5 ipv6.6: @${HOST_SH} ${.CURDIR}/dotest6 ${.CURDIR} \ - `${AWK} "/^$@ / { print; } " ${.CURDIR}/test.format` + `${TOOL_AWK} "/^$@ / { print; } " ${.CURDIR}/test.format` p1 p2 p3 p5: @${HOST_SH} ${.CURDIR}/ptest ${.CURDIR} \ - `${AWK} "/^$@ / { print; } " ${.CURDIR}/test.format` + `${TOOL_AWK} "/^$@ / { print; } " ${.CURDIR}/test.format` ip1: @${HOST_SH} ${.CURDIR}/iptest ${.CURDIR} \ - `${AWK} "/^$@ / { print; } " ${.CURDIR}/test.format` + `${TOOL_AWK} "/^$@ / { print; } " ${.CURDIR}/test.format` ${.OBJDIR}/input/ip2.data: @if [ ! -d ${.OBJDIR}/input ]; then \ @@ -107,11 +107,11 @@ ${.OBJDIR}/input/ip2.data: ip2: ${.OBJDIR}/input/ip2.data @${HOST_SH} ${.CURDIR}/iptest ${.CURDIR} \ - `${AWK} "/^$@ / { print; } " ${.CURDIR}/test.format` + `${TOOL_AWK} "/^$@ / { print; } " ${.CURDIR}/test.format` bpf-f1: @${HOST_SH} ${.CURDIR}/bpftest ${.CURDIR} \ - `${AWK} "/^$@ / { print; } " ${.CURDIR}/test.format` + `${TOOL_AWK} "/^$@ / { print; } " ${.CURDIR}/test.format` clean: /bin/rm -f f1 f2 f3 f4 f5 f6 f7 f8 f9 f10 f11 f12 f13 f14 f15 f16 f17 f18 f19 f20 f24