From e0bccb6c180e1005e8edc1a1e20fca8349a6d6f5 Mon Sep 17 00:00:00 2001 From: apb Date: Sun, 19 Oct 2008 19:42:23 +0000 Subject: [PATCH] During the tools build (from src/tools/awk/Makefile), src/tools/Makefile.host changes .CURDIR back and forth between src/tools/awk and src/usr.bin/awk. For some unknown reason, including bsd.info.mk here leads to the obj dir being created at the wrong time, while .CURDIR is src/usr.bin/awk. Work around the problem by not including bsd.info.mk when MKINFO=no. --- usr.bin/awk/Makefile | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/usr.bin/awk/Makefile b/usr.bin/awk/Makefile index 8c166211f5e9..aeec914e74d0 100644 --- a/usr.bin/awk/Makefile +++ b/usr.bin/awk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2008/08/29 00:02:24 gmcgarry Exp $ +# $NetBSD: Makefile,v 1.11 2008/10/19 19:42:23 apb Exp $ .include @@ -19,5 +19,14 @@ COPTS= -Wno-pointer-sign .PATH: ${NETBSDSRCDIR}/gnu/dist/gawk TEXINFO= awk.info +# During the tools build (from src/tools/awk/Makefile), +# src/tools/Makefile.host changes .CURDIR back and forth between +# src/tools/awk and src/usr.bin/awk. For some unknown reason, including +# bsd.info.mk here leads to the obj dir being created at the wrong time, +# while .CURDIR is src/usr.bin/awk. Work around the problem by not +# including bsd.info.mk when MKINFO=no. +.if ${MKINFO} != "no" .include +.endif + .include