Fix typos on CHANGES

Replaced /usr/local with the use of ${PREFIX} in calc Makefiles.

The ${PREFIX} is not the same as ${T}.  The ${T} specifies
a top level directory under which calc installs things.
While usally ${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.

Corrected a few more typos in Makefile comments.

Added Makefile.local, a file with a single comment.  The main
Makefile includes Makefile.local just before the first all rule.
One may overtide any Makefile setting by modifying Makefile.local.
For example, Makefile.local could force BLD_TYPE:

    HAVE_STRING_H:= YES
    HAVE_TIMES_H:= YES
    SED:= /usr/local/bin/nsed

Added ${LOC_MKF} to specify the make of the file that is
included just before the all file.  So one could place
the above override lines into a different file and call
make changing the ${LOC_MKF} value.  For example:

    make LOC_MKF=Makefile.private clobber all chk

Updated HOWTO.INSTALL to mention Makefile.local.

BUGS

@@ -119,9 +119,6 @@ Known bugs in calc:
     The output of the alg_config.cal resource file is bogus.
     We would welcome a replacement for this code.
 
-    Calc shell scripts do not read from stdin properly,
-    we all as a number of the cscript examples.
-
     We are sure some more bugs exist.  When you find them, please let
     us know!  See the above for details on how to report and were to
     Email your bug reports and hopefully patches to fix them.

CHANGES

@@ -1,4 +1,37 @@
-The following are the changes from calc version 2.13.0 to date:
+The following are the changes from calc version 2.13.0.1 to date:
+
+    Replaced /usr/local with the use of ${PREFIX} in calc Makefiles.
+
+    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.
+
+    Corrected a few more typos in Makefile comments.
+
+    Added Makefile.local, a file with a single comment.  The main
+    Makefile includes Makefile.local just before the first all rule.
+    One may override any Makefile setting by modifying Makefile.local.
+    For example, Makefile.local could force BLD_TYPE:
+
+	HAVE_STRING_H:= YES
+	HAVE_TIMES_H:= YES
+	SED:= /usr/local/bin/nsed
+
+    Added ${LOC_MKF} to specify the make of the file that is
+    included just before the all file.  So one could place
+    the above override lines into a different file and call
+    make changing the ${LOC_MKF} value.  For example:
+
+	make LOC_MKF=Makefile.private clobber all chk
+
+    Updated HOWTO.INSTALL to mention Makefile.local.
+
+
+The following are the changes from calc version 2.13.0.0 to date:
 
     Fixed typo (missing quotes) in the env rule.
 
@@ -65,7 +98,9 @@ The following are the changes from calc version 2.13.0 to date:
     Due to incompatible changes to the argv() function, and #! calc
     scripts, we are setting the version to the next minor number:
 
-	2.13.0
+	2.13.0.x
+
+    Updated BUGS file as per v2.13.0 fixes.
 
 
 The following are the changes from calc version 2.12.8.2 to 2.12.9.1:

HOWTO.INSTALL

@@ -31,10 +31,10 @@ Installing calc from the bzip2-ed tarball in 4 easy steps:
 
     (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 modern
 	Make (such as gmake) or an equivalently advanced make.	On many
 	targets, the default make is sufficient.  On FreeBSD for example,
-	one must use gmake instead of make.
+	probably want to use gmake instead of make.
 
 	Some report that under macOS, one has to declare the target
 	to be Darwin.  So for macOS, one might have to do:
@@ -46,8 +46,8 @@ Installing calc from the bzip2-ed tarball in 4 easy steps:
 	    make target=Darwin chk
 	    make target=Darwin install
 
-	If your target system does not have GNU Make (or equivalent), then
-	you should try using the Makefile.simple and custom/Makefile.simple
+	If your target system does not have a moderm Makefile (such as gmake),
+	then you should try using the Makefile.simple and custom/Makefile.simple
 	files:
 
 	    mv Makefile Makefile.gmake
@@ -60,6 +60,14 @@ Installing calc from the bzip2-ed tarball in 4 easy steps:
 	values should work.  If in doubt, follow the 'When in doubt'
 	suggestion.
 
+	If you are using a modern make (such as gmake), you may override
+	any values set in the Mkefile by adding them to Makefile.local
+	using the := directive.  For example:
+
+	    HAVE_STRING_H:= YES
+	    HAVE_TIMES_H:= YES
+	    SED:= /usr/local/bin/nsed
+
 	!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 	! If you are building under Windoz or a Windoz-like environment !
 	! (such as Cygwin or DJGPP), read the README.WINDOWS file.      !

Makefile

@@ -68,6 +68,22 @@ endif
 #-=-=-=-=-=-=-=-=- You may want to change some values below -=-=-=-=-=-=-=-=-#
 ##############################################################################
 
+# 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. :-)
+#
+# When in doubt, try:
+#
+#	PREFIX= /usr/local
+#
+PREFIX= /usr/local
+#PREFIX= /usr
+#PREFIX= /usr/global
+
 # 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
@@ -111,22 +127,22 @@ USE_READLINE= -DUSE_READLINE
 #
 #READLINE_LIB=
 #READLINE_LIB= -L/usr/gnu/lib -lreadline -lhistory -lncurses
-#READLINE_LIB= -L/usr/local/lib -lreadline -lhistory -lncurses
+#READLINE_LIB= -L${PREFIX}/lib -lreadline -lhistory -lncurses
 ifeq ($(target),Darwin)
-# homebrew installs readline & history libs in /usr/local/opt/readline/lib
-READLINE_LIB= -L/usr/local/opt/readline/lib -lreadline -lhistory -lncurses
+# homebrew installs readline & history libs in ${PREFIX}/opt/readline/lib
+READLINE_LIB= -L${PREFIX}/opt/readline/lib -lreadline -lhistory -lncurses
 else
 READLINE_LIB= -lreadline -lhistory -lncurses
 endif
 #
 ifeq ($(target),Darwin)
-# homebrew installs readline & history *.h under /usr/local/opt/readline/include
-READLINE_INCLUDE= -I/usr/local/opt/readline/include
+# homebrew installs readline & history *.h under ${PREFIX}/opt/readline/include
+READLINE_INCLUDE= -I${PREFIX}/opt/readline/include
 else
 READLINE_INCLUDE=
 endif
 #READLINE_INCLUDE= -I/usr/gnu/include
-#READLINE_INCLUDE= -I/usr/local/include
+#READLINE_INCLUDE= -I${PREFIX}/include
 
 # Normally certain files depend on the Makefile.  If the Makefile is
 # changed, then certain steps should be redone.	 If MAKE_FILE is
@@ -242,6 +258,7 @@ XVAR= \
 	MAKE_FILE='${MAKE_FILE}' \
 	NROFF='${NROFF}' \
 	Q='${Q}' \
+	PREFIX='${PREFIX}' \
 	READLINE_INCLUDE='${READLINE_INCLUDE}' \
 	READLINE_LIB='${READLINE_LIB}' \
 	RPM_TOP='${RPM_TOP}' \

Makefile.local

@@ -0,0 +1 @@
+# Add below to override Makefile values (using :=) as in: HAVE_STRING_H:= YES

Makefile.ship

@@ -47,7 +47,7 @@
 #	SHELL= /bin/bash
 #
 # On some systems such as macOS, the bash shell is very
-# far behind to the point wehre is cannot be depended on.
+# far behind to the point where is cannot be depended on.
 # On such systems, the zsh may be a much better alternative
 # shell for this Makefile to use:
 #
@@ -78,6 +78,36 @@ endif
 #-=-=-=-=-=-=-=-=- You may want to change some values below -=-=-=-=-=-=-=-=-#
 ##############################################################################
 
+# 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
+
 # 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
@@ -85,7 +115,7 @@ endif
 # if calculations.
 #
 # In the case of calc, we are motivated in part by the desire for calc
-# to correctly calculate: even durings extremely long calculations.
+# 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).
@@ -651,7 +681,7 @@ HAVE_STRLCAT=
 #
 # However, if you are on macOS then set:
 #
-#	INCDIR= /usr/local/include
+#	INCDIR= ${PREFIX}/include
 #if 0	/* start of skip for non-Gnu makefiles */
 ifeq ($(target),Darwin)
 
@@ -663,7 +693,7 @@ else
 
 # default INCDIR for non-macOS
 INCDIR= /usr/include
-#INCDIR= /usr/local/include
+#INCDIR= ${PREFIX}/include
 #INCDIR= /dev/env/DJDIR/include
 
 #if 0	/* start of skip for non-Gnu makefiles */
@@ -707,26 +737,26 @@ endif
 #
 # However, if you are on macOS then set:
 #
-#	BINDIR= /usr/local/bin
-#	LIBDIR= /usr/local/lib
-#	CALC_SHAREDIR= /usr/local/share/calc
+#	BINDIR= ${PREFIX}/bin
+#	LIBDIR= ${PREFIX}/lib
+#	CALC_SHAREDIR= ${PREFIX}/share/calc
 #
 # 	NOTE: Starting with macOS El Capitan OS X 10.11, root by default
 # 	      could not mkdir under system locations, so macOS must now
-# 	      use the /usr/local tree.
+# 	      use the ${PREFIX} tree.
 
 #if 0	/* start of skip for non-Gnu makefiles */
 ifeq ($(target),Darwin)
 
 # default BINDIR for macOS
-BINDIR= /usr/local/bin
+BINDIR= ${PREFIX}/bin
 
 else
 #endif	/* end of skip for non-Gnu makefiles */
 
 # default BINDIR for non-macOS
 BINDIR= /usr/bin
-#BINDIR= /usr/local/bin
+#BINDIR= ${PREFIX}/bin
 #BINDIR= /dev/env/DJDIR/bin
 
 #if 0	/* start of skip for non-Gnu makefiles */
@@ -735,14 +765,14 @@ endif
 ifeq ($(target),Darwin)
 
 # default LIBDIR for macOS
-LIBDIR= /usr/local/lib
+LIBDIR= ${PREFIX}/lib
 
 else
 #endif	/* end of skip for non-Gnu makefiles */
 
 # default LIBDIR for non-macOS
 LIBDIR= /usr/lib
-#LIBDIR= /usr/local/lib
+#LIBDIR= ${PREFIX}/lib
 #LIBDIR= /dev/env/DJDIR/lib
 
 #if 0	/* start of skip for non-Gnu makefiles */
@@ -751,25 +781,25 @@ endif
 ifeq ($(target),Darwin)
 
 # default CALC_SHAREDIR for macOS
-CALC_SHAREDIR= /usr/local/share/calc
+CALC_SHAREDIR= ${PREFIX}/share/calc
 
 else
 #endif	/* end of skip for non-Gnu makefiles */
 
 # default CALC_SHAREDIR for non-macOS
 CALC_SHAREDIR= /usr/share/calc
-#CALC_SHAREDIR= /usr/local/lib/calc
+#CALC_SHAREDIR= ${PREFIX}/lib/calc
 #CALC_SHAREDIR= /dev/env/DJDIR/share/calc
 
 #if 0	/* start of skip for non-Gnu makefiles */
 endif
 #endif	/* end of skip for non-Gnu makefiles */
 
-# NOTE: Do not set CALC_INCDIR to /usr/include or /usr/local/include!!!
+# NOTE: Do not set CALC_INCDIR to /usr/include or ${PREFIX}/include!!!
 #	Always be sure that the CALC_INCDIR path ends in /calc to avoid
 #	conflicts with system or other application include files!!!
 #
-#CALC_INCDIR= /usr/local/include/calc
+#CALC_INCDIR= ${PREFIX}/include/calc
 #CALC_INCDIR= /dev/env/DJDIR/include/calc
 CALC_INCDIR= ${INCDIR}/calc
 
@@ -828,6 +858,16 @@ SCRIPTDIR= ${BINDIR}/cscript
 # calc is installed under ${T}, as if one had to chroot under
 # ${T} for calc to operate.
 #
+# 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.
+#
+#	See ${PREFIX} above.
+#
 # If in doubt, use T=
 #
 T=
@@ -841,15 +881,15 @@ T=
 # NOTE: man pages not installed by macOS must go under,
 # (according to MANPATH as found in /private/etc/man.conf):
 #
-#	MANDIR= /usr/local/share/man/man1
+#	MANDIR= ${PREFIX}/share/man/man1
 #
 #MANDIR=
-#MANDIR= /usr/local/man/man1
+#MANDIR= ${PREFIX}/man/man1
 #MANDIR= /usr/man/man1
 #
 #if 0	/* start of skip for non-Gnu makefiles */
 ifeq ($(target),Darwin)
-MANDIR= /usr/local/share/man/man1
+MANDIR= ${PREFIX}/share/man/man1
 else
 #endif	/* end of skip for non-Gnu makefiles */
 MANDIR= /usr/share/man/man1
@@ -870,8 +910,8 @@ endif
 #	${NROFF} executable and/or the ${MANMAKE} executable.
 #
 CATDIR=
-#CATDIR= /usr/local/man/cat1
-#CATDIR= /usr/local/catman/cat1
+#CATDIR= ${PREFIX}/man/cat1
+#CATDIR= ${PREFIX}/catman/cat1
 #CATDIR= /usr/man/cat1
 #CATDIR= /usr/share/man/cat1
 #CATDIR= /dev/env/DJDIR/man/cat1
@@ -923,7 +963,7 @@ NROFF=
 #NROFF= groff
 NROFF_ARG= -man
 #NROFF_ARG= -mandoc
-MANMAKE= /usr/local/bin/manmake
+MANMAKE= ${PREFIX}/bin/manmake
 #MANMAKE= manmake
 MANMODE= 0444
 CATMODE= 0444
@@ -1005,7 +1045,7 @@ READLINE_EXTRAS=
 #READLINE_LIB= -L/usr/gnu/lib -lreadline
 #READLINE_EXTRAS= -lhistory -lncurses
 #
-#READLINE_LIB= -L/usr/local/lib -lreadline
+#READLINE_LIB= -L${PREFIX}/lib -lreadline
 #READLINE_EXTRAS= -lhistory -lncurses
 #
 # For Apple OS X: install fink from http://fink.sourceforge.net
@@ -1020,12 +1060,12 @@ READLINE_EXTRAS=
 #
 # and use:
 #
-#READLINE_LIB= -L/usr/local/opt/readline/lib -lreadline
+#READLINE_LIB= -L${PREFIX}/opt/readline/lib -lreadline
 #READLINE_EXTRAS= -lhistory -lncurses
 #
 READLINE_INCLUDE=
 #READLINE_INCLUDE= -I/usr/gnu/include
-#READLINE_INCLUDE= -I/usr/local/include
+#READLINE_INCLUDE= -I${PREFIX}/include
 
 # If $PAGER is not set, use this program to display a help file
 #
@@ -1081,6 +1121,11 @@ RANLIB=ranlib
 #
 MAKE_FILE= Makefile
 
+# Local file that is included just prior to the first rule,
+# that allows one to override any values set in this Makefile.
+#
+LOC_MKF= Makefile.local
+
 # Controlling file makefile basename (without the path)
 #
 # This is the basename same of the makefile that may/does/will drive
@@ -1153,7 +1198,7 @@ EXT=
 
 # The default calc versions
 #
-VERSION= 2.13.0.0
+VERSION= 2.13.0.1
 
 # Names of shared libraries with versions
 #
@@ -1339,7 +1384,7 @@ ifeq ($(target),Linux)
 BLD_TYPE= calc-dynamic-only
 #
 CC_SHARE= -fPIC
-DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:/usr/local/lib
+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}"
@@ -1391,7 +1436,7 @@ ifeq ($(target),Darwin)
 BLD_TYPE= calc-dynamic-only
 #
 CC_SHARE= -fPIC
-DEFAULT_LIB_INSTALL_PATH= ${PWD}:${LIBDIR}:/usr/local/lib
+DEFAULT_LIB_INSTALL_PATH= ${PWD}:${LIBDIR}:${PREFIX}/lib
 LD_SHARE= ${DARWIN_ARCH}
 #SET_INSTALL_NAME= no
 SET_INSTALL_NAME= yes
@@ -1473,7 +1518,7 @@ ifeq ($(target),FreeBSD)
 BLD_TYPE= calc-dynamic-only
 #
 CC_SHARE= -fPIC
-DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:/usr/local/lib
+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}"
@@ -1533,7 +1578,7 @@ ifeq ($(target),OpenBSD)
 BLD_TYPE= calc-dynamic-only
 #
 CC_SHARE= -fPIC
-DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:/usr/local/lib
+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}"
@@ -1587,7 +1632,7 @@ ifeq ($(target),SunOS)
 BLD_TYPE= calc-dynamic-only
 #
 CC_SHARE= -fPIC
-DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:/usr/local/lib
+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}"
@@ -1639,7 +1684,7 @@ ifeq ($(target),Cygwin)
 BLD_TYPE= calc-static-only
 #
 CC_SHARE= -fPIC
-DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:/usr/local/lib
+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}"
@@ -1695,7 +1740,7 @@ ifeq ($(target),simple)
 BLD_TYPE= calc-static-only
 #
 CC_SHARE= -fPIC
-DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:/usr/local/lib
+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}"
@@ -1754,7 +1799,7 @@ CALCRC= ${CALC_SHAREDIR}/startup;~/.calcrc;./.calcinit
 BLD_TYPE= calc-static-only
 #
 CC_SHARE= -fPIC
-DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:/usr/local/lib
+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}"
@@ -1794,7 +1839,7 @@ ifeq ($(target),)
 BLD_TYPE= calc-static-only
 #
 CC_SHARE= -fPIC
-DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:/usr/local/lib
+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}"
@@ -1959,7 +2004,7 @@ LIB_H_SRC= alloc.h banned.h blkcpy.h block.h byteswap.h calc.h cmath.h \
 
 # we build these .h files during the make
 #
