Fix calc(1) man page install uncer macOS

This commit is contained in:
Landon Curt Noll
2021-03-26 21:43:41 -07:00
parent 09d7080547
commit 3c866367c6
5 changed files with 48 additions and 44 deletions

2
BUGS
View File

@@ -116,8 +116,6 @@ of a context diff patch).
Known bugs in calc: Known bugs in calc:
Under macOS, the installation of the calc man page fails.
The output of the alg_config.cal resource file is bogus. The output of the alg_config.cal resource file is bogus.
We would welcome a replacement for this code. We would welcome a replacement for this code.

View File

@@ -25,6 +25,8 @@ The following are the changes from calc version 2.12.9.2 to date:
# SRC: ... some message about the origin ... # SRC: ... some message about the origin ...
Fixed how the calc(1) man page is installed under macOS.
The following are the changes from calc version 2.12.8.2 to 2.12.9.1: The following are the changes from calc version 2.12.8.2 to 2.12.9.1:

View File

@@ -4,7 +4,7 @@ IMPORTANT: Please see the section at the bottom of this file for
Installing calc from the bzip2-ed tarball in 4 easy steps: Installing calc from the bzip2-ed tarball in 4 easy steps:
0) If your platform supports i686 RPMs, you may want to go to: (0) If your platform supports i686 RPMs, you may want to go to:
http://www.isthe.com/chongo/src/calc/ http://www.isthe.com/chongo/src/calc/
@@ -29,7 +29,7 @@ Installing calc from the bzip2-ed tarball in 4 easy steps:
cd /var/tmp cd /var/tmp
bunzip2 -c /usr/src/redhat/SOURCES/calc-*.tar.bz2 | tar -xvf - bunzip2 -c /usr/src/redhat/SOURCES/calc-*.tar.bz2 | tar -xvf -
1) Look at the makefile, and adjust it to suit your needs. (1) Look at the makefile, and adjust it to suit your needs.
The top level Makefile and the custom/Makefile require a GNU The top level Makefile and the custom/Makefile require a GNU
Make (such as gmake) or an equivalently advanced make. On many Make (such as gmake) or an equivalently advanced make. On many
@@ -152,7 +152,7 @@ Installing calc from the bzip2-ed tarball in 4 easy steps:
Adjust other Makefile variables as needed. Adjust other Makefile variables as needed.
2) build calc: (2) build calc:
The top level Makefile and the custom/Makefile require a GNU The top level Makefile and the custom/Makefile require a GNU
Make (such as gmake) or an equivalently advanced make. On many Make (such as gmake) or an equivalently advanced make. On many
@@ -184,7 +184,7 @@ Installing calc from the bzip2-ed tarball in 4 easy steps:
make clobber make clobber
make calc-dynamic-only BLD_TYPE=calc-dynamic-only make calc-dynamic-only BLD_TYPE=calc-dynamic-only
3) test calc: (3) test calc:
make check make check
@@ -195,7 +195,7 @@ Installing calc from the bzip2-ed tarball in 4 easy steps:
make chk make chk
4) install calc: (4) install calc:
make install make install
@@ -369,6 +369,8 @@ custom/Makefile
... these go inbetween custom/Makefile.head and custom/Makefile.tail ... these go inbetween custom/Makefile.head and custom/Makefile.tail
# end of host target cut # end of host target cut
NOTE: The clobber rule does not remove this file. - XXX
custom/Makefile.simple custom/Makefile.simple
# SRC: non-GNU Makefile via make -f Makefile custom/Makefile.simple # SRC: non-GNU Makefile via make -f Makefile custom/Makefile.simple

View File

