Junk CDPATH from the environment.

diff --git a/usr.bin/make/main.c b/usr.bin/make/main.c
index db83c32..22d1505 100644 (file)
--- a/usr.bin/make/main.c
+++ b/usr.bin/make/main.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: main.c,v 1.29 2000/03/26 16:21:32 espie Exp $ */
+/*     $OpenBSD: main.c,v 1.30 2000/04/03 02:58:46 espie Exp $ */
 /*     $NetBSD: main.c,v 1.34 1997/03/24 20:56:36 gwr Exp $    */
 
 /*
@@ -49,7 +49,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)main.c     8.3 (Berkeley) 3/19/94";
 #else
-static char rcsid[] = "$OpenBSD: main.c,v 1.29 2000/03/26 16:21:32 espie Exp $";
+static char rcsid[] = "$OpenBSD: main.c,v 1.30 2000/04/03 02:58:46 espie Exp $";
 #endif
 #endif /* not lint */
 
@@ -586,6 +586,7 @@ main(argc, argv)
        }
 
        setenv("PWD", objdir, 1);
+       unsetenv("CDPATH");
 
        create = Lst_Init();
        makefiles = Lst_Init();
@@ -654,6 +655,7 @@ main(argc, argv)
 
        MainParseArgs(argc, argv);
 
+
        /*
         * Initialize archive, target and suffix modules in preparation for
         * parsing the makefile(s)

diff --git a/usr.bin/make/make.1 b/usr.bin/make/make.1
index bcf40e1..578eefa 100644 (file)
--- a/usr.bin/make/make.1
+++ b/usr.bin/make/make.1
@@ -1,4 +1,4 @@
-.\"    $OpenBSD: make.1,v 1.29 2000/03/11 21:40:07 aaron Exp $
+.\"    $OpenBSD: make.1,v 1.30 2000/04/03 02:58:46 espie Exp $
 .\"    $NetBSD: make.1,v 1.18 1997/03/10 21:19:53 christos Exp $
 .\"
 .\" Copyright (c) 1990, 1993
@@ -1162,6 +1162,9 @@ uses the following environment variables, if they exist:
 .Ev MAKEOBJDIRPREFIX ,
 and
 .Ev PWD .
+.Nm
+also ignores and unsets 
+.Ev CDPATH .
 .Sh FILES
 .Bl -tag -width /usr/share/mk -compact
 .It Pa .depend