diff options
| author | Marc Espie <espie@cvs.openbsd.org> | 2007-09-16 12:30:36 +0000 |
|---|---|---|
| committer | Marc Espie <espie@cvs.openbsd.org> | 2007-09-16 12:30:36 +0000 |
| commit | 077e0b37b207ab0d204744e2ff7c4dbe44d4364e (patch) | |
| tree | e6c46d4371a0a0f8086f352a306980867bbfd6cb /usr.bin/make/parse.c | |
| parent | 2bf08dcae532bcaa033bbe04e5e6a2f942dc6c4e (diff) | |
rename dirSearchPath -> defaultPath, and openDirectories -> knownDirectories
Diffstat (limited to 'usr.bin/make/parse.c')
| -rw-r--r-- | usr.bin/make/parse.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/usr.bin/make/parse.c b/usr.bin/make/parse.c index 898e66d1644..0b94c89202d 100644 --- a/usr.bin/make/parse.c +++ b/usr.bin/make/parse.c @@ -1,5 +1,5 @@ /* $OpenPackages$ */ -/* $OpenBSD: parse.c,v 1.82 2007/09/16 10:57:02 espie Exp $ */ +/* $OpenBSD: parse.c,v 1.83 2007/09/16 12:30:35 espie Exp $ */ /* $NetBSD: parse.c,v 1.29 1997/03/10 21:20:04 christos Exp $ */ /* @@ -737,7 +737,7 @@ ParseDoDependency(char *line) /* the line to parse */ /* * Certain special targets have special semantics: - * .PATH Have to set the dirSearchPath + * .PATH Have to set the defaultPath * variable too * .MAIN Its sources are only used if * nothing has been specified to @@ -766,7 +766,7 @@ ParseDoDependency(char *line) /* the line to parse */ */ switch (specType) { case ExPath: - Lst_AtEnd(&paths, dirSearchPath); + Lst_AtEnd(&paths, defaultPath); break; case Main: if (!Lst_IsEmpty(create)) { @@ -1157,7 +1157,7 @@ resolve_include_filename(const char *file, bool isSystem) strchr(file, '\0'), '/'); fullname = Dir_FindFile(newName, parseIncPath); if (fullname == NULL) - fullname = Dir_FindFile(newName, dirSearchPath); + fullname = Dir_FindFile(newName, defaultPath); free(newName); if (fullname) return fullname; @@ -1170,7 +1170,7 @@ resolve_include_filename(const char *file, bool isSystem) fullname = Dir_FindFile(file, parseIncPath); if (fullname) return fullname; - fullname = Dir_FindFile(file, dirSearchPath); + fullname = Dir_FindFile(file, defaultPath); if (fullname) return fullname; |