From d2cb03b4cc81c74b6ce5f8bfc7235429d563f50a Mon Sep 17 00:00:00 2001
From: Landon Curt Noll <github-mail@asthe.com>
Date: Sat, 12 Feb 2022 11:18:49 -0800
Subject: [PATCH] Add ${MSYS} to Makefile for Windows 11 MINGW64_NT users

---
 CHANGES         |  3 +++
 Makefile        | 10 ++++++++++
 Makefile.simple |  4 ++++
 3 files changed, 17 insertions(+)

diff --git a/CHANGES b/CHANGES
index 1d40348..7d9ad12 100644
--- a/CHANGES
+++ b/CHANGES
@@ -23,6 +23,9 @@ The following are the changes from calc version 2.14.0.15 to date:
 
     Added .PHONY rule, just after all rule, to Makefiles.
 
+    Added ${MSYS} Makefile variable for users under Windows 11 who
+    use MINGW64_NT.
+
 
 The following are the changes from calc version 2.14.0.14 to 2.14.0.14:
 
diff --git a/Makefile b/Makefile
index 78ee76b..5b49b7d 100644
--- a/Makefile
+++ b/Makefile
@@ -77,6 +77,9 @@ endif
 ifeq ($(hardware),)
 hardware=$(shell uname -m 2>/dev/null)
 endif
+ifeq ($(MSYS),)
+MSYS=$(shell uname -o 2>/dev/null)
+endif
 #
 #endif	/* end of skip for non-Gnu makefiles */
 #
@@ -104,6 +107,9 @@ SHELL= /bin/bash
 ifeq ($(target),Darwin)
 SHELL:= /bin/sh
 endif
+ifeq ($(MSYS),Msys)
+SHELL:= "git-bash.exe"
+endif
 #
 #endif	/* end of skip for non-Gnu makefiles */
 
@@ -2197,6 +2203,7 @@ CUSTOM_PASSDOWN=  \
     MAKE_FILE=Makefile \
     MKDIR=${MKDIR} \
     MV=${MV} \
+    MSYS=${MSYS} \
     PREFIX="${PREFIX}" \
     PURIFY="${PURIFY}" \
     Q="${Q}" \
@@ -2249,6 +2256,7 @@ HELP_PASSDOWN= \
     LIBDIR="${LIBDIR}" \
     MAKE_FILE=Makefile \
     MKDIR=${MKDIR} \
+    MSYS=${MSYS} \
     MV=${MV} \
     PREFIX="${PREFIX}" \
     Q="${Q}" \
@@ -2283,6 +2291,7 @@ CAL_PASSDOWN= \
     LIBDIR="${LIBDIR}" \
     MAKE_FILE=Makefile \
     MKDIR=${MKDIR} \
+    MSYS=${MSYS} \
     MV=${MV} \
     PREFIX="${PREFIX}" \
     Q="${Q}" \
@@ -2318,6 +2327,7 @@ CSCRIPT_PASSDOWN= \
     LIBDIR="${LIBDIR}" \
     MAKE_FILE=Makefile \
     MKDIR=${MKDIR} \
+    MSYS=${MSYS} \
     MV=${MV} \
     PREFIX="${PREFIX}" \
     Q="${Q}" \
diff --git a/Makefile.simple b/Makefile.simple
index 40cb449..eb8ca27 100644
--- a/Makefile.simple
+++ b/Makefile.simple
@@ -1615,6 +1615,7 @@ CUSTOM_PASSDOWN=  \
     MAKE_FILE=Makefile \
     MKDIR=${MKDIR} \
     MV=${MV} \
+    MSYS=${MSYS} \
     PREFIX="${PREFIX}" \
     PURIFY="${PURIFY}" \
     Q="${Q}" \
@@ -1667,6 +1668,7 @@ HELP_PASSDOWN= \
     LIBDIR="${LIBDIR}" \
     MAKE_FILE=Makefile \
     MKDIR=${MKDIR} \
+    MSYS=${MSYS} \
     MV=${MV} \
     PREFIX="${PREFIX}" \
     Q="${Q}" \
@@ -1701,6 +1703,7 @@ CAL_PASSDOWN= \
     LIBDIR="${LIBDIR}" \
     MAKE_FILE=Makefile \
     MKDIR=${MKDIR} \
+    MSYS=${MSYS} \
     MV=${MV} \
     PREFIX="${PREFIX}" \
     Q="${Q}" \
@@ -1736,6 +1739,7 @@ CSCRIPT_PASSDOWN= \
     LIBDIR="${LIBDIR}" \
     MAKE_FILE=Makefile \
     MKDIR=${MKDIR} \
+    MSYS=${MSYS} \
     MV=${MV} \
     PREFIX="${PREFIX}" \
     Q="${Q}" \