-BUILD_H_SRC= align32.h args.h calcerr.c calcerr.h conf.h endian_calc.h \
+BUILD_H_SRC= align32.h args.h calcerr.h conf.h endian_calc.h \
 	fposval.h have_ban_pragma.h have_const.h have_fpos.h \
 	have_fpos_pos.h have_getpgid.h have_getprid.h have_getsid.h \
 	have_gettime.h have_memmv.h have_newstr.h have_offscl.h \
@@ -2092,6 +2137,7 @@ CUSTOM_PASSDOWN=  \
     MAKE_FILE=Makefile \
     MKDIR=${MKDIR} \
     MV=${MV} \
+    PREFIX="${PREFIX}" \
     PURIFY="${PURIFY}" \
     Q="${Q}" \
     RANLIB="${RANLIB}" \
@@ -2144,6 +2190,7 @@ HELP_PASSDOWN= \
     MAKE_FILE=Makefile \
     MKDIR=${MKDIR} \
     MV=${MV} \
+    PREFIX="${PREFIX}" \
     Q="${Q}" \
     RM=${RM} \
     RMDIR=${RMDIR} \
@@ -2178,6 +2225,7 @@ CAL_PASSDOWN= \
     MAKE_FILE=Makefile \
     MKDIR=${MKDIR} \
     MV=${MV} \
+    PREFIX="${PREFIX}" \
     Q="${Q}" \
     RM=${RM} \
     RMDIR=${RMDIR} \
@@ -2213,6 +2261,7 @@ CSCRIPT_PASSDOWN= \
     MAKE_FILE=Makefile \
     MKDIR=${MKDIR} \
     MV=${MV} \
+    PREFIX="${PREFIX}" \
     Q="${Q}" \
     RM=${RM} \
     RMDIR=${RMDIR} \
@@ -2243,7 +2292,8 @@ LICENSE= COPYING COPYING-LGPL
 #
 DISTLIST= ${C_SRC} ${H_SRC} ${MAKE_FILE} BUGS CHANGES LIBRARY README.FIRST \
 	  README.WINDOWS calc.man HOWTO.INSTALL ${UTIL_MISC_SRC} ${LICENSE} \
-	  sample.README calc.spec.in rpm.mk README.md QUESTIONS CONTRIB-CODE
+	  sample.README calc.spec.in rpm.mk README.md QUESTIONS CONTRIB-CODE \
+	  ${LOC_MKF}
 
 # These files are used to make (but not build) a calc .a link library
 #
@@ -2340,6 +2390,16 @@ LATE_TARGETS= calc.1 calc.usage \
 #
 TARGETS= ${EARLY_TARGETS} ${BLD_TYPE} ${LATE_TARGETS}
 
+#if 0	/* start of skip for non-Gnu makefiles */
+###
+#
+# Allow Makefile.local to override any of the above settings
+#
+###
+
+include ${LOC_MKF}
+#endif	/* end of skip for non-Gnu makefiles */
+
 ###
 #
 # The reason for this Makefile	:-)
@@ -2371,7 +2431,7 @@ calc-dynamic-only: ${DYNAMIC_FIRST_TARGETS} ${EARLY_TARGETS} \
 		   ${CALC_DYNAMIC_LIBS} ${SYM_DYNAMIC_LIBS} calc${EXT} \
 		   ${SAMPLE_TARGETS} ${LATE_TARGETS}
 
-.dynamic: ${MAKE_FILE}
+.dynamic: ${MAKE_FILE} ${LOC_MKF}
 	${Q} r="calc-dynamic-only"; \
 	    if [ "${BLD_TYPE}" != "$$r" ]; then \
 	    echo "NOTE: The host target $(target) defaults to a build" 1>&2; \
@@ -2417,7 +2477,7 @@ calc-static-only: ${STATIC_FIRST_TARGETS} ${EARLY_TARGETS} \
 	    fi; \
 	done
 
-.static: ${MAKE_FILE}
+.static: ${MAKE_FILE} ${LOC_MKF}
 	${Q} r="calc-static-only"; \
 	    if [ "${BLD_TYPE}" != "$$r" ]; then \
 	    echo "NOTE: The host target $(target) defaults to a build" 1>&2; \
@@ -2451,12 +2511,12 @@ calc-static-only: ${STATIC_FIRST_TARGETS} ${EARLY_TARGETS} \
 	done
 	 -${Q} ${TOUCH} $@
 
-calc${EXT}: .hsrc ${CALCOBJS} ${CALC_DYNAMIC_LIBS} ${MAKE_FILE}
+calc${EXT}: .hsrc ${CALCOBJS} ${CALC_DYNAMIC_LIBS} ${MAKE_FILE} ${LOC_MKF}
 	${RM} -f $@
 	${CC} ${CALCOBJS} ${LDFLAGS} ${LD_SHARE} ${CALC_DYNAMIC_LIBS} \
 	      ${READLINE_LIB} ${READLINE_EXTRAS} -o $@
 
-libcalc${LIB_EXT_VERSION}: ${LIBOBJS} ver_calc${EXT} ${MAKE_FILE}
+libcalc${LIB_EXT_VERSION}: ${LIBOBJS} ver_calc${EXT} ${MAKE_FILE} ${LOC_MKF}
 	${CC} ${LIBCALC_SHLIB} ${LIBOBJS} \
 	      ${READLINE_LIB} ${READLINE_EXTRAS} -o libcalc${LIB_EXT_VERSION}
 
@@ -2470,7 +2530,7 @@ libcalc${LIB_EXT}: libcalc${LIB_EXT_VERSION}
 #
 ###
 
-calc.1: calc.man ${MAKE_FILE}
+calc.1: calc.man ${MAKE_FILE} ${LOC_MKF}
 	${RM} -f $@
 	${Q} echo forming calc.1 from calc.man
 	@${SED} -e 's:$${LIBDIR}:${LIBDIR}:g' \
@@ -2486,7 +2546,7 @@ calc.1: calc.man ${MAKE_FILE}
 	        -e 's,$${CALCRC},${CALCRC},g' < calc.man > calc.1
 	${Q} echo calc.1 formed
 
