summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoland McGrath <roland@redhat.com>1993-01-13 21:09:20 +0000
committerRoland McGrath <roland@redhat.com>1993-01-13 21:09:20 +0000
commitbb90ac7aef295136791c5276bcae9c912d35eacb (patch)
tree2bf38db81a2d00278f4d84829d65e00a89505ae7
parent4694e3fe2eb260599bc938b73074c80703692b49 (diff)
downloadgunmake-bb90ac7aef295136791c5276bcae9c912d35eacb.tar.gz
Formerly variable.c.~15~
-rw-r--r--variable.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/variable.c b/variable.c
index 181b76d..0729550 100644
--- a/variable.c
+++ b/variable.c
@@ -1,5 +1,5 @@
/* Internals of variables for GNU Make.
-Copyright (C) 1988, 1989, 1990, 1991, 1992 Free Software Foundation, Inc.
+Copyright (C) 1988, 1989, 1990, 1991, 1992, 1993 Free Software Foundation, Inc.
This file is part of GNU Make.
GNU Make is free software; you can redistribute it and/or modify
@@ -358,7 +358,7 @@ define_automatic_variables ()
v->export = v_export;
/* Don't let SHELL come from the environment. */
- if (*v->value == '\0' || (v->origin == o_env))
+ if (*v->value == '\0' || v->origin == o_env || v->origin == o_env_override)
{
free (v->value);
v->origin = o_file;