diff options
| author | Marc Espie <espie@cvs.openbsd.org> | 2000-04-03 02:58:47 +0000 |
|---|---|---|
| committer | Marc Espie <espie@cvs.openbsd.org> | 2000-04-03 02:58:47 +0000 |
| commit | b93b485c945f09a7194aa9016d1b243ce6375b08 (patch) | |
| tree | 0d76c3b938f827bebb4929cd8c20a30c27fc590d /usr.bin/make | |
| parent | 77d1c20804b44aa52edbe2e5cee6e13a7346e6be (diff) | |
Junk CDPATH from the environment.
Diffstat (limited to 'usr.bin/make')
| -rw-r--r-- | usr.bin/make/main.c | 6 | ||||
| -rw-r--r-- | usr.bin/make/make.1 | 5 |
2 files changed, 8 insertions, 3 deletions
diff --git a/usr.bin/make/main.c b/usr.bin/make/main.c index db83c32070b..22d15056940 100644 --- 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 bcf40e103e2..578eefae1d9 100644 --- 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 |