diff options
author | Roland McGrath <roland@redhat.com> | 1992-05-12 04:42:11 +0000 |
---|---|---|
committer | Roland McGrath <roland@redhat.com> | 1992-05-12 04:42:11 +0000 |
commit | 8486a30c74ab6c297973d4f1d034f29026388c39 (patch) | |
tree | b70394458e1fccdb71183da5842220e3e57caac8 | |
parent | 8696be1950e2e050ecb31fed88b9454d33545044 (diff) | |
download | gunmake-8486a30c74ab6c297973d4f1d034f29026388c39.tar.gz |
Formerly variable.c.~4~
-rw-r--r-- | variable.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -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); } } |