-calc.usage: calc.1 ${MAKE_FILE}
+calc.usage: calc.1 ${MAKE_FILE} ${LOC_MKF}
 	${RM} -f $@
 	${Q} echo forming calc.usage from calc.1
 	${Q} if [ -z "${NROFF}" ]; then \
@@ -2505,11 +2565,11 @@ calc.usage: calc.1 ${MAKE_FILE}
 
 sample: ${SAMPLE_TARGETS}
 
-sample_rand${EXT}: sample_rand.o ${CALC_DYNAMIC_LIBS} ${MAKE_FILE}
+sample_rand${EXT}: sample_rand.o ${CALC_DYNAMIC_LIBS} ${MAKE_FILE} ${LOC_MKF}
 	${CC} sample_rand.o ${LDFLAGS} ${LD_SHARE} ${CALC_DYNAMIC_LIBS} \
 	      ${READLINE_LIB} ${READLINE_EXTRAS} -o $@
 
-sample_many${EXT}: sample_many.o ${CALC_DYNAMIC_LIBS} ${MAKE_FILE}
+sample_many${EXT}: sample_many.o ${CALC_DYNAMIC_LIBS} ${MAKE_FILE} ${LOC_MKF}
 	${CC} sample_many.o ${LDFLAGS} ${LD_SHARE} ${CALC_DYNAMIC_LIBS} \
 	      ${READLINE_LIB} ${READLINE_EXTRAS} -o $@
 
@@ -2519,15 +2579,15 @@ sample_many${EXT}: sample_many.o ${CALC_DYNAMIC_LIBS} ${MAKE_FILE}
 #
 ###
 
-hist.o: hist.c ${MAKE_FILE}
+hist.o: hist.c ${MAKE_FILE} ${LOC_MKF}
 	${CC} ${CFLAGS} ${TERMCONTROL} ${USE_READLINE} ${READLINE_INCLUDE} \
 	    -c hist.c
 
-seed.o: seed.c ${MAKE_FILE}
+seed.o: seed.c ${MAKE_FILE} ${LOC_MKF}
 	${CC} ${CFLAGS} ${WNO_IMPLICT} ${WNO_ERROR_LONG_LONG} \
 	    ${WNO_LONG_LONG} -c seed.c
 
-file.o: file.c ${MAKE_FILE}
+file.o: file.c ${MAKE_FILE} ${LOC_MKF}
 	${CC} ${CFLAGS} ${WNO_ERROR_LONG_LONG} ${WNO_LONG_LONG} -c file.c
 
 ###
@@ -2552,7 +2612,7 @@ hsrc: ${BUILD_H_SRC} ${BUILD_C_SRC}
 	${Q} ${RM} -f .hsrc
 	-${Q} ${TOUCH} .hsrc
 
-conf.h: ${MAKE_FILE}
+conf.h: ${MAKE_FILE} ${LOC_MKF}
 	${Q} ${RM} -f $@
 	${H} echo 'forming $@'
 	${Q} echo '/*' > $@
@@ -2625,7 +2685,7 @@ endif
 	fi
 
 endian_calc.h: endian.c have_stdlib.h have_unistd.h \
-	banned.h have_ban_pragma.h ${MAKE_FILE}
+	banned.h have_ban_pragma.h ${MAKE_FILE} ${LOC_MKF}
 	${Q} ${RM} -f endian.o endian${EXT} $@
 	${H} echo 'forming $@'
 	${Q} echo '/*' > $@
@@ -2677,7 +2737,7 @@ endian_calc.h: endian.c have_stdlib.h have_unistd.h \
 	fi
 
 longbits.h: longbits.c have_unistd.h have_stdlib.h \
-	banned.h have_ban_pragma.h ${MAKE_FILE}
+	banned.h have_ban_pragma.h ${MAKE_FILE} ${LOC_MKF}
 	${Q} ${RM} -f longbits.o longbits${EXT} $@
 	${H} echo 'forming $@'
 	${Q} echo '/*' > $@
@@ -2707,7 +2767,7 @@ longbits.h: longbits.c have_unistd.h have_stdlib.h \
 	    ${TRUE}; \
 	fi
 
-have_times.h: ${MAKE_FILE}
+have_times.h: ${MAKE_FILE} ${LOC_MKF}
 	${Q} ${RM} -f $@
 	${H} echo 'forming $@'
 	${Q} echo '/*' > $@
@@ -2773,7 +2833,7 @@ have_times.h: ${MAKE_FILE}
 	    ${TRUE}; \
 	fi
 
-have_stdlib.h: ${MAKE_FILE}
+have_stdlib.h: ${MAKE_FILE} ${LOC_MKF}
 	${Q} ${RM} -f $@
 	${H} echo 'forming $@'
 	${Q} echo '/*' > $@
@@ -2809,7 +2869,7 @@ have_stdlib.h: ${MAKE_FILE}
 	    ${TRUE}; \
 	fi
 
-have_unistd.h: ${MAKE_FILE}
+have_unistd.h: ${MAKE_FILE} ${LOC_MKF}
 	${Q} ${RM} -f $@
 	${H} echo 'forming $@'
 	${Q} echo '/*' > $@
@@ -2845,7 +2905,7 @@ have_unistd.h: ${MAKE_FILE}
 	    ${TRUE}; \
 	fi
 
-have_string.h: ${MAKE_FILE}
+have_string.h: ${MAKE_FILE} ${LOC_MKF}
 	${Q} ${RM} -f $@
 	${H} echo 'forming $@'
 	${Q} echo '/*' > $@
@@ -2881,7 +2941,7 @@ have_string.h: ${MAKE_FILE}
 	    ${TRUE}; \
 	fi
 
-terminal.h: ${MAKE_FILE}
+terminal.h: ${MAKE_FILE} ${LOC_MKF}
 	${Q} ${RM} -f $@
 	${H} echo 'forming $@'
 	${Q} echo '/*' > $@
@@ -2935,7 +2995,7 @@ terminal.h: ${MAKE_FILE}
 	    ${TRUE}; \
 	fi
 
-have_fpos.h: have_fpos.c banned.h have_ban_pragma.h ${MAKE_FILE}
+have_fpos.h: have_fpos.c banned.h have_ban_pragma.h ${MAKE_FILE} ${LOC_MKF}
 	${Q} ${RM} -f fpos_tmp $@
 	${H} echo 'forming $@'
 	${Q} echo '/*' > $@
@@ -2978,7 +3038,7 @@ have_fpos.h: have_fpos.c banned.h have_ban_pragma.h ${MAKE_FILE}
 	fi
 
 have_fpos_pos.h: have_fpos_pos.c have_fpos.h have_posscl.h \
-		 banned.h have_ban_pragma.h ${MAKE_FILE}
+		 banned.h have_ban_pragma.h ${MAKE_FILE} ${LOC_MKF}
 	${Q} ${RM} -f fpos_tmp $@
 	${H} echo 'forming $@'
 	${Q} echo '/*' > $@
@@ -3023,7 +3083,7 @@ have_fpos_pos.h: have_fpos_pos.c have_fpos.h have_posscl.h \
 
 fposval.h: fposval.c have_fpos.h have_fpos_pos.h have_offscl.h have_posscl.h \
 	   endian_calc.h banned.h have_ban_pragma.h fposval.h.def alloc.h \
-	   have_newstr.h have_memmv.h ${MAKE_FILE}
+	   have_newstr.h have_memmv.h ${MAKE_FILE} ${LOC_MKF}
 	${Q} ${RM} -f fposval_tmp $@
 	${H} echo 'forming $@'
 	${Q} echo '/*' > $@
@@ -3065,7 +3125,7 @@ fposval.h: fposval.c have_fpos.h have_fpos_pos.h have_offscl.h have_posscl.h \
 	    ${TRUE}; \
 	fi
 
-have_const.h: have_const.c banned.h have_ban_pragma.h ${MAKE_FILE}
+have_const.h: have_const.c banned.h have_ban_pragma.h ${MAKE_FILE} ${LOC_MKF}
 	${Q} ${RM} -f have_const const_tmp $@
 	${H} echo 'forming $@'
 	${Q} echo '/*' > $@