@@ -35,6 +35,11 @@
# calculator by David I. Bell with help/mods from others # calculator by David I. Bell with help/mods from others
# Makefile by Landon Curt Noll # Makefile by Landon Curt Noll
# Try uname -s if the target was not already set on the make command line
#
ifeq ($(target),)
target=$(shell uname -s 2>/dev/null)
endif
# The shell used by this Makefile # The shell used by this Makefile
# #
@@ -53,10 +58,15 @@
# #
# SHELL= /bin/zsh # SHELL= /bin/zsh
# #
#SHELL= /bin/sh ifeq ($(target),Darwin)
SHELL= /bin/zsh
else
SHELL= /bin/bash SHELL= /bin/bash
#SHELL= /bin/zsh endif
##############################################################################
#-=-=-=-=-=-=-=-=- You may want to change some values below -=-=-=-=-=-=-=-=-#
##############################################################################
# CCBAN is given to ${CC} in order to control if banned.h is in effect. # CCBAN is given to ${CC} in order to control if banned.h is in effect.
# #
@@ -93,17 +103,16 @@ SHELL= /bin/bash
CCBAN= -UUNBAN CCBAN= -UUNBAN
#CCBAN= -DUNBAN #CCBAN= -DUNBAN
# where man section 1 pages are installed
# Try uname -s if the target was not already set on the make command line
# #
ifeq ($(target),) #if 0 /* start of skip for non-Gnu makefiles */
target=$(shell uname -s 2>/dev/null) ifeq ($(target),Darwin)
MANDIR= /usr/local/share/man/man1
else
MANDIR= /usr/share/man/man1
#if 0 /* start of skip for non-Gnu makefiles */
endif endif
##############################################################################
#-=-=-=-=-=-=-=-=- You may want to change some values below -=-=-=-=-=-=-=-=-#
##############################################################################
# Determine of the GNU-readline facility will be used instead of the # Determine of the GNU-readline facility will be used instead of the
# built-in calc binding method. # built-in calc binding method.
# #
@@ -129,12 +138,6 @@ endif
#READLINE_INCLUDE= -I/usr/gnu/include #READLINE_INCLUDE= -I/usr/gnu/include
#READLINE_INCLUDE= -I/usr/local/include #READLINE_INCLUDE= -I/usr/local/include
# Where man pages are installed
#
# Under macOS, we cannot modify /usr/share/man.
#
MANDIR= /usr/local/man/man1
# Normally certain files depend on the Makefile. If the Makefile is # Normally certain files depend on the Makefile. If the Makefile is
# changed, then certain steps should be redone. If MAKE_FILE is # changed, then certain steps should be redone. If MAKE_FILE is
# set to Makefile, then these files will depend on Makefile. If # set to Makefile, then these files will depend on Makefile. If

View File

@@ -58,6 +58,26 @@ SHELL= /bin/sh
#SHELL= /bin/zsh #SHELL= /bin/zsh
#if 0 /* start of skip for non-Gnu makefiles */
##############################################################################
#-=-=-=-=-=-=-=-=- Identify the target machine, if possible -=-=-=-=-=-=-=-=-#
##############################################################################
# NOTE: You can force a target value by defining target as in:
#
# make ...__optional_arguments_... target=value
# Try uname -s if the target was not already set on the make command line
#
ifeq ($(target),)
target=$(shell uname -s 2>/dev/null)
endif
#endif /* end of skip for non-Gnu makefiles */
##############################################################################
#-=-=-=-=-=-=-=-=- You may want to change some values below -=-=-=-=-=-=-=-=-#
##############################################################################
# CCBAN is given to ${CC} in order to control if banned.h is in effect. # CCBAN is given to ${CC} in order to control if banned.h is in effect.
# #
# The banned.h attempts to ban the use of certain dangerous functions # The banned.h attempts to ban the use of certain dangerous functions
@@ -93,27 +113,6 @@ SHELL= /bin/sh
CCBAN= -UUNBAN CCBAN= -UUNBAN
#CCBAN= -DUNBAN #CCBAN= -DUNBAN
#if 0 /* start of skip for non-Gnu makefiles */
##############################################################################
#-=-=-=-=-=-=-=-=- Identify the target machine, if possible -=-=-=-=-=-=-=-=-#
##############################################################################
# NOTE: You can force a target value by defining target as in:
#
# make ...__optional_arguments_... target=value
# Try uname -s if the target was not already set on the make command line
#
ifeq ($(target),)
target=$(shell uname -s 2>/dev/null)
endif
#endif /* end of skip for non-Gnu makefiles */
##############################################################################
#-=-=-=-=-=-=-=-=- You may want to change some values below -=-=-=-=-=-=-=-=-#
##############################################################################
# Determine the type of terminal controls that you want to use # Determine the type of terminal controls that you want to use
# #
# value meaning # value meaning