From 0b17d143bad61827a5b6e54772fb3fc3a33f765d Mon Sep 17 00:00:00 2001
From: Paul Smith <psmith@gnu.org>
Date: Sat, 13 Oct 2007 14:46:04 +0000
Subject: [PATCH] Windows: allow SHELL to be set to a more complex value by
checking its expansion to see if it's a valid shell, not just the unexpanded
value.
---
ChangeLog | 6 ++++++
variable.c | 19 ++++++++++++++++++-
2 files changed, 24 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
index 4fdf3746..fd801687 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-10-12 Eli Zaretskii <eliz@gnu.org>
+
+ * variable.c (do_variable_definition): Allow $(SHELL) to expand to
+ a more complex value than a simple shell: if it's not a default
+ shell now then expand it and see if is a default shell then.
+
2007-10-10 Eli Zaretskii <eliz@gnu.org>
* dir.c (find_directory) [WINDOWS32]: Remove trailing slashes from
diff --git a/variable.c b/variable.c
index d8f1b813..7f019884 100644
--- a/variable.c
+++ b/variable.c
@@ -1188,7 +1188,24 @@ do_variable_definition (const struct floc *flocp, const char *varname,
no_default_sh_exe = 0;
}
else
- v = lookup_variable (varname, strlen (varname));
+ {
+ if (alloc_value)
+ free (alloc_value);
+
+ alloc_value = allocated_variable_expand (p);
+ if (find_and_set_default_shell (alloc_value))
+ {
+ v = define_variable_in_set (varname, strlen (varname), p,
+ origin, flavor == f_recursive,
+ (target_var
+ ? current_variable_set_list->set
+ : NULL),
+ flocp);
+ no_default_sh_exe = 0;
+ }
+ else
+ v = lookup_variable (varname, strlen (varname));
+ }
}
else
#endif