jimzah/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src.git synced 2024-12-01 23:43:35 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Don't preferentially execute Makefiles in ${OBJDIR} - it just causes

Browse Source 
confusion and suffering.  Tested by "make world".
Submitted by:	gibbs
This commit is contained in:
Jordan K. Hubbard 1997-08-27 06:31:27 +00:00
parent 7d85a3e836
commit b1795946fd
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=28828
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
usr.bin/make/main.c
View File

@ -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)