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

minor Makefile changes

Browse Source 
Changes #! lines in Makefiles to "#!/usr/bin/env make".

Set SHELL in Makefiles to the basename of the shell.
This commit is contained in:
Landon Curt Noll
2023-02-16 16:47:01 -08:00
parent 11ddc30528
commit 644b348bcb
10 changed files with 83 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGES
View File

@@ -6,6 +6,10 @@ The following are the changes from calc version 2.14.2.3 to date:
build calc RPMs on a reference RHEL8.7 platform (formerly a RHEL7.9 build calc RPMs on a reference RHEL8.7 platform (formerly a RHEL7.9
platform). platform).
Changes #! lines in Makefiles to "#!/usr/bin/env make".
Set SHELL in Makefiles to the basename of the shell.
The following are the changes from calc version 2.14.2.0 to 2.14.1.2: The following are the changes from calc version 2.14.2.0 to 2.14.1.2:

20
Makefile
View File

@@ -1,8 +1,8 @@
#!/bin/make #!/usr/bin/env make
# #
# calc - arbitrary precision calculator # calc - arbitrary precision calculator
# #
# Copyright (C) 1999-2018,2021,2022 Landon Curt Noll # Copyright (C) 1999-2018,2021-2023 Landon Curt Noll
# #
# SRC: Makefile - top level Makefile # SRC: Makefile - top level Makefile
# #
@@ -49,6 +49,7 @@ ifndef EXCLUDE_FROM_CUSTOM_MAKEFILE
# The section continues until the next line that # # The section continues until the next line that #
# starts with a '# End skipping ..' comment line. # # starts with a '# End skipping ..' comment line. #
################################################### ###################################################
#endif /* end of skip for non-Gnu makefiles */
# Unfortunately due to the complex dependency issues between # Unfortunately due to the complex dependency issues between
# Makefile, Makefile.ship and custom/Makefile, parallel GNU make # Makefile, Makefile.ship and custom/Makefile, parallel GNU make
@@ -65,7 +66,8 @@ ifndef EXCLUDE_FROM_CUSTOM_MAKEFILE
# NOTE: You can force a target value by defining target as in: # NOTE: You can force a target value by defining target as in:
# #
# make ...__optional_arguments_... target=value # make ...__optional_arguments_... target=value
#
#if 0 /* start of skip for non-Gnu makefiles */
# Try uname -s if the target was not already set on the make command line # Try uname -s if the target was not already set on the make command line
# #
ifeq ($(target),) ifeq ($(target),)
@@ -80,9 +82,8 @@ endif
ifeq ($(MINGW),) ifeq ($(MINGW),)
MINGW=$(shell uname -o 2>/dev/null) MINGW=$(shell uname -o 2>/dev/null)
endif endif
#
#endif /* end of skip for non-Gnu makefiles */ #endif /* end of skip for non-Gnu makefiles */
#
# The shell used by this Makefile # The shell used by this Makefile
# #
# On some systems, /bin/sh is a rather reduced shell with # On some systems, /bin/sh is a rather reduced shell with
@@ -91,17 +92,17 @@ endif
# If your system has a up to date, bash shell, then # If your system has a up to date, bash shell, then
# you may wish to use: # you may wish to use:
# #
# SHELL= /bin/bash # SHELL= bash
# #
# On some systems such as macOS, the bash shell is very # On some systems such as macOS, the bash shell is very
# far behind to the point where is cannot be depended on. # far behind to the point where is cannot be depended on.
# On such systems, the sh may be a much better alternative # On such systems, the sh may be a much better alternative
# shell for this Makefile to use: # shell for this Makefile to use:
# #
# SHELL= /bin/sh # SHELL= sh
# #
SHELL= /bin/bash SHELL= bash
#SHELL= /bin/sh #SHELL= sh
#if 0 /* start of skip for non-Gnu makefiles */ #if 0 /* start of skip for non-Gnu makefiles */
# #
ifeq ($(target),Darwin) ifeq ($(target),Darwin)
@@ -118,6 +119,7 @@ endif
# #
#endif /* end of skip for non-Gnu makefiles */ #endif /* end of skip for non-Gnu makefiles */
############################################################################## ##############################################################################
#-=-=-=-=-=-=-=-=- You may want to change some values below -=-=-=-=-=-=-=-=-# #-=-=-=-=-=-=-=-=- You may want to change some values below -=-=-=-=-=-=-=-=-#
############################################################################## ##############################################################################

