===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/make/main.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -c -r1.12 -r1.13
*** src/usr.bin/make/main.c	1997/04/01 07:28:13	1.12
--- src/usr.bin/make/main.c	1998/01/28 12:41:50	1.13
***************
*** 1,4 ****
! /*	$OpenBSD: main.c,v 1.12 1997/04/01 07:28:13 millert Exp $	*/
  /*	$NetBSD: main.c,v 1.34 1997/03/24 20:56:36 gwr Exp $	*/
  
  /*
--- 1,4 ----
! /*	$OpenBSD: main.c,v 1.13 1998/01/28 12:41:50 niklas Exp $	*/
  /*	$NetBSD: main.c,v 1.34 1997/03/24 20:56:36 gwr Exp $	*/
  
  /*
***************
*** 49,55 ****
  #if 0
  static char sccsid[] = "@(#)main.c	8.3 (Berkeley) 3/19/94";
  #else
! static char rcsid[] = "$OpenBSD: main.c,v 1.12 1997/04/01 07:28:13 millert Exp $";
  #endif
  #endif /* not lint */
  
--- 49,55 ----
  #if 0
  static char sccsid[] = "@(#)main.c	8.3 (Berkeley) 3/19/94";
  #else
! static char rcsid[] = "$OpenBSD: main.c,v 1.13 1998/01/28 12:41:50 niklas Exp $";
  #endif
  #endif /* not lint */
  
***************
*** 693,700 ****
  		ln = Lst_Find(makefiles, (ClientData)NULL, ReadMakefile);
  		if (ln != NILLNODE)
  			Fatal("make: cannot open %s.", (char *)Lst_Datum(ln));
! 	} else if (!ReadMakefile("makefile", NULL))
! 		(void)ReadMakefile("Makefile", NULL);
  
  	(void)ReadMakefile(".depend", NULL);
  
--- 693,701 ----
  		ln = Lst_Find(makefiles, (ClientData)NULL, ReadMakefile);
  		if (ln != NILLNODE)
  			Fatal("make: cannot open %s.", (char *)Lst_Datum(ln));
! 	} else if (!ReadMakefile("BSDmakefile", NULL))
! 		if (!ReadMakefile("makefile", NULL))
! 			(void)ReadMakefile("Makefile", NULL);
  
  	(void)ReadMakefile(".depend", NULL);