From: Roland McGrath <roland@redhat.com>
Date: Wed, 13 Jan 1993 21:09:20 +0000 (+0000)
Subject: Formerly variable.c.~15~
X-Git-Tag: 3.70.2~445
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bb90ac7aef295136791c5276bcae9c912d35eacb;p=thirdparty%2Fmake.git

Formerly variable.c.~15~
---

diff --git a/variable.c b/variable.c
index 181b76d3..07295503 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;