From f68d9de78d1c8ed186253fba72a609eca2f79a40 Mon Sep 17 00:00:00 2001 From: jdolecek Date: Fri, 12 Jan 2001 09:27:44 +0000 Subject: [PATCH] only print the 'duplicate script for target' warning if parseWarnFatal is on --- usr.bin/make/parse.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/usr.bin/make/parse.c b/usr.bin/make/parse.c index fd5d39d732c3..62222b6323e9 100644 --- a/usr.bin/make/parse.c +++ b/usr.bin/make/parse.c @@ -1,4 +1,4 @@ -/* $NetBSD: parse.c,v 1.56 2001/01/10 15:54:00 christos Exp $ */ +/* $NetBSD: parse.c,v 1.57 2001/01/12 09:27:44 jdolecek Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 @@ -39,14 +39,14 @@ */ #ifdef MAKE_BOOTSTRAP -static char rcsid[] = "$NetBSD: parse.c,v 1.56 2001/01/10 15:54:00 christos Exp $"; +static char rcsid[] = "$NetBSD: parse.c,v 1.57 2001/01/12 09:27:44 jdolecek Exp $"; #else #include #ifndef lint #if 0 static char sccsid[] = "@(#)parse.c 8.3 (Berkeley) 3/19/94"; #else -__RCSID("$NetBSD: parse.c,v 1.56 2001/01/10 15:54:00 christos Exp $"); +__RCSID("$NetBSD: parse.c,v 1.57 2001/01/12 09:27:44 jdolecek Exp $"); #endif #endif /* not lint */ #endif @@ -1596,10 +1596,12 @@ ParseAddCmd(gnp, cmd) gn = (GNode *) Lst_Datum (Lst_Last (gn->cohorts)); if (!(gn->type & OP_HAS_COMMANDS)) (void)Lst_AtEnd(gn->commands, cmd); - else + else if (parseWarnFatal) { Parse_Error (PARSE_WARNING, "duplicate script for target \"%s\" ignored", gn->name); + } + return(0); }