From 8486a30c74ab6c297973d4f1d034f29026388c39 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Tue, 12 May 1992 04:42:11 +0000 Subject: [PATCH] Formerly variable.c.~4~ --- variable.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/variable.c b/variable.c index 16e5ada7..8a257fdb 100644 --- a/variable.c +++ b/variable.c @@ -370,13 +370,13 @@ define_automatic_variables () /* This won't override any definition, but it will provide one if there isn't one there. */ v = define_variable ("SHELL", 5, default_shell, o_default, 0); + v->export = 1; - /* Don't let SHELL come from the environment - if MAKELEVEL is 0. Also, SHELL must not be empty. */ - if (*v->value == '\0' || (v->origin == o_env && makelevel == 0)) + /* Don't let SHELL come from the environment. */ + if (*v->value == '\0' || (v->origin == o_env)) { v->origin = o_file; - v->value = savestring ("/bin/sh", 7); + v->value = savestring (default_shell, 7); } }