diff options
| author | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1998-01-28 12:41:52 +0000 |
|---|---|---|
| committer | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1998-01-28 12:41:52 +0000 |
| commit | fbd6c9ead48be65a615a557d3d9e610d26a02fb9 (patch) | |
| tree | 94a3ba4a8677356e381c248b9a368f7ed548a5c7 /usr.bin | |
| parent | d2d2a72135a2801084e26a82991316e8a3f4afbf (diff) | |
Use BSDmakefile in favour of [mM]akefile if existent. Good for
cases where you want BSDmake specific facilities not messing up other
implementations of make
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/make/main.c | 9 | ||||
| -rw-r--r-- | usr.bin/make/make.1 | 10 |
2 files changed, 11 insertions, 8 deletions
diff --git a/usr.bin/make/main.c b/usr.bin/make/main.c index a57654ef4dc..b23ed55fbaa 100644 --- a/usr.bin/make/main.c +++ b/usr.bin/make/main.c @@ -1,4 +1,4 @@ -/* $OpenBSD: main.c,v 1.12 1997/04/01 07:28:13 millert Exp $ */ +/* $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,7 +49,7 @@ static char copyright[] = #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 $"; +static char rcsid[] = "$OpenBSD: main.c,v 1.13 1998/01/28 12:41:50 niklas Exp $"; #endif #endif /* not lint */ @@ -693,8 +693,9 @@ main(argc, argv) 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); + } else if (!ReadMakefile("BSDmakefile", NULL)) + if (!ReadMakefile("makefile", NULL)) + (void)ReadMakefile("Makefile", NULL); (void)ReadMakefile(".depend", NULL); diff --git a/usr.bin/make/make.1 b/usr.bin/make/make.1 index 95fc514fc0d..09f852c98ad 100644 --- a/usr.bin/make/make.1 +++ b/usr.bin/make/make.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: make.1,v 1.11 1997/09/18 14:12:37 deraadt Exp $ +.\" $OpenBSD: make.1,v 1.12 1998/01/28 12:41:51 niklas Exp $ .\" $NetBSD: make.1,v 1.18 1997/03/10 21:19:53 christos Exp $ .\" .\" Copyright (c) 1990, 1993 @@ -60,11 +60,13 @@ is a program designed to simplify the maintenance of other programs. Its input is a list of specifications as to the files upon which programs and other files depend. If the file -.Ql Pa makefile +.Ql Pa BSDmakefile exists, it is read for this list of specifications. -If it does not exist, the file +If it does not exist, the files +.Ql Pa makefile +and .Ql Pa Makefile -is read. +are tried in order. If the file .Ql Pa .depend exists, it is read (see |