@@ -3108,7 +3168,7 @@ have_const.h: have_const.c banned.h have_ban_pragma.h ${MAKE_FILE}
 	fi
 
 have_offscl.h: have_offscl.c have_unistd.h \
-	banned.h have_ban_pragma.h ${MAKE_FILE}
+	banned.h have_ban_pragma.h ${MAKE_FILE} ${LOC_MKF}
 	${Q} ${RM} -f offscl_tmp $@
 	${H} echo 'forming $@'
 	${Q} echo '/*' > $@
@@ -3149,7 +3209,7 @@ have_offscl.h: have_offscl.c have_unistd.h \
 	fi
 
 have_posscl.h: have_posscl.c have_fpos.h have_unistd.h \
-	banned.h have_ban_pragma.h ${MAKE_FILE}
+	banned.h have_ban_pragma.h ${MAKE_FILE} ${LOC_MKF}
 	${Q} ${RM} -f have_posscl have_posscl.o posscl_tmp $@
 	${H} echo 'forming $@'
 	${Q} echo '/*' > $@
@@ -3190,7 +3250,7 @@ have_posscl.h: have_posscl.c have_fpos.h have_unistd.h \
 	fi
 
 align32.h: align32.c longbits.h have_unistd.h \
-	banned.h have_ban_pragma.h ${MAKE_FILE}
+	banned.h have_ban_pragma.h ${MAKE_FILE} ${LOC_MKF}
 	${Q} ${RM} -f align32 align32_tmp $@
 	${H} echo 'forming $@'
 	${Q} echo '/*' > $@
@@ -3245,7 +3305,7 @@ align32.h: align32.c longbits.h have_unistd.h \
 	fi
 
 have_uid_t.h: have_uid_t.c have_unistd.h \
-	banned.h have_ban_pragma.h ${MAKE_FILE}
+	banned.h have_ban_pragma.h ${MAKE_FILE} ${LOC_MKF}
 	${Q} ${RM} -f have_uid_t uid_tmp $@
 	${H} echo 'forming $@'
 	${Q} echo '/*' > $@
@@ -3285,7 +3345,7 @@ have_uid_t.h: have_uid_t.c have_unistd.h \
 	    ${TRUE}; \
 	fi
 
-have_newstr.h: have_newstr.c banned.h have_ban_pragma.h ${MAKE_FILE}
+have_newstr.h: have_newstr.c banned.h have_ban_pragma.h ${MAKE_FILE} ${LOC_MKF}
 	${Q} ${RM} -f newstr_tmp $@
 	${H} echo 'forming $@'
 	${Q} echo '/*' > $@
@@ -3325,7 +3385,7 @@ have_newstr.h: have_newstr.c banned.h have_ban_pragma.h ${MAKE_FILE}
 	    ${TRUE}; \
 	fi
 
-have_memmv.h: have_memmv.c banned.h have_ban_pragma.h ${MAKE_FILE}
+have_memmv.h: have_memmv.c banned.h have_ban_pragma.h ${MAKE_FILE} ${LOC_MKF}
 	${Q} ${RM} -f have_memmv have_memmv.o memmv_tmp $@
 	${H} echo 'forming $@'
 	${Q} echo '/*' > $@
@@ -3365,7 +3425,7 @@ have_memmv.h: have_memmv.c banned.h have_ban_pragma.h ${MAKE_FILE}
 	    ${TRUE}; \
 	fi
 
-have_ustat.h: have_ustat.c banned.h have_ban_pragma.h ${MAKE_FILE}
+have_ustat.h: have_ustat.c banned.h have_ban_pragma.h ${MAKE_FILE} ${LOC_MKF}
 	${Q} ${RM} -f ustat_tmp $@
 	${H} echo 'forming $@'
 	${Q} echo '/*' > $@
@@ -3405,7 +3465,7 @@ have_ustat.h: have_ustat.c banned.h have_ban_pragma.h ${MAKE_FILE}
 	fi
 
 have_getsid.h: have_getsid.c have_unistd.h \
-	banned.h have_ban_pragma.h ${MAKE_FILE}
+	banned.h have_ban_pragma.h ${MAKE_FILE} ${LOC_MKF}
 	${Q} ${RM} -f getsid_tmp $@
 	${H} echo 'forming $@'
 	${Q} echo '/*' > $@
@@ -3446,7 +3506,7 @@ have_getsid.h: have_getsid.c have_unistd.h \
 	fi
 
 have_getpgid.h: have_getpgid.c have_unistd.h \
-	banned.h have_ban_pragma.h ${MAKE_FILE}
+	banned.h have_ban_pragma.h ${MAKE_FILE} ${LOC_MKF}
 	${Q} ${RM} -f getpgid_tmp $@
 	${H} echo 'forming $@'
 	${Q} echo '/*' > $@
@@ -3486,7 +3546,8 @@ have_getpgid.h: have_getpgid.c have_unistd.h \
 	    ${TRUE}; \
 	fi
 
-have_gettime.h: have_gettime.c banned.h have_ban_pragma.h ${MAKE_FILE}
+have_gettime.h: have_gettime.c banned.h have_ban_pragma.h \
+		${MAKE_FILE} ${LOC_MKF}
 	${Q} ${RM} -f gettime_tmp $@
 	${H} echo 'forming $@'
 	${Q} echo '/*' > $@
@@ -3527,7 +3588,7 @@ have_gettime.h: have_gettime.c banned.h have_ban_pragma.h ${MAKE_FILE}
 	fi
 
 have_getprid.h: have_getprid.c have_unistd.h \
-	banned.h have_ban_pragma.h ${MAKE_FILE}
+	banned.h have_ban_pragma.h ${MAKE_FILE} ${LOC_MKF}
 	${Q} ${RM} -f getprid_tmp $@
 	${H} echo 'forming $@'
 	${Q} echo '/*' > $@
@@ -3567,7 +3628,7 @@ have_getprid.h: have_getprid.c have_unistd.h \
 	    ${TRUE}; \
 	fi
 
-have_urandom.h: ${MAKE_FILE}
+have_urandom.h: ${MAKE_FILE} ${LOC_MKF}
 	${Q} ${RM} -f $@
 	${H} echo 'forming $@'
 	${Q} echo '/*' > $@
@@ -3603,7 +3664,7 @@ have_urandom.h: ${MAKE_FILE}
 	    ${TRUE}; \
 	fi
 
-have_rusage.h: have_rusage.c banned.h have_ban_pragma.h ${MAKE_FILE}
+have_rusage.h: have_rusage.c banned.h have_ban_pragma.h ${MAKE_FILE} ${LOC_MKF}
 	${Q} ${RM} -f rusage_tmp $@
 	${H} echo 'forming $@'
 	${Q} echo '/*' > $@
@@ -3643,7 +3704,7 @@ have_rusage.h: have_rusage.c banned.h have_ban_pragma.h ${MAKE_FILE}
 	    ${TRUE}; \
 	fi
 
-have_strdup.h: have_strdup.c banned.h have_ban_pragma.h ${MAKE_FILE}
+have_strdup.h: have_strdup.c banned.h have_ban_pragma.h ${MAKE_FILE} ${LOC_MKF}
 	${Q} ${RM} -f strdup_tmp $@
 	${H} echo 'forming $@'
 	${Q} echo '/*' > $@
@@ -3744,7 +3805,7 @@ args.h: have_stdvs.c have_varvs.c have_string.h have_unistd.h \
 	    ${TRUE}; \
 	fi
 
-calcerr.h: calcerr.tbl calcerr_h.sed calcerr_h.awk ${MAKE_FILE}
+calcerr.h: calcerr.tbl calcerr_h.sed calcerr_h.awk ${MAKE_FILE} ${LOC_MKF}
 	${Q} ${RM} -f calerr.h
 	${H} echo 'forming $@'
 	${Q} echo '/*' > $@
