Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. =================================================================== RCS file: /ftp/cvs/cvsroot/src/usr.bin/make/make.c,v rcsdiff: /ftp/cvs/cvsroot/src/usr.bin/make/make.c,v: warning: Unknown phrases like `commitid ...;' are present. retrieving revision 1.62 retrieving revision 1.63 diff -u -p -r1.62 -r1.63 --- src/usr.bin/make/make.c 2006/03/31 21:05:34 1.62 +++ src/usr.bin/make/make.c 2006/09/23 20:51:28 1.63 @@ -1,4 +1,4 @@ -/* $NetBSD: make.c,v 1.62 2006/03/31 21:05:34 dsl Exp $ */ +/* $NetBSD: make.c,v 1.63 2006/09/23 20:51:28 dsl Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 @@ -69,14 +69,14 @@ */ #ifndef MAKE_NATIVE -static char rcsid[] = "$NetBSD: make.c,v 1.62 2006/03/31 21:05:34 dsl Exp $"; +static char rcsid[] = "$NetBSD: make.c,v 1.63 2006/09/23 20:51:28 dsl Exp $"; #else #include #ifndef lint #if 0 static char sccsid[] = "@(#)make.c 8.1 (Berkeley) 6/6/93"; #else -__RCSID("$NetBSD: make.c,v 1.62 2006/03/31 21:05:34 dsl Exp $"); +__RCSID("$NetBSD: make.c,v 1.63 2006/09/23 20:51:28 dsl Exp $"); #endif #endif /* not lint */ #endif @@ -1230,7 +1230,7 @@ Make_Run(Lst targs) */ while (!Lst_IsEmpty(toBeMade) || jobTokensRunning > 0) { Job_CatchOutput(); - Job_CatchChildren(!usePipes); + Job_CatchChildren(usePipes ? 0 : CATCH_BLOCK); (void)MakeStartJobs(); }