1
Makefile.local
View File

@@ -1,3 +1,4 @@
#!/usr/bin/env make
# #
# Makefile.local - local Makefile variables # Makefile.local - local Makefile variables
# #

30
Makefile.simple
View File

@@ -1,8 +1,8 @@
#!/bin/make #!/usr/bin/env make
# #
# calc - arbitrary precision calculator # calc - arbitrary precision calculator
# #
# Copyright (C) 1999-2018,2021,2022 Landon Curt Noll # Copyright (C) 1999-2018,2021-2023 Landon Curt Noll
# #
# SRC: Makefile.simple - non-GNU version # SRC: Makefile.simple - non-GNU version
# #
@@ -37,7 +37,24 @@
# #
# Unfortunately due to the complex dependency issues between
# Makefile, Makefile.ship and custom/Makefile, parallel GNU make
# is NOT recommended. Sorry.
# #
# XXX - fix this - XXX
#
.NOTPARALLEL:
##############################################################################
#-=-=-=-=-=-=-=-=- Identify the target machine, if possible -=-=-=-=-=-=-=-=-#
##############################################################################
# NOTE: You can force a target value by defining target as in:
#
# make ...__optional_arguments_... target=value
#
# The shell used by this Makefile # The shell used by this Makefile
# #
# On some systems, /bin/sh is a rather reduced shell with # On some systems, /bin/sh is a rather reduced shell with
@@ -46,17 +63,18 @@
# If your system has a up to date, bash shell, then # If your system has a up to date, bash shell, then
# you may wish to use: # you may wish to use:
# #
# SHELL= /bin/bash # SHELL= bash
# #
# On some systems such as macOS, the bash shell is very # On some systems such as macOS, the bash shell is very
# far behind to the point where is cannot be depended on. # far behind to the point where is cannot be depended on.
# On such systems, the sh may be a much better alternative # On such systems, the sh may be a much better alternative
# shell for this Makefile to use: # shell for this Makefile to use:
# #
# SHELL= /bin/sh # SHELL= sh
# #
SHELL= /bin/bash SHELL= bash
#SHELL= /bin/sh #SHELL= sh
############################################################################## ##############################################################################
#-=-=-=-=-=-=-=-=- You may want to change some values below -=-=-=-=-=-=-=-=-# #-=-=-=-=-=-=-=-=- You may want to change some values below -=-=-=-=-=-=-=-=-#

15
cal/Makefile
View File

@@ -1,8 +1,8 @@
#!/bin/make #!/usr/bin/env make
# #
# cal - makefile for calc standard resource files # cal - makefile for calc standard resource files
# #
# Copyright (C) 1999-2006,2017,2021,2022 Landon Curt Noll # Copyright (C) 1999-2006,2017,2021-2023 Landon Curt Noll
# #
# SRC: cal/Makefile # SRC: cal/Makefile
# #
@@ -44,20 +44,21 @@
# If your system has a up to date, bash shell, then # If your system has a up to date, bash shell, then
# you may wish to use: # you may wish to use:
# #
# SHELL= /bin/bash # SHELL= bash
# #
# On some systems such as macOS, the bash shell is very # On some systems such as macOS, the bash shell is very
# far behind to the point where is cannot be depended on. # far behind to the point where is cannot be depended on.
# On such systems, the sh may be a much better alternative # On such systems, the sh may be a much better alternative
# shell for this Makefile to use: # shell for this Makefile to use:
# #
# SHELL= /bin/sh # SHELL= sh
# #
SHELL= /bin/bash SHELL= bash
#SHELL= /bin/sh #SHELL= sh
#if 0 /* start of skip for non-Gnu makefiles */ #if 0 /* start of skip for non-Gnu makefiles */
#
ifeq ($(target),Darwin) ifeq ($(target),Darwin)
SHELL:= /bin/zsh SHELL:= /bin/sh
endif endif
#endif /* end of skip for non-Gnu makefiles */ #endif /* end of skip for non-Gnu makefiles */