@@ -3774,7 +3835,7 @@ calcerr.h: calcerr.tbl calcerr_h.sed calcerr_h.awk ${MAKE_FILE}
 	    ${TRUE}; \
 	fi
 
-calcerr.c: calcerr.tbl calcerr_c.sed calcerr_c.awk ${MAKE_FILE}
+calcerr.c: calcerr.tbl calcerr_c.sed calcerr_c.awk ${MAKE_FILE} ${LOC_MKF}
 	${Q} ${RM} -f calerr.c
 	${H} echo 'forming $@'
 	${Q} echo '/*' > $@
@@ -3796,7 +3857,8 @@ calcerr.c: calcerr.tbl calcerr_c.sed calcerr_c.awk ${MAKE_FILE}
 	    ${TRUE}; \
 	fi
 
-have_unused.h: have_unused.c have_stdlib.h have_ban_pragma.h ${MAKE_FILE}
+have_unused.h: have_unused.c have_stdlib.h have_ban_pragma.h \
+	       ${MAKE_FILE} ${LOC_MKF}
 	${Q} ${RM} -f unused_tmp $@
 	${H} echo 'forming $@'
 	${Q} echo '/*' > $@
@@ -3838,7 +3900,7 @@ have_unused.h: have_unused.c have_stdlib.h have_ban_pragma.h ${MAKE_FILE}
 	    ${TRUE}; \
 	fi
 
-have_ban_pragma.h: have_ban_pragma.c banned.h ${MAKE_FILE}
+have_ban_pragma.h: have_ban_pragma.c banned.h ${MAKE_FILE} ${LOC_MKF}
 	${Q} ${RM} -f unused_tmp $@
 	${H} echo 'forming $@'
 	${Q} echo '/*' > $@
@@ -3880,7 +3942,8 @@ have_ban_pragma.h: have_ban_pragma.c banned.h ${MAKE_FILE}
 	    ${TRUE}; \
 	fi
 
-have_strlcpy.h: have_strlcpy.c banned.h have_ban_pragma.h ${MAKE_FILE}
+have_strlcpy.h: have_strlcpy.c banned.h have_ban_pragma.h \
+		${MAKE_FILE} ${LOC_MKF}
 	${Q} ${RM} -f unused_tmp $@
 	${H} echo 'forming $@'
 	${Q} echo '/*' > $@
@@ -3921,7 +3984,8 @@ have_strlcpy.h: have_strlcpy.c banned.h have_ban_pragma.h ${MAKE_FILE}
 	    ${TRUE}; \
 	fi
 
-have_strlcat.h: have_strlcat.c banned.h have_ban_pragma.h ${MAKE_FILE}
+have_strlcat.h: have_strlcat.c banned.h have_ban_pragma.h \
+		${MAKE_FILE} ${LOC_MKF}
 	${Q} ${RM} -f unused_tmp $@
 	${H} echo 'forming $@'
 	${Q} echo '/*' > $@
@@ -3971,14 +4035,15 @@ have_strlcat.h: have_strlcat.c banned.h have_ban_pragma.h ${MAKE_FILE}
 #
 ###
 
-win32_hsrc: win32.mkdef banned.h have_ban_pragma.h alloc.h ${MAKE_FILE}
+win32_hsrc: win32.mkdef banned.h have_ban_pragma.h alloc.h \
+	    ${MAKE_FILE} ${LOC_MKF}
 	${H} echo 'forming win32 directory'
 	${Q} ${RM} -rf win32
 	${Q} ${MKDIR} -p win32
 	${Q} ${CP} banned.h have_ban_pragma.h alloc.h win32
 	${Q} ${CP} ${UTIL_C_SRC} win32
 	${Q} ${CP} ${UTIL_MISC_SRC} win32
-	${Q} ${CP} ${MAKE_FILE} win32/${MAKE_FILE}
+	${Q} ${CP} ${MAKE_FILE} ${LOC_MKF}  win32
 	${Q} (cd win32; \
 	 echo "${MAKE} -f ${MAKE_FILE} hsrc `${CAT} win32.mkdef` EXT="; \
 	 ${MAKE} -f ${MAKE_FILE} hsrc `${CAT} win32.mkdef` EXT=; \
@@ -3987,7 +4052,7 @@ win32_hsrc: win32.mkdef banned.h have_ban_pragma.h alloc.h ${MAKE_FILE}
 	 ${RM} -f ${UTIL_OBJS}; \
 	 ${RM} -f ${UTIL_PROGS}; \
 	 ${RM} -f ${UTIL_FILES}; \
-	 ${RM} -f ${MAKE_FILE})
+	 ${RM} -f ${MAKE_FILE} ${LOC_MKF})
 	${H} echo 'win32 directory formed'
 
 ###
@@ -4068,7 +4133,7 @@ endif
 ###
 
 calc-static${EXT}: .hsrc ${CALCOBJS} \
-		   ${CALC_STATIC_LIBS} ${MAKE_FILE}
+		   ${CALC_STATIC_LIBS} ${MAKE_FILE} ${LOC_MKF}
 	${RM} -f $@
 	${CC} ${LDFLAGS} ${CALCOBJS} ${LD_STATIC} ${CALC_STATIC_LIBS} \
 	      ${READLINE_LIB} ${READLINE_EXTRAS} -o $@
@@ -4077,7 +4142,7 @@ libcustcalc.a: custom/libcustcalc.a
 	${Q} ${RM} -f $@
 	${CP} -f $? $@
 
-libcalc.a: ${LIBOBJS} ${MAKE_FILE}
+libcalc.a: ${LIBOBJS} ${MAKE_FILE} ${LOC_MKF}
 	${RM} -f libcalc.a
 	${AR} qc libcalc.a ${LIBOBJS}
 	${RANLIB} libcalc.a
@@ -4092,11 +4157,13 @@ custom/libcustcalc.a: custom/Makefile
 endif
 #endif	/* end of skip for non-Gnu makefiles */
 
-sample_rand-static${EXT}: sample_rand.o ${CALC_STATIC_LIBS} ${MAKE_FILE}
+sample_rand-static${EXT}: sample_rand.o ${CALC_STATIC_LIBS} \
+			  ${MAKE_FILE} ${LOC_MKF}
 	${CC} ${LDFLAGS} sample_rand.o ${LD_STATIC} \
 	      ${CALC_STATIC_LIBS} ${READLINE_LIB} ${READLINE_EXTRAS} -o $@
 
-sample_many-static${EXT}: sample_many.o ${CALC_STATIC_LIBS} ${MAKE_FILE}
+sample_many-static${EXT}: sample_many.o ${CALC_STATIC_LIBS} \
+			  ${MAKE_FILE} ${LOC_MKF}
 	${CC} ${LDFLAGS} sample_many.o ${LD_STATIC} \
 	      ${CALC_STATIC_LIBS} ${READLINE_LIB} ${READLINE_EXTRAS} -o $@
 
@@ -4504,6 +4571,7 @@ env:
 	@echo 'LIB_H_SRC=${LIB_H_SRC}'; echo ''
 	@echo 'LICENSE=${LICENSE}'; echo ''
 	@echo 'LN=${LN}'; echo ''
+	@echo 'LOC_MKF=${LOC_MKF}'; echo ''
 	@echo 'LONG_BITS=${LONG_BITS}'; echo ''
 	@echo 'MAKE=${MAKE}'; echo ''
 	@echo 'MAKEDEPEND=${MAKEDEPEND}'; echo ''
@@ -4522,6 +4590,7 @@ env:
 	@echo 'PWD=${PWD}'; echo ''
 	@echo 'PWDCMD=${PWDCMD}'; echo ''
 	@echo 'Q=${Q}'; echo ''
+	@echo 'PREFIX=${PREFIX}'; echo ''
 	@echo 'RANLIB=${RANLIB}'; echo ''
 	@echo 'READLINE_EXTRAS=${READLINE_EXTRAS}'; echo ''
 	@echo 'READLINE_INCLUDE=${READLINE_INCLUDE}'; echo ''
