diff -r -c make-3.78.1-localshell\config.h.W32 ../../../unxutils/make-3.78.1\config.h.W32
*** make-3.78.1-localshell\config.h.W32	Thu Sep 12 16:18:02 2002
--- ../../../unxutils/make-3.78.1\config.h.W32	Thu Sep 12 16:40:29 2002
***************
*** 333,339 ****
  /* #undef HAVE_LIBSUN */
  
  /* Build host information. */
! #define MAKE_HOST "Windows32 - default sh.exe, local shell first"
  
  /*
   * Refer to README.W32 for info on the following settings
--- 333,339 ----
  /* #undef HAVE_LIBSUN */
  
  /* Build host information. */
! #define MAKE_HOST "Windows32"
  
  /*
   * Refer to README.W32 for info on the following settings
***************
*** 346,359 ****
   */
  #undef BATCH_MODE_ONLY_SHELL
  #define BATCH_MODE_ONLY_SHELL 1
- 
- /* WINDOWS32 only:
-  * First try to find the default shell sh.exe in the same directory
-  * where this make.exe lives. Only if the default shell is not found in
-  * the same directory as this make program, standard PATH.
-  */
- #undef TRY_LOCAL_SHELL_FIRST
- #define TRY_LOCAL_SHELL_FIRST 1
  
  /*
   * Define if you have the Cygnus "Cygwin" GNU Windows32 tool set.
--- 346,351 ----
diff -r -c make-3.78.1-localshell\main.c ../../../unxutils/make-3.78.1\main.c
*** make-3.78.1-localshell\main.c	Thu Sep 12 16:02:47 2002
--- ../../../unxutils/make-3.78.1\main.c	Thu Sep 12 16:40:29 2002
***************
*** 578,597 ****
    PATH_VAR(sh_path);
    extern char *default_shell;
  
!   if (!token) {
! #if defined(WINDOWS32) && defined(TRY_LOCAL_SHELL_FIRST)
!     /* first try to find the default shell sh.exe in the same directory
!      * where this make.exe lives. Only then search the standard PATH. */
!     extern char* get_sh_in_my_dir PARAMS ((char*));
!     search_token = get_sh_in_my_dir(default_shell);
!     if( !search_token || !file_exists_p(search_token) ) {
!       /* if it is not found in my own directory, try to find it in the PATH. */
!       search_token = default_shell;
!     }
! #else
      search_token = default_shell;
- #endif
-   }
    else
      search_token = token;
  
--- 578,585 ----
    PATH_VAR(sh_path);
    extern char *default_shell;
  
!   if (!token)
      search_token = default_shell;
    else
      search_token = token;