===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/make/compat.c,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- src/usr.bin/make/compat.c	2012/03/22 13:47:12	1.76
+++ src/usr.bin/make/compat.c	2012/09/21 07:55:20	1.77
@@ -1,4 +1,4 @@
-/*	$OpenBSD: compat.c,v 1.76 2012/03/22 13:47:12 espie Exp $	*/
+/*	$OpenBSD: compat.c,v 1.77 2012/09/21 07:55:20 espie Exp $	*/
 /*	$NetBSD: compat.c,v 1.14 1996/11/06 17:59:01 christos Exp $	*/
 
 /*
@@ -43,6 +43,7 @@
 #include "defines.h"
 #include "dir.h"
 #include "engine.h"
+#include "job.h"
 #include "compat.h"
 #include "suff.h"
 #include "var.h"
@@ -161,7 +162,7 @@
 			 * the $> variable using Make_DoAllVar().
 			 */
 			Make_DoAllVar(sib);
-			cmdsOk = Job_CheckCommands(sib);
+			cmdsOk = node_find_valid_commands(sib);
 			if (cmdsOk || (gn->type & OP_OPTIONAL))
 				break;
 
@@ -179,7 +180,7 @@
 					Job_Touch(gn);
 			}
 		} else {
-			job_failure(gn, Fatal);
+			node_failure(gn);
 			sib->built_status = ERROR;
 		}
 
@@ -228,15 +229,7 @@
 		} else if (keepgoing)
 			pgn->must_make = false;
 		else {
-
-			if (gn->origin.lineno)
-				printf("\n\nStop in %s (line %lu of %s).\n",
-				    Var_Value(".CURDIR"),
-				    (unsigned long)gn->origin.lineno,
-				    gn->origin.fname);
-			else
-				printf("\n\nStop in %s.\n",
-				    Var_Value(".CURDIR"));
+			print_errors();
 			exit(1);
 		}
 	} else if (gn->built_status == ERROR)
@@ -271,16 +264,6 @@
 {
 	GNode	  *gn = NULL;	/* Current root target */
 	int 	  errors;   	/* Number of targets not remade due to errors */
-
-	setup_engine(0);
-	/* If the user has defined a .BEGIN target, execute the commands
-	 * attached to it.  */
-	if (!queryFlag) {
-		if (run_gnode(begin_node) == ERROR) {
-			printf("\n\nStop.\n");
-			exit(1);
-		}
-	}
 
 	/* For each entry in the list of targets to create, call CompatMake on
 	 * it to create the thing. CompatMake will leave the 'built_status'