@@ -4567,6 +4636,9 @@ env:
 
 mkdebug: env version.c
 	@echo '=-=-=-=-= ${MAKE_FILE} start of $@ rule =-=-=-=-='
+	@echo '=-=-=-= Contents of ${LOC_MKF} follows =-=-=-='
+	@${CAT} ${LOC_MKF}
+	@echo '=-=-=-= End of contents of ${LOC_MKF} =-=-=-='
 	@echo '=-=-=-= Determining the source version =-=-=-='
 	@${MAKE} -f Makefile Q= V=@ ver_calc${EXT}
 	-@./ver_calc${EXT}
@@ -4580,6 +4652,9 @@ mkdebug: env version.c
 
 debug: calcinfo env
 	@echo '=-=-=-=-= ${MAKE_FILE} start of $@ rule =-=-=-=-='
+	@echo '=-=-=-= Contents of ${LOC_MKF} follows =-=-=-='
+	@${CAT} ${LOC_MKF}
+	@echo '=-=-=-= End of contents of ${LOC_MKF} =-=-=-='
 	@echo '=-=-=-= Invoking ${MAKE} -f Makefile Q= V=@ clobber =-=-=-='
 	@${MAKE} -f Makefile Q= V=@ clobber
 	@echo '=-=-=-= Back to the main Makefile for $@ rule =-=-=-='
@@ -4687,7 +4762,7 @@ rpm-clean-static:
 
 # Form the installed file list
 #
-inst_files: ${MAKE_FILE} help/Makefile cal/Makefile \
+inst_files: ${MAKE_FILE} ${LOC_MKF} help/Makefile cal/Makefile \
 	    cscript/Makefile ver_calc${EXT} custom/Makefile
 	${V} echo '=-=-=-=-= ${MAKE_FILE} start of $@ rule =-=-=-=-='
 	${Q} ${RM} -f inst_files
@@ -4722,9 +4797,14 @@ inst_files: ${MAKE_FILE} help/Makefile cal/Makefile \
 # then you can use this rule to clean out the older calc stuff under
 # the /usr/local directory.
 #
+# NOTE: This rule is an exception to the use of ${PREFIX}.
+#	In this rule we really to want to explicitly deal
+#	with legacy paths under /usr/local.
+#
 olduninstall:
 	${RM} -f inst_files
 	${MAKE} -f Makefile \
+		PREFIX=/usr/local \
 		BINDIR=/usr/local/bin \
 		INCDIR=/usr/local/include \
 		LIBDIR=/usr/local/lib/calc \
@@ -4745,6 +4825,7 @@ olduninstall:
 	-${RMDIR} /usr/local/include/calc
 	-${RMDIR} /usr/local/bin/cscript
 	${RM} -f inst_files
+	${RM} -f ${CALC_INCDIR}/calcerr.c
 
 tags: ${CALCSRC} ${LIBSRC} ${H_SRC} ${BUILD_H_SRC} ${MAKE_FILE}
 	-${CTAGS} ${CALCSRC} ${LIBSRC} ${H_SRC} ${BUILD_H_SRC} 2>&1 | \
@@ -5053,7 +5134,7 @@ endif
 		fi; \
 	    fi; \
 	fi
-	-${Q} for i in ${LIB_H_SRC} ${BUILD_H_SRC} /dev/null; do \
+	-${Q} for i in ${LIB_H_SRC} /dev/null; do \
 	    if [ "$$i" = "/dev/null" ]; then \
 		continue; \
 	    fi; \
@@ -5126,6 +5207,9 @@ endif
 	fi
 	${V} # NOTE: misc install cleanup
 	${Q} ${RM} -f tmp
+	${V} # NOTE: remove the calcerr.c that was installed by mistake
+	${V} #	     under ${INC_DIR} in calc v2.12.9.1
+	${Q} ${RM} -f ${T}${CALC_INCDIR}/calcerr.c
 	${V} echo '=-=-=-=-= ${MAKE_FILE} end of $@ rule =-=-=-=-='
 
 # Try to remove everything that was installed

cal/Makefile

@@ -47,7 +47,7 @@
 #	SHELL= /bin/bash
 #
 # On some systems such as macOS, the bash shell is very
-# far behind to the point wehre is cannot be depended on.
+# far behind to the point where is cannot be depended on.
 # On such systems, the zsh may be a much better alternative
 # shell for this Makefile to use:
 #
@@ -63,6 +63,36 @@ SHELL= /bin/sh
 # 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
+
 # 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
@@ -92,11 +122,11 @@ TOP_MAKE_FILE= Makefile
 #	INCDIR= /usr/include
 #
 
-#INCDIR= /usr/local/include
+#INCDIR= ${PREFIX}/include
 #INCDIR= /dev/env/DJDIR/include
 INCDIR= /usr/include
 
-# where to install calc realted things
+# where to install calc related things
 #
 # ${BINDIR}		where to install calc binary files
 # ${LIBDIR}		where calc link library (*.a) files are installed
@@ -118,15 +148,15 @@ INCDIR= /usr/include
 #	LIBDIR= /usr/lib
 #	CALC_SHAREDIR= /usr/share/calc
 #
-#BINDIR= /usr/local/bin
+#BINDIR= ${PREFIX}/bin
 #BINDIR= /dev/env/DJDIR/bin
 BINDIR= /usr/bin
 
-#LIBDIR= /usr/local/lib
+#LIBDIR= ${PREFIX}/lib
 #LIBDIR= /dev/env/DJDIR/lib
 LIBDIR= /usr/lib
 
-#CALC_SHAREDIR= /usr/local/lib/calc
+#CALC_SHAREDIR= ${PREFIX}/lib/calc
 #CALC_SHAREDIR= /dev/env/DJDIR/share/calc
 CALC_SHAREDIR= /usr/share/calc
 

cscript/Makefile

@@ -46,7 +46,7 @@
 #	SHELL= /bin/bash
 #
 # On some systems such as macOS, the bash shell is very
-# far behind to the point wehre is cannot be depended on.
+# far behind to the point where is cannot be depended on.
 # On such systems, the zsh may be a much better alternative
 # shell for this Makefile to use:
 #
@@ -62,6 +62,36 @@ SHELL= /bin/sh
 # 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
+
 # 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
@@ -91,11 +121,11 @@ TOP_MAKE_FILE= Makefile
 #	INCDIR= /usr/include
 #
 
-#INCDIR= /usr/local/include
+#INCDIR= ${PREFIX}/include
 #INCDIR= /dev/env/DJDIR/include
 INCDIR= /usr/include
 
-# where to install calc realted things
+# where to install calc related things
 #
 # ${BINDIR}		where to install calc binary files
 # ${LIBDIR}		where calc link library (*.a) files are installed
@@ -117,15 +147,15 @@ INCDIR= /usr/include
 #	LIBDIR= /usr/lib
 #	CALC_SHAREDIR= /usr/share/calc
 #
-#BINDIR= /usr/local/bin
+#BINDIR= ${PREFIX}/bin
 #BINDIR= /dev/env/DJDIR/bin
 BINDIR= /usr/bin
 
-#LIBDIR= /usr/local/lib
+#LIBDIR= ${PREFIX}/lib
 #LIBDIR= /dev/env/DJDIR/lib
 LIBDIR= /usr/lib
 
-#CALC_SHAREDIR= /usr/local/lib/calc
+#CALC_SHAREDIR= ${PREFIX}/lib/calc
 #CALC_SHAREDIR= /dev/env/DJDIR/share/calc
 CALC_SHAREDIR= /usr/share/calc
 
@@ -339,7 +369,7 @@ detaillist:
 # Home grown make dependency rules.  Your system make not support
 # or have the needed tools.  You can ignore this section.
 #
-# We will form a skelaton tree of *.c files containing only #include "foo.h"
+# We will form a skeleton tree of *.c files containing only #include "foo.h"
 # lines and .h files containing the same lines surrounded by multiple include
 # prevention lines.  This allows us to build a static depend list that will
 # satisfy all possible cpp symbol definition combinations.

custom/Makefile

