[src/trunk]: src/usr.bin/make Fix long-standing bug where, if an objdir exist...

[tv <tv%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/4092ecc18336
branches:  trunk
changeset: 517380:4092ecc18336
user:      tv <tv%NetBSD.org@localhost>
date:      Sun Nov 11 21:36:06 2001 +0000

description:
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).

diffstat:

 usr.bin/make/dir.c |  9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diffs (36 lines):

diff -r 8b3351d818aa -r 4092ecc18336 usr.bin/make/dir.c
--- a/usr.bin/make/dir.c        Sun Nov 11 21:21:02 2001 +0000
+++ b/usr.bin/make/dir.c        Sun Nov 11 21:36:06 2001 +0000
@@ -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 @@
        }
     }
 
-
-    if (cur && (file = DirLookup(cur, name, cp, hasSlash)) != NULL) {
+    if (cur && (file = DirLookupSubdir(cur, name)) != NULL) {
        if (*file)
            return file;
        else