diff options
| author | sjg <sjg@FreeBSD.org> | 2013-09-05 15:57:26 +0000 |
|---|---|---|
| committer | sjg <sjg@FreeBSD.org> | 2013-09-05 15:57:26 +0000 |
| commit | 61d13f6983f254f54a424483966100812c5a5c36 (patch) | |
| tree | 11421e940bc58d36b4c59c4094bd98d6e21635b0 /contrib/bmake/main.c | |
| parent | 42eb0e69b4a01ca059fa4db4d572fa4154de4bb7 (diff) | |
| parent | 2abe6518e634d199cdd179ce1f2b3edce30a42e1 (diff) | |
| download | FreeBSD-src-61d13f6983f254f54a424483966100812c5a5c36.zip FreeBSD-src-61d13f6983f254f54a424483966100812c5a5c36.tar.gz | |
Merge bmake-20130904
Diffstat (limited to 'contrib/bmake/main.c')
| -rw-r--r-- | contrib/bmake/main.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/contrib/bmake/main.c b/contrib/bmake/main.c index f4445c9..45a45e0 100644 --- a/contrib/bmake/main.c +++ b/contrib/bmake/main.c @@ -1,4 +1,4 @@ -/* $NetBSD: main.c,v 1.222 2013/07/18 15:31:49 sjg Exp $ */ +/* $NetBSD: main.c,v 1.224 2013/09/04 15:38:26 sjg Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 @@ -69,7 +69,7 @@ */ #ifndef MAKE_NATIVE -static char rcsid[] = "$NetBSD: main.c,v 1.222 2013/07/18 15:31:49 sjg Exp $"; +static char rcsid[] = "$NetBSD: main.c,v 1.224 2013/09/04 15:38:26 sjg Exp $"; #else #include <sys/cdefs.h> #ifndef lint @@ -81,7 +81,7 @@ __COPYRIGHT("@(#) Copyright (c) 1988, 1989, 1990, 1993\ #if 0 static char sccsid[] = "@(#)main.c 8.3 (Berkeley) 3/19/94"; #else -__RCSID("$NetBSD: main.c,v 1.222 2013/07/18 15:31:49 sjg Exp $"); +__RCSID("$NetBSD: main.c,v 1.224 2013/09/04 15:38:26 sjg Exp $"); #endif #endif /* not lint */ #endif @@ -1414,7 +1414,7 @@ ReadMakefile(const void *p, const void *q MAKE_ATTR_UNUSED) if (!strcmp(fname, "-")) { Parse_File(NULL /*stdin*/, -1); - Var_Set("MAKEFILE", "", VAR_GLOBAL, 0); + Var_Set("MAKEFILE", "", VAR_INTERNAL, 0); } else { /* if we've chdir'd, rebuild the path name */ if (strcmp(curdir, objdir) && *fname != '/') { @@ -1463,7 +1463,7 @@ ReadMakefile(const void *p, const void *q MAKE_ATTR_UNUSED) */ found: if (!doing_depend) - Var_Set("MAKEFILE", fname, VAR_GLOBAL, 0); + Var_Set("MAKEFILE", fname, VAR_INTERNAL, 0); Parse_File(fname, fd); } free(path); |