@@ -66,7 +66,7 @@
 #	SHELL= /bin/bash
 #
 # On some systems such as macOS, the bash shell is very
-# far behind to the point wehre is cannot be depended on.
+# far behind to the point where is cannot be depended on.
 # On such systems, the zsh may be a much better alternative
 # shell for this Makefile to use:
 #
@@ -77,6 +77,37 @@ SHELL= /bin/sh
 #SHELL= /bin/zsh
 
 
+# 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
+
+
 # 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
@@ -84,7 +115,7 @@ SHELL= /bin/sh
 # if calculations.
 #
 # In the case of calc, we are motivated in part by the desire for calc
-# to correctly calculate: even durings extremely long calculations.
+# 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).
@@ -231,7 +262,7 @@ V=@:
 #	INCDIR= /usr/include
 #
 
-#INCDIR= /usr/local/include
+#INCDIR= ${PREFIX}/include
 #INCDIR= /dev/env/DJDIR/include
 INCDIR= /usr/include
 
@@ -257,15 +288,15 @@ INCDIR= /usr/include
 #	LIBDIR= /usr/lib
 #	CALC_SHAREDIR= /usr/share/calc
 #
-#BINDIR= /usr/local/bin
+#BINDIR= ${PREFIX}/bin
 #BINDIR= /dev/env/DJDIR/bin
 BINDIR= /usr/bin
 
-#LIBDIR= /usr/local/lib
+#LIBDIR= ${PREFIX}/lib
 #LIBDIR= /dev/env/DJDIR/lib
 LIBDIR= /usr/lib
 
-#CALC_SHAREDIR= /usr/local/lib/calc
+#CALC_SHAREDIR= ${PREFIX}/lib/calc
 #CALC_SHAREDIR= /dev/env/DJDIR/share/calc
 CALC_SHAREDIR= /usr/share/calc
 
@@ -458,7 +489,7 @@ EXT=
 
 # The default calc versions
 #
-VERSION= 2.13.0.0
+VERSION= 2.13.0.1
 
 # Names of shared libraries with versions
 #
@@ -636,7 +667,7 @@ ifeq ($(target),Linux)
 BLD_TYPE= calc-dynamic-only
 #
 CC_SHARE= -fPIC
-DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:/usr/local/lib
+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}"
@@ -688,7 +719,7 @@ ifeq ($(target),Darwin)
 BLD_TYPE= calc-dynamic-only
 #
 CC_SHARE= -fPIC
-DEFAULT_LIB_INSTALL_PATH= ${PWD}:${LIBDIR}:/usr/local/lib
+DEFAULT_LIB_INSTALL_PATH= ${PWD}:${LIBDIR}:${PREFIX}/lib
 LD_SHARE= ${DARWIN_ARCH}
 #SET_INSTALL_NAME= no
 SET_INSTALL_NAME= yes
@@ -770,7 +801,7 @@ ifeq ($(target),FreeBSD)
 BLD_TYPE= calc-dynamic-only
 #
 CC_SHARE= -fPIC
-DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:/usr/local/lib
+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}"
@@ -830,7 +861,7 @@ ifeq ($(target),OpenBSD)
 BLD_TYPE= calc-dynamic-only
 #
 CC_SHARE= -fPIC
-DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:/usr/local/lib
+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}"
@@ -884,7 +915,7 @@ ifeq ($(target),SunOS)
 BLD_TYPE= calc-dynamic-only
 #
 CC_SHARE= -fPIC
-DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:/usr/local/lib
+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}"
@@ -936,7 +967,7 @@ ifeq ($(target),Cygwin)
 BLD_TYPE= calc-static-only
 #
 CC_SHARE= -fPIC
-DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:/usr/local/lib
+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}"
@@ -992,7 +1023,7 @@ ifeq ($(target),simple)
 BLD_TYPE= calc-static-only
 #
 CC_SHARE= -fPIC
-DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:/usr/local/lib
+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}"
@@ -1051,7 +1082,7 @@ CALCRC= ${CALC_SHAREDIR}/startup;~/.calcrc;./.calcinit
 BLD_TYPE= calc-static-only
 #
 CC_SHARE= -fPIC
-DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:/usr/local/lib
+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}"
@@ -1091,7 +1122,7 @@ ifeq ($(target),)
 BLD_TYPE= calc-static-only
 #
 CC_SHARE= -fPIC
-DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:/usr/local/lib
+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}"

custom/Makefile.head

@@ -66,7 +66,7 @@
 #	SHELL= /bin/bash
 #
 # On some systems such as macOS, the bash shell is very
-# far behind to the point wehre is cannot be depended on.
+# far behind to the point where is cannot be depended on.
 # On such systems, the zsh may be a much better alternative
 # shell for this Makefile to use:
 #
@@ -77,6 +77,37 @@ SHELL= /bin/sh
 #SHELL= /bin/zsh
 
 
+# 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
+
+
 # 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
@@ -84,7 +115,7 @@ SHELL= /bin/sh
 # if calculations.
 #
 # In the case of calc, we are motivated in part by the desire for calc
-# to correctly calculate: even durings extremely long calculations.
+# 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).
@@ -231,7 +262,7 @@ V=@:
 #	INCDIR= /usr/include
 #
 
-#INCDIR= /usr/local/include
+#INCDIR= ${PREFIX}/include
 #INCDIR= /dev/env/DJDIR/include
 INCDIR= /usr/include
 
@@ -257,15 +288,15 @@ INCDIR= /usr/include
 #	LIBDIR= /usr/lib
 #	CALC_SHAREDIR= /usr/share/calc
 #
-#BINDIR= /usr/local/bin
+#BINDIR= ${PREFIX}/bin
 #BINDIR= /dev/env/DJDIR/bin
 BINDIR= /usr/bin
 
-#LIBDIR= /usr/local/lib
+#LIBDIR= ${PREFIX}/lib
 #LIBDIR= /dev/env/DJDIR/lib
 LIBDIR= /usr/lib
 
-#CALC_SHAREDIR= /usr/local/lib/calc
+#CALC_SHAREDIR= ${PREFIX}/lib/calc
 #CALC_SHAREDIR= /dev/env/DJDIR/share/calc
 CALC_SHAREDIR= /usr/share/calc
 
@@ -458,7 +489,7 @@ EXT=
 
 # The default calc versions
 #
-VERSION= 2.13.0.0
+VERSION= 2.13.0.1
 
 # Names of shared libraries with versions
 #

help/Makefile

@@ -47,7 +47,7 @@
 #	SHELL= /bin/bash
 #
 # On some systems such as macOS, the bash shell is very
-# far behind to the point wehre is cannot be depended on.
+# far behind to the point where is cannot be depended on.
 # On such systems, the zsh may be a much better alternative
 # shell for this Makefile to use:
 #
@@ -63,6 +63,36 @@ SHELL= /bin/sh
 # 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
+
 # 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
@@ -118,15 +148,15 @@ INCDIR= /usr/include
 #	LIBDIR= /usr/lib
 #	CALC_SHAREDIR= /usr/share/calc
 #
-#BINDIR= /usr/local/bin
+#BINDIR= ${PREFIX}/bin
 #BINDIR= /dev/env/DJDIR/bin
 BINDIR= /usr/bin
 
-#LIBDIR= /usr/local/lib
+#LIBDIR= ${PREFIX}/lib
 #LIBDIR= /dev/env/DJDIR/lib
 LIBDIR= /usr/lib
 
-#CALC_SHAREDIR= /usr/local/lib/calc
+#CALC_SHAREDIR= ${PREFIX}/lib/calc
 #CALC_SHAREDIR= /dev/env/DJDIR/share/calc
 CALC_SHAREDIR= /usr/share/calc
 

version.c

@@ -54,7 +54,7 @@ static char *program;
 #define MAJOR_VER	2	/* major library version */
 #define MINOR_VER	13	/* minor library version */
 #define MAJOR_PATCH	0	/* major software version level */
-#define MINOR_PATCH	0	/* minor software version level */
+#define MINOR_PATCH	1	/* minor software version level */
 
 
 /*