14
cscript/Makefile
View File

@@ -1,7 +1,8 @@
#!/usr/bin/env make
# #
# cscript - makefile for calc shell script files # cscript - makefile for calc shell script files
# #
# Copyright (C) 1999-2006,2014,2017,2021,2022 Landon Curt Noll # Copyright (C) 1999-2006,2014,2017,2021-2023 Landon Curt Noll
# #
# SRC: cscript/Makefile # SRC: cscript/Makefile
# #
@@ -43,20 +44,21 @@
# If your system has a up to date, bash shell, then # If your system has a up to date, bash shell, then
# you may wish to use: # you may wish to use:
# #
# SHELL= /bin/bash # SHELL= bash
# #
# On some systems such as macOS, the bash shell is very # On some systems such as macOS, the bash shell is very
# far behind to the point where is cannot be depended on. # far behind to the point where is cannot be depended on.
# On such systems, the sh may be a much better alternative # On such systems, the sh may be a much better alternative
# shell for this Makefile to use: # shell for this Makefile to use:
# #
# SHELL= /bin/sh # SHELL= sh
# #
SHELL= /bin/bash SHELL= bash
#SHELL= /bin/sh #SHELL= sh
#if 0 /* start of skip for non-Gnu makefiles */ #if 0 /* start of skip for non-Gnu makefiles */
#
ifeq ($(target),Darwin) ifeq ($(target),Darwin)
SHELL:= /bin/zsh SHELL:= /bin/sh
endif endif
#endif /* end of skip for non-Gnu makefiles */ #endif /* end of skip for non-Gnu makefiles */

17
custom/Makefile
View File

@@ -1,8 +1,8 @@
#!/bin/make #!/usr/bin/env make
# #
# custom - makefile for calc custom routines # custom - makefile for calc custom routines
# #
# Copyright (C) 1999-2006,2014,2017-2018,2021 Landon Curt Noll # Copyright (C) 1999-2006,2014,2017-2018,2021,2023 Landon Curt Noll
# #
# SRC: custom/Makefile # SRC: custom/Makefile
# #
@@ -44,20 +44,21 @@
# If your system has a up to date, bash shell, then # If your system has a up to date, bash shell, then
# you may wish to use: # you may wish to use:
# #
# SHELL= /bin/bash # SHELL= bash
# #
# On some systems such as macOS, the bash shell is very # On some systems such as macOS, the bash shell is very
# far behind to the point where is cannot be depended on. # far behind to the point where is cannot be depended on.
# On such systems, the zsh may be a much better alternative # On such systems, the sh may be a much better alternative
# shell for this Makefile to use: # shell for this Makefile to use:
# #
# SHELL= /bin/zsh # SHELL= sh
# #
SHELL= /bin/bash SHELL= bash
#SHELL= /bin/sh #SHELL= sh
#if 0 /* start of skip for non-Gnu makefiles */ #if 0 /* start of skip for non-Gnu makefiles */
#
ifeq ($(target),Darwin) ifeq ($(target),Darwin)
SHELL:= /bin/zsh SHELL:= /bin/sh
endif endif
#endif /* end of skip for non-Gnu makefiles */ #endif /* end of skip for non-Gnu makefiles */

14
custom/Makefile.simple
View File

