From 57cad0d1077986b8ee7261d8eb0d9474e7cca668 Mon Sep 17 00:00:00 2001
From: christos <christos@NetBSD.org>
Date: Mon, 11 Mar 1996 13:45:31 +0000
Subject: [PATCH] Jonathan Stone's fixes: main.c:	Remove double include
 of <sys/resource.h>; if MACHINE is defined, use 	that instead of uname.
 Makefile: Add util.c.

---
 usr.bin/make/Makefile | 4 ++--
 usr.bin/make/main.c   | 9 ++++++---
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/usr.bin/make/Makefile b/usr.bin/make/Makefile
index 1405f3ee50fa..744cdca70860 100644
--- a/usr.bin/make/Makefile
+++ b/usr.bin/make/Makefile
@@ -1,10 +1,10 @@
-#	$NetBSD: Makefile,v 1.9 1996/02/04 22:20:27 christos Exp $
+#	$NetBSD: Makefile,v 1.10 1996/03/11 13:45:31 christos Exp $
 #	@(#)Makefile	5.2 (Berkeley) 12/28/90
 
 PROG=	make
 CFLAGS+= -I${.CURDIR} -DPOSIX -DSYSVINCLUDE
 SRCS=	arch.c buf.c compat.c cond.c dir.c for.c hash.c job.c main.c \
-	make.c parse.c str.c suff.c targ.c var.c
+	make.c parse.c str.c suff.c targ.c var.c util.c
 SRCS+=	lstAppend.c lstAtEnd.c lstAtFront.c lstClose.c lstConcat.c \
 	lstDatum.c lstDeQueue.c lstDestroy.c lstDupl.c lstEnQueue.c \
 	lstFind.c lstFindFrom.c lstFirst.c lstForEach.c lstForEachFrom.c \
diff --git a/usr.bin/make/main.c b/usr.bin/make/main.c
index 1fb443fb8bad..de064b1b0610 100644
--- a/usr.bin/make/main.c
+++ b/usr.bin/make/main.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: main.c,v 1.25 1996/03/06 00:15:17 christos Exp $	*/
+/*	$NetBSD: main.c,v 1.26 1996/03/11 13:45:33 christos Exp $	*/
 
 /*
  * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -48,7 +48,7 @@ char copyright[] =
 #if 0
 static char sccsid[] = "@(#)main.c	5.25 (Berkeley) 4/1/91";
 #else
-static char rcsid[] = "$NetBSD: main.c,v 1.25 1996/03/06 00:15:17 christos Exp $";
+static char rcsid[] = "$NetBSD: main.c,v 1.26 1996/03/11 13:45:33 christos Exp $";
 #endif
 #endif /* not lint */
 
@@ -86,7 +86,6 @@ static char rcsid[] = "$NetBSD: main.c,v 1.25 1996/03/06 00:15:17 christos Exp $
 #include <sys/signal.h>
 #include <sys/stat.h>
 #include <sys/utsname.h>
-#include <sys/resource.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <stdio.h>
@@ -451,11 +450,15 @@ main(argc, argv)
 	 * MACHINE_ARCH is always known at compile time.
 	 */
     	if (!machine) {
+#ifndef MACHINE
 	    if (uname(&utsname) == -1) {
 		    perror("make: uname");
 		    exit(2);
 	    }
 	    machine = utsname.machine;
+#else
+	    machine = MACHINE;
+#endif
 	}
 
 	/*