drygdryg/calc
1
0
Fork 0
mirror of https://github.com/lcn2/calc.git synced 2025-08-19 01:13:27 +03:00
Code Issues Packages Projects Releases Wiki Activity

Add ${MSYS} to Makefile for Windows 11 MINGW64_NT users

Browse Source
This commit is contained in:
Landon Curt Noll
2022-02-12 11:18:49 -08:00
parent 80f13a4e45
commit d2cb03b4cc
3 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES
View File

@@ -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 .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: The following are the changes from calc version 2.14.0.14 to 2.14.0.14:

10
Makefile
View File

@@ -77,6 +77,9 @@ endif
ifeq ($(hardware),) ifeq ($(hardware),)
hardware=$(shell uname -m 2>/dev/null) hardware=$(shell uname -m 2>/dev/null)
endif endif
ifeq ($(MSYS),)
MSYS=$(shell uname -o 2>/dev/null)
endif
# #
#endif /* end of skip for non-Gnu makefiles */ #endif /* end of skip for non-Gnu makefiles */
# #
@@ -104,6 +107,9 @@ SHELL= /bin/bash
ifeq ($(target),Darwin) ifeq ($(target),Darwin)
SHELL:= /bin/sh SHELL:= /bin/sh
endif endif
ifeq ($(MSYS),Msys)
SHELL:= "git-bash.exe"
endif
# #
#endif /* end of skip for non-Gnu makefiles */ #endif /* end of skip for non-Gnu makefiles */
@@ -2197,6 +2203,7 @@ CUSTOM_PASSDOWN= \
MAKE_FILE=Makefile \ MAKE_FILE=Makefile \
MKDIR=${MKDIR} \ MKDIR=${MKDIR} \
MV=${MV} \ MV=${MV} \
MSYS=${MSYS} \
PREFIX="${PREFIX}" \ PREFIX="${PREFIX}" \
PURIFY="${PURIFY}" \ PURIFY="${PURIFY}" \
Q="${Q}" \ Q="${Q}" \
@@ -2249,6 +2256,7 @@ HELP_PASSDOWN= \
LIBDIR="${LIBDIR}" \ LIBDIR="${LIBDIR}" \
MAKE_FILE=Makefile \ MAKE_FILE=Makefile \
MKDIR=${MKDIR} \ MKDIR=${MKDIR} \
MSYS=${MSYS} \
MV=${MV} \ MV=${MV} \
PREFIX="${PREFIX}" \ PREFIX="${PREFIX}" \
Q="${Q}" \ Q="${Q}" \
@@ -2283,6 +2291,7 @@ CAL_PASSDOWN= \
LIBDIR="${LIBDIR}" \ LIBDIR="${LIBDIR}" \
MAKE_FILE=Makefile \ MAKE_FILE=Makefile \
MKDIR=${MKDIR} \ MKDIR=${MKDIR} \
MSYS=${MSYS} \
MV=${MV} \ MV=${MV} \
PREFIX="${PREFIX}" \ PREFIX="${PREFIX}" \
Q="${Q}" \ Q="${Q}" \
@@ -2318,6 +2327,7 @@ CSCRIPT_PASSDOWN= \
LIBDIR="${LIBDIR}" \ LIBDIR="${LIBDIR}" \
MAKE_FILE=Makefile \ MAKE_FILE=Makefile \
MKDIR=${MKDIR} \ MKDIR=${MKDIR} \
MSYS=${MSYS} \
MV=${MV} \ MV=${MV} \
PREFIX="${PREFIX}" \ PREFIX="${PREFIX}" \
Q="${Q}" \ Q="${Q}" \

4
Makefile.simple
View File

@@ -1615,6 +1615,7 @@ CUSTOM_PASSDOWN= \
MAKE_FILE=Makefile \ MAKE_FILE=Makefile \
MKDIR=${MKDIR} \ MKDIR=${MKDIR} \
MV=${MV} \ MV=${MV} \
MSYS=${MSYS} \
PREFIX="${PREFIX}" \ PREFIX="${PREFIX}" \
PURIFY="${PURIFY}" \ PURIFY="${PURIFY}" \
Q="${Q}" \ Q="${Q}" \
@@ -1667,6 +1668,7 @@ HELP_PASSDOWN= \
LIBDIR="${LIBDIR}" \ LIBDIR="${LIBDIR}" \
MAKE_FILE=Makefile \ MAKE_FILE=Makefile \
MKDIR=${MKDIR} \ MKDIR=${MKDIR} \
MSYS=${MSYS} \
MV=${MV} \ MV=${MV} \
PREFIX="${PREFIX}" \ PREFIX="${PREFIX}" \
Q="${Q}" \ Q="${Q}" \
@@ -1701,6 +1703,7 @@ CAL_PASSDOWN= \
LIBDIR="${LIBDIR}" \ LIBDIR="${LIBDIR}" \
MAKE_FILE=Makefile \ MAKE_FILE=Makefile \
MKDIR=${MKDIR} \ MKDIR=${MKDIR} \
MSYS=${MSYS} \
MV=${MV} \ MV=${MV} \
PREFIX="${PREFIX}" \ PREFIX="${PREFIX}" \
Q="${Q}" \ Q="${Q}" \
@@ -1736,6 +1739,7 @@ CSCRIPT_PASSDOWN= \
LIBDIR="${LIBDIR}" \ LIBDIR="${LIBDIR}" \
MAKE_FILE=Makefile \ MAKE_FILE=Makefile \
MKDIR=${MKDIR} \ MKDIR=${MKDIR} \
MSYS=${MSYS} \
MV=${MV} \ MV=${MV} \
PREFIX="${PREFIX}" \ PREFIX="${PREFIX}" \
Q="${Q}" \ Q="${Q}" \