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

Fixed how SHELL is set in Makefiles, fix make depend on linux

Browse Source
This commit is contained in:
Landon Curt Noll
2021-12-07 04:18:39 -08:00
parent 4b2ae40c86
commit faf40b7149
5 changed files with 24 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES
View File

@@ -25,6 +25,8 @@ The following are the changes from calc version 2.14.0.11 to date:
Fixed depend rule for custom/Makefile. Fixed depend rule for custom/Makefile.
Fixed how Makefile variable SHELL is set on macOS vs. linux.
The following are the changes from calc version 2.14.0.9 to 2.14.0.10: The following are the changes from calc version 2.14.0.9 to 2.14.0.10:

18
Makefile.ship
View File

@@ -53,9 +53,12 @@
# #
# SHELL= /bin/zsh # SHELL= /bin/zsh
# #
SHELL= /bin/sh SHELL= /bin/bash
#SHELL= /bin/bash #if 0 /* start of skip for non-Gnu makefiles */
#SHELL= /bin/zsh ifeq ($(target),Darwin)
SHELL:= /bin/zsh
endif
#endif /* end of skip for non-Gnu makefiles */
#if 0 /* start of skip for non-Gnu makefiles */ #if 0 /* start of skip for non-Gnu makefiles */
@@ -1255,7 +1258,7 @@ LANG= C
LDCONFIG= ldconfig LDCONFIG= ldconfig
LN= ln LN= ln
MAKE= make MAKE= make
MAKEDEPEND= /usr/bin/makedepend MAKEDEPEND= makedepend
MKDIR= mkdir MKDIR= mkdir
MV= mv MV= mv
PWDCMD= pwd PWDCMD= pwd
@@ -4202,11 +4205,6 @@ depend: hsrc custom/Makefile
else \ else \
${TRUE}; \ ${TRUE}; \
fi fi
${Q} if [ ! -x "${MAKEDEPEND}" ]; then \
echo "makedepend command not found: ${MAKEDEPEND}"; \
echo "aborting depend rule"; \
exit 1; \
fi
${V} echo '=-=-=-=-= Invoking depend rule for cscript =-=-=-=-=' ${V} echo '=-=-=-=-= Invoking depend rule for cscript =-=-=-=-='
${Q} cd cscript; ${MAKE} -f Makefile ${CSCRIPT_PASSDOWN} depend ${Q} cd cscript; ${MAKE} -f Makefile ${CSCRIPT_PASSDOWN} depend
${V} echo '=-=-=-=-= Back to the main Makefile for $@ rule =-=-=-=-=' ${V} echo '=-=-=-=-= Back to the main Makefile for $@ rule =-=-=-=-='
@@ -5101,7 +5099,7 @@ endif
#if 0 /* start of skip for non-Gnu makefiles */ #if 0 /* start of skip for non-Gnu makefiles */
ifdef ALLOW_CUSTOM ifdef ALLOW_CUSTOM
#endif /* end of skip for non-Gnu makefiles */ #endif /* end of skip for non-Gnu makefiles */
${V} echo 'XXX =-=-=-=-= Invoking $@ rule for custom =-=-=-=-=' ${V} echo '=-=-=-=-= Invoking $@ rule for custom =-=-=-=-='
${Q} cd custom; ${MAKE} -f Makefile ${CUSTOM_PASSDOWN} install ${Q} cd custom; ${MAKE} -f Makefile ${CUSTOM_PASSDOWN} install
${V} echo '=-=-=-=-= Back to the main Makefile for $@ rule =-=-=-=-=' ${V} echo '=-=-=-=-= Back to the main Makefile for $@ rule =-=-=-=-='
#if 0 /* start of skip for non-Gnu makefiles */ #if 0 /* start of skip for non-Gnu makefiles */

16
custom/Makefile
View File

@@ -72,9 +72,12 @@
# #
# SHELL= /bin/zsh # SHELL= /bin/zsh
# #
SHELL= /bin/sh SHELL= /bin/bash
#SHELL= /bin/bash #if 0 /* start of skip for non-Gnu makefiles */
#SHELL= /bin/zsh ifeq ($(target),Darwin)
SHELL:= /bin/zsh
endif
#endif /* end of skip for non-Gnu makefiles */
# PREFIX - Top level location for calc # PREFIX - Top level location for calc
@@ -515,7 +518,7 @@ FMT= fmt
GREP= egrep GREP= egrep
LN= ln LN= ln
MAKE= make MAKE= make
MAKEDEPEND= /usr/bin/makedepend MAKEDEPEND= makedepend
MKDIR= mkdir MKDIR= mkdir
MV= mv MV= mv
RM= rm RM= rm
@@ -1303,11 +1306,6 @@ depend:
else \ else \
${TRUE}; \ ${TRUE}; \
fi fi
${Q} if [ ! -x "${MAKEDEPEND}" ]; then \
echo "makedepend command not found: ${MAKEDEPEND}"; \
echo "aborting depend rule"; \
exit 1; \
fi
${Q} echo forming custom/skel ${Q} echo forming custom/skel
${Q} ${RM} -rf skel ${Q} ${RM} -rf skel
${Q} ${MKDIR} -p skel ${Q} ${MKDIR} -p skel

11
custom/Makefile.head
View File

@@ -72,9 +72,12 @@
# #
# SHELL= /bin/zsh # SHELL= /bin/zsh
# #
SHELL= /bin/sh SHELL= /bin/bash
#SHELL= /bin/bash #if 0 /* start of skip for non-Gnu makefiles */
#SHELL= /bin/zsh ifeq ($(target),Darwin)
SHELL:= /bin/zsh
endif
#endif /* end of skip for non-Gnu makefiles */
# PREFIX - Top level location for calc # PREFIX - Top level location for calc
@@ -515,7 +518,7 @@ FMT= fmt
GREP= egrep GREP= egrep
LN= ln LN= ln
MAKE= make MAKE= make
MAKEDEPEND= /usr/bin/makedepend MAKEDEPEND= makedepend
MKDIR= mkdir MKDIR= mkdir
MV= mv MV= mv
RM= rm RM= rm

5
custom/Makefile.tail
View File

@@ -193,11 +193,6 @@ depend:
else \ else \
${TRUE}; \ ${TRUE}; \
fi fi
${Q} if [ ! -x "${MAKEDEPEND}" ]; then \
echo "makedepend command not found: ${MAKEDEPEND}"; \
echo "aborting depend rule"; \
exit 1; \
fi
${Q} echo forming custom/skel ${Q} echo forming custom/skel
${Q} ${RM} -rf skel ${Q} ${RM} -rf skel
${Q} ${MKDIR} -p skel ${Q} ${MKDIR} -p skel