@@ -1,8 +1,8 @@
#!/bin/make #!/usr/bin/env make
# #
# custom - makefile for calc custom routines # custom - makefile for calc custom routines
# #
# Copyright (C) 1999-2006,2014,2017-2018,2021 Landon Curt Noll # Copyright (C) 1999-2006,2014,2017-2018,2021,2023 Landon Curt Noll
# #
# SRC: custom/Makefile.simple - non-GNU version # SRC: custom/Makefile.simple - non-GNU version
# #
@@ -44,17 +44,17 @@
# If your system has a up to date, bash shell, then # If your system has a up to date, bash shell, then
# you may wish to use: # you may wish to use:
# #
# SHELL= /bin/bash # SHELL= bash
# #
# On some systems such as macOS, the bash shell is very # On some systems such as macOS, the bash shell is very
# far behind to the point where is cannot be depended on. # far behind to the point where is cannot be depended on.
# On such systems, the zsh may be a much better alternative # On such systems, the sh may be a much better alternative
# shell for this Makefile to use: # shell for this Makefile to use:
# #
# SHELL= /bin/zsh # SHELL= sh
# #
SHELL= /bin/bash SHELL= bash
#SHELL= /bin/sh #SHELL= sh
# PREFIX - Top level location for calc # PREFIX - Top level location for calc

15
help/Makefile
View File

@@ -1,8 +1,8 @@
#!/bin/make #!/usr/bin/env make
# #
# help - makefile for calc help files # help - makefile for calc help files
# #
# Copyright (C) 1999-2006,2017,2021,2022 Landon Curt Noll # Copyright (C) 1999-2006,2017,2021-2023 Landon Curt Noll
# #
# SRC: help/Makefile # SRC: help/Makefile
# #
@@ -44,20 +44,21 @@
# If your system has a up to date, bash shell, then # If your system has a up to date, bash shell, then
# you may wish to use: # you may wish to use:
# #
# SHELL= /bin/bash # SHELL= bash
# #
# On some systems such as macOS, the bash shell is very # On some systems such as macOS, the bash shell is very
# far behind to the point where is cannot be depended on. # far behind to the point where is cannot be depended on.
# On such systems, the sh may be a much better alternative # On such systems, the sh may be a much better alternative
# shell for this Makefile to use: # shell for this Makefile to use:
# #
# SHELL= /bin/sh # SHELL= sh
# #
SHELL= /bin/bash SHELL= bash
#SHELL= /bin/sh #SHELL= sh
#if 0 /* start of skip for non-Gnu makefiles */ #if 0 /* start of skip for non-Gnu makefiles */
#
ifeq ($(target),Darwin) ifeq ($(target),Darwin)
SHELL:= /bin/zsh SHELL:= /bin/sh
endif endif
#endif /* end of skip for non-Gnu makefiles */ #endif /* end of skip for non-Gnu makefiles */

7
rpm.mk
View File

@@ -1,9 +1,8 @@
#!/bin/make #!/usr/bin/env make
#****h* calc/rpm.mk
# #
# rpm.mk - Makefile for building rpm packages for calc # rpm.mk - Makefile for building rpm packages for calc
# #
# Copyright (C) 2003,2014,2021 Petteri Kettunen and Landon Curt Noll # Copyright (C) 2003,2014,2021,2023 Petteri Kettunen and Landon Curt Noll
# #
# Calc is open software; you can redistribute it and/or modify it under # Calc is open software; you can redistribute it and/or modify it under
# the terms of the version 2.1 of the GNU Lesser General Public License # the terms of the version 2.1 of the GNU Lesser General Public License
@@ -63,7 +62,7 @@
# setup # setup
# #
SHELL= /bin/sh SHELL= bash
RPMBUILD_TOOL= rpmbuild RPMBUILD_TOOL= rpmbuild
TARCH= x86_64 TARCH= x86_64
RPMBUILD_OPTION= -ba --target=$(TARCH) --buildroot=${RPM_BUILD_ROOT} RPMBUILD_OPTION= -ba --target=$(TARCH) --buildroot=${RPM_BUILD_ROOT}