diff options
| author | jkh <jkh@FreeBSD.org> | 1997-08-27 06:31:27 +0000 |
|---|---|---|
| committer | jkh <jkh@FreeBSD.org> | 1997-08-27 06:31:27 +0000 |
| commit | f9bc029397a709b425651e92ed8f84b385e4e2c9 (patch) | |
| tree | 2db21a9dc77859cec005c3f08d2efa1752681ff5 /usr.bin/make | |
| parent | 510a917b8aa978dfa2815a806fa6561f0b61cb40 (diff) | |
| download | FreeBSD-src-f9bc029397a709b425651e92ed8f84b385e4e2c9.zip FreeBSD-src-f9bc029397a709b425651e92ed8f84b385e4e2c9.tar.gz | |
Don't preferentially execute Makefiles in ${OBJDIR} - it just causes
confusion and suffering. Tested by "make world".
Submitted by: gibbs
Diffstat (limited to 'usr.bin/make')
| -rw-r--r-- | usr.bin/make/main.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/usr.bin/make/main.c b/usr.bin/make/main.c index 84515c4..a01c4a7 100644 --- a/usr.bin/make/main.c +++ b/usr.bin/make/main.c @@ -47,7 +47,7 @@ static const char copyright[] = static char sccsid[] = "@(#)main.c 8.3 (Berkeley) 3/19/94"; #endif static const char rcsid[] = - "$Id: main.c,v 1.20 1997/08/14 19:24:11 fsmp Exp $"; + "$Id: main.c,v 1.21 1997/08/25 21:35:44 fsmp Exp $"; #endif /* not lint */ /*- @@ -834,8 +834,6 @@ ReadMakefile(p, q) Parse_File("(stdin)", stdin); Var_Set("MAKEFILE", "", VAR_GLOBAL); } else { - if ((stream = fopen(fname, "r")) != NULL) - goto found; /* if we've chdir'd, rebuild the path name */ if (curdir != objdir && *fname != '/') { (void)sprintf(path, "%s/%s", curdir, fname); @@ -843,7 +841,8 @@ ReadMakefile(p, q) fname = path; goto found; } - } + } else if ((stream = fopen(fname, "r")) != NULL) + goto found; /* look in -I and system include directories. */ name = Dir_FindFile(fname, parseIncPath); if (!name) |
