Fixes for issue #130.

admb-project · Apr 18, 2020 · 1db0005 · 1db0005
1 parent 7e4e92e
commit 1db0005
Show file tree

Hide file tree

Showing 15 changed files with 645 additions and 16 deletions.
diff --git a/contrib/GNUmakefile b/contrib/GNUmakefile
@@ -2,7 +2,7 @@ ifeq ($(OS),Windows_NT)
   ifeq ($(SHELL),cmd)
     CMDSHELL=cmd
   else
-    ifneq ($(findstring bash.exe,$(shell where bash.exe 2>&1 | findstr bash.exe)),bash.exe)
+    ifneq ($(findstring sh.exe,$(shell where sh.exe 2>&1 | findstr sh.exe)),sh.exe)
       SHELL=cmd
       CMDSHELL=cmd
     endif

diff --git a/contrib/ad2csv/GNUmakefile b/contrib/ad2csv/GNUmakefile
@@ -4,7 +4,7 @@ ifeq ($(OS),Windows_NT)
   ifeq ($(SHELL),cmd)
     CMDSHELL=cmd
   else
-    ifeq ($(findstring bash.exe,$(shell where bash.exe 2>&1 | findstr bash.exe)),bash.exe)
+    ifeq ($(findstring sh.exe,$(shell where sh.exe 2>&1 | findstr sh.exe)),sh.exe)
       EXT=.sh
     else
       SHELL=cmd

diff --git a/contrib/admb-rules.mak b/contrib/admb-rules.mak
@@ -2,7 +2,7 @@ ifeq ($(OS),Windows_NT)
   ifeq ($(SHELL),cmd)
     CMDSHELL=cmd
   else
-    ifeq ($(findstring bash.exe,$(shell where bash.exe 2>&1 | findstr bash.exe)),bash.exe)
+    ifeq ($(findstring sh.exe,$(shell where sh.exe 2>&1 | findstr sh.exe)),sh.exe)
       EXT=.sh
     else
       SHELL=cmd

diff --git a/examples/GNUmakefile b/examples/GNUmakefile
@@ -4,7 +4,7 @@ ifeq ($(OS),Windows_NT)
   ifeq ($(SHELL),cmd)
       CMDSHELL=cmd
   else
-    ifneq ($(findstring bash.exe,$(shell where bash.exe 2>&1 | findstr bash.exe)),bash.exe)
+    ifneq ($(findstring sh.exe,$(shell where sh.exe 2>&1 | findstr sh.exe)),sh.exe)
       SHELL=cmd
       CMDSHELL=cmd
     endif

diff --git a/examples/admb/prof_like/GNUmakefile b/examples/admb/prof_like/GNUmakefile
@@ -2,7 +2,7 @@ ifeq ($(OS),Windows_NT)
   ifeq ($(SHELL),cmd)
     CMDSHELL=cmd
   else
-    ifeq ($(findstring bash.exe,$(shell where bash.exe 2>&1 | findstr bash.exe)),bash.exe)
+    ifeq ($(findstring sh.exe,$(shell where sh.exe 2>&1 | findstr sh.exe)),sh.exe)
       EXT=.sh
     else
       SHELL=cmd