===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/make/main.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -c -r1.5 -r1.6
*** src/usr.bin/make/main.c	1996/02/23 18:32:56	1.5
--- src/usr.bin/make/main.c	1996/03/27 19:32:36	1.6
***************
*** 1,4 ****
! /*	$NetBSD: main.c,v 1.24 1996/02/04 22:20:49 christos Exp $	*/
  
  /*
   * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
--- 1,5 ----
! /*	$OpenBSD: main.c,v 1.6 1996/03/27 19:32:36 niklas 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.
***************
*** 47,54 ****
  #ifndef lint
  #if 0
  static char sccsid[] = "@(#)main.c	5.25 (Berkeley) 4/1/91";
  #else
! static char rcsid[] = "$NetBSD: main.c,v 1.24 1996/02/04 22:20:49 christos Exp $";
  #endif
  #endif /* not lint */
  
--- 48,56 ----
  #ifndef lint
  #if 0
  static char sccsid[] = "@(#)main.c	5.25 (Berkeley) 4/1/91";
+ static char rcsid[] = "$NetBSD: main.c,v 1.26 1996/03/11 13:45:33 christos Exp $";
  #else
! static char rcsid[] = "$OpenBSD: main.c,v 1.6 1996/03/27 19:32:36 niklas Exp $";
  #endif
  #endif /* not lint */
  
***************
*** 86,92 ****
  #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>
--- 88,93 ----
***************
*** 454,464 ****
--- 455,469 ----
  	 * 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
  	}
  
  	/*