--- src/usr.bin/make/main.c	2005/08/18 07:58:30	1.141
+++ src/usr.bin/make/main.c	2005/09/17 11:07:23	1.142
@@ -874,6 +874,7 @@ main(int argc, char **argv)
 {
 	CLI		cli;
 	Parser		parser;
+	Shell		*shell;
 	int		status;		/* exit status */
 	char		curdir[MAXPATHLEN];	/* startup directory */
 	char		objdir[MAXPATHLEN];	/* where we chdir'ed to */
@@ -912,11 +913,13 @@ main(int argc, char **argv)
 	cli.queryFlag = false;
 	cli.forceJobs = false;
 
+	shell = Shell_Match(DEFSHELLNAME);
+
 	/*
 	 * Initialize the various modules.
 	 */
 	Proc_Init();
-	Shell_Init(DEFSHELLNAME);
+	commandShell = shell;
 	Targ_Init();
 	Suff_Init();
 	Dir_Init();