Release v2.14.3.5

The following are the changes in this release: Under macOS, to reduce dependency chains, we remove functions and data that are unreachable by the entry point or exported symbols. In particular, the macOS linker is used with both "-dead_strip" and "-dead_strip_dylibs". The libcalc shared library is now linked with libcustcalc.
remove excess empty line from CHANGES
2025-08-22 01:23:28 +03:00 · 2023-08-17 14:37:50 -07:00 · 2023-08-17 14:30:30 -07:00 · 2023-08-17 14:28:52 -07:00 · 2023-08-17 14:23:29 -07:00 · 2023-08-14 23:09:46 -07:00
25 changed files with 2277 additions and 3044 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -7,27 +7,26 @@
 .dynamic
 .hsrc
 .static
-Makefile.our
-NOTES
 align32.h
 args.h
 cal/.all
 calc
-calc-static
 calc.1
-calc.usage
 calcerr.c
 calcerr.h
+calc.spec
+calc-static
+calc.usage
 charbit.h
 conf.h
-cscript/.all
 cscript/4dsphere
-cscript/README
+cscript/.all
 cscript/fproduct
 cscript/mersenne
 cscript/piforever
 cscript/plus
 cscript/powerterm
+cscript/README
 cscript/simple
 cscript/square
 custom/.all
@@ -69,8 +68,6 @@ have_unused.h
 have_urandom.h
 have_ustat.h
 help/.all
-help/COPYING
-help/COPYING-LGPL
 help/binding
 help/bindings
 help/bug
@@ -80,6 +77,8 @@ help/change
 help/changes
 help/contrib
 help/copy
+help/COPYING
+help/COPYING-LGPL
 help/cscript
 help/custom_cal
 help/errorcode
@@ -100,6 +99,8 @@ libcalc*
 libcustcalc*
 longbits
 longbits.h
+Makefile.our
+NOTES
 sample_many
 sample_many-static
 sample_rand
--- a/86
+++ b/86
@@ -1,4 +1,14 @@
-The following are the changes from calc version 2.14.3.1 to date:
+The following are the changes from calc version 2.14.3.4 to 2.14.3.5:
+
+    Under macOS, to reduce dependency chains, we remove functions
+    and data that are unreachable by the entry point or exported
+    symbols.  In particular, the macOS linker is used with both
+    "-dead_strip" and "-dead_strip_dylibs".
+
+    The libcalc shared library is now linked with libcustcalc.
+
+
+The following are the changes from calc version 2.14.3.0 to 2.14.3.4:

    Fix typo in the `make debug` Makefile rule.

@@ -31,18 +41,80 @@ The following are the changes from calc version 2.14.3.1 to date:

 	ALLOW_CUSTOM="-UCUSTOM"

-    Added comments in Makefile.local for how to reduce dependency chains
-    under macOS.  XXX - this doesn't yet work so don't uncomment - XXX.
-
    Dropped support of Makefile.simple and custom/Makefile.simple.
    The calc version 2.14.3.0 is the last release that supported
    the Makefile.simple and custom/Makefile.simple files.
    Now, a make that supports makefile conditional syntax is required.
+    The simple target, a target that only was used for Makefile.simple
+    was removed.
+
+    Moved makefile variables that configure calc and configure how to
+    compile calc from Makefile into a new Makefile.config file.
+
+    The Makeifle includes the Makefile.config file.
+    The cal/Makeifle includes the Makefile.config file.
+    The cscript/Makeifle includes the Makefile.config file.
+    The custom/Makeifle includes the Makefile.config file.
+    The help/Makeifle includes the Makefile.config file.
+
+    Now, the Makefile.config file will consistently configure
+    calc and how calc is compiled and built by all calc Makefiles.
+    The custom/Makefile no longer includes Makefile.

    The platform target section from the old Makefile has been moved
-    to a new file, Makefile.target.  The Makefile.target is shared
-    by both Makefile and custom/Makefile.  The custom/Makefile no
-    longer includes Makefile (instead it includes ../Makefile.target).
+    to a new file, Makefile.target.  Improved the format and comments
+    in target information.
+
+    The Makeifle includes the Makefile.target file.
+    The cal/Makeifle includes the Makefile.target file.
+    The cscript/Makeifle includes the Makefile.target file.
+    The custom/Makeifle includes the Makefile.target file.
+    The help/Makeifle includes the Makefile.target file.
+
+    Now, the Makefile.target file will consistently set
+    target information for all calc Makefiles.
+
+    The cal/Makeifle includes the Makefile.local file.
+    The cscript/Makeifle includes the Makefile.local file.
+    The custom/Makeifle includes the Makefile.local file.
+    The help/Makeifle includes the Makefile.local file.
+
+    Thus, one may modify or append many Makefile variables
+    in all calc Makefiles.
+
+    Removed the ${CAL_PASSDOWN}, ${HELP_PASSDOWN}, ${HELP_PASSDOWN},
+    ${CSCRIPT_PASSDOWN} Makefile variables as the new Makefile
+    include files keep Makefile variables in sync.
+
+    Fixed the ability of calc to compile when CUSTOM is undefined
+    (i.e., -UCUSTOM).  The libcustcalc is always built, regardless
+    of the $(ALLOW_CUSTOM} Makefile variable.  However when CUSTOM
+    is undefined, the bulk of custom functions are not defined.
+
+    Dropped the use of Makefile variable ${SET_INSTALL_NAME}.
+    Under macOS it was always needed, elsewhere it was not.
+
+    Added Makefile variable ${VER} to hold the calc major release version.
+    The calc major release version is a 3 level version (x.y.z).
+
+    Under macOS, the current version of both libcalc and libcustcalc
+    shared libraries are set to the current calc major release version.
+
+    Under macOS, to reduce dependency chains, we remove functions and
+    data that are unreachable by the entry point or exported symbols.
+    In particular, the macOS linker is used with "-dead_strip" by default.
+
+    While calc on macOS will execute if linker used with "-dead_strip_dylibs"
+    and CUSTOM is defined, other applications that use libcalc but not
+    libcustcalc (such as sample_many and sample_rand) will fail to execute
+    due to missile symbols.  Therefore "-dead_strip_dylibs" is not used
+    by default when ALLOW_CUSTOM is "-DCUSTOM" under macOS.
+    Thanks to GitHub user @TurtleWilly for bringing to our attention,
+    problems related to use of  "-dead_strip_dylibs".
+
+    When installing shared libraries, libcalc.x.y.z will be a link
+    to the libcalc shared library and libcustcalc.x.y.z will be a link
+    to the libcustcal shared library.


 The following are the changes from calc version 2.14.2.1 to 2.14.3.0:
--- a/HOWTO.INSTALL
+++ b/HOWTO.INSTALL
@@ -9,6 +9,7 @@ and see if there is a pre-compiled version of calc that you may install.
 Open up the 'Assets' tag below a given release and download these RPMs:

    * calc*.rpm
+
 	- all that is needed if you just want to use calc

 If your platform supports rpm and matches one of the "calc*.rpm" files, you
@@ -23,6 +24,7 @@ In addition, if your platform supports rpm and matches one of the
 files for use in other programs:

    * calc-devel-*.rpm
+
 	- calc *.h header and *.a lib files for use in other programs

 Alternately to the above github link, you might try looking at the RPMs under:
@@ -81,9 +83,6 @@ than the top of the master branch.

 ## Step 1: Makefile considerations

-Look at Makefile, and adjust it to suit your needs.
-
-

 ### IMPORTANT: Make support of conditional syntax required:

@@ -100,21 +99,48 @@ The Gnu Make is not required per-se, just a modern make tool
 that supports "Conditional syntax".


+### Review Makefiles

-### Suggestion: Modify Makefile.local instead of Makefile:
+Review Makefile.config and Makefile.target.
+
+If you are curious, review Makefile as well, although
+there may be little in the main Makefile that you may
+want to change.
+
+Consider modifying Makefile.local by replace values or
+appending values found in Makefile.config and Makefile.target.
+
+If you are adding custom functions, review custom/Makefile
+and modify custom/Makefile as needed.
+
+
+
+### Suggestion: Modify Makefile.local
+
+All Makefiles include Makefile.local just before the
+first and default all rule.  So Makefile.local may be
+used to modify, replace or append values to Makefile variables.

 In most cases, to change the way that calc is made, consider
-adding lines to Makefile.local instead of modifying Makefile.
+adding lines to Makefile.local instead of modifying other Makefiles.

-A recommened way to adjust it is to add lines to: Makefile.local
+A recommended way to adjust it is to add lines to: Makefile.local
 using the := syntax to replace values such as:

    DEBUG:= -O0 -g

 or by using the += syntax to append to values such as:

-    CFLAGS+= -UCUSTOM
+    DEBUG+= -ipa

+You can, of course, modify other Makefiles.  We only
+suggest using Makefile.local to minimize the number
+of source files you modify.
+
+And finally, you can always just add arguments to your
+make command line instead of modifying a Makefile.  For example:
+
+    make clobber all DEBUG="-O0 -g"


 ## readline package assumed by default:
@@ -167,6 +193,8 @@ or add to Makefile.local, these lines:
    READLINE_INCLUDE=
    READLINE_LIB=

+See the "Suggestion: Modify Makefile.local" section above for
+information on the Makefile.local file.


 ### Windows or a Windows-like environments:
@@ -230,6 +258,8 @@ instead of Makefile" above.  For example:

    T:= /var/tmp/testing

+See the "Suggestion: Modify Makefile.local" section above for
+information on the Makefile.local file.


 ### platform target section
@@ -286,11 +316,11 @@ See the BUGS file if you find any compiler warning or errors.

 You may run the calc regression test suite, after successfully compiling, by:

-	make check
+    make check

 For a more quiet check which only prints if something goes wrong, use:

-	make chk
+    make chk



--- a/1800
+++ b/1800
--- a/Makefile.config
+++ b/Makefile.config
--- a/Makefile.local
+++ b/Makefile.local
@@ -1,10 +1,34 @@
 #!/usr/bin/env make
 #
-# Makefile.local - local Makefile variables
+# Makefile.local - modify, replace or append calc Makefile variables
 #
-# This file is included by Makefile after the last Makefile is set and
-# before the first make rule.  This makes this file suitable to override
-# Makefile variables.
+# Copyright (C) 2023  Landon Curt Noll
+#
+# Suggestion: Read the HOWTO.INSTALL file.
+#
+# Calc is open software; you can redistribute it and/or modify it under
+# the terms of version 2.1 of the GNU Lesser General Public License
+# as published by the Free Software Foundation.
+#
+# Calc is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+# or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General
+# Public License for more details.
+#
+# A copy of version 2.1 of the GNU Lesser General Public License is
+# distributed with calc under the filename COPYING-LGPL.  You should have
+# received a copy with calc; if not, write to Free Software Foundation, Inc.
+# 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
+#
+# This calculator first developed by David I. Bell with help/mods from others.
+#
+# chongo <was here> /\oo/\	http://www.isthe.com/chongo/
+# Share and enjoy!  :-)		http://www.isthe.com/chongo/tech/comp/calc/
+
+####
+# This file is included all calc Makefiles after the last Makefile variable
+# is set and before the first make rule.  This makes this file suitable to
+# modify, replace or append Makefile variables.
 #
 # To replace a Makefile variable, use := symbols.  For example:
 #
@@ -85,13 +109,3 @@
 # LDFLAGS+= -Wno-invalid-command-line-argument ${FSANITIZE} -fno-omit-frame-pointer
 # CALC_ENV+= ASAN_OPTIONS=detect_stack_use_after_return=1
 ####
-
-####
-# To reduce dependency chains under macOS:
-#
-# This comment block was tested under:
-#
-#	macOS 13.5 with clang version 14.0.3 (clang-1403.0.22.14.1)
-#
-# LDFLAGS+= -Wl,-dead_strip_dylibs -Wl,-dead_strip
-####
--- a/Makefile.target
+++ b/Makefile.target
@@ -19,6 +19,17 @@
 # distributed with calc under the filename COPYING-LGPL.  You should have
 # received a copy with calc; if not, write to Free Software Foundation, Inc.
 # 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
+#
+# This calculator first developed by David I. Bell with help/mods from others.
+#
+# chongo <was here> /\oo/\	http://www.isthe.com/chongo/
+# Share and enjoy!  :-)		http://www.isthe.com/chongo/tech/comp/calc/
+
+
+# SUGGESTION: Instead of modifying this file, consider adding
+#	      statements to modify, replace or append Makefile
+#	      variables in the Makefile.local file.
+

 #######################################################################
 # NOTE: These lines are included by both Makefile and custom/Makefile #
@@ -86,44 +97,34 @@
 #
 # Specific target overrides or modifications to default values

+
 ################
 # Linux target #
 ################

 ifeq ($(target),Linux)
+
+# default build type for this target
 #
 BLD_TYPE= calc-dynamic-only
+
+# target specific library parameters
 #
 CC_SHARE= -fPIC
 DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:${PREFIX}/lib
 LD_SHARE= "-Wl,-rpath,${DEFAULT_LIB_INSTALL_PATH}" \
    "-Wl,-rpath-link,${DEFAULT_LIB_INSTALL_PATH}"
 LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
-ifeq ($(ALLOW_CUSTOM),-DCUSTOM)
 LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
-else
-LIBCUSTCALC_SHLIB=
-endif
+
+# static library option
 #
 CC_STATIC=
 LD_STATIC=
 LIBCALC_STATIC=
 LIBCUSTCALC_STATIC=
-#
-# If you want to add flags to all compiler and linker
-# run (via ${COMMON_CFLAGS} and ${COMMON_LDFLAGS}),
-# set ${COMMON_ADD}.
-#
-# For example to use gcc's -Werror to force warnings
-# to become errors, call make with:
-#
-#   make .. COMMON_ADD='-Werror'
-#
-# This facility requires a Gnu Makefile, or a make command
-# that understands the += make operand.
-#
-COMMON_CFLAGS+= ${COMMON_ADD}
-COMMON_LDFLAGS+= ${COMMON_ADD}
+
+# common values set for this target
 #
 #CCWARN= -Wall
 CCWARN= -Wall -Wextra -pedantic
@@ -133,73 +134,59 @@ WNO_LONG_LONG= -Wno-long-long
 CCWERR=
 CCOPT= ${DEBUG}
 CCMISC=
-#
 LCC= gcc
 CC= ${PURIFY} ${LCC} ${CCWERR}
-#
-endif
+
+endif	# ($(target),Linux)
+

 ###############################
 # Apple macOS / Darwin target #
 ###############################

+ifeq ($(target),Darwin)
+
+# default build type for this target
+#
+BLD_TYPE= calc-dynamic-only
+
 # For old Apple Power PC systems, we need to add:
 #
 #	-std=gnu99 -arch ppc
 #
 ifeq ($(arch),powerpc)
-COMMON_CFLAGS+= -std=gnu99
-COMMON_LDFLAGS+= -std=gnu99
+COMMON_ADD+= -std=gnu99
 ARCH_CFLAGS+= -arch ppc
-endif
+endif	# ($(arch),powerpc)

-ifeq ($(target),Darwin)
-#
-BLD_TYPE= calc-dynamic-only
+# target specific library parameters
 #
 CC_SHARE= -fPIC
 DEFAULT_LIB_INSTALL_PATH= ${PWD}:${LIBDIR}:${PREFIX}/lib
 LD_SHARE= ${ARCH_CFLAGS}
-#SET_INSTALL_NAME= no
-SET_INSTALL_NAME= yes
-ifeq ($(SET_INSTALL_NAME),yes)
-LIBCALC_SHLIB= -single_module -undefined dynamic_lookup -dynamiclib \
-    -install_name ${LIBDIR}/libcalc${LIB_EXT_VERSION} ${ARCH_CFLAGS}
-else
-LIBCALC_SHLIB= -single_module -undefined dynamic_lookup -dynamiclib \
+LIBCALC_SHLIB= -dynamiclib -undefined dynamic_lookup \
+    -install_name ${LIBDIR}/libcalc${LIB_EXT_VERSION} \
+    -current_version ${VER} \
    ${ARCH_CFLAGS}
-endif
-ifeq ($(ALLOW_CUSTOM),-DCUSTOM)
-ifeq ($(SET_INSTALL_NAME),yes)
-LIBCUSTCALC_SHLIB= -single_module -undefined dynamic_lookup -dynamiclib \
-    -install_name ${LIBDIR}/libcustcalc${LIB_EXT_VERSION} ${ARCH_CFLAGS}
-else
-LIBCUSTCALC_SHLIB= -single_module -undefined dynamic_lookup -dynamiclib \
+LIBCUSTCALC_SHLIB= -dynamiclib -undefined dynamic_lookup \
+    -install_name ${LIBDIR}/libcustcalc${LIB_EXT_VERSION} \
+    -current_version ${VER} \
    ${ARCH_CFLAGS}
-endif
-else
-LIBCUSTCALC_SHLIB=
-endif
+
+# To reduce dependency chains under macOS, we remove functions and
+# data that are unreachable by the entry point or exported symbols.
+#
+COMMON_LDFLAGS+= -Wl,-dead_strip
+COMMON_LDFLAGS+= -Wl,-dead_strip_dylibs
+
+# static library option
 #
 CC_STATIC=
 LD_STATIC= ${ARCH_CFLAGS}
 LIBCALC_STATIC=
 LIBCUSTCALC_STATIC=
-# If you want to add flags to all compiler and linker
-# run (via ${COMMON_CFLAGS} and ${COMMON_LDFLAGS}),
-# set ${COMMON_ADD}.
-#
-# For example to use clang's -fsanitize for calc testing,
-# which requires a common set of flags to be passed to
-# every compile and link, then call make with:
-#
-#   make .. COMMON_ADD='-fsanitize=undefined -fsanitize=address'
-#
-# This facility requires a Gnu Makefile, or a make command
-# that understands the += make operand.
-#
-COMMON_CFLAGS+= ${COMMON_ADD}
-COMMON_LDFLAGS+= ${COMMON_ADD}
+
+# common values set for this target
 #
 #CCWARN= -Wall
 CCWARN= -Wall -Wextra -pedantic
@@ -209,55 +196,46 @@ WNO_LONG_LONG= -Wno-long-long
 CCWERR=
 CCOPT= ${DEBUG}
 CCMISC= ${ARCH_CFLAGS}
-#
 LCC= cc
 CC= ${PURIFY} ${LCC} ${CCWERR}
-#
+
 # Darwin dynamic shared lib filenames
+#
 LIB_EXT:= .dylib
 LIB_EXT_VERSION:= .${VERSION}${LIB_EXT}
+
 # LDCONFIG not required on this platform, so we redefine it to an empty string
+#
 LDCONFIG:=
-endif
+
+endif	# ($(target),Darwin)
+

 ##################
 # FreeBSD target #
 ##################

 ifeq ($(target),FreeBSD)
+
+# default build type for this target
 #
 BLD_TYPE= calc-dynamic-only
+
+# target specific library parameters
 #
 CC_SHARE= -fPIC
 DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:${PREFIX}/lib
 LD_SHARE= "-Wl,-rpath,${DEFAULT_LIB_INSTALL_PATH}" \
    "-Wl,-rpath-link,${DEFAULT_LIB_INSTALL_PATH}"
 LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
-ifeq ($(ALLOW_CUSTOM),-DCUSTOM)
 LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
-else
-LIBCUSTCALC_SHLIB=
-endif
-#
+
 CC_STATIC=
 LD_STATIC=
 LIBCALC_STATIC=
 LIBCUSTCALC_STATIC=
-#
-# If you want to add flags to all compiler and linker
-# run (via ${COMMON_CFLAGS} and ${COMMON_LDFLAGS}),
-# set ${COMMON_ADD}.
-#
-# For example to use gcc's -Werror to force warnings
-# to become errors, call make with:
-#
-#   make .. COMMON_ADD='-Werror'
-#
-# This facility requires a Gnu Makefile, or a make command
-# that understands the += make operand.
-#
-COMMON_CFLAGS+= ${COMMON_ADD}
-COMMON_LDFLAGS+= ${COMMON_ADD}
+
+# common values set for this target
 #
 #CCWARN= -Wall
 CCWARN= -Wall -Wextra -pedantic
@@ -267,52 +245,44 @@ WNO_LONG_LONG= -Wno-long-long
 CCWERR=
 CCOPT= ${DEBUG}
 CCMISC=
-#
 LCC= gcc
 CC= ${PURIFY} ${LCC} ${CCWERR}
+
+# We must use gmake as the FreeBSD target because under some older
+# releases of FreeBSD, make not support conditional syntax.
 #
 MAKE= gmake
-#
-endif
+
+endif	# ($(target),FreeBSD)
+

 ##################
 # OpenBSD target #
 ##################

 ifeq ($(target),OpenBSD)
+
+# default build type for this target
 #
 BLD_TYPE= calc-dynamic-only
+
+# default build type for this target
 #
 CC_SHARE= -fPIC
 DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:${PREFIX}/lib
 LD_SHARE= "-Wl,-rpath,${DEFAULT_LIB_INSTALL_PATH}" \
    "-Wl,-rpath-link,${DEFAULT_LIB_INSTALL_PATH}"
 LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
-ifeq ($(ALLOW_CUSTOM),-DCUSTOM)
 LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
-else
-LIBCUSTCALC_SHLIB=
-endif
+
+# static library option
 #
 CC_STATIC=
 LD_STATIC=
 LIBCALC_STATIC=
 LIBCUSTCALC_STATIC=
-#
-# If you want to add flags to all compiler and linker
-# run (via ${COMMON_CFLAGS} and ${COMMON_LDFLAGS}),
-# set ${COMMON_ADD}.
-#
-# For example to use gcc's -Werror to force warnings
-# to become errors, call make with:
-#
-#   make .. COMMON_ADD='-Werror'
-#
-# This facility requires a Gnu Makefile, or a make command
-# that understands the += make operand.
-#
-COMMON_CFLAGS+= ${COMMON_ADD}
-COMMON_LDFLAGS+= ${COMMON_ADD}
+
+# common values set for this target
 #
 #CCWARN= -Wall
 CCWARN= -Wall -Wextra -pedantic
@@ -328,46 +298,34 @@ CC= ${PURIFY} ${LCC} ${CCWERR}
 #
 MAKE= gmake
 #
-endif
+endif	# ($(target),OpenBSD)
+

 #################
 # Cygwin target #
 #################

 ifeq ($(target),Cygwin)
-#
+
 BLD_TYPE= calc-static-only
+
+# target specific library parameters
 #
 CC_SHARE= -fPIC
 DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:${PREFIX}/lib
 LD_SHARE= "-Wl,-rpath,${DEFAULT_LIB_INSTALL_PATH}" \
    "-Wl,-rpath-link,${DEFAULT_LIB_INSTALL_PATH}"
 LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
-ifeq ($(ALLOW_CUSTOM),-DCUSTOM)
 LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
-else
-LIBCUSTCALC_SHLIB=
-endif
+
+# static library option
 #
 CC_STATIC=
 LIBCALC_STATIC=
 LIBCUSTCALC_STATIC=
 LD_STATIC=
-#
-# If you want to add flags to all compiler and linker
-# run (via ${COMMON_CFLAGS} and ${COMMON_LDFLAGS}),
-# set ${COMMON_ADD}.
-#
-# For example to use gcc's -Werror to force warnings
-# to become errors, call make with:
-#
-#   make .. COMMON_ADD='-Werror'
-#
-# This facility requires a Gnu Makefile, or a make command
-# that understands the += make operand.
-#
-COMMON_CFLAGS+= ${COMMON_ADD}
-COMMON_LDFLAGS+= ${COMMON_ADD}
+
+# common values set for this target
 #
 #CCWARN= -Wall
 CCWARN= -Wall -Wextra -pedantic
@@ -377,65 +335,11 @@ WNO_LONG_LONG= -Wno-long-long
 CCWERR=
 CCOPT= ${DEBUG}
 CCMISC=
-#
 LCC= cc
 CC= ${PURIFY} ${LCC} ${CCWERR}
-#
-endif

-#################
-# simple target #
-#################
+endif	# ($(target),Cygwin)

-# NOTE: This is not a real host target.  It is just a best
-#	attempt is a generic host not otherwise found above.
-
-ifeq ($(target),simple)
-#
-BLD_TYPE= calc-static-only
-#
-CC_SHARE= -fPIC
-DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:${PREFIX}/lib
-LD_SHARE= "-Wl,-rpath,${DEFAULT_LIB_INSTALL_PATH}" \
-    "-Wl,-rpath-link,${DEFAULT_LIB_INSTALL_PATH}"
-LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
-ifeq ($(ALLOW_CUSTOM),-DCUSTOM)
-LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
-else
-LIBCUSTCALC_SHLIB=
-endif
-#
-CC_STATIC=
-LD_STATIC=
-LIBCALC_STATIC=
-LIBCUSTCALC_STATIC=
-#
-#CCWARN= -Wall
-CCWARN= -Wall -Wextra -pedantic
-WNO_IMPLICT= -Wno-implicit
-WNO_ERROR_LONG_LONG= -Wno-error=long-long
-WNO_LONG_LONG= -Wno-long-long
-CCWERR=
-CCOPT= ${DEBUG}
-CCMISC=
-#
-LCC= cc
-CC= ${PURIFY} ${LCC} ${CCWERR}
-#
-# The simple makefile forces the use of static ${CC} flags
-#
-# ICFLAGS are given to ${CC} for intermediate programs used to help compile calc
-# CFLAGS are given to ${CC} for calc programs other than intermediate programs
-# ILDFLAGS for ${CC} in linking intermediate programs used to help compile calc
-# LDFLAGS for ${CC} in linking calc programs other than intermediate programs
-#
-ICFLAGS= ${COMMON_CFLAGS} ${CCBAN} ${CC_STATIC}
-CFLAGS= ${ICFLAGS} ${CCOPT}
-#
-ILDFLAGS= ${COMMON_LDFLAGS} ${LD_STATIC}
-LDFLAGS= ${LD_DEBUG} ${ILDFLAGS} ${LIBCALC_STATIC} ${LIBCUSTCALC_STATIC}
-#
-endif

 ###########################################
 # default target - (when target is empty) #
@@ -445,25 +349,47 @@ endif
 #	host target matches.

 ifeq ($(target),)
+
+# default build type for this target
 #
 BLD_TYPE= calc-static-only
+
+# target specific library parameters
 #
 CC_SHARE= -fPIC
 DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:${PREFIX}/lib
 LD_SHARE= "-Wl,-rpath,${DEFAULT_LIB_INSTALL_PATH}" \
    "-Wl,-rpath-link,${DEFAULT_LIB_INSTALL_PATH}"
 LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
-ifeq ($(ALLOW_CUSTOM),-DCUSTOM)
 LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
-else
-LIBCUSTCALC_SHLIB=
-endif
+
+# static library option
 #
 CC_STATIC=
 LIBCALC_STATIC=
 LIBCUSTCALC_STATIC=
 LD_STATIC=
+
+# common values set for this target
 #
+#CCWARN= -Wall
+CCWARN= -Wall -Wextra -pedantic
+WNO_IMPLICT= -Wno-implicit
+WNO_ERROR_LONG_LONG= -Wno-error=long-long
+WNO_LONG_LONG= -Wno-long-long
+CCWERR=
+CCOPT= ${DEBUG}
+CCMISC=
+LCC= gcc
+CC= ${PURIFY} ${LCC} ${CCWERR}
+
+endif	# ($(target),)
+
+
+###########################################
+# Set the default compile flags for ${CC} #
+###########################################
+
 # If you want to add flags to all compiler and linker
 # run (via ${COMMON_CFLAGS} and ${COMMON_LDFLAGS}),
 # set ${COMMON_ADD}.
@@ -478,23 +404,6 @@ LD_STATIC=
 #
 COMMON_CFLAGS+= ${COMMON_ADD}
 COMMON_LDFLAGS+= ${COMMON_ADD}
-#
-#CCWARN= -Wall
-CCWARN= -Wall -Wextra -pedantic
-WNO_IMPLICT= -Wno-implicit
-WNO_ERROR_LONG_LONG= -Wno-error=long-long
-WNO_LONG_LONG= -Wno-long-long
-CCWERR=
-CCOPT= ${DEBUG}
-CCMISC=
-#
-LCC= gcc
-CC= ${PURIFY} ${LCC} ${CCWERR}
-endif
-
-###########################################
-# Set the default compile flags for ${CC} #
-###########################################

 # Required flags to compile C files for calc
 #
@@ -505,9 +414,9 @@ endif
 #
 ifeq ($(BLD_TYPE),calc-static-only)
 ICFLAGS= ${COMMON_CFLAGS} ${CCBAN} ${CC_STATIC}
-else
+else	# ($(BLD_TYPE),calc-static-only)
 ICFLAGS= ${COMMON_CFLAGS} ${CCBAN} ${CC_SHARE}
-endif
+endif	# ($(BLD_TYPE),calc-static-only)
 CFLAGS= ${ICFLAGS} ${CCOPT}

 # Required flags to link files for calc
--- a/cal/Makefile
+++ b/cal/Makefile
@@ -4,13 +4,7 @@
 #
 # Copyright (C) 1999-2006,2017,2021-2023  Landon Curt Noll
 #
-# SRC: cal/Makefile
-#
-#	The "# SRC: ... - ..." comment line above indicates
-#	the origin of this file.
-#
-# IMPORTANT: Please see the section on Makefiles near the
-#	     bottom of the HOWTO.INSTALL file.
+# Suggestion: Read the ../HOWTO.INSTALL file.
 #
 # 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
@@ -29,184 +23,64 @@
 # Under source code control:	1991/07/21 05:00:54
 # File existed as early as:	1991
 #
+# This calculator first developed by David I. Bell with help/mods from others.
+#
 # chongo <was here> /\oo/\	http://www.isthe.com/chongo/
-# Share and enjoy!  :-) http://www.isthe.com/chongo/tech/comp/calc/
-#
-# calculator by David I. Bell with help/mods from others
-# Makefile by Landon Curt Noll
+# Share and enjoy!  :-)		http://www.isthe.com/chongo/tech/comp/calc/


-# The shell used by this Makefile
-#
-# On some systems, /bin/sh is a rather reduced shell with
-# deprecated behavior.
-#
-# If your system has a up to date, bash shell, then
-# you may wish to use:
-#
-#	SHELL= bash
-#
-# On some systems such as macOS, the bash shell is very
-# far behind to the point where is cannot be depended on.
-# On such systems, the sh may be a much better alternative
-# shell for this Makefile to use:
-#
-#	SHELL= sh
-#
-SHELL= bash
-#SHELL= sh
-#if 0	/* start of skip for non-Gnu makefiles */
-#
-ifeq ($(target),Darwin)
-SHELL:= /bin/sh
-endif
-#endif	/* end of skip for non-Gnu makefiles */
+# SUGGESTION: Instead of modifying this file, consider adding
+#	      statements to modify, replace or append Makefile
+#	      variables in the ../Makefile.local file.


-####
-# Normally, the upper level makefile will set these values.  We provide
-# a default here just in case you want to build from this directory.
-####
-
-# PREFIX - Top level location for calc
-#
-# The PREFIX is often prepended to paths within calc and calc Makefiles.
-#
-# Starting with calc v2.13.0.1, nearly all Makefile places that used
-# /usr/local now use ${PREFIX}.  An exception is the olduninstall rule
-# and, of course, this section. :-)
-#
-# NOTE: The ${PREFIX} is not the same as ${T}.  The ${T} specifies
-#	a top level directory under which calc installs things.
-#	While usually ${T} is empty, it can be specific path
-#	as if calc where "chrooted" during an install.
-#	The ${PREFIX} value, during install, is a path between
-#	the top level ${T} install directory and the object
-#	such as an include file.
-#
-# NOTE: See also, ${T}, below.
-#
-# There are some paths that do NOT call under ${PREFIX}, such as
-# ${CALCPATH}, that include paths not under ${PREFIX}, but those
-# too are exceptions to this general rule.
-#
-# When in doubt, try:
-#
-#	PREFIX= /usr/local
-#
-PREFIX= /usr/local
-#PREFIX= /usr
-#PREFIX= /usr/global
+###########################################
+# Files used or included by this Makefile #
+###########################################

 # Normally certain files depend on the Makefile.  If the Makefile is
 # changed, then certain steps should be redone.  If MAKE_FILE is
 # set to Makefile, then these files will depend on Makefile.  If
-# MAKE_FILE is empty, then they wont.
+# MAKE_FILE is empty, then they won't.
 #
 # If in doubt, set MAKE_FILE to Makefile
 #
 MAKE_FILE= Makefile

-# Where the system include (.h) files are kept
-#
-# For DJGPP, select:
-#
-#	INCDIR= /dev/env/DJDIR/include
-#
-# If in doubt, set:
-#
-#	INCDIR= /usr/include
+# Calc configuration and compile configuration values
 #
+CONFIG_MKF= ../Makefile.config

-#INCDIR= ${PREFIX}/include
-#INCDIR= /dev/env/DJDIR/include
-INCDIR= /usr/include
+# Host target information.
+#
+TARGET_MKF= ../Makefile.target

-# where to install calc related things
+# Local file that is included just prior to the first rule,
+# that allows one to override any values set in this Makefile.
 #
-# ${BINDIR}		where to install calc binary files
-# ${LIBDIR}		where calc link library (*.a) files are installed
-# ${CALC_SHAREDIR}	where to install calc help, .cal, startup, config files
-#
-# NOTE: The install rule prepends installation paths with ${T}, which
-#	by default is empty.  If ${T} is non-empty, then installation
-#	locations will be relative to the ${T} directory.
-#
-# For DJGPP, select:
-#
-#	BINDIR= /dev/env/DJDIR/bin
-#	LIBDIR= /dev/env/DJDIR/lib
-#	CALC_SHAREDIR= /dev/env/DJDIR/share/calc
-#
-# If in doubt, set:
-#
-#	BINDIR= /usr/bin
-#	LIBDIR= /usr/lib
-#	CALC_SHAREDIR= /usr/share/calc
-#
-#BINDIR= ${PREFIX}/bin
-#BINDIR= /dev/env/DJDIR/bin
-BINDIR= /usr/bin
+LOCAL_MKF= ../Makefile.local

-#LIBDIR= ${PREFIX}/lib
-#LIBDIR= /dev/env/DJDIR/lib
-LIBDIR= /usr/lib
+# The set of Makefiles
+#
+MK_SET= ${MAKE_FILE} ${CONFIG_MKF} ${TARGET_MKF} ${LOCAL_MKF}

-#CALC_SHAREDIR= ${PREFIX}/lib/calc
-#CALC_SHAREDIR= /dev/env/DJDIR/share/calc
-CALC_SHAREDIR= /usr/share/calc

-# By default, these values are based CALC_SHAREDIR, INCDIR, BINDIR
-# ---------------------------------------------------------------
-# ${HELPDIR}		where the help directory is installed
-# ${CALC_INCDIR}	where the calc include files are installed
-# ${SCRIPTDIR}		where calc shell scripts are installed
-#
-# NOTE: The install rule prepends installation paths with ${T}, which
-#	by default is empty.  If ${T} is non-empty, then installation
-#	locations will be relative to the ${T} directory.
-#
-# If in doubt, set:
-#
-#	HELPDIR= ${CALC_SHAREDIR}/help
-#	CALC_INCDIR= ${INCDIR}/calc
-#	SCRIPTDIR= ${BINDIR}/cscript
-#
-HELPDIR= ${CALC_SHAREDIR}/help
-CALC_INCDIR= ${INCDIR}/calc
-SCRIPTDIR= ${BINDIR}/cscript
+#######################################################
+# Calc configuration and compile configuration values #
+#######################################################
+include ${CONFIG_MKF}
+
+
+###############################
+# host target section include #
+###############################
+include ${TARGET_MKF}
+
+
+##########################################################################
+#=-=-=-=-=- Be careful if you change something below this line -=-=-=-=-=#
+##########################################################################

-# T - top level directory under which calc will be installed
-#
-# The calc install is performed under ${T}, the calc build is
-# performed under /.	The purpose for ${T} is to allow someone
-# to install calc somewhere other than into the system area.
-#
-# For example, if:
-#
-#     BINDIR= /usr/bin
-#     LIBDIR= /usr/lib
-#     CALC_SHAREDIR= /usr/share/calc
-#
-# and if:
-#
-#     T= /var/tmp/testing
-#
-# Then the installation locations will be:
-#
-#     calc binary files:	/var/tmp/testing/usr/bin
-#     calc link library:	/var/tmp/testing/usr/lib
-#     calc help, .cal ...:	/var/tmp/testing/usr/share/calc
-#     ... etc ...		/var/tmp/testing/...
-#
-# If ${T} is empty, calc is installed under /, which is the same
-# top of tree for which it was built.  If ${T} is non-empty, then
-# calc is installed under ${T}, as if one had to chroot under
-# ${T} for calc to operate.
-#
-# If in doubt, use T=
-#
-T=

 # Makefile debug
 #
@@ -240,22 +114,6 @@ H=@
 V=@:
 #V=@

-# standard tools
-#
-CHMOD= chmod
-CMP= cmp
-CO= co
-CP= cp
-FMT= fmt
-MKDIR= mkdir
-MV= mv
-RM= rm
-RMDIR= rmdir
-SED= sed
-SORT= sort
-TOUCH= touch
-TRUE= true
-
 # The calc files to install
 #
 # This list is produced by the detaillist rule when no WARNINGS are detected.
@@ -300,8 +158,24 @@ CALCLIBLIST=
 #
 PHONY= all clobber distlist install

+
+############################################################
+# Allow Makefile.local to change any of the above settings #
+############################################################
+include ${LOCAL_MKF}
+
+
+###########################################
+# all - First and default Makefile target #
+###########################################
+
 all: ${CALC_FILES} ${MAKE_FILE} .all

+
+###############################
+# additional Makefile targets #
+###############################
+
 # used by the upper level Makefile to determine of we have done all
 #
 .all:
--- a/calc.c
+++ b/calc.c
@@ -164,9 +164,31 @@ main(int argc, char **argv)
 				switch (c) {
 				case 'C':
 #if defined(CUSTOM)
+
+					/*
+					 * error if libcustcalc was compiled with CUSTOM undefined
+					 */
+					if (custom_compiled() == 0) {
+					    fprintf(stderr, "%s: calc was built with custom functions enabled, "
+							    "however custom_compiled() retuned 0", program);
+					    exit(1);
+					}
+
+					/*
+					 * indicate that custom functions are now allowed
+					 */
 					allow_custom = TRUE;
 					break;
 #else /* CUSTOM */
+
+					/*
+					 * error if libcustcalc was compiled with CUSTOM defined
+					 */
+					if (custom_compiled() == 1) {
+					    fprintf(stderr, "%s: calc was built with custom functions disabled, "
+							    "however custom_compiled() retuned 1", program);
+					}
+
 					/*
 					 * we are too early in processing to
 					 * call libcalc_call_me_last() -
--- a/calc.spec.in
+++ b/calc.spec.in
@@ -1,7 +1,7 @@
 #
 # calc.spec.in - template specfile 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
 # the terms of the version 2.1 of the GNU Lesser General Public License
@@ -20,23 +20,25 @@
 # Under source code control:	2003/02/16 20:21:39
 # File existed as early as:	2003
 #
-# calculator by David I. Bell with help/mods from others
-# Makefile by Petteri Kettunen with modifications from Landon Curt Noll
+# This calculator first developed by David I. Bell with help/mods from others.
+#
+# chongo <was here> /\oo/\	http://www.isthe.com/chongo/
+# Share and enjoy!  :-)		http://www.isthe.com/chongo/tech/comp/calc/

 # BUGS
 #  - Uninstalling calc and calc-devel leaves empty dirs /usr/include/calc
-#    and /usr/share/calc and its subdirs. In case e.g. %{_includedir}/calc
+#    and /usr/share/calc and its subdirs. In case e.g., _includedir/calc
 #    is defined in `files devel' section, then rpmbuild complains that
 #    header files are defined twice - rpmbuild bug or bug in specfile conf???

 Summary: Arbitrary precision calculator.
 Name: calc
 Version: <<<PROJECT_VERSION>>>
-Release: 13
+Release: 14
 License: LGPL
 Group: Applications/Engineering
-Source: http://www.isthe.com/chongo/src/calc/%{name}-%{version}.tar.bz2
-URL: http://www.isthe.com/chongo/tech/comp/calc/index.html
+Source: https://github.com/lcn2/calc/releases/download/v<<<PROJECT_VERSION>>>/%{name}-%{version}.tar.bz2
+URL: https://github.com/lcn2/calc
 Vendor: Landon Noll and Associates
 Packager: Landon Noll and Associates (http://www.isthe.com/chongo/index.html)
 Requires: ncurses >= 5.5-24, readline >= 5.1-3, less >= 358
@@ -51,7 +53,11 @@ calculator, an algorithm prototype and mathematical research
 tool. Calc comes with a rich set of builtin mathematical and
 programming functions.

-For the latest calc release, see the calc project home page:
+For the latest calc release, see the calc GitHub repo:
+
+    https://github.com/lcn2/calc
+
+or the calc home page:

    http://www.isthe.com/chongo/tech/comp/calc/index.html

@@ -67,7 +73,11 @@ Requires: ncurses >= 5.5-24, readline >= 5.1-3, less >= 358
 This package contains the header files and static libraries for developing
 calc (arbitrary precision calculator).

-For the latest calc release, see the project home page:
+For the latest calc release, see the calc GitHub repo:
+
+    https://github.com/lcn2/calc
+
+or the calc home page:

    http://www.isthe.com/chongo/tech/comp/calc/index.html

@@ -152,8 +162,10 @@ echo '-=- calc.spec beginning make clean -=-'
 %attr(644, root, root) %{_datadir}/%{name}/*.cal
 %attr(644, root, root) %{_datadir}/%{name}/set8700.line
 %attr(644, root, root) %{_libdir}/libcalc.so
+%attr(644, root, root) %{_libdir}/libcalc.so.<<<PROJECT_VER>>>
 %attr(644, root, root) %{_libdir}/libcalc.so.%{version}
 %attr(644, root, root) %{_libdir}/libcustcalc.so
+%attr(644, root, root) %{_libdir}/libcustcalc.so.<<<PROJECT_VER>>>
 %attr(644, root, root) %{_libdir}/libcustcalc.so.%{version}

 %files devel
@@ -165,6 +177,11 @@ echo '-=- calc.spec beginning make clean -=-'
 %attr(644, root, root) %{_libdir}/libcustcalc.a

 %changelog
+* Mon Aug 14 2023 Landon Curt Noll http://www.isthe.com/chongo
+- Release: 14
+- Use Source and URL based on calc GitHub repo URLs.
+- Install dynamic shared libraries with 3-digit version numbers.
+
 * Sun Mar 24 2019 Landon Curt Noll http://www.isthe.com/chongo
 - Release: 13
 - Disable compiling with the default ARCH_CFLAGS= -march=native
--- a/cscript/Makefile
+++ b/cscript/Makefile
@@ -4,13 +4,7 @@
 #
 # Copyright (C) 1999-2006,2014,2017,2021-2023  Landon Curt Noll
 #
-# SRC: cscript/Makefile
-#
-#	The "# SRC: ... - ..." comment line above indicates
-#	the origin of this file.
-#
-# IMPORTANT: Please see the section on Makefiles near the
-#	     bottom of the HOWTO.INSTALL file.
+# Suggestion: Read the ../HOWTO.INSTALL file.
 #
 # 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
@@ -29,184 +23,63 @@
 # Under source code control:	1999/11/29 11:10:26
 # File existed as early as:	1999
 #
+# This calculator first developed by David I. Bell with help/mods from others.
+#
 # chongo <was here> /\oo/\	http://www.isthe.com/chongo/
-# Share and enjoy!  :-) http://www.isthe.com/chongo/tech/comp/calc/
-#
-# calculator by David I. Bell with help/mods from others
-# Makefile by Landon Curt Noll
+# Share and enjoy!  :-)		http://www.isthe.com/chongo/tech/comp/calc/


-# The shell used by this Makefile
-#
-# On some systems, /bin/sh is a rather reduced shell with
-# deprecated behavior.
-#
-# If your system has a up to date, bash shell, then
-# you may wish to use:
-#
-#	SHELL= bash
-#
-# On some systems such as macOS, the bash shell is very
-# far behind to the point where is cannot be depended on.
-# On such systems, the sh may be a much better alternative
-# shell for this Makefile to use:
-#
-#	SHELL= sh
-#
-SHELL= bash
-#SHELL= sh
-#if 0	/* start of skip for non-Gnu makefiles */
-#
-ifeq ($(target),Darwin)
-SHELL:= /bin/sh
-endif
-#endif	/* end of skip for non-Gnu makefiles */
+# SUGGESTION: Instead of modifying this file, consider adding
+#	      statements to modify, replace or append Makefile
+#	      variables in the ../Makefile.local file.


-####
-# Normally, the upper level makefile will set these values.  We provide
-# a default here just in case you want to build from this directory.
-####
-
-# PREFIX - Top level location for calc
-#
-# The PREFIX is often prepended to paths within calc and calc Makefiles.
-#
-# Starting with calc v2.13.0.1, nearly all Makefile places that used
-# /usr/local now use ${PREFIX}.  An exception is the olduninstall rule
-# and, of course, this section. :-)
-#
-# NOTE: The ${PREFIX} is not the same as ${T}.  The ${T} specifies
-#	a top level directory under which calc installs things.
-#	While usually ${T} is empty, it can be specific path
-#	as if calc where "chrooted" during an install.
-#	The ${PREFIX} value, during install, is a path between
-#	the top level ${T} install directory and the object
-#	such as an include file.
-#
-# NOTE: See also, ${T}, below.
-#
-# There are some paths that do NOT call under ${PREFIX}, such as
-# ${CALCPATH}, that include paths not under ${PREFIX}, but those
-# too are exceptions to this general rule.
-#
-# When in doubt, try:
-#
-#	PREFIX= /usr/local
-#
-PREFIX= /usr/local
-#PREFIX= /usr
-#PREFIX= /usr/global
+###########################################
+# Files used or included by this Makefile #
+###########################################

 # Normally certain files depend on the Makefile.  If the Makefile is
 # changed, then certain steps should be redone.  If MAKE_FILE is
 # set to Makefile, then these files will depend on Makefile.  If
-# MAKE_FILE is empty, then they wont.
+# MAKE_FILE is empty, then they won't.
 #
 # If in doubt, set MAKE_FILE to Makefile
 #
 MAKE_FILE= Makefile

-# Where the system include (.h) files are kept
-#
-# For DJGPP, select:
-#
-#	INCDIR= /dev/env/DJDIR/include
-#
-# If in doubt, set:
-#
-#	INCDIR= /usr/include
+# Calc configuration and compile configuration values
 #
+CONFIG_MKF= ../Makefile.config

-#INCDIR= ${PREFIX}/include
-#INCDIR= /dev/env/DJDIR/include
-INCDIR= /usr/include
+# Host targets that are shared in common with both Makefile
+# and custom/Makefile.
+#
+TARGET_MKF= ../Makefile.target

-# where to install calc related things
+# Host target information.
 #
-# ${BINDIR}		where to install calc binary files
-# ${LIBDIR}		where calc link library (*.a) files are installed
-# ${CALC_SHAREDIR}	where to install calc help, .cal, startup, config files
-#
-# NOTE: The install rule prepends installation paths with ${T}, which
-#	by default is empty.  If ${T} is non-empty, then installation
-#	locations will be relative to the ${T} directory.
-#
-# For DJGPP, select:
-#
-#	BINDIR= /dev/env/DJDIR/bin
-#	LIBDIR= /dev/env/DJDIR/lib
-#	CALC_SHAREDIR= /dev/env/DJDIR/share/calc
-#
-# If in doubt, set:
-#
-#	BINDIR= /usr/bin
-#	LIBDIR= /usr/lib
-#	CALC_SHAREDIR= /usr/share/calc
-#
-#BINDIR= ${PREFIX}/bin
-#BINDIR= /dev/env/DJDIR/bin
-BINDIR= /usr/bin
+LOCAL_MKF= ../Makefile.local

-#LIBDIR= ${PREFIX}/lib
-#LIBDIR= /dev/env/DJDIR/lib
-LIBDIR= /usr/lib
+# The set of Makefiles
+#
+MK_SET= ${MAKE_FILE} ${CONFIG_MKF} ${TARGET_MKF} ${LOCAL_MKF}

-#CALC_SHAREDIR= ${PREFIX}/lib/calc
-#CALC_SHAREDIR= /dev/env/DJDIR/share/calc
-CALC_SHAREDIR= /usr/share/calc

-# By default, these values are based CALC_SHAREDIR, INCDIR, BINDIR
-# ---------------------------------------------------------------
-# ${HELPDIR}		where the help directory is installed
-# ${CALC_INCDIR}	where the calc include files are installed
-# ${SCRIPTDIR}		where calc shell scripts are installed
-#
-# NOTE: The install rule prepends installation paths with ${T}, which
-#	by default is empty.  If ${T} is non-empty, then installation
-#	locations will be relative to the ${T} directory.
-#
-# If in doubt, set:
-#
-#	HELPDIR= ${CALC_SHAREDIR}/help
-#	CALC_INCDIR= ${INCDIR}/calc
-#	SCRIPTDIR= ${BINDIR}/cscript
-#
-HELPDIR= ${CALC_SHAREDIR}/help
-CALC_INCDIR= ${INCDIR}/calc
-SCRIPTDIR= ${BINDIR}/cscript
+#######################################################
+# Calc configuration and compile configuration values #
+#######################################################
+include ${CONFIG_MKF}

-# T - top level directory under which calc will be installed
-#
-# The calc install is performed under ${T}, the calc build is
-# performed under /.	The purpose for ${T} is to allow someone
-# to install calc somewhere other than into the system area.
-#
-# For example, if:
-#
-#     BINDIR= /usr/bin
-#     LIBDIR= /usr/lib
-#     CALC_SHAREDIR= /usr/share/calc
-#
-# and if:
-#
-#     T= /var/tmp/testing
-#
-# Then the installation locations will be:
-#
-#     calc binary files:	/var/tmp/testing/usr/bin
-#     calc link library:	/var/tmp/testing/usr/lib
-#     calc help, .cal ...:	/var/tmp/testing/usr/share/calc
-#     ... etc ...		/var/tmp/testing/...
-#
-# If ${T} is empty, calc is installed under /, which is the same
-# top of tree for which it was built.  If ${T} is non-empty, then
-# calc is installed under ${T}, as if one had to chroot under
-# ${T} for calc to operate.
-#
-# If in doubt, use T=
-#
-T=
+
+###############################
+# host target section include #
+###############################
+include ${TARGET_MKF}
+
+
+##########################################################################
+#=-=-=-=-=- Be careful if you change something below this line -=-=-=-=-=#
+##########################################################################

 # Makefile debug
 #
@@ -240,29 +113,6 @@ H=@
 V=@:
 #V=@

-# standard tools
-#
-CAT= cat
-CHMOD= chmod
-CMP= cmp
-CO= co
-CP= cp
-FMT= fmt
-MKDIR= mkdir
-MV= mv
-RM= rm
-RMDIR= rmdir
-SED= sed
-SORT= sort
-TOUCH= touch
-TRUE= true
-
-# NOTE: On some shells, echo is a builtin that does
-#	not understand -n, so we call /bin/echo -n
-#	directly to get around such shells.
-#
-ECHON= /bin/echo -n
-
 # The ${SCRIPT} list is the list of calc shell script files (without the .calc
 # extension) which will be installed.
 #
@@ -304,10 +154,26 @@ TARGETS= ${CSCRIPT_TARGETS} README
 #
 PHONY= all clobber distlist install

+
+############################################################
+# Allow Makefile.local to change any of the above settings #
+############################################################
+include ${LOCAL_MKF}
+
+
+###########################################
+# all - First and default Makefile target #
+###########################################
+
 # The reason for this Makefile
 #
 all: ${TARGETS} .all

+
+###############################
+# additional Makefile targets #
+###############################
+
 .PHONY: ${PHONY}

 README: README.src
--- a/custom.c
+++ b/custom.c
@@ -41,6 +41,8 @@
 # include <string.h>
 #endif

+EXTERN CONST struct custom cust[];	/* custom interface table */
+
 #else /* CUSTOM */

 #include "config.h"
@@ -66,6 +68,14 @@ custom(char *name, int count, VALUE **vals)

 	CONST struct custom *p;		/* current function */

+	/*
+	 * error if libcustcalc was compiled with CUSTOM undefined
+	 */
+	if (custom_compiled() == 0) {
+	    math_error("libcustcalc was compiled CUSTOM undefined");
+	    not_reached();
+	}
+
 	/*
 	 * search the custom interface table for a function
 	 */
@@ -98,6 +108,14 @@ custom(char *name, int count, VALUE **vals)

 #else /* CUSTOM */

+	/*
+	 * error if libcustcalc was compiled with CUSTOM defined
+	 */
+	if (custom_compiled() == 1) {
+	    math_error("libcustcalc was compiled with CUSTOM defined");
+	    not_reached();
+	}
+
 	fprintf(stderr,
 	    "%sCalc was built with custom functions disabled\n",
 	    (conf->tab_ok ? "\t" : ""));
--- a/custom.h
+++ b/custom.h
@@ -73,11 +73,11 @@ struct custom {
 *
 * These are the required interfaces.  The dummy.c stubs these interfaces too.
 */
+E_FUNC int custom_compiled(void);	/* return 1 ==> libcustcalc compiled w/CUSTOM defined, else return 0 */
 E_FUNC VALUE custom(char*, int, VALUE**);	/* master custom interface */
 EXTERN BOOL allow_custom;		/* TRUE => custom builtins allowed */
 E_FUNC void showcustom(void);		/* print custom functions */
 E_FUNC void customhelp(char *);		/* direct custom help */
-EXTERN CONST struct custom cust[];	/* custom interface table */
 E_FUNC void init_custreg(void);		/* initialize custom registers */

 #endif /* !CUSTOM_H */
--- a/custom/Makefile
+++ b/custom/Makefile
@@ -4,13 +4,7 @@
 #
 # Copyright (C) 1999-2006,2014,2017-2018,2021,2023  Landon Curt Noll
 #
-# SRC: custom/Makefile
-#
-#	The "# SRC: ... - ..." comment line above indicates
-#	the origin of this file.
-#
-# IMPORTANT: Please see the section on Makefiles near the
-#	     bottom of the HOWTO.INSTALL file.
+# Suggestion: Read the ../HOWTO.INSTALL file.
 #
 # 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
@@ -29,147 +23,63 @@
 # Under source code control:	1997/03/09 02:28:54
 # File existed as early as:	1997
 #
+# This calculator first developed by David I. Bell with help/mods from others.
+#
 # chongo <was here> /\oo/\	http://www.isthe.com/chongo/
-# Share and enjoy!  :-) http://www.isthe.com/chongo/tech/comp/calc/
-#
-# calculator by David I. Bell with help/mods from others
-# Makefile by Landon Curt Noll
+# Share and enjoy!  :-)		http://www.isthe.com/chongo/tech/comp/calc/


-# The shell used by this Makefile
-#
-# On some systems, /bin/sh is a rather reduced shell with
-# deprecated behavior.
-#
-# If your system has a up to date, bash shell, then
-# you may wish to use:
-#
-#	SHELL= bash
-#
-# On some systems such as macOS, the bash shell is very
-# far behind to the point where is cannot be depended on.
-# On such systems, the sh may be a much better alternative
-# shell for this Makefile to use:
-#
-#	SHELL= sh
-#
-SHELL= bash
-#SHELL= sh
-
-# Darwin shell default
-#
-ifeq ($(target),Darwin)
-SHELL:= /bin/sh
-endif	# ($(target),Darwin)
-
-# If you are using Cygwin with MinGW64 packages
-# then we will also need to use the Cygwin runtime enviroment
-# and the calc Cygwin make target.
-##
-ifeq ($(OSNAME),Cygwin)
-target:= Cygwin
-endif	# ($(OSNAME),Cygwin)
+# SUGGESTION: Instead of modifying this file, consider adding
+#	      statements to modify, replace or append Makefile
+#	      variables in the ../Makefile.local file.


-# PREFIX - Top level location for calc
+###########################################
+# Files used or included by this Makefile #
+###########################################
+
+# Normally certain files depend on the Makefile.  If the Makefile is
+# changed, then certain steps should be redone.  If MAKE_FILE is
+# set to Makefile, then these files will depend on Makefile.  If
+# MAKE_FILE is empty, then they won't.
 #
-# The PREFIX is often prepended to paths within calc and calc Makefiles.
+# If in doubt, set MAKE_FILE to Makefile
 #
-# Starting with calc v2.13.0.1, nearly all Makefile places that used
-# /usr/local now use ${PREFIX}.  An exception is the olduninstall rule
-# and, of course, this section. :-)
+MAKE_FILE= Makefile
+
+# Calc configuration and compile configuration values
 #
-# NOTE: The ${PREFIX} is not the same as ${T}.  The ${T} specifies
-#	a top level directory under which calc installs things.
-#	While usually ${T} is empty, it can be specific path
-#	as if calc where "chrooted" during an install.
-#	The ${PREFIX} value, during install, is a path between
-#	the top level ${T} install directory and the object
-#	such as an include file.
+CONFIG_MKF= ../Makefile.config
+
+# Host targets that are shared in common with both Makefile
+# and custom/Makefile.
 #
-# NOTE: See also, ${T}, below.
+TARGET_MKF= ../Makefile.target
+
+# Host target information.
 #
-# There are some paths that do NOT call under ${PREFIX}, such as
-# ${CALCPATH}, that include paths not under ${PREFIX}, but those
-# too are exceptions to this general rule.
+LOCAL_MKF= ../Makefile.local
+
+# The set of Makefiles
 #
-# When in doubt, try:
-#
-#	PREFIX= /usr/local
-#
-PREFIX= /usr/local
-#PREFIX= /usr
-#PREFIX= /usr/global
+MK_SET= ${MAKE_FILE} ${CONFIG_MKF} ${TARGET_MKF} ${LOCAL_MKF}


-# 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
-# that, if improperly used, could compromise the computational integrity
-# if calculations.
-#
-# In the case of calc, we are motivated in part by the desire for calc
-# to correctly calculate: even during extremely long calculations.
-#
-# If UNBAN is NOT defined, then calling certain functions
-# will result in a call to a non-existent function (link error).
-#
-# While we do NOT encourage defining UNBAN, there may be
-# a system / compiler environment where re-defining a
-# function may lead to a fatal compiler complication.
-# If that happens, consider compiling as:
-#
-#	make clobber all chk CCBAN=-DUNBAN
-#
-# as see if this is a work-a-round.
-#
-# If YOU discover a need for the -DUNBAN work-a-round, PLEASE tell us!
-# Please send us a bug report.  See the file:
-#
-#	BUGS
-#
-# or the URL:
-#
-#	http://www.isthe.com/chongo/tech/comp/calc/calc-bugrept.html
-#
-# for how to send us such a bug report.
-#
-CCBAN= -UUNBAN
-#CCBAN= -DUNBAN
+#######################################################
+# Calc configuration and compile configuration values #
+#######################################################
+include ${CONFIG_MKF}


-# We do not support parallel make of calc.  We have found most
-# parallel make systems do not get the rule dependency order
-# correct, resulting in a failed attempt to compile calc.
-#
-# If you believe you have a way to get a parallel make of calc
-# to work, consider submitting a pull request with a
-# proposed change.
-#
-.NOTPARALLEL:
+###############################
+# host target section include #
+###############################
+include ${TARGET_MKF}

-##############################################################################
-#-=-=-=-=-=-=-=-=- 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	# ($(target),)
-ifeq ($(arch),)
-arch=$(shell uname -p 2>/dev/null)
-endif	# ($(arch),)
-ifeq ($(hardware),)
-hardware=$(shell uname -m 2>/dev/null)
-endif	# ($(hardware),)
-ifeq ($(OSNAME),)
-OSNAME=$(shell uname -o 2>/dev/null)
-endif	# ($(OSNAME),)
+##################################
+# Files managed by this Makefile #
+##################################

 # The custom calc resource files to install
 #
@@ -214,16 +124,10 @@ CUSTOM_SRC= c_argv.c c_devnull.c c_help.c c_sysinfo.c c_pzasusb8.c \
 CUSTOM_OBJ= c_argv.o c_devnull.o c_help.o c_sysinfo.o c_pzasusb8.o \
 	c_pmodm127.o c_register.o

-##############################################################################
-#-=-=-=-=-=-=-=-=- You may want to change some values below -=-=-=-=-=-=-=-=-#
-##############################################################################

-##############################################################################
-#-=-=-=-=-=-=- Defaults in case you want to build from this dir -=-=-=-=-=-=-#
-##############################################################################
-
-# Normally, the upper level makefile will set these values.  We provide
-# a default here just in case you want to build from this directory.
+##########################################################################
+#=-=-=-=-=- Be careful if you change something below this line -=-=-=-=-=#
+##########################################################################

 # Makefile debug
 #
@@ -257,337 +161,6 @@ H=@
 V=@:
 #V=@

-####
-# Normally, the upper level makefile will set these values.  We provide
-# a default here just in case you want to build from this directory.
-####
-
-# Where the system include (.h) files are kept
-#
-# For DJGPP, select:
-#
-#	INCDIR= /dev/env/DJDIR/include
-#
-# If in doubt, set:
-#
-#	INCDIR= /usr/include
-#
-
-#INCDIR= ${PREFIX}/include
-#INCDIR= /dev/env/DJDIR/include
-INCDIR= /usr/include
-
-# where to install calc related things
-#
-# ${BINDIR}		where to install calc binary files
-# ${LIBDIR}		where calc link library (*.a) files are installed
-# ${CALC_SHAREDIR}	where to install calc help, .cal, startup, config files
-#
-# NOTE: The install rule prepends installation paths with ${T}, which
-#	by default is empty.  If ${T} is non-empty, then installation
-#	locations will be relative to the ${T} directory.
-#
-# For DJGPP, select:
-#
-#	BINDIR= /dev/env/DJDIR/bin
-#	LIBDIR= /dev/env/DJDIR/lib
-#	CALC_SHAREDIR= /dev/env/DJDIR/share/calc
-#
-# If in doubt, set:
-#
-#	BINDIR= /usr/bin
-#	LIBDIR= /usr/lib
-#	CALC_SHAREDIR= /usr/share/calc
-#
-#BINDIR= ${PREFIX}/bin
-#BINDIR= /dev/env/DJDIR/bin
-BINDIR= /usr/bin
-
-#LIBDIR= ${PREFIX}/lib
-#LIBDIR= /dev/env/DJDIR/lib
-LIBDIR= /usr/lib
-
-#CALC_SHAREDIR= ${PREFIX}/lib/calc
-#CALC_SHAREDIR= /dev/env/DJDIR/share/calc
-CALC_SHAREDIR= /usr/share/calc
-
-# By default, these values are based CALC_SHAREDIR, INCDIR, BINDIR
-# ---------------------------------------------------------------
-# ${HELPDIR}		where the help directory is installed
-# ${CALC_INCDIR}	where the calc include files are installed
-# ${CUSTOMCALDIR}	where custom *.cal files are installed
-# ${CUSTOMHELPDIR}	where custom help files are installed
-# ${CUSTOMINCDIR}	where custom .h files are installed
-# ${SCRIPTDIR}		where calc shell scripts are installed
-#
-# NOTE: The install rule prepends installation paths with ${T}, which
-#	by default is empty.  If ${T} is non-empty, then installation
-#	locations will be relative to the ${T} directory.
-#
-# If in doubt, set:
-#
-#	HELPDIR= ${CALC_SHAREDIR}/help
-#	CALC_INCDIR= ${INCDIR}/calc
-#	CUSTOMCALDIR= ${CALC_SHAREDIR}/custom
-#	CUSTOMHELPDIR= ${CALC_SHAREDIR}/custhelp
-#	CUSTOMINCDIR= ${CALC_INCDIR}/custom
-#	SCRIPTDIR= ${BINDIR}/cscript
-#
-HELPDIR= ${CALC_SHAREDIR}/help
-CALC_INCDIR= ${INCDIR}/calc
-CUSTOMCALDIR= ${CALC_SHAREDIR}/custom
-CUSTOMHELPDIR= ${CALC_SHAREDIR}/custhelp
-CUSTOMINCDIR= ${CALC_INCDIR}/custom
-SCRIPTDIR= ${BINDIR}/cscript
-
-# T - top level directory under which calc will be installed
-#
-# The calc install is performed under ${T}, the calc build is
-# performed under /.	The purpose for ${T} is to allow someone
-# to install calc somewhere other than into the system area.
-#
-# For example, if:
-#
-#     BINDIR= /usr/bin
-#     LIBDIR= /usr/lib
-#     CALC_SHAREDIR= /usr/share/calc
-#
-# and if:
-#
-#     T= /var/tmp/testing
-#
-# Then the installation locations will be:
-#
-#     calc binary files:	/var/tmp/testing/usr/bin
-#     calc link library:	/var/tmp/testing/usr/lib
-#     calc help, .cal ...:	/var/tmp/testing/usr/share/calc
-#     ... etc ...		/var/tmp/testing/...
-#
-# If ${T} is empty, calc is installed under /, which is the same
-# top of tree for which it was built.  If ${T} is non-empty, then
-# calc is installed under ${T}, as if one had to chroot under
-# ${T} for calc to operate.
-#
-# If in doubt, use T=
-#
-T=
-
-# Debug/Optimize options for ${CC} and ${LCC}
-#
-# Select DEBUG= -O2 -gstabs+ -D_WIN32 for DJGPP.
-#
-#DEBUG=
-#
-#DEBUG= -O
-#DEBUG= -O -g
-#DEBUG= -O -g3
-#
-#DEBUG= -O1
-#DEBUG= -O1 -g
-#DEBUG= -O1 -g3
-#
-#DEBUG= -O2
-#DEBUG= -O2 -g
-#DEBUG= -O2 -g3
-#DEBUG= -O2 -ipa
-#DEBUG= -O2 -g3 -ipa
-#
-#DEBUG= -O3
-#DEBUG= -O3 -g
-DEBUG= -O3 -g3
-#DEBUG= -O3 -ipa
-#DEBUG= -O3 -g3 -ipa
-#
-#DEBUG= -g
-#DEBUG= -g3
-#DEBUG= -gx
-#DEBUG= -WM,-g
-#
-#DEBUG= -O2 -gstabs+ -D_WIN32
-
-# Some systems require one to use ranlib to add a symbol table to
-# a *.a link library.  Set RANLIB to the utility that performs this
-# action.  Set RANLIB to : if your system does not need such a utility.
-#
-RANLIB=ranlib
-#RANLIB=:
-
-# Normally certain files depend on the Makefile.  If the Makefile is
-# changed, then certain steps should be redone.	 If MAKE_FILE is
-# set to Makefile, then these files will depend on Makefile.  If
-# MAKE_FILE is empty, then they wont.
-#
-# If in doubt, set MAKE_FILE to Makefile
-#
-MAKE_FILE= Makefile
-#MAKE_FILE=
-
-# If you do not wish to use purify, set PURIFY to an empty string.
-#
-# If in doubt, use PURIFY=
-#
-#PURIFY= purify
-#PURIFY= purify -m71-engine
-#PURIFY= purify -logfile=pure.out
-#PURIFY= purify -m71-engine -logfile=pure.out
-PURIFY=
-
-# If you want to use a debugging link library such as a malloc debug link
-# library, or need to add special ld flags after the calc link libraries
-# are included, set ${LD_DEBUG} below.
-#
-# If in doubt, set LD_DEBUG to empty.
-#
-#LD_DEBUG= -lmalloc_cv
-LD_DEBUG=
-
-# When doing a:
-#
-#	make check
-#	make chk
-#	make debug
-#
-# the ${CALC_ENV} is used to supply the proper environment variables
-# to calc.  Most people will simply need 'CALCPATH=./cal' to ensure
-# that these debug rules will only use calc resource files under the
-# local source directory.  The longer lines (with MALLOC_VERBOSE=1 ...)
-# are useful for SGI IRIX people who have 'WorkShop Performance Tools'
-# and who also set 'LD_DEBUG= -lmalloc_cv' above.
-#
-# If in doubt, use CALC_ENV= CALCPATH=./cal.
-#
-CALC_ENV= CALCPATH=./cal
-#CALC_ENV= CALCPATH=./cal MALLOC_VERBOSE=1 MALLOC_TRACING=1 \
-#	  MALLOC_FASTCHK=1 MALLOC_FULLWARN=1
-#CALC_ENV= CALCPATH=./cal MALLOC_VERBOSE=1 MALLOC_TRACING=1 \
-#	  MALLOC_FASTCHK=1 MALLOC_FULLWARN=1 MALLOC_CLEAR_FREE=1 \
-#	  MALLOC_CLEAR_MALLOC=1
-
-# By default, custom builtin functions may only be executed if calc
-# is given the -C option.  This is because custom builtin functions
-# may invoke non-standard or non-portable code.	 One may completely
-# disable custom builtin functions by not compiling any of code
-#
-# ALLOW_CUSTOM= -DCUSTOM	# allow custom only if -C is given
-# ALLOW_CUSTOM= -UCUSTOM	# disable custom even if -C is given
-#
-# If in doubt, use ALLOW_CUSTOM= -DCUSTOM
-#
-ALLOW_CUSTOM= -DCUSTOM
-#ALLOW_CUSTOM= -UCUSTOM
-
-
-# Some out of date operating systems require / want an executable to
-# end with a certain file extension.  Some compile systems such as
-# Cygwin build calc as calc.exe.  The EXT variable is used to denote
-# the extension required by such.
-#
-# EXT=				# normal Un*x / Linux / GNU/Linux systems
-# EXT=.exe			# Windows / Cygwin
-#
-# If in doubt, use EXT=
-#
-EXT=
-#EXT=.exe
-
-# The default calc versions
-#
-VERSION= 2.14.3.1
-
-# Names of shared libraries with versions
-#
-LIB_EXT= .so
-LIB_EXT_VERSION= ${LIB_EXT}.${VERSION}
-
-# standard tools
-#
-AR= ar
-AWK= awk
-CHMOD= chmod
-CMP= cmp
-CO= co
-CP= cp
-DIFF= diff
-FMT= fmt
-GREP= grep
-LN= ln
-LS= ls
-MAKE= make
-MAKEDEPEND= makedepend
-MKDIR= mkdir
-MV= mv
-RM= rm
-RMDIR= rmdir
-SED= sed
-SORT= sort
-TAIL= tail
-TOUCH= touch
-TRUE= true
-
-# EXTRA_CFLAGS are flags given to ${CC} when compiling C files
-# EXTRA_LDFLAGS are flags given to ${CC} when linking progs
-#
-# Both CFLAGS and LDFLAGS are left blank in this Makefile by
-# default so that users may use them on the make command line
-# to always the way that C is compiled and files are linked
-# respectively.  For example:
-#
-#	make all EXTRA_CFLAGS="-DMAGIC" EXTRA_LDFLAGS="-lmagic"
-#
-# NOTE: These should be left blank in this Makefile to make it
-#       easier to add stuff on the command line.  If you want to
-#	to change the way calc is compiled by this Makefile, change
-#	the appropriate host target section below or a flag above.
-#
-EXTRA_CFLAGS=
-EXTRA_LDFLAGS=
-
-# COMMON_CFLAGS are the common ${CC} flags used for all progs, both
-#	    intermediate and final calc and calc related progs
-#
-COMMON_CFLAGS= -DCALC_SRC ${ALLOW_CUSTOM} ${CCWARN} ${CCMISC} ${EXTRA_CFLAGS}
-
-# COMMON_LDFLAGS are the common flags used for linking all progs, both
-#	     intermediate and final calc and calc related progs
-#
-COMMON_LDFLAGS= ${EXTRA_LDFLAGS}
-
-###########################################
-# Set the default compile flags for ${CC} #
-###########################################
-
-# Required flags to compile C files for calc
-#
-# ICFLAGS are given to ${CC} for intermediate progs used to help compile calc
-# CFLAGS are given to ${CC} for calc progs other than intermediate progs
-#
-# NOTE: This does not work for: make-XYZ-only and BLD_TYPE != make-XYZ-only
-#
-ifeq ($(BLD_TYPE),calc-static-only)
-ICFLAGS= ${COMMON_CFLAGS} ${CCBAN} ${CC_STATIC}
-else	# ($(BLD_TYPE),calc-static-only)
-ICFLAGS= ${COMMON_CFLAGS} ${CCBAN} ${CC_SHARE}
-endif	# ($(BLD_TYPE),calc-static-only)
-CFLAGS= ${ICFLAGS} ${CCOPT}
-
-# Required flags to link files for calc
-#
-# ILDFLAGS for ${CC} in linking intermediate progs used to help compile calc
-# LDFLAGS for ${CC} in linking calc progs other than intermediate progs
-#
-ILDFLAGS= ${COMMON_LDFLAGS}
-LDFLAGS= ${LD_DEBUG} ${ILDFLAGS}
-
-##########################################################################
-#=-=-=-=-=- Be careful if you change something below this line -=-=-=-=-=#
-##########################################################################
-
-# Host targets that are shared in common with both Makefile
-# and custom/Makefile (if ALLOW_CUSTOM is -DCUSTOM).
-#
-TARGET_MKF= ../Makefile.target
-include ${TARGET_MKF}
-
 # These .c files are required for the main custom interface and
 # for the custom support functions for libcustcalc${LIB_EXT_VERSION}.
 #
@@ -646,15 +219,25 @@ CALC_STATIC_LIBCUSTCALC= libcustcalc.a
 #
 TARGETS= ${BLD_TYPE}

-###
-#
-# The main reason for this Makefile	:-)
-#
-###
+
+############################################################
+# Allow Makefile.local to change any of the above settings #
+############################################################
+include ${LOCAL_MKF}
+
+
+###########################################
+# all - First and default Makefile target #
+###########################################

 all: ${TARGETS} ${INSTALL_H_SRC} ${CUSTOM_CALC_FILES} \
 	${CUSTOM_HELP} ${MAKE_FILE} .all

+
+###############################
+# additional Makefile targets #
+###############################
+
 calc-dynamic-only: ${CUSTCALC_OBJ} ${CALC_DYNAMIC_LIBCUSTCALC}

 calc-static-only: ${CUSTCALC_OBJ} ${CALC_STATIC_LIBCUSTCALC}
@@ -674,12 +257,6 @@ libcustcalc${LIB_EXT_VERSION}: ${CUSTCALC_OBJ} ${MAKE_FILE}
 c_sysinfo.o: c_sysinfo.c ${MAKE_FILE}
 	${CC} ${CFLAGS} c_sysinfo.c -c

-##
-#
-# used by the upper level Makefile
-#
-##
-
 # to determine of we have done all
 #
 .all:
--- a/custom/c_argv.c
+++ b/custom/c_argv.c
@@ -1,7 +1,7 @@
 /*
 * c_argv - a custom function display info about its args
 *
- * Copyright (C) 1999-2006,2021  Landon Curt Noll
+ * Copyright (C) 1999-2006,2021,2023  Landon Curt Noll
 *
 * 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
@@ -25,21 +25,32 @@
 */


+/*
+ * ISO C requires a translation unit to contain at least one declaration,
+ * so we declare a global variable whose value is based on if CUSTOM is defined.
+ */
+#if defined(CUSTOM)
+int c_argv_allowed = 1;		/* CUSTOM defined */
+#else /* CUSTOM */
+int c_argv_allowed = 0;		/* CUSTOM undefined */
+#endif /* CUSTOM */
+
+
 #if defined(CUSTOM)

 #include <stdio.h>

-#include "have_const.h"
-#include "value.h"
-#include "custom.h"
+#include "../have_const.h"
+#include "../value.h"
+#include "../custom.h"

-#include "config.h"
-#include "calc.h"
+#include "../config.h"
+#include "../calc.h"

-#include "have_unused.h"
+#include "../have_unused.h"


-#include "banned.h"	/* include after system header <> includes */
+#include "../banned.h"	/* include after system header <> includes */


 /*
--- a/custom/c_devnull.c
+++ b/custom/c_devnull.c
@@ -1,7 +1,7 @@
 /*
 * c_devnull - a custom function that does nothing
 *
- * Copyright (C) 1999-2004,2021  Landon Curt Noll
+ * Copyright (C) 1999-2004,2021,2023  Landon Curt Noll
 *
 * 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
@@ -25,21 +25,32 @@
 */


+/*
+ * ISO C requires a translation unit to contain at least one declaration,
+ * so we declare a global variable whose value is based on if CUSTOM is defined.
+ */
+#if defined(CUSTOM)
+int c_devnull_allowed = 1;	/* CUSTOM defined */
+#else /* CUSTOM */
+int c_devnull_allowed = 0;	/* CUSTOM undefined */
+#endif /* CUSTOM */
+
+
 #if defined(CUSTOM)

-#include "have_unistd.h"
+#include "../have_unistd.h"
 #if defined(HAVE_UNISTD_H)
 #include <unistd.h>
 #endif

-#include "have_const.h"
-#include "value.h"
-#include "custom.h"
+#include "../have_const.h"
+#include "../value.h"
+#include "../custom.h"

-#include "have_unused.h"
+#include "../have_unused.h"


-#include "banned.h"	/* include after system header <> includes */
+#include "../banned.h"	/* include after system header <> includes */


 /*
--- a/custom/c_help.c
+++ b/custom/c_help.c
@@ -1,7 +1,7 @@
 /*
 * c_help - custom help function
 *
- * Copyright (C) 1999-2004,2021,2022  Landon Curt Noll
+ * Copyright (C) 1999-2004,2021-2023  Landon Curt Noll
 *
 * 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
@@ -25,22 +25,33 @@
 */


+/*
+ * ISO C requires a translation unit to contain at least one declaration,
+ * so we declare a global variable whose value is based on if CUSTOM is defined.
+ */
+#if defined(CUSTOM)
+int c_help_allowed = 1;		/* CUSTOM defined */
+#else /* CUSTOM */
+int c_help_allowed = 0;		/* CUSTOM undefined */
+#endif /* CUSTOM */
+
+
 #if defined(CUSTOM)

-#include "have_unistd.h"
+#include "../have_unistd.h"
 #if defined(HAVE_UNISTD_H)
 #include <unistd.h>
 #endif

-#include "have_const.h"
-#include "value.h"
-#include "custom.h"
+#include "../have_const.h"
+#include "../value.h"
+#include "../custom.h"

-#include "have_unused.h"
+#include "../have_unused.h"


-#include "attribute.h"
-#include "banned.h"	/* include after system header <> includes */
+#include "../attribute.h"
+#include "../banned.h"	/* include after system header <> includes */


 /*
--- a/custom/c_pmodm127.c
+++ b/custom/c_pmodm127.c
@@ -1,7 +1,7 @@
 /*
 * c_pmodm127 - calculate q mod 2^(2^127-1)
 *
- * Copyright (C) 2004-2007,2021,2022  Landon Curt Noll
+ * Copyright (C) 2004-2007,2021-2023  Landon Curt Noll
 *
 * 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
@@ -24,20 +24,31 @@
 */


+/*
+ * ISO C requires a translation unit to contain at least one declaration,
+ * so we declare a global variable whose value is based on if CUSTOM is defined.
+ */
+#if defined(CUSTOM)
+int c_pmodm127_allowed = 1;	/* CUSTOM defined */
+#else /* CUSTOM */
+int c_pmodm127_allowed = 0;	/* CUSTOM undefined */
+#endif /* CUSTOM */
+
+
 #if defined(CUSTOM)

 #include <stdio.h>

-#include "have_const.h"
-#include "value.h"
-#include "custom.h"
-#include "zmath.h"
+#include "../have_const.h"
+#include "../value.h"
+#include "../custom.h"
+#include "../zmath.h"

-#include "have_unused.h"
+#include "../have_unused.h"


-#include "attribute.h"
-#include "banned.h"	/* include after system header <> includes */
+#include "../attribute.h"
+#include "../banned.h"	/* include after system header <> includes */


 /* 2^255 */
--- a/custom/c_pzasusb8.c
+++ b/custom/c_pzasusb8.c
@@ -1,7 +1,7 @@
 /*
 * c_pzasusb8 - print numerator as a string of USB8s
 *
- * Copyright (C) 1999-2004,2021,2022  Ernest Bowen
+ * Copyright (C) 1999-2004,2021-2023  Ernest Bowen
 *
 * 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
@@ -24,20 +24,31 @@
 */


+/*
+ * ISO C requires a translation unit to contain at least one declaration,
+ * so we declare a global variable whose value is based on if CUSTOM is defined.
+ */
+#if defined(CUSTOM)
+int c_pzasusb8_allowed = 1;	/* CUSTOM defined */
+#else /* CUSTOM */
+int c_pzasusb8_allowed = 0;	/* CUSTOM undefined */
+#endif /* CUSTOM */
+
+
 #if defined(CUSTOM)

 #include <stdio.h>

-#include "have_const.h"
-#include "value.h"
-#include "custom.h"
-#include "zmath.h"
+#include "../have_const.h"
+#include "../value.h"
+#include "../custom.h"
+#include "../zmath.h"

-#include "have_unused.h"
+#include "../have_unused.h"


-#include "attribute.h"
-#include "banned.h"	/* include after system header <> includes */
+#include "../attribute.h"
+#include "../banned.h"	/* include after system header <> includes */


 /*
--- a/custom/c_register.c
+++ b/custom/c_register.c
@@ -1,7 +1,7 @@
 /*
 * c_register - set or print a custom register value
 *
- * Copyright (C) 2007,2021,2022  Landon Curt Noll
+ * Copyright (C) 2007,2021-2023  Landon Curt Noll
 *
 * 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
@@ -25,22 +25,33 @@
 */


+/*
+ * ISO C requires a translation unit to contain at least one declaration,
+ * so we declare a global variable whose value is based on if CUSTOM is defined.
+ */
+#if defined(CUSTOM)
+int c_register_allowed = 1;	/* CUSTOM defined */
+#else /* CUSTOM */
+int c_register_allowed = 0;	/* CUSTOM undefined */
+#endif /* CUSTOM */
+
+
 #if defined(CUSTOM)

 #include <stdio.h>

-#include "have_const.h"
-#include "value.h"
-#include "custom.h"
+#include "../have_const.h"
+#include "../value.h"
+#include "../custom.h"

-#include "config.h"
-#include "calc.h"
+#include "../config.h"
+#include "../calc.h"

-#include "have_unused.h"
+#include "../have_unused.h"


-#include "attribute.h"
-#include "banned.h"	/* include after system header <> includes */
+#include "../attribute.h"
+#include "../banned.h"	/* include after system header <> includes */


 /*
--- a/custom/c_sysinfo.c
+++ b/custom/c_sysinfo.c
@@ -1,7 +1,7 @@
 /*
 * c_sysinfo - names and values of selected #defines
 *
- * Copyright (C) 1999-2007,2021,2022  Landon Curt Noll
+ * Copyright (C) 1999-2007,2021-2023  Landon Curt Noll
 *
 * 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
@@ -25,40 +25,51 @@
 */


+/*
+ * ISO C requires a translation unit to contain at least one declaration,
+ * so we declare a global variable whose value is based on if CUSTOM is defined.
+ */
+#if defined(CUSTOM)
+int c_sysinfo_allowed = 1;	/* CUSTOM defined */
+#else /* CUSTOM */
+int c_sysinfo_allowed = 0;	/* CUSTOM undefined */
+#endif /* CUSTOM */
+
+
 #if defined(CUSTOM)

 #include <stdio.h>
 #include <ctype.h>

-#include "have_string.h"
+#include "../have_string.h"
 #if defined(HAVE_STRING_H)
 #include <string.h>
 #endif

-#include "have_const.h"
-#include "value.h"
-#include "custom.h"
+#include "../have_const.h"
+#include "../value.h"
+#include "../custom.h"

-#include "config.h"
-#include "lib_calc.h"
-#include "calc.h"
-#include "longbits.h"
+#include "../config.h"
+#include "../lib_calc.h"
+#include "../calc.h"
+#include "../longbits.h"
 #define CHECK_L_FORMAT
-#include "block.h"
-#include "calcerr.h"
-#include "conf.h"
-#include "endian_calc.h"
-#include "fposval.h"
-#include "hist.h"
-#include "prime.h"
-#include "zrand.h"
-#include "zrandom.h"
+#include "../block.h"
+#include "../calcerr.h"
+#include "../conf.h"
+#include "../endian_calc.h"
+#include "../fposval.h"
+#include "../hist.h"
+#include "../prime.h"
+#include "../zrand.h"
+#include "../zrandom.h"

-#include "have_unused.h"
+#include "../have_unused.h"


-#include "attribute.h"
-#include "banned.h"	/* include after system header <> includes */
+#include "../attribute.h"
+#include "../banned.h"	/* include after system header <> includes */


 /*
--- a/custom/custtbl.c
+++ b/custom/custtbl.c
@@ -1,7 +1,7 @@
 /*
 * custtbl - custom interface table
 *
- * Copyright (C) 1999-2007,2021  Landon Curt Noll
+ * Copyright (C) 1999-2007,2021,2023  Landon Curt Noll
 *
 * 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
@@ -24,19 +24,37 @@
 * Share and enjoy!  :-)	http://www.isthe.com/chongo/tech/comp/calc/
 */

+
 #include <unistd.h>

-#include "have_const.h"
-#include "value.h"
-#include "custom.h"
+#include "../have_const.h"
+#include "../value.h"
+#include "../custom.h"


-#include "banned.h"	/* include after system header <> includes */
+#include "../banned.h"	/* include after system header <> includes */


 /*
- * NOTE: See the file CUSTOM for instructions on how to add
- *	 custom functions.
+ * custom_compiled - determine if custom functions are compiled into libcustcalc
+ *
+ * returns:
+s*	1 ==> libcustcalc was compiled with CUSTOM defined
+ *	0 ==> libcustcalc was compiled with CUSTOM undefined
+ */
+E_FUNC int
+custom_compiled(void)
+{
+#if defined(CUSTOM)
+	return 1;
+#else /* CUSTOM */
+	return 0;
+#endif /* CUSTOM */
+}
+
+
+/*
+ * NOTE: See the file HOW_TO_ADD for instructions on how to add custom functions.
 */


--- a/help/Makefile
+++ b/help/Makefile
@@ -4,13 +4,7 @@
 #
 # Copyright (C) 1999-2006,2017,2021-2023  Landon Curt Noll
 #
-# SRC: help/Makefile
-#
-#	The "# SRC: ... - ..." comment line above indicates
-#	the origin of this file.
-#
-# IMPORTANT: Please see the section on Makefiles near the
-#	     bottom of the HOWTO.INSTALL file.
+# Suggestion: Read the ../HOWTO.INSTALL file.
 #
 # 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
@@ -29,184 +23,63 @@
 # Under source code control:	1991/07/23 06:47:57
 # File existed as early as:	1991
 #
+# This calculator first developed by David I. Bell with help/mods from others.
+#
 # chongo <was here> /\oo/\	http://www.isthe.com/chongo/
-# Share and enjoy!  :-) http://www.isthe.com/chongo/tech/comp/calc/
-#
-# calculator by David I. Bell with help/mods from others
-# Makefile by Landon Curt Noll
+# Share and enjoy!  :-)		http://www.isthe.com/chongo/tech/comp/calc/


-# The shell used by this Makefile
-#
-# On some systems, /bin/sh is a rather reduced shell with
-# deprecated behavior.
-#
-# If your system has a up to date, bash shell, then
-# you may wish to use:
-#
-#	SHELL= bash
-#
-# On some systems such as macOS, the bash shell is very
-# far behind to the point where is cannot be depended on.
-# On such systems, the sh may be a much better alternative
-# shell for this Makefile to use:
-#
-#	SHELL= sh
-#
-SHELL= bash
-#SHELL= sh
-#if 0	/* start of skip for non-Gnu makefiles */
-#
-ifeq ($(target),Darwin)
-SHELL:= /bin/sh
-endif
-#endif	/* end of skip for non-Gnu makefiles */
+# SUGGESTION: Instead of modifying this file, consider adding
+#	      statements to modify, replace or append Makefile
+#	      variables in the ../Makefile.local file.


-####
-# Normally, the upper level makefile will set these values.  We provide
-# a default here just in case you want to build from this directory.
-####
-
-# PREFIX - Top level location for calc
-#
-# The PREFIX is often prepended to paths within calc and calc Makefiles.
-#
-# Starting with calc v2.13.0.1, nearly all Makefile places that used
-# /usr/local now use ${PREFIX}.  An exception is the olduninstall rule
-# and, of course, this section. :-)
-#
-# NOTE: The ${PREFIX} is not the same as ${T}.  The ${T} specifies
-#	a top level directory under which calc installs things.
-#	While usually ${T} is empty, it can be specific path
-#	as if calc where "chrooted" during an install.
-#	The ${PREFIX} value, during install, is a path between
-#	the top level ${T} install directory and the object
-#	such as an include file.
-#
-# NOTE: See also, ${T}, below.
-#
-# There are some paths that do NOT call under ${PREFIX}, such as
-# ${CALCPATH}, that include paths not under ${PREFIX}, but those
-# too are exceptions to this general rule.
-#
-# When in doubt, try:
-#
-#	PREFIX= /usr/local
-#
-PREFIX= /usr/local
-#PREFIX= /usr
-#PREFIX= /usr/global
+###########################################
+# Files used or included by this Makefile #
+###########################################

 # Normally certain files depend on the Makefile.  If the Makefile is
 # changed, then certain steps should be redone.  If MAKE_FILE is
 # set to Makefile, then these files will depend on Makefile.  If
-# MAKE_FILE is empty, then they wont.
+# MAKE_FILE is empty, then they won't.
 #
 # If in doubt, set MAKE_FILE to Makefile
 #
 MAKE_FILE= Makefile

-# Where the system include (.h) files are kept
-#
-# For DJGPP, select:
-#
-#	INCDIR= /dev/env/DJDIR/include
-#
-# If in doubt, set:
-#
-#	INCDIR= /usr/include
+# Calc configuration and compile configuration values
 #
+CONFIG_MKF= ../Makefile.config

-#INCDIR= /usr/local/include
-#INCDIR= /dev/env/DJDIR/include
-INCDIR= /usr/include
+# Host targets that are shared in common with both Makefile
+# and custom/Makefile.
+#
+TARGET_MKF= ../Makefile.target

-# where to install calc related things
+# Host target information.
 #
-# ${BINDIR}		where to install calc binary files
-# ${LIBDIR}		where calc link library (*.a) files are installed
-# ${CALC_SHAREDIR}	where to install calc help, .cal, startup, config files
-#
-# NOTE: The install rule prepends installation paths with ${T}, which
-#	by default is empty.  If ${T} is non-empty, then installation
-#	locations will be relative to the ${T} directory.
-#
-# For DJGPP, select:
-#
-#	BINDIR= /dev/env/DJDIR/bin
-#	LIBDIR= /dev/env/DJDIR/lib
-#	CALC_SHAREDIR= /dev/env/DJDIR/share/calc
-#
-# If in doubt, set:
-#
-#	BINDIR= /usr/bin
-#	LIBDIR= /usr/lib
-#	CALC_SHAREDIR= /usr/share/calc
-#
-#BINDIR= ${PREFIX}/bin
-#BINDIR= /dev/env/DJDIR/bin
-BINDIR= /usr/bin
+LOCAL_MKF= ../Makefile.local

-#LIBDIR= ${PREFIX}/lib
-#LIBDIR= /dev/env/DJDIR/lib
-LIBDIR= /usr/lib
+# The set of Makefiles
+#
+MK_SET= ${MAKE_FILE} ${CONFIG_MKF} ${TARGET_MKF} ${LOCAL_MKF}

-#CALC_SHAREDIR= ${PREFIX}/lib/calc
-#CALC_SHAREDIR= /dev/env/DJDIR/share/calc
-CALC_SHAREDIR= /usr/share/calc

-# By default, these values are based CALC_SHAREDIR, INCDIR, BINDIR
-# ---------------------------------------------------------------
-# ${HELPDIR}		where the help directory is installed
-# ${CALC_INCDIR}	where the calc include files are installed
-# ${SCRIPTDIR}		where calc shell scripts are installed
-#
-# NOTE: The install rule prepends installation paths with ${T}, which
-#	by default is empty.  If ${T} is non-empty, then installation
-#	locations will be relative to the ${T} directory.
-#
-# If in doubt, set:
-#
-#	HELPDIR= ${CALC_SHAREDIR}/help
-#	CALC_INCDIR= ${INCDIR}/calc
-#	SCRIPTDIR= ${BINDIR}/cscript
-#
-HELPDIR= ${CALC_SHAREDIR}/help
-CALC_INCDIR= ${INCDIR}/calc
-SCRIPTDIR= ${BINDIR}/cscript
+#######################################################
+# Calc configuration and compile configuration values #
+#######################################################
+include ${CONFIG_MKF}

-# T - top level directory under which calc will be installed
-#
-# The calc install is performed under ${T}, the calc build is
-# performed under /.	The purpose for ${T} is to allow someone
-# to install calc somewhere other than into the system area.
-#
-# For example, if:
-#
-#     BINDIR= /usr/bin
-#     LIBDIR= /usr/lib
-#     CALC_SHAREDIR= /usr/share/calc
-#
-# and if:
-#
-#     T= /var/tmp/testing
-#
-# Then the installation locations will be:
-#
-#     calc binary files:	/var/tmp/testing/usr/bin
-#     calc link library:	/var/tmp/testing/usr/lib
-#     calc help, .cal ...:	/var/tmp/testing/usr/share/calc
-#     ... etc ...		/var/tmp/testing/...
-#
-# If ${T} is empty, calc is installed under /, which is the same
-# top of tree for which it was built.  If ${T} is non-empty, then
-# calc is installed under ${T}, as if one had to chroot under
-# ${T} for calc to operate.
-#
-# If in doubt, use T=
-#
-T=
+
+###############################
+# host target section include #
+###############################
+include ${TARGET_MKF}
+
+
+##########################################################################
+#=-=-=-=-=- Be careful if you change something below this line -=-=-=-=-=#
+##########################################################################

 # Makefile debug
 #
@@ -240,41 +113,11 @@ H=@
 V=@:
 #V=@

-# standard tools
-#
-CAT= cat
-CHMOD= chmod
-CMP= cmp
-CP= cp
-FMT= fmt
-GREP= grep
-ICFLAGS=
-ILDFLAGS=
-LCC= cc
-MKDIR= mkdir
-MV= mv
-RM= rm
-RMDIR= rmdir
-SED= sed
-SORT= sort
-TOUCH= touch
-TRUE= true

-# Some out of date operating systems require / want an executable to
-# end with a certain file extension.  Some compile systems such as
-# Cygwin build calc as calc.exe.  The EXT variable is used to denote
-# the extension required by such.
-#
-# EXT=				# normal Un*x / Linux / GNU/Linux systems
-# EXT=.exe			# Windows / Cygwin
-#
-# If in doubt, use EXT=
-#
-EXT=
-#EXT=.exe
+##################################
+# Files managed by this Makefile #
+##################################

-# Standard and Builtin help files
-#
 STD_HELP_FILES_1= intro overview help
 STD_HELP_FILES_2= assoc

@@ -414,9 +257,25 @@ CALCLIBLIST=
 #
 PHONY= all clobber distlist install

+
+############################################################
+# Allow Makefile.local to change any of the above settings #
+############################################################
+include ${LOCAL_MKF}
+
+
+###########################################
+# all - First and default Makefile target #
+###########################################
+
 all: ${FULL_HELP_FILES} full ${DETAIL_HELP} ${DETAIL_CLONE} \
     ${SINGULAR_FILES} .all

+
+###############################
+# additional Makefile targets #
+###############################
+
 # used by the upper level Makefile to determine of we have done all
 #
 # NOTE: Due to bogus shells found on one common system we must have
--- a/rpm.mk
+++ b/rpm.mk
@@ -134,10 +134,12 @@ V=@:
 all: ver_calc calc.spec
 	${V} echo '=-=-=-=-= rpm.mk start of $@ rule =-=-=-=-='
 	PROJECT_VERSION="`./ver_calc`"; \
+	PROJECT_VER="`./ver_calc -V`"; \
 	PROJECT_RELEASE="`${SED} -n \
 	    -e '/^Release:/s/^Release: *//p' calc.spec.in`"; \
 	$(MAKE) -f rpm.mk rpm \
 	    PROJECT_VERSION="$$PROJECT_VERSION" \
+	    PROJECT_VER="$$PROJECT_VER" \
 	    PROJECT_RELEASE="$$PROJECT_RELEASE" Q= S= E=
 	${V} echo '=-=-=-=-= rpm.mk end of $@ rule =-=-=-=-='

@@ -158,6 +160,7 @@ calc.spec: calc.spec.in ver_calc
 	${V} echo '=-=-=-=-= rpm.mk start of $@ rule =-=-=-=-='
 	${RM} -f calc.spec
 	${SED} -e 's/<<<PROJECT_VERSION>>>/'"`./ver_calc`"/g \
+	       -e 's/<<<PROJECT_VER>>>/'"`./ver_calc -V`"/g \
 	    calc.spec.in > calc.spec
 	${V} echo '=-=-=-=-= rpm.mk end of $@ rule =-=-=-=-='

@@ -167,6 +170,7 @@ srcpkg: make_rhdir
 	${V} echo RPM_TOP="${RPM_TOP}"
 	${V} echo RPM_BUILD_ROOT="${RPM_BUILD_ROOT}"
 	${V} echo PROJECT_VERSION="${PROJECT_VERSION}"
+	${V} echo PROJECT_VER="${PROJECT_VER}"
 	${V} echo PROJECT_RELEASE="${PROJECT_RELEASE}"
 	${RM} -rf "$(TMPDIR)/$(PROJECT)"
 	${FIND} . -depth -print | \
@@ -190,6 +194,7 @@ rpm: srcpkg calc.spec
 	${V} echo RPM_TOP="${RPM_TOP}"
 	${V} echo RPM_BUILD_ROOT="${RPM_BUILD_ROOT}"
 	${V} echo PROJECT_VERSION="${PROJECT_VERSION}"
+	${V} echo PROJECT_VER="${PROJECT_VER}"
 	${V} echo PROJECT_RELEASE="${PROJECT_RELEASE}"
 	$(MAKE) -f Makefile clean Q= S= E=
 	${CP} "$(SPECFILE)" "$(RPM_TOP)/SPECS/$(SPECFILE)"
@@ -210,6 +215,7 @@ make_rhdir:
 	${V} echo RPM_TOP="${RPM_TOP}"
 	${V} echo RPM_BUILD_ROOT="${RPM_BUILD_ROOT}"
 	${V} echo PROJECT_VERSION="${PROJECT_VERSION}"
+	${V} echo PROJECT_VER="${PROJECT_VER}"
 	${V} echo PROJECT_RELEASE="${PROJECT_RELEASE}"
 	for subdir in "" BUILD RPMS SOURCES SPECS SRPMS tmp; do \
 	    i="$(RPM_TOP)/$$subdir"; \
@@ -287,7 +293,10 @@ test: ver_calc
 	    echo "test needs to install, must be root to test" 1>&2; \
 	    exit 6; \
 	fi
-	$(MAKE) -f rpm.mk PROJECT_VERSION="`./ver_calc`" installrpm \
+	$(MAKE) -f rpm.mk \
+		PROJECT_VERSION="`./ver_calc`" \
+		PROJECT_VER="`./ver_calc -V`" \
+		installrpm \
 		chksys Q= S= E=
 	${V} echo '=-=-=-=-= rpm.mk end of $@ rule =-=-=-=-='

--- a/version.c
+++ b/version.c
@@ -84,7 +84,7 @@ static char *program;
 #define MAJOR_VER	2	/* major library version */
 #define MINOR_VER	14	/* minor library version */
 #define MAJOR_PATCH	3	/* major software version level */
-#define MINOR_PATCH	1	/* minor software version level */
+#define MINOR_PATCH	5	/* minor software version level */


 /*