From: deraadt <deraadt@openbsd.org>
Date: Tue, 15 Jul 2014 23:07:19 +0000 (+0000)
Subject: remove support for the non-standard BSDmakefile, which make tries to
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=7c8e039b953a21c37b44a481b0a7b62a845164dc;p=openbsd

remove support for the non-standard BSDmakefile, which make tries to
open first.  a handful of strange ports will cope soon.
ok espie
---

diff --git a/usr.bin/make/main.c b/usr.bin/make/main.c
index 53089760b3b..7f2f0eeaaab 100644
--- a/usr.bin/make/main.c
+++ b/usr.bin/make/main.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: main.c,v 1.103 2014/05/15 19:40:42 chl Exp $ */
+/*	$OpenBSD: main.c,v 1.104 2014/07/15 23:07:19 deraadt Exp $ */
 /*	$NetBSD: main.c,v 1.34 1997/03/24 20:56:36 gwr Exp $	*/
 
 /*
@@ -578,8 +578,7 @@ read_all_make_rules(bool noBuiltins, bool read_depend,
 {
 	/*
 	 * Read in the built-in rules first, followed by the specified
-	 * makefile(s), or the default BSDmakefile, Makefile or
-	 * makefile, in that order.
+	 * makefile(s), or the default Makefile or makefile, in that order.
 	 */
 	if (!noBuiltins) {
 		LIST sysMkPath; 		/* Path of sys.mk */
@@ -594,9 +593,8 @@ read_all_make_rules(bool noBuiltins, bool read_depend,
 
 	if (!Lst_IsEmpty(makefiles)) {
 		read_makefile_list(makefiles, d);
-	} else if (!ReadMakefile("BSDmakefile", d))
-		if (!ReadMakefile("makefile", d))
-			(void)ReadMakefile("Makefile", d);
+	} else if (!ReadMakefile("makefile", d))
+		(void)ReadMakefile("Makefile", d);
 
 	/* read a .depend file, if it exists, and we're not building depend */
 
diff --git a/usr.bin/make/make.1 b/usr.bin/make/make.1
index 9d588d6c38d..343134714e8 100644
--- a/usr.bin/make/make.1
+++ b/usr.bin/make/make.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: make.1,v 1.113 2014/04/14 07:03:19 jmc Exp $
+.\"	$OpenBSD: make.1,v 1.114 2014/07/15 23:07:19 deraadt Exp $
 .\"	$NetBSD: make.1,v 1.18 1997/03/10 21:19:53 christos Exp $
 .\"
 .\" Copyright (c) 1990, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"	from: @(#)make.1	8.4 (Berkeley) 3/19/94
 .\"
-.Dd $Mdocdate: April 14 2014 $
+.Dd $Mdocdate: July 15 2014 $
 .Dt MAKE 1
 .Os
 .Sh NAME
@@ -61,11 +61,9 @@ By default, this
 .Ar makefile
 is determined as follows:
 first the file
-.Sq Pa BSDmakefile ,
-if it exists, then the files
 .Sq Pa makefile
-and
-.Sq Pa Makefile ,
+if it exists, then the file
+.Sq Pa Makefile
 in that order.
 If none of these files exist,
 .Nm
@@ -79,10 +77,8 @@ exists, it will also be read after the main
 .Xr mkdep 1 ) .
 .Pp
 The handling of
-.Sq Pa BSDmakefile
-and
 .Sq Pa .depend
-are
+is a
 .Bx
 extensions.
 .Pp
@@ -1466,11 +1462,8 @@ also ignores and unsets
 .Bl -tag -width /usr/share/mk -compact
 .It Pa .depend
 list of dependencies
-.It Pa BSDmakefile
-default makefile
 .It Pa makefile
-default makefile if
-.Pa BSDmakefile
+default makefile
 does not exist
 .It Pa Makefile
 default makefile if