Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix long-standing bug where, if an objdir exists, searching the .PATH for a 

file will strip any leading path on the filename when searching ${.CURDIR}.

This bug manifested itself more prominently with xsrc/xfree/xc/lib/GL/GL,
since we now always search ${.CURDIR} as an alternative to ${.OBJDIR}
(PR bin/14499).
This commit is contained in:
tv 2001-11-11 21:36:06 +00:00
parent 50a347501a
commit 2814f4901b
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
usr.bin/make/dir.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: dir.c,v 1.26 2000/04/16 23:24:04 christos Exp $ */
/* $NetBSD: dir.c,v 1.27 2001/11/11 21:36:06 tv Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@ -39,14 +39,14 @@
*/
#ifdef MAKE_BOOTSTRAP
static char rcsid[] = "$NetBSD: dir.c,v 1.26 2000/04/16 23:24:04 christos Exp $";
static char rcsid[] = "$NetBSD: dir.c,v 1.27 2001/11/11 21:36:06 tv Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)dir.c 8.2 (Berkeley) 1/2/94";
#else
__RCSID("$NetBSD: dir.c,v 1.26 2000/04/16 23:24:04 christos Exp $");
__RCSID("$NetBSD: dir.c,v 1.27 2001/11/11 21:36:06 tv Exp $");
#endif
#endif /* not lint */
#endif
@ -885,8 +885,7 @@ DirFindDot(hasSlash, name, cp)
}
}
if (cur && (file = DirLookup(cur, name, cp, hasSlash)) != NULL) {
if (cur && (file = DirLookupSubdir(cur, name)) != NULL) {
if (*file)
return file;
else