Release v2.14.0.14

The following are the changes in this release:

    Fixed typo in Makefile.local comment.

    Established a tagging procedure for a production release.
    Production git tags will be of the form:

	prod-2.x.y.z

.gitignore

@@ -84,6 +84,7 @@ help/man
 help/new_custom
 help/question
 help/questions
+help/releases
 help/resource
 help/type
 help/usage
@@ -91,6 +92,7 @@ libcalc*
 libcustcalc*
 longbits
 longbits.h
+Makefile.our
 sample_many
 sample_rand
 tags

BUGS

@@ -15,12 +15,21 @@ Look at the end of the output, it should say something like:
 
 If it does not, then something is really broken!
 
-To be sure that your version of calc is up to date, check out:
+To be sure that your version of calc is up to date.
+Look for the latest release on GitHub:
 
-    http://www.isthe.com/chongo/tech/comp/calc/calc-mirror.html
+    https://github.com/lcn2/calc/releases
+
+Just below latest GitHub release sectiop is something called:
+
+    > Assets
+
+Click in the triangle to open up the Assets then click on
+the approptiate package to download.
 
 If you made and modifications to calc beyond the simple Makefile
-configuration, try backing them out and see if things get better.
+configuration, try backing those changges out and see if things get
+better.
 
 If you have tried all of the above and things still are not right,
 then it may be time to send in a bug report.

CHANGES

@@ -1,4 +1,98 @@
-The following are the changes from calc version 2.14.0.11 to date:
+The following are the changes from calc version 2.14.0.14 to date:
+
+    Fixed typo in Makefile.local comment.
+
+    Established a tagging procedure for a production release.
+    Production git tags will be of the form:
+
+	prod-2.x.y.z
+
+
+The following are the changes from calc version 2.14.0.13 to 2.14.0.13:
+
+    Made major changes to our release process in order to avoid
+    missing critical files that happened in calc v2.4.0.12.
+
+    Minor tweak to seed() builtin.  Updated help/srand and help/srandom.
+
+    Moved Makefile.ship into Makefile.
+
+    Removed custom/Makefile.head and custom/Makefile.tail.
+
+    The custom/Makefile is now part of source and includes Makefile.
+    In particular, custom/Makefile makes use of the 'middle' of
+    the new top level Makefile where calc's top level Makefile
+    variables are defined.
+
+    Makefile.simple and custom/Makefile.simple are now part of the source
+    and are constructed from Makefile and custom/Makefile respectively.
+    The Makefile.simple and custom/Makefile.simple avoid using GNU
+    conditionals. They may be used with older/classic make commands.
+
+    Makefile.local will include comments about how to better use
+    it. Between releases, Makefile.local at the top of the master branch
+    will contain how we typically build calc and test calc (FYI: we
+    normally enable things such as -Werror -Wextra -pedantic).  When we
+    push out a release, Makefile.local will be stripped of non-comment
+    lines.  Thus, releases of calc, and, released "calc*.src.rpm"
+    files and the source tarballs, will have a Makefile.local with
+    only comments.
+
+    The "README.*" files and "HOWTO.INSTALL" file have been updated.
+
+    By default, compiler warnings have been turned up.  The Makefile
+    variable ${CCWARN} now defaults to:
+
+	CCWARN= -Wall -Wextra -pedantic
+
+    The previous level of compiler warnings can be easily restored by
+    adding to Makefile.local:
+
+	CCWARN:= -Wall
+
+    The readline, history and ncurses libraries are now default.
+    The Makefile variables ${USE_READLINE}, ${READLINE_LIB}, and
+    ${READLINE_EXTRAS} now default to:
+
+	USE_READLINE= -DUSE_READLINE
+	READLINE_LIB= -lreadline
+	READLINE_EXTRAS= -lhistory -lncurses
+
+    The previous mode where readline, history and ncurses libraries
+    were not compiled in by default can be easily restored by
+    adding to Makefile.local:
+
+	USE_READLINE:=
+	READLINE_LIB:=
+	READLINE_EXTRAS:=
+
+    We have renamed "stable" as "production".
+    We have renamed "unstable" as "tested".
+
+    On the web site:
+
+	http://www.isthe.com/chongo/src/calc/
+
+    these files has been renamed:
+
+	2.x.y.z_IS_LATEST_STABLE   ==> 2.x.y.z_IS_LATEST_PRODUCTION
+	2.x.y.z_IS_LATEST_UNSTABLE ==> 2.x.y.z_IS_LATEST_TESTED
+
+    The terms 'stable' and 'unstable' were both misleading and
+    inaccurate.  For details see the new documention file:
+
+	README.RELEASE
+
+    See also the help command:
+
+	; help release
+
+    Fixed bug impacting how have_ustat.h was formed.
+
+    Updated help/archive, BUGS, HOWTO.INSTALL to reflect GitHub use.
+
+
+The following are the changes from calc version 2.14.0.11 to 2.14.0.12:
 
     Fixed a number of typos.
 

HOWTO.INSTALL

@@ -256,45 +256,33 @@ SHELL= ...
 
 	    SHELL= /bin/sh
 
-Makefile
+Makefile.local
 
-    # SRC: Makefile - Our calc build environment
+    # SRC: Makefile.local - tweaks to the top level Makefile
 
-    This is our internal Makefile that drives how we build calc.
-    For critical rules in Makefile.ship, there is a corresponding
-    rule, Makefile, that calls ${MAKE} -f Makefile.ship with,
-    additional commands, args and Makefile variables.  The ${XVAR}
-    Makefile variable, for example, is passed on each call to
-    ${MAKE} -f Makefile.ship so that the environment and parameters of
-    Makefile.ship may be managed for our build environment.
+    Between releases, Makefile.local at the top of the master branch
+    will contain how we typically build calc and test calc (FYI: we
+    normally enable things such as -Werror -Wextra -pedantic).  When we
+    push out a release, Makefile.local will be stripped of non-comment
+    lines.  Thus, releases of calc, and, released "calc*.src.rpm"
+    files and the source tarballs, will have a Makefile.local with
+    only comments.
 
-    This Makefile is used to make the calc rpm.  In addition to these
-    comments, this Makefile differs from the non-rpm bzip2-ed tarball
-    source Makefile in at least the the following ways:
+    If the Makefile is not suitable for you (say because you fetch it
+    from the top of the master branch between releases), then you may
+    wish to remove all non-comment lines.  I.e., lines that do not start
+    with the # character.
 
-	CCWERR= -Werror
-	USE_READLINE= -DUSE_READLINE
-	READLINE_LIB= -lreadline -lhistory -lncurses
-
-    If the Makefile is not suitable for you, then
-    you may wish to replace it with Makefile.ship:
-
-	mv -f -v Makefile.ship Makefile
-
-    This Makefile assumes you have a modern make command such as
+    This Makefile.local assumes you have a modern make command such as
     the GNU make.  See Makefile.simple comment below if you do not
     have such a modern make command.
 
-    In packages such as RPMs, and the tar.bz2 source tarball,
-    Makefile contains the contents of Makefile.ship.  If Makefile.ship
-    is missing it has likely moved to replace Makefile.
-
     In the calc GitHub repo, Makefile is the calc build environment
     and Makefile.ship is the top level Makefile:
 
 	https://github.com/lcn2/calc
 
-Makefile.ship
+Makefile
 
     # SRC: Makefile.ship - top level Makefile
 
@@ -334,16 +322,9 @@ Makefile.ship
 	...
 	#endif /* DO NOT DO THIS */
 
-    The custom/Makefile rule of Makefile.ship is used to form
-    the custom/Makefile.  In particular the Makefile.ship lines:
-
-	# start of host target cut
-	... these go between custom/Makefile.head and custom/Makefile.tail
-	# end of host target cut
-
 Makefile.simple
 
-    # SRC: non-GNU Makefile via make -f Makefile.ship Makefile.simple
+    # SRC: Makefile.simple - non-GNU version
 
     This is a non-GNU or simple Makefile designed for environments
     that do not have a modern make command.
@@ -370,36 +351,15 @@ Makefile.simple
 
 	http://www.isthe.com/chongo/tech/comp/calc/calc-mirror.html
 
-custom/Makefile.head
-
-    # SRC: custom/Makefile.head
-
-    This file forms the top part of the custom/Makefile.
-
-custom/Makefile.tail
-
-    # SRC: custom/Makefile.tail
-
-    This file forms the bottom part of the custom/Makefile.
-
 custom/Makefile
 
     # SRC: Makefile via make -f Makefile custom/Makefile
 
     This is the custom directory Makefile.
 
-    The custom/Makefile rule of Makefile.ship is used to form
-    the custom/Makefile.  In particular the Makefile.ship lines:
-
-	# start of host target cut
-	... these go in between custom/Makefile.head and custom/Makefile.tail
-	# end of host target cut
-
-    NOTE: The clobber rule does not remove this file. - XXX
-
 custom/Makefile.simple
 
-    # SRC: non-GNU Makefile via make -f Makefile custom/Makefile.simple
+    # SRC: custom/Makefile.simple - non-GNU version
 
     This is a non-GNU or simple Makefile for the custom directory
     that is designed for environments that do not have a modern make

Makefile.local

@@ -1 +1,18 @@
-# Add below to override Makefile values (using :=) as in: HAVE_STRING_H:= YES
+#
+# Makefile.local - local 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.
+#
+# To replace a Makefile variable, use := symbols.  For example:
+#
+#	CCWERR:= -Werror
+#
+# NOTE: You need to remove the leading '#<whitespaces>' to take effect.
+# Comments start with a #-character.
+#
+# You can append to an existing Makefile variable using '+=' symbols.
+# For example:
+#
+#	CFLAGS+= -Ofast

Makefile.simple

@@ -4,7 +4,7 @@
 #
 # Copyright (C) 1999-2018,2021  Landon Curt Noll
 #
-# SRC: non-GNU Makefile via make -f Makefile.simple Makefile.simple
+# SRC: Makefile.simple - non-GNU version
 #
 #	The "# SRC: ... - ..." comment line above indicates
 #	the origin of this file.
@@ -35,7 +35,6 @@
 # calculator by David I. Bell with help/mods from others
 # Makefile by Landon Curt Noll
 
-
 # The shell used by this Makefile
 #
 # On some systems, /bin/sh is a rather reduced shell with
@@ -1004,14 +1003,14 @@ CALCRC= ./.calcinit:~/.calcrc:${CALC_SHAREDIR}/startup
 #
 # If in doubt, set USE_READLINE, READLINE_LIB and READLINE_INCLUDE to nothing.
 #
-USE_READLINE=
-#USE_READLINE= -DUSE_READLINE
+#USE_READLINE=
+USE_READLINE= -DUSE_READLINE
 #
-READLINE_LIB=
-READLINE_EXTRAS=
+#READLINE_LIB=
+#READLINE_EXTRAS=
 #
-#READLINE_LIB= -lreadline
-#READLINE_EXTRAS= -lhistory -lncurses
+READLINE_LIB= -lreadline
+READLINE_EXTRAS= -lhistory -lncurses
 #
 #READLINE_LIB= -L/usr/gnu/lib -lreadline
 #READLINE_EXTRAS= -lhistory -lncurses
@@ -1038,6 +1037,7 @@ READLINE_INCLUDE=
 #READLINE_INCLUDE= -I/usr/gnu/include
 #READLINE_INCLUDE= -I${PREFIX}/include
 
+
 # If $PAGER is not set, use this program to display a help file
 #
 # Select CALCPAGER= less.exe -ci for DJGPP.
@@ -1097,15 +1097,6 @@ MAKE_FILE= 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
-# this makefile.
-#
-# If in doubt, set TOP_MAKE_FILE to Makefile
-#
-TOP_MAKE_FILE= Makefile
-
 # If you do not wish to use purify, set PURIFY to an empty string.
 #
 # If in doubt, use PURIFY=
@@ -1143,7 +1134,6 @@ LD_DEBUG=
 CALC_ENV= CALCPATH=./cal LD_LIBRARY_PATH=. DYLD_LIBRARY_PATH=. CALCHELP=./help \
 	  CALCCUSTOMHELP=./custom
 
-
 # Some out of date operating systems require/want an executable to
 # end with a certain file extension.  Some compiler systems such as
 # Windows build calc as calc.exe.  The EXT variable is used to denote
@@ -1160,7 +1150,7 @@ EXT=
 
 # The default calc versions
 #
-VERSION= 2.14.0.12
+VERSION= 2.14.0.14
 
 # Names of shared libraries with versions
 #
@@ -1186,6 +1176,7 @@ HOSTNAME= hostname
 LANG= C
 LDCONFIG= ldconfig
 LN= ln
+LS= ls
 MAKE= make
 MAKEDEPEND= makedepend
 MKDIR= mkdir
@@ -1250,11 +1241,24 @@ COMMON_CFLAGS= -DCALC_SRC ${ALLOW_CUSTOM} ${CCWARN} \
 #
 COMMON_LDFLAGS= ${EXTRA_LDFLAGS}
 
-# start of host target cut - Do not remove this line
-
-###########################################################
-# NOTE: Start of section from the middle of Makefile.ship #
-###########################################################
+###################################################
+# End skipping lines for the custom/Makefile      #
+#						  #
+# The lines in section are NOT used by the lower  #
+# level custom/Makefile's "include ../Makefile".  #
+#						  #
+# The section starts with the next line that has  #
+# a line that starts with '# Begin skipping ..'.  #
+###################################################
+# include start from top Makefile - keep this line
+######################################################
+# NOTE: Start of section from the middle of Makefile #
+#						     #
+# These lines are shared in common with the lower    #
+# custom/Makefile. That is, until the comment line   #
+# that starts with '# NOTE: End of section ..' line, #
+# these Makefile lines are used in BOTH Makefiles.   #
+######################################################
 
 ##############################################################################
 #-=-=-=-=-=- host target section - targets that override defaults -=-=-=-=-=-#
@@ -1343,7 +1347,8 @@ LD_STATIC=
 LIBCALC_STATIC=
 LIBCUSTCALC_STATIC=
 #
-CCWARN= -Wall
+#CCWARN= -Wall
+CCWARN= -Wall -Wextra -pedantic
 WNO_IMPLICT= -Wno-implicit
 WNO_ERROR_LONG_LONG= -Wno-error=long-long
 WNO_LONG_LONG= -Wno-long-long
@@ -1372,15 +1377,21 @@ LDFLAGS= ${LD_DEBUG} ${ILDFLAGS} ${LIBCALC_STATIC} ${LIBCUSTCALC_STATIC}
 #-=-=-=-=-=- end of target section - only make rules below -=-=-=-=-=-#
 #######################################################################
 
-#########################################################
-# NOTE: End of section from the middle of Makefile.ship #
-#########################################################
+######################################################
+# NOTE: End of section from the middle of Makefile   #
+#						     #
+# These lines are shared in common with the lower    #
+# custom/Makefile. That is, starting with the line   #
+# that starts with '# NOTE: End of section ..' line, #
+# these Makefile lines are used in BOTH Makefiles.   #
+######################################################
+# include end from top Makefile - keep this line
 
 # end of host target cut - Do not remove this line
 
-###############################################################################
-#=-=-=-=-=- Be careful if you change something in this next section -=-=-=-=-=#
-###############################################################################
+##########################################################################
+#=-=-=-=-=- Be careful if you change something below this line -=-=-=-=-=#
+##########################################################################
 
 # Makefile debug
 #
@@ -1579,6 +1590,7 @@ CUSTOM_PASSDOWN=  \
     CUSTOMINCDIR="${CUSTOMINCDIR}" \
     DEBUG="${DEBUG}" \
     DEFAULT_LIB_INSTALL_PATH="${DEFAULT_LIB_INSTALL_PATH}" \
+    DIFF="${DIFF}" \
     E="${E}" \
     FMT=${FMT} \
     GREP=${GREP} \
@@ -1595,6 +1607,7 @@ CUSTOM_PASSDOWN=  \
     LIBCUSTCALC_SHLIB="${LIBCUSTCALC_SHLIB}" \
     LIBDIR="${LIBDIR}" \
     LN=${LN} \
+    LS=${LS} \
     MAKE=${MAKE} \
     MAKEDEPEND=${MAKEDEPEND} \
     MAKE_FILE=Makefile \
@@ -1613,7 +1626,6 @@ CUSTOM_PASSDOWN=  \
     SORT=${SORT} \
     T=${T} \
     TAIL=${TAIL} \
-    TOP_MAKE_FILE=${MAKE_FILE} \
     TOUCH=${TOUCH} \
     TRUE=${TRUE} \
     V=${V} \
@@ -1663,7 +1675,6 @@ HELP_PASSDOWN= \
     SED=${SED} \
     SHELL=${SHELL} \
     T=${T} \
-    TOP_MAKE_FILE=${MAKE_FILE} \
     TOUCH=${TOUCH} \
     TRUE=${TRUE} \
     V=${V}
@@ -1697,7 +1708,6 @@ CAL_PASSDOWN= \
     SCRIPTDIR="${SCRIPTDIR}" \
     SHELL=${SHELL} \
     T=${T} \
-    TOP_MAKE_FILE=${MAKE_FILE} \
     TOUCH=${TOUCH} \
     TRUE=${TRUE} \
     V=${V}
@@ -1735,7 +1745,6 @@ CSCRIPT_PASSDOWN= \
     SHELL=${SHELL} \
     SORT=${SORT} \
     T=${T} \
-    TOP_MAKE_FILE=${MAKE_FILE} \
     TOUCH=${TOUCH} \
     TRUE=${TRUE} \
     V=${V}
@@ -1757,7 +1766,7 @@ 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 \
-	  ${LOC_MKF}
+	  ${LOC_MKF} Makefile.simple README.RELEASE
 
 # These files are used to make (but not build) a calc .a link library
 #
@@ -1825,7 +1834,7 @@ TARGETS= ${EARLY_TARGETS} ${BLD_TYPE} ${LATE_TARGETS}
 
 ###
 #
-# The reason for this Makefile	:-)
+# The main reason for this Makefile	:-)
 #
 ###
 
@@ -2996,9 +3005,9 @@ have_ustat.h: have_ustat.c banned.h have_ban_pragma.h ${MAKE_FILE} ${LOC_MKF}
 	${Q} echo '/* do we have or want ustat()? */' >> $@
 	${Q} ${RM} -f have_ustat.o have_ustat${EXT}
 	-${Q} if echo '#include <ustat.h>' | ${CC} -E - ${S}; then \
-	    ${Q} ${LCC} ${ICFLAGS} ${HAVE_USTAT} have_ustat.c -c ${S}; \
-	    ${Q} ${LCC} ${ILDFLAGS} have_ustat.o -o have_ustat${EXT} ${S}; \
-	    ${Q} ./have_ustat${EXT} > ustat_tmp ${E}; \
+	    ${LCC} ${ICFLAGS} ${HAVE_USTAT} have_ustat.c -c ${S}; \
+	    ${LCC} ${ILDFLAGS} have_ustat.o -o have_ustat${EXT} ${S}; \
+	    ./have_ustat${EXT} > ustat_tmp ${E}; \
 	fi
 	-${Q} if [ -s ustat_tmp ]; then \
 	    ${CAT} ustat_tmp >> $@; \
@@ -3367,7 +3376,7 @@ calcerr.h: calcerr.tbl calcerr_h.sed calcerr_h.awk ${MAKE_FILE} ${LOC_MKF}
 	${Q} echo '/*' > $@
 	${Q} echo ' * DO NOT EDIT' >> $@
 	${Q} echo ' *' >> $@
-	${Q} echo ' * generated by calcerr.tbl via Makefile' >> $@
+	${Q} echo ' * generated by calcerr.tbl via Makefile.simple' >> $@
 	${Q} echo ' */' >> $@
 	${Q} echo '' >> $@
 	${Q} echo '' >> $@
@@ -3397,7 +3406,7 @@ calcerr.c: calcerr.tbl calcerr_c.sed calcerr_c.awk ${MAKE_FILE} ${LOC_MKF}
 	${Q} echo '/*' > $@
 	${Q} echo ' * DO NOT EDIT' >> $@
 	${Q} echo ' *' >> $@
-	${Q} echo ' * generated by calcerr.tbl via Makefile' >> $@
+	${Q} echo ' * generated by calcerr.tbl via Makefile.simple' >> $@
 	${Q} echo ' */' >> $@
 	${Q} echo '' >> $@
 	${Q} ${SED} -f calcerr_c.sed < calcerr.tbl | \
@@ -3768,6 +3777,17 @@ depend: hsrc custom/Makefile
 	    fi; \
 	done >> skel/makedep.out
 	${Q} LANG=C ${SORT} -u skel/makedep.out -o skel/makedep.out
+	echo '#if 0	/* start of skip for non-Gnu makefiles */' \
+	  >> skel/makedep.out
+	echo '###################################################' \
+	  >> skel/makedep.out
+	echo '# End 2nd skip of lines for the custom/Makefile   #' \
+	  >> skel/makedep.out
+	echo '###################################################' \
+	  >> skel/makedep.out
+	echo 'endif' >> skel/makedep.out
+	echo '#endif	/* end of skip for non-Gnu makefiles */' \
+	  >> skel/makedep.out
 	${Q} echo dependency list formed
 	${Q} echo forming new ${MAKE_FILE}
 	${Q} ${RM} -f ${MAKE_FILE}.bak
@@ -3877,6 +3897,46 @@ calcliblistfmt:
 	${Q} ${MAKE} -f Makefile calcliblist | \
 	    ${FMT} -64 | ${SED} -e 's/^/	/'
 
+Makefile.simple: Makefile custom/Makefile.simple
+	${V} echo '=-=-=-=-= ${MAKE_FILE} start of $@ rule =-=-=-=-='
+	${Q} if [ -f $@.bak ]; then \
+		echo "$@.bak exists, remove or move it"; \
+		exit 1; \
+	else \
+	    ${TRUE}; \
+	fi
+	-${Q} if [ -f $@ ]; then \
+	    ${MV} -f $@ $@.bak; \
+	fi
+	${Q} ${AWK} '/^#if 0/{skp=1} {if(!skp){print $$0}} /^#endif/{skp=0}' \
+	    Makefile | \
+	    ${SED} -e 's/cd custom; $${MAKE} -f Makefile/&.simple/' \
+		   -e 's;^# SRC:.*;# SRC: $@ - non-GNU version;' \
+		   -e '/^ifeq /d' \
+		   -e '/^ifneq /d' \
+		   -e '/^ifdef /d' \
+		   -e '/^ifndef /d' \
+		   -e '/^else/d' \
+		   -e '/^endif/d' \
+		   -e 's;via Makefile.simple'"'"';via $@'"'"';' > $@
+	-${Q} if [ -s $@.bak ]; then \
+	    if ${CMP} -s $@.bak $@; then \
+		echo 'top level $@ was already up to date'; \
+		echo 'restoring original $@'; \
+		${MV} -f $@.bak $@; \
+	    else \
+		echo 'old $@ is now $@.bak'; \
+		echo 'updated top level $@ formed'; \
+		${DIFF} -u $@.bak $@; \
+	    fi \
+	else \
+	    echo 'new top level $@ formed'; \
+	    echo; \
+	    ${LS} -l $@; \
+	    echo; \
+	fi
+	${V} echo '=-=-=-=-= ${MAKE_FILE} end of $@ rule =-=-=-=-='
+
 
 ###
 #
@@ -4129,7 +4189,6 @@ env:
 	@echo 'TARGETS=${TARGETS}'; echo ''
 	@echo 'TEE=${TEE}'; echo ''
 	@echo 'TERMCONTROL=${TERMCONTROL}'; echo ''
-	@echo 'TOP_MAKE_FILE=${TOP_MAKE_FILE}'; echo ''
 	@echo 'TOUCH=${TOUCH}'; echo ''
 	@echo 'TRUE=${TRUE}'; echo ''
 	@echo 'UNAME=${UNAME}'; echo ''
@@ -4848,6 +4907,12 @@ uninstall: custom/Makefile
 	 fi
 	${V} echo '=-=-=-=-= ${MAKE_FILE} end of $@ rule =-=-=-=-='
 
+# unbak - remove any .bak files that may have been created
+#
+unbak:
+	${Q} ${RM} -f -v Makefile.bak Makefile.simple.bak
+	${Q} ${RM} -f -v custom/Makefile.bak custom/Makefile.simple.bak
+
 # splint - A tool for statically checking C programs
 #
 splint: #hsrc
@@ -6454,7 +6519,3 @@ zrandom.o: value.h
 zrandom.o: zmath.h
 zrandom.o: zrandom.c
 zrandom.o: zrandom.h
-
-Makefile.simple:
-	${Q} if [ ! -f Makefile.simple ]; then \
-		${CP} -f $@ $@; fi

README.RELEASE

@@ -0,0 +1,117 @@
+On calc versions and releases
+
+Calc version numbers have 4 levels.  For example:
+
+	 ++=== top 2 levels: calc builtin functions compatibility
+	 ||
+	vvvv
+
+	2.14.0.8
+	 \\\\\\
+	^  \\\\----> top 3 levels: calc important code base change
+	|
+	+--- top version level: internal representation compatibility
+
+The top version level (e.g., 2) refers to the internal representation
+of values.  Any library or hardware linked/built for calc 2 will be able
+to use values from other 2.x.y.z versions.
+
+The top 2 levels (e.g., 2.14) refers to a specific compatible set of
+builtin functions.  Calc interpreted code (such as calc resource files)
+written for, say calc 2.14, will be able to use the same set of builtin
+functions for any other 2.14.y.z version.  Any new builtin functions or
+significant changes to existing builtin functions would be introduced in
+a later release such as version 2.15.y.z.  While calc scripts written for
+2.14.y.z will highly likely be able to run under version 2.15.y.z, any
+new builtin functions added in calc 2.15 may collide with an identically
+named used defined function.
+
+The top 3 levels (e.g., 2.14.0) change to reflect an important change to
+the code base such as a bug fix or performance improvement.  There was
+neither a change to the internal representation format (a top level
+version change), nor were there new calc builtins introduced in such
+a top 3 level release.
+
+There are 3 classes of changes to the calc source tree:
+
+alpha		=> untagged GitHub commit
+
+	Any untagged commit to the GitHub master branch should be
+	considered as alpha code that may make calc unstable.
+
+	While we try to avoid breaking the calc code with commits,
+	there is a risk that picking up such a change could
+	negatively impact the code.
+
+tested		=> tagged GitHub pre-release commit
+
+	A new version of calc has been released and has recently passed
+	regression testing on at least to different platforms and chip
+	architectures.
+
+	The "tested" class was historically called "untested",
+	however this term was misleading as such releases ARE tested.
+	Since 2.14.0.13 we have used the term "tested".
+
+	All tested releases are tagged with a new version number.
+	Such releases have GitHub assets such as a source tarball,
+	zip file, source rpm, development rpm and binary rpm.  See the
+	orange "Pre-release" GitHub releases under:
+
+	    https://github.com/lcn2/calc/releases
+
+	 At the bottom of a given release is a "> Assets" that may
+	 be opened to reveal down-loadable files.
+
+production	=> tagged GitHub release commit
+
+	A new version of calc has been released and has undergone
+	extensive testing over time over a number of platforms.
+	Sometimes a "tested" release that is found work well over
+	a period of time will be re-released with a new version
+	number as a "production" release.
+
+	The latest production GitHub release is marked with green
+	"Latest" label under:
+
+	    https://github.com/lcn2/calc/releases
+
+	A release that has neither an orange "Pre-release" nor
+	a green "Latest" label is a prior production class release.
+
+	At the bottom of a given release is a "> Assets" that may
+	be opened to reveal down-loadable files.
+
+	Production class code where stability is critical should use a
+	"production" release.
+
+A historical note and apology:
+
+In the past, some version number changes were made that did not fully
+reflect the above version number or change class.  Moreover older terms
+such as "stable" and "unstable" were misleading and did not properly
+reflect the nature of the change.  Sorry!  The purpose of this document
+is to try and bring a better level of conformity to source code updates,
+tagged releases and version numbers.
+
+## Copyright (C) 2021  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
+## 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.
+## 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+##
+## Under source code control:	2021/12/12 19:36:26
+## File existed as early as:	2021
+##
+## chongo <was here> /\oo/\	http://www.isthe.com/chongo/
+## Share and enjoy!  :-)	http://www.isthe.com/chongo/tech/comp/calc/

cal/Makefile

@@ -106,15 +106,6 @@ PREFIX= /usr/local
 #
 MAKE_FILE= Makefile
 
-# Controlling file makefile basename (without the path)
-#
-# This is the basename same of the makefile that may/does/will drive
-# this makefile.
-#
-# If in doubt, set TOP_MAKE_FILE to Makefile
-#
-TOP_MAKE_FILE= Makefile
-
 # Where the system include (.h) files are kept
 #
 # For DJGPP, select:

cscript/Makefile

@@ -105,15 +105,6 @@ PREFIX= /usr/local
 #
 MAKE_FILE= Makefile
 
-# Controlling file makefile basename (without the path)
-#
-# This is the basename same of the makefile that may/does/will drive
-# this makefile.
-#
-# If in doubt, set TOP_MAKE_FILE to Makefile
-#
-TOP_MAKE_FILE= Makefile
-
 # Where the system include (.h) files are kept
 #
 # For DJGPP, select:

custom/Makefile

@@ -4,7 +4,7 @@
 #
 # Copyright (C) 1999-2006,2014,2017-2018,2021  Landon Curt Noll
 #
-# SRC: Makefile via make -f Makefile.ship custom/Makefile
+# SRC: custom/Makefile
 #
 #	The "# SRC: ... - ..." comment line above indicates
 #	the origin of this file.
@@ -35,25 +35,6 @@
 # calculator by David I. Bell with help/mods from others
 # Makefile by Landon Curt Noll
 
-####################################################
-# NOTE: Start of section from custom/Makefile.head #
-####################################################
-
-#.###############################################################.#
-#.#								#.#
-#.# WARNING: This Makefile is generated from a combination of	#.#
-#.#	   custom/Makefile.head, Makefile.ship, and		#.#
-#.#	   custom/Makefile.tail.  We recommend that you NOT	#.#
-#.#	   edit this file, but instead edit the proper source	#.#
-#.#	   file and then make custom/Makefile:			#.#
-#.#								#.#
-#.#		make custom/Makefile				#.#
-#.#								#.#
-#.#	   See the '# NOTE .. section from ..' lines for	#.#
-#.#	   where the source file for the lines are from.	#.#
-#.#								#.#
-#.###############################################################.#
-
 
 # The shell used by this Makefile
 #
@@ -151,8 +132,10 @@ CCBAN= -UUNBAN
 #if 0	/* start of skip for non-Gnu makefiles */
 
 # Unfortunately due to the complex dependency issues between
-# Makefile, Makefile.ship and custom/Makefile, parallel GNU make
-# is NOT recommended.  Sorry.
+# Makefile, and custom/Makefile, parallel GNU make
+# is NOT recommended.
+#
+# XXX - fix this - XXX
 #
 .NOTPARALLEL:
 
@@ -171,10 +154,6 @@ target=$(shell uname -s 2>/dev/null)
 endif
 #endif	/* end of skip for non-Gnu makefiles */
 
-##############################################################################
-#-=-=-=-=-=-=-=-=- You may want to change some values below -=-=-=-=-=-=-=-=-#
-##############################################################################
-
 # The custom calc resource files to install
 #
 # Put your custom calc resource files here.
@@ -218,6 +197,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 -=-=-=-=-=-=-#
 ##############################################################################
@@ -422,15 +405,6 @@ RANLIB=ranlib
 MAKE_FILE= Makefile
 #MAKE_FILE=
 
-# Controlling file makefile basename (without the path)
-#
-# This is the basename same of the makefile that may/does/will drive
-# this makefile.
-#
-# If in doubt, set TOP_MAKE_FILE to Makefile
-#
-TOP_MAKE_FILE= Makefile
-
 # If you do not wish to use purify, set PURIFY to an empty string.
 #
 # If in doubt, use PURIFY=
@@ -500,7 +474,7 @@ EXT=
 
 # The default calc versions
 #
-VERSION= 2.14.0.12
+VERSION= 2.14.0.14
 
 # Names of shared libraries with versions
 #
@@ -515,9 +489,11 @@ CHMOD= chmod
 CMP= cmp
 CO= co
 CP= cp
+DIFF= diff
 FMT= fmt
 GREP= egrep
 LN= ln
+LS= ls
 MAKE= make
 MAKEDEPEND= makedepend
 MKDIR= mkdir
@@ -588,548 +564,21 @@ LDFLAGS= ${LD_DEBUG} ${ILDFLAGS}
 
 #endif	/* end of skip for non-Gnu makefiles */
 
-##################################################
-# NOTE: End of section from custom/Makefile.head #
-##################################################
-# start of host target cut - Do not remove this line
-
-###########################################################
-# NOTE: Start of section from the middle of Makefile.ship #
-###########################################################
-
-##############################################################################
-#-=-=-=-=-=- host target section - targets that override defaults -=-=-=-=-=-#
-##############################################################################
-
-# Common values set in targets
-#
-# BLD_TYPE determines if calc is built with static and/or dynamic libs.
-#	       Set this value to one of:
-#
-#	BLD_TYPE= calc-dynamic-only
-#	BLD_TYPE= calc-static-only
-#
-# CC_SHARE are flags given to ${CC} to build .o files suitable for shared libs
-# DEFAULT_LIB_INSTALL_PATH is where calc programs look for calc shared libs
-# LD_SHARE are common flags given to ${CC} to link with shared libraries
-# LIBCALC_SHLIB are flags given to ${CC} to build libcalc shared libraries
-# LIBCUSTCALC_SHLIB are flags given to ${CC} to build libcustcalc shared lib
-#
-#	NOTE: The above 5 values are unused if BLD_TYPE= calc-static-only
-#
-# CC_STATIC are flags given to ${CC} to build .o files suitable for static libs
-# LD_STATIC are common flags given to ${CC} to link with static libraries
-# LIBCALC_STATIC are flags given to ${CC} to build libcalc static libraries
-# LIBCUSTCALC_STATIC are flags given to ${CC} to build libcustcalc static lib
-#
-#	NOTE: The above 4 values are unused if BLD_TYPE= calc-dynamic-only
-#
-# CCOPT are flags given to ${CC} for optimization
-# CCWARN are flags given to ${CC} for warning message control
-#
-# The following are given to ${CC}:
-#
-#	WNO_IMPLICT
-#	WNO_ERROR_LONG_LONG
-#	WNO_LONG_LONG
-#
-# when compiling special .o files that may need special compile options:
-#
-#	NOTE: These flags simply turn off certain compiler warnings,
-#	      which is useful only when CCWERR is set to -Werror.
-#
-#	NOTE: If your compiler does not have these -Wno files, just
-#	      set these variables to nothing as in:
-#
-#		WNO_IMPLICT=
-#		WNO_ERROR_LONG_LONG=
-#		WNO_LONG_LONG=
-#
-# CCWERR are flags given to ${CC} to make warnings fatal errors
-#	NOTE: CCWERR is only set in development Makefiles and must only be
-#	      used with ${CC}, not ${LCC}.  If you do not want the compiler
-#	      to abort on warnings, then leave CCWERR blank.
-# CCMISC are misc flags given to ${CC}
-#
-# CCBAN is given to ${CC} in order to control if banned.h is in effect.
-#	NOTE: See where CCBAN is defined above for details.
-#
-# LCC is how the C compiler is invoked on locally executed intermediate programs
-# CC is how the C compiler is invoked (with an optional Purify)
-#
-# Specific target overrides or modifications to default values
-
 ##########################################################################
-# NOTE: If your target is not supported below and the default target	 #
-#	is not suitable for your needs, please send to the:		 #
-#									 #
-#		calc-contrib at asthe dot com				 #
-#									 #
-#	Email address an "ifeq ($(target),YOUR_TARGET_NAME)" ... "endif" #
-#	set of lines so that we can consider them for the next release.  #
+#=-=-=-=-=- Be careful if you change something below this line -=-=-=-=-=#
 ##########################################################################
 
+# include start from top Makefile - keep this line
 #if 0	/* start of skip for non-Gnu makefiles */
-################
-# Linux target #
-################
-
-ifeq ($(target),Linux)
+###
 #
-BLD_TYPE= calc-dynamic-only
+# Allow Makefile.local to override any of the above settings
 #
-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}"
-ifdef ALLOW_CUSTOM
-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}
-#
-CCWARN= -Wall
-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
-
-###############################
-# Apple macOS / Darwin target #
-###############################
-
-ifeq ($(target),Darwin)
-#
-BLD_TYPE= calc-dynamic-only
-#
-CC_SHARE= -fPIC
-DEFAULT_LIB_INSTALL_PATH= ${PWD}:${LIBDIR}:${PREFIX}/lib
-LD_SHARE= ${DARWIN_ARCH}
-#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} ${DARWIN_ARCH}
-else
-LIBCALC_SHLIB= -single_module -undefined dynamic_lookup -dynamiclib \
-    ${DARWIN_ARCH}
-endif
-ifdef ALLOW_CUSTOM
-ifeq ($(SET_INSTALL_NAME),yes)
-LIBCUSTCALC_SHLIB= -single_module -undefined dynamic_lookup -dynamiclib \
-    -install_name ${LIBDIR}/libcustcalc${LIB_EXT_VERSION} ${DARWIN_ARCH}
-else
-LIBCUSTCALC_SHLIB= -single_module -undefined dynamic_lookup -dynamiclib \
-    ${DARWIN_ARCH}
-endif
-else
-LIBCUSTCALC_SHLIB=
-endif
-#
-CC_STATIC=
-LD_STATIC= ${DARWIN_ARCH}
-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}
-#
-CCWARN= -Wall
-WNO_IMPLICT= -Wno-implicit
-WNO_ERROR_LONG_LONG= -Wno-error=long-long
-WNO_LONG_LONG= -Wno-long-long
-CCWERR=
-CCOPT= ${DEBUG}
-CCMISC= ${DARWIN_ARCH}
-#
-LCC= clang
-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:=
-# DARWIN_ARCH= -arch i386 -arch ppc	# Universal binary
-# DARWIN_ARCH= -arch i386		# Intel binary
-# DARWIN_ARCH= -arch ppc		# PPC binary
-# DARWIN_ARCH= -arch x86_64		# native 64-bit binary
-DARWIN_ARCH=				# native binary
-endif
-
-##################
-# FreeBSD target #
-##################
-
-########################################################################
-# NOTE: You MUST either use gmake (GNU Make) or you must try your luck #
-#       with Makefile.simple and custom/Makefile.simple versions.      #
-#	See HOWTO.INSTALL for more information.                        #
-########################################################################
-
-ifeq ($(target),FreeBSD)
-#
-BLD_TYPE= calc-dynamic-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}"
-ifdef ALLOW_CUSTOM
-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}
-#
-CCWARN= -Wall
-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}
-#
-MAKE= gmake
-#
-endif
-
-##################
-# OpenBSD target #
-##################
-
-########################################################################
-# NOTE: You MUST either use gmake (GNU Make) or you must try your luck #
-#       with Makefile.simple and custom/Makefile.simple versions.      #
-#	See HOWTO.INSTALL for more information.                        #
-########################################################################
-
-ifeq ($(target),OpenBSD)
-#
-BLD_TYPE= calc-dynamic-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}"
-ifdef ALLOW_CUSTOM
-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}
-#
-CCWARN= -Wall
-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}
-#
-MAKE= gmake
-#
-endif
-
-#################
-# Cygwin target #
-#################
-
-ifeq ($(target),Cygwin)
-#
-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}"
-ifdef ALLOW_CUSTOM
-LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
-else
-LIBCUSTCALC_SHLIB=
-endif
-#
-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}
-#
-CCWARN= -Wall
-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
-
-#######################################################
-# simple target - values used to form Makefile.simple #
-#######################################################
-
-# NOTE: This is not a real host target.  The simple target
-#	exists only to form the Makefile.simple file.
-
-ifeq ($(target),simple)
+###
+EXCLUDE_FROM_CUSTOM_MAKEFILE=true	# include only middle of ../Makefile
+include ../Makefile
 #endif	/* end of skip for non-Gnu makefiles */
-#
-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}"
-LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
-#
-CC_STATIC=
-LD_STATIC=
-LIBCALC_STATIC=
-LIBCUSTCALC_STATIC=
-#
-CCWARN= -Wall
-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}
-#
-#if 0	/* start of skip for non-Gnu makefiles */
-endif
-
-###################################################
-# default target - when no specific target exists #
-###################################################
-
-# NOTE: This is the default generic host target.  Used when no other
-#	host target matches.
-
-ifeq ($(target),)
-#
-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}"
-ifdef ALLOW_CUSTOM
-LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
-else
-LIBCUSTCALC_SHLIB=
-endif
-#
-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}
-#
-CCWARN= -Wall
-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
-#
-# 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
-#
-# 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
-ICFLAGS= ${COMMON_CFLAGS} ${CCBAN} ${CC_SHARE}
-endif
-CFLAGS= ${ICFLAGS} ${CCOPT}
-
-# Required flags to link files for calc
-#
-# ILDFLAGS for ${CC} in linking intermediate programs used to help compile calc
-# LDFLAGS for ${CC} in linking calc programs other than intermediate programs
-#
-ILDFLAGS= ${COMMON_LDFLAGS}
-LDFLAGS= ${LD_DEBUG} ${ILDFLAGS}
-#endif	/* end of skip for non-Gnu makefiles */
-
-#######################################################################
-#-=-=-=-=-=- end of target section - only make rules below -=-=-=-=-=-#
-#######################################################################
-
-#########################################################
-# NOTE: End of section from the middle of Makefile.ship #
-#########################################################
-
-# end of host target cut - Do not remove this line
-#
-# Copyright (C) 1999-2006,2014,2017-2018,2021  Landon Curt Noll
-#
-# SRC: Makefile via make -f Makefile.ship 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.
-
-####################################################
-# NOTE: Start of section from custom/Makefile.tail #
-####################################################
-
-##############################################################################
-#-=-=-=-=-=-=-=-=- Be careful if you change something below -=-=-=-=-=-=-=-=-#
-##############################################################################
+# include end from top Makefile - keep this line
 
 # These .c files are required for the main custom interface and
 # for the custom support functions for libcustcalc${LIB_EXT_VERSION}.
@@ -1171,8 +620,7 @@ H_SRC= ${CUSTOM_H_SRC}
 # directory but are installed as help files from the help/Makefile.
 #
 DISTLIST= ${CUSTCALC_SRC} ${CUSTOM_CALC_FILES} ${CUSTOM_HELP} \
-	${INSTALL_H_SRC} CUSTOM_CAL HOW_TO_ADD ${MAKE_FILE}.head \
-	${MAKE_FILE}.tail
+	${INSTALL_H_SRC} CUSTOM_CAL HOW_TO_ADD Makefile Makefile.simple
 
 # These files are used to make (but not built) a calc .a link library
 #
@@ -1192,7 +640,7 @@ TARGETS= ${BLD_TYPE} Makefile.simple
 
 ###
 #
-# The reason for this Makefile	:-)
+# The main reason for this Makefile	:-)
 #
 ###
 
@@ -1273,7 +721,7 @@ calcliblist: ${CALCLIBLIST}
 	done
 
 #if 0	/* start of skip for non-Gnu makefiles */
-Makefile.simple: Makefile ../Makefile ../Makefile.ship
+Makefile.simple: Makefile ../Makefile
 	${V} echo '=-=-=-=-= custom/${MAKE_FILE} start of $@ rule =-=-=-=-='
 	${Q} if [ -f $@.bak ]; then \
 		echo "custom/$@.bak exists, remove or move it"; \
@@ -1285,14 +733,41 @@ Makefile.simple: Makefile ../Makefile ../Makefile.ship
 	    ${MV} -f $@ $@.bak; \
 	fi
 	${Q} ${AWK} '/^#if 0/{skp=1} {if(!skp){print $$0}} /^#endif/{skp=0}' \
-	    Makefile | \
-	    ${GREP} -v '#\.#' | \
-	    ${SED} -e 's;^# SRC:.*;# SRC: non-GNU Makefile via;' \
-		   -e 's;via$$;via ${MAKE} -f ${MAKE_FILE} custom/$@;' > $@
-	${Q} echo >> $@
-	${Q} echo 'Makefile.simple:' >> $@
-	${Q} echo '	$${Q} if [ ! -f Makefile.simple ]; then '"\\" >> $@
-	${Q} echo '		$${CP} -f $${MAKE_FILE} $$@; fi' >> $@
+	     Makefile | \
+	     ${SED} -e '/^# include start from top Makefile - keep /,$$d' \
+		    -e 's;^# SRC:.*;# SRC: custom/$@ - non-GNU version;' \
+		    -e '/^ifeq /d' \
+		    -e '/^ifneq /d' \
+		    -e '/^ifdef /d' \
+		    -e '/^ifndef /d' \
+		    -e '/^else/d' \
+		    -e '/^endif/d' \
+		    > $@
+	${Q} echo '# include start from top Makefile - keep this line' \
+	     >> $@
+	${Q} ${AWK} '/^#if 0/{skp=1} {if(!skp){print $$0}} /^#endif/{skp=0}' \
+	     ../Makefile | \
+	     ${SED} -e '1,/^# include start from top Makefile - keep /d' \
+		    -e '/^# include end from top Makefile - keep /,$$d' \
+		    -e '/^ifeq /d' \
+		    -e '/^ifneq /d' \
+		    -e '/^ifdef /d' \
+		    -e '/^ifndef /d' \
+		    -e '/^else/d' \
+		    -e '/^endif/d' \
+		    >> $@
+	${Q} echo '# include end from top Makefile - keep this line' \
+	     >> $@
+	${Q} ${AWK} '/^#if 0/{skp=1} {if(!skp){print $$0}} /^#endif/{skp=0}' \
+	     Makefile | \
+	     ${SED} -e '1,/^# include end from top Makefile - keep /d' \
+		    -e '/^ifeq /d' \
+		    -e '/^ifneq /d' \
+		    -e '/^ifdef /d' \
+		    -e '/^ifndef /d' \
+		    -e '/^else/d' \
+		    -e '/^endif/d' \
+		    >> $@
 	-${Q} if [ -s $@.bak ]; then \
 	    if ${CMP} -s $@.bak $@; then \
 		echo 'custom/$@ was already up to date'; \
@@ -1301,10 +776,13 @@ Makefile.simple: Makefile ../Makefile ../Makefile.ship
 	    else \
 		echo 'old custom/$@ is now custom/$@.bak'; \
 		echo 'updated custom/$@ formed'; \
-		echo 'try: diff -u custom/$@.bak custom/$@'; \
+		(cd .. ; ${DIFF} -u custom/$@.bak custom/$@); \
 	    fi; \
 	else \
 	    echo 'new custom/$@ formed'; \
+	    echo; \
+	    (cd .. ; ${LS} -l custom/$@); \
+	    echo; \
 	fi
 	${V} echo '=-=-=-=-= custom/${MAKE_FILE} end of $@ rule =-=-=-=-='
 #endif	/* end of skip for non-Gnu makefiles */
@@ -1347,8 +825,8 @@ depend:
 		>> "skel/custom/$$i"; \
 	    echo '#endif /* '"$$tag"' */' >> "skel/custom/$$i"; \
 	done
-	${Q} (cd ..; ${MAKE} -f ${TOP_MAKE_FILE} hsrc)
-	${MAKE} -f ../${TOP_MAKE_FILE} h_list 2>/dev/null | \
+	${Q} (cd ..; ${MAKE} -f ${MAKE_FILE} hsrc)
+	${MAKE} -f ../${MAKE_FILE} h_list 2>/dev/null | \
 	    while read i; do \
 		if [ ! -f "../$$i" ]; then continue; fi; \
 		tag="`echo $$i | ${SED} 's/[\.+,:]/_/g'`"; \
@@ -1383,7 +861,6 @@ depend:
 	${Q} ${SED} -n '1,/^# DO NOT DELETE THIS LINE/p' \
 		    ${MAKE_FILE}.bak > ${MAKE_FILE}
 	${Q} ${GREP} -v '^#' skel/custom/makedep.out >> ${MAKE_FILE}
-	${Q} ${TAIL} -4 ${MAKE_FILE}.tail >> ${MAKE_FILE}
 	${Q} echo removing skel
 	${Q} ${RM} -rf skel
 	-${Q} if ${CMP} -s ${MAKE_FILE}.bak ${MAKE_FILE}; then \
@@ -1902,7 +1379,3 @@ custtbl.o: ../str.h
 custtbl.o: ../value.h
 custtbl.o: ../zmath.h
 custtbl.o: custtbl.c
-
-##################################################
-# NOTE: End of section from custom/Makefile.tail #
-##################################################

custom/Makefile.head

@@ -1,593 +0,0 @@
-#!/bin/make
-#
-# custom - makefile for calc custom routines
-#
-# Copyright (C) 1999-2006,2014,2017-2018,2021  Landon Curt Noll
-#
-# SRC: custom/Makefile.head
-#
-#	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.
-#
-# 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
-# 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.
-# 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-#
-# Under source code control:	1997/03/09 02:28:54
-# File existed as early as:	1997
-#
-# 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
-
-####################################################
-# NOTE: Start of section from custom/Makefile.head #
-####################################################
-
-#.###############################################################.#
-#.#								#.#
-#.# WARNING: This Makefile is generated from a combination of	#.#
-#.#	   custom/Makefile.head, Makefile.ship, and		#.#
-#.#	   custom/Makefile.tail.  We recommend that you NOT	#.#
-#.#	   edit this file, but instead edit the proper source	#.#
-#.#	   file and then make custom/Makefile:			#.#
-#.#								#.#
-#.#		make custom/Makefile				#.#
-#.#								#.#
-#.#	   See the '# NOTE .. section from ..' lines for	#.#
-#.#	   where the source file for the lines are from.	#.#
-#.#								#.#
-#.###############################################################.#
-
-
-# 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= /bin/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 zsh may be a much better alternative
-# shell for this Makefile to use:
-#
-#	SHELL= /bin/zsh
-#
-SHELL= /bin/bash
-#SHELL= /bin/sh
-#if 0	/* start of skip for non-Gnu makefiles */
-ifeq ($(target),Darwin)
-SHELL:= /bin/zsh
-endif
-#endif	/* end of skip for non-Gnu makefiles */
-
-
-# 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
-# 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
-
-
-#if 0	/* start of skip for non-Gnu makefiles */
-
-# Unfortunately due to the complex dependency issues between
-# Makefile, Makefile.ship and custom/Makefile, parallel GNU make
-# is NOT recommended.  Sorry.
-#
-.NOTPARALLEL:
-
-##############################################################################
-#-=-=-=-=-=-=-=-=- Identify the target machine, if possible -=-=-=-=-=-=-=-=-#
-##############################################################################
-
-# NOTE: You can force a target value by defining target as in:
-#
-#	make ...__optional_arguments_... target=value
-
-# Try uname -s if the target was not already set on the make command line
-#
-ifeq ($(target),)
-target=$(shell uname -s 2>/dev/null)
-endif
-#endif	/* end of skip for non-Gnu makefiles */
-
-##############################################################################
-#-=-=-=-=-=-=-=-=- You may want to change some values below -=-=-=-=-=-=-=-=-#
-##############################################################################
-
-# The custom calc resource files to install
-#
-# Put your custom calc resource files here.
-#
-CUSTOM_CALC_FILES= argv.cal halflen.cal pzasusb8.cal pmodm127.cal register.cal
-
-# The custom help files to install
-#
-# Put your custom help files here.
-#
-CUSTOM_HELP= argv devnull help sysinfo pzasusb8 pmodm127 register
-
-# Any .h files that are needed by programs that use
-# libcustcalc${LIB_EXT_VERSION}
-#
-# Put any .h files that you add which might be useful to other
-# programs here.
-#
-CUSTOM_H_SRC=
-
-# Any .c files that are needed to build libcustcalc${LIB_EXT_VERSION}.
-#
-# Don't put ${REQUIRED_SRC} files in this list.
-#
-# There MUST be a .c in CUSTOM_SRC for every .o in CUSTOM_OBJ.
-#
-# Put your custom .c files here.
-#
-CUSTOM_SRC= c_argv.c c_devnull.c c_help.c c_sysinfo.c c_pzasusb8.c \
-	c_pmodm127.c c_register.c
-
-# Any .o files that are needed by program that use
-# libcustcalc${LIB_EXT_VERSION}.
-#
-# Don't put ${REQUIRED_OBJ} files in this list.
-#
-# There MUST be a .c in CUSTOM_SRC for every .o in CUSTOM_OBJ.
-#
-# Put your custom .o files here.
-#
-CUSTOM_OBJ= c_argv.o c_devnull.o c_help.o c_sysinfo.o c_pzasusb8.o \
-	c_pmodm127.o c_register.o
-
-##############################################################################
-#-=-=-=-=-=-=- 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.
-
-# Makefile debug
-#
-# Q=@	do not echo internal Makefile actions (quiet mode)
-# Q=	echo internal Makefile actions (debug / verbose mode)
-#
-# H=@:	do not report hsrc file formation progress
-# H=@	do echo hsrc file formation progress
-#
-# S= >/dev/null 2>&1	silence ${CC} output during hsrc file formation
-# S=			full ${CC} output during hsrc file formation
-#
-# E= 2>/dev/null	silence command stderr during hsrc file formation
-# E=			full command stderr during hsrc file formation
-#
-# V=@:	do not echo debug statements (quiet mode)
-# V=@	do echo debug statements (debug / verbose mode)
-#
-#Q=
-Q=@
-#
-S= >/dev/null 2>&1
-#S=
-#
-E= 2>/dev/null
-#E=
-#
-#H=@:
-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=
-
-# Controlling file makefile basename (without the path)
-#
-# This is the basename same of the makefile that may/does/will drive
-# this makefile.
-#
-# If in doubt, set TOP_MAKE_FILE to Makefile
-#
-TOP_MAKE_FILE= Makefile
-
-# 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=			# disable custom even if -C is given
-#
-# If in doubt, use ALLOW_CUSTOM= -DCUSTOM
-#
-ALLOW_CUSTOM= -DCUSTOM
-#ALLOW_CUSTOM=
-
-# 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.0.12
-
-# 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
-FMT= fmt
-GREP= egrep
-LN= ln
-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} #
-###########################################
-
-#if 0	/* start of skip for non-Gnu makefiles */
-
-# 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
-ICFLAGS= ${COMMON_CFLAGS} ${CCBAN} ${CC_SHARE}
-endif
-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}
-
-#endif	/* end of skip for non-Gnu makefiles */
-
-##################################################
-# NOTE: End of section from custom/Makefile.head #
-##################################################

custom/Makefile.simple

@@ -4,7 +4,7 @@
 #
 # Copyright (C) 1999-2006,2014,2017-2018,2021  Landon Curt Noll
 #
-# SRC: non-GNU Makefile via make -f Makefile custom/Makefile.simple
+# SRC: custom/Makefile.simple - non-GNU version
 #
 #	The "# SRC: ... - ..." comment line above indicates
 #	the origin of this file.
@@ -35,11 +35,6 @@
 # calculator by David I. Bell with help/mods from others
 # Makefile by Landon Curt Noll
 
-####################################################
-# NOTE: Start of section from custom/Makefile.head #
-####################################################
-
-
 
 # The shell used by this Makefile
 #
@@ -130,10 +125,6 @@ CCBAN= -UUNBAN
 
 
 
-##############################################################################
-#-=-=-=-=-=-=-=-=- You may want to change some values below -=-=-=-=-=-=-=-=-#
-##############################################################################
-
 # The custom calc resource files to install
 #
 # Put your custom calc resource files here.
@@ -177,6 +168,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 -=-=-=-=-=-=-#
 ##############################################################################
@@ -381,15 +376,6 @@ RANLIB=ranlib
 MAKE_FILE= Makefile
 #MAKE_FILE=
 
-# Controlling file makefile basename (without the path)
-#
-# This is the basename same of the makefile that may/does/will drive
-# this makefile.
-#
-# If in doubt, set TOP_MAKE_FILE to Makefile
-#
-TOP_MAKE_FILE= Makefile
-
 # If you do not wish to use purify, set PURIFY to an empty string.
 #
 # If in doubt, use PURIFY=
@@ -459,7 +445,7 @@ EXT=
 
 # The default calc versions
 #
-VERSION= 2.14.0.12
+VERSION= 2.14.0.14
 
 # Names of shared libraries with versions
 #
@@ -474,9 +460,11 @@ CHMOD= chmod
 CMP= cmp
 CO= co
 CP= cp
+DIFF= diff
 FMT= fmt
 GREP= egrep
 LN= ln
+LS= ls
 MAKE= make
 MAKEDEPEND= makedepend
 MKDIR= mkdir
@@ -522,14 +510,19 @@ COMMON_LDFLAGS= ${EXTRA_LDFLAGS}
 ###########################################
 
 
-##################################################
-# NOTE: End of section from custom/Makefile.head #
-##################################################
-# start of host target cut - Do not remove this line
+##########################################################################
+#=-=-=-=-=- Be careful if you change something below this line -=-=-=-=-=#
+##########################################################################
 
-###########################################################
-# NOTE: Start of section from the middle of Makefile.ship #
-###########################################################
+# include start from top Makefile - keep this line
+######################################################
+# NOTE: Start of section from the middle of Makefile #
+#						     #
+# These lines are shared in common with the lower    #
+# custom/Makefile. That is, until the comment line   #
+# that starts with '# NOTE: End of section ..' line, #
+# these Makefile lines are used in BOTH Makefiles.   #
+######################################################
 
 ##############################################################################
 #-=-=-=-=-=- host target section - targets that override defaults -=-=-=-=-=-#
@@ -618,7 +611,8 @@ LD_STATIC=
 LIBCALC_STATIC=
 LIBCUSTCALC_STATIC=
 #
-CCWARN= -Wall
+#CCWARN= -Wall
+CCWARN= -Wall -Wextra -pedantic
 WNO_IMPLICT= -Wno-implicit
 WNO_ERROR_LONG_LONG= -Wno-error=long-long
 WNO_LONG_LONG= -Wno-long-long
@@ -647,29 +641,15 @@ LDFLAGS= ${LD_DEBUG} ${ILDFLAGS} ${LIBCALC_STATIC} ${LIBCUSTCALC_STATIC}
 #-=-=-=-=-=- end of target section - only make rules below -=-=-=-=-=-#
 #######################################################################
 
-#########################################################
-# NOTE: End of section from the middle of Makefile.ship #
-#########################################################
-
-# end of host target cut - Do not remove this line
-#
-# Copyright (C) 1999-2006,2014,2017-2018,2021  Landon Curt Noll
-#
-# SRC: non-GNU Makefile via make -f Makefile custom/Makefile.simple
-#
-#	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.
-
-####################################################
-# NOTE: Start of section from custom/Makefile.tail #
-####################################################
-
-##############################################################################
-#-=-=-=-=-=-=-=-=- Be careful if you change something below -=-=-=-=-=-=-=-=-#
-##############################################################################
+######################################################
+# NOTE: End of section from the middle of Makefile   #
+#						     #
+# These lines are shared in common with the lower    #
+# custom/Makefile. That is, starting with the line   #
+# that starts with '# NOTE: End of section ..' line, #
+# these Makefile lines are used in BOTH Makefiles.   #
+######################################################
+# include end from top Makefile - keep this line
 
 # These .c files are required for the main custom interface and
 # for the custom support functions for libcustcalc${LIB_EXT_VERSION}.
@@ -711,8 +691,7 @@ H_SRC= ${CUSTOM_H_SRC}
 # directory but are installed as help files from the help/Makefile.
 #
 DISTLIST= ${CUSTCALC_SRC} ${CUSTOM_CALC_FILES} ${CUSTOM_HELP} \
-	${INSTALL_H_SRC} CUSTOM_CAL HOW_TO_ADD ${MAKE_FILE}.head \
-	${MAKE_FILE}.tail
+	${INSTALL_H_SRC} CUSTOM_CAL HOW_TO_ADD Makefile Makefile.simple
 
 # These files are used to make (but not built) a calc .a link library
 #
@@ -732,7 +711,7 @@ TARGETS= ${BLD_TYPE} Makefile.simple
 
 ###
 #
-# The reason for this Makefile	:-)
+# The main reason for this Makefile	:-)
 #
 ###
 
@@ -851,8 +830,8 @@ depend:
 		>> "skel/custom/$$i"; \
 	    echo '#endif /* '"$$tag"' */' >> "skel/custom/$$i"; \
 	done
-	${Q} (cd ..; ${MAKE} -f ${TOP_MAKE_FILE} hsrc)
-	${MAKE} -f ../${TOP_MAKE_FILE} h_list 2>/dev/null | \
+	${Q} (cd ..; ${MAKE} -f ${MAKE_FILE} hsrc)
+	${MAKE} -f ../${MAKE_FILE} h_list 2>/dev/null | \
 	    while read i; do \
 		if [ ! -f "../$$i" ]; then continue; fi; \
 		tag="`echo $$i | ${SED} 's/[\.+,:]/_/g'`"; \
@@ -887,7 +866,6 @@ depend:
 	${Q} ${SED} -n '1,/^# DO NOT DELETE THIS LINE/p' \
 		    ${MAKE_FILE}.bak > ${MAKE_FILE}
 	${Q} ${GREP} -v '^#' skel/custom/makedep.out >> ${MAKE_FILE}
-	${Q} ${TAIL} -4 ${MAKE_FILE}.tail >> ${MAKE_FILE}
 	${Q} echo removing skel
 	${Q} ${RM} -rf skel
 	-${Q} if ${CMP} -s ${MAKE_FILE}.bak ${MAKE_FILE}; then \
@@ -1406,11 +1384,3 @@ custtbl.o: ../str.h
 custtbl.o: ../value.h
 custtbl.o: ../zmath.h
 custtbl.o: custtbl.c
-
-##################################################
-# NOTE: End of section from custom/Makefile.tail #
-##################################################
-
-Makefile.simple:
-	${Q} if [ ! -f Makefile.simple ]; then \
-		${CP} -f ${MAKE_FILE} $@; fi

custom/Makefile.tail

@@ -1,794 +0,0 @@
-#
-# Copyright (C) 1999-2006,2014,2017-2018,2021  Landon Curt Noll
-#
-# SRC: custom/Makefile.tail
-#
-#	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.
-
-####################################################
-# NOTE: Start of section from custom/Makefile.tail #
-####################################################
-
-##############################################################################
-#-=-=-=-=-=-=-=-=- Be careful if you change something below -=-=-=-=-=-=-=-=-#
-##############################################################################
-
-# These .c files are required for the main custom interface and
-# for the custom support functions for libcustcalc${LIB_EXT_VERSION}.
-#
-# There MUST be a .c for every .o in REQUIRED_OBJ.
-#
-REQUIRED_SRC= custtbl.c
-
-# These .o files correspond to the .c files in REQUIRED_SRC
-# for libcustcalc${LIB_EXT_VERSION}.
-#
-# There MUST be a .o for every .c in REQUIRED_SRC.
-#
-REQUIRED_OBJ= custtbl.o
-
-# These .h files are installed under ${CUSTOMCALDIR} by the install rule.
-#
-INSTALL_H_SRC= ${CUSTOM_H_SRC}
-
-# These .c files are used to form libcustcalc${LIB_EXT_VERSION}.
-#
-CUSTCALC_SRC= ${REQUIRED_SRC} ${CUSTOM_SRC}
-
-# These .o files are used to form libcustcalc${LIB_EXT_VERSION}.
-#
-CUSTCALC_OBJ= ${REQUIRED_OBJ} ${CUSTOM_OBJ}
-
-# These .c files are used to build the dependency list
-#
-C_SRC= ${REQUIRED_SRC} ${CUSTOM_SRC}
-
-# These .h files are used to build the dependency list
-#
-H_SRC= ${CUSTOM_H_SRC}
-
-# These files are found (but not built) in the distribution
-#
-# The CUSTOM_CAL and HOW_TO_ADD are files distributed from this
-# directory but are installed as help files from the help/Makefile.
-#
-DISTLIST= ${CUSTCALC_SRC} ${CUSTOM_CALC_FILES} ${CUSTOM_HELP} \
-	${INSTALL_H_SRC} CUSTOM_CAL HOW_TO_ADD ${MAKE_FILE}.head \
-	${MAKE_FILE}.tail
-
-# These files are used to make (but not built) a calc .a link library
-#
-CALCLIBLIST= ${CUSTCALC_SRC} ${INSTALL_H_SRC} ${MAKE_FILE} HOW_TO_ADD
-
-# This is the custom dynamic shared library that is build
-#
-CALC_DYNAMIC_LIBCUSTCALC= libcustcalc${LIB_EXT_VERSION}
-
-# This is the custom static library that is build
-#
-CALC_STATIC_LIBCUSTCALC= libcustcalc.a
-
-# complete list of targets
-#
-TARGETS= ${BLD_TYPE} Makefile.simple
-
-###
-#
-# The reason for this Makefile	:-)
-#
-###
-
-all: ${TARGETS} ${INSTALL_H_SRC} ${CUSTOM_CALC_FILES} \
-	${CUSTOM_HELP} ${MAKE_FILE} .all
-
-calc-dynamic-only: ${CUSTCALC_OBJ} ${CALC_DYNAMIC_LIBCUSTCALC}
-
-calc-static-only: ${CUSTCALC_OBJ} ${CALC_STATIC_LIBCUSTCALC}
-
-custom/libcustcalc${LIB_EXT_VERSION}: libcustcalc${LIB_EXT_VERSION} \
-	${CALC_STATIC_LIBCUSTCALC}
-
-libcustcalc${LIB_EXT_VERSION}: ${CUSTCALC_OBJ} ${MAKE_FILE}
-	${CC} ${LIBCUSTCALC_SHLIB} ${CUSTCALC_OBJ} -o $@
-
-##
-#
-# Special .o files
-#
-##
-
-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:
-	${RM} -f .all
-	${TOUCH} .all
-
-###
-#
-# building calc-static and static lib*.a libraries
-#
-###
-
-libcustcalc.a: ${CUSTCALC_OBJ} ${MAKE_FILE}
-	${RM} -f libcustcalc.a
-	${AR} qc libcustcalc.a ${CUSTCALC_OBJ}
-	${RANLIB} libcustcalc.a
-	${CHMOD} 0644 libcustcalc.a
-
-##
-#
-# File list generation.	 You can ignore this section.
-#
-#
-# We will form the names of source files as if they were in a
-# sub-directory called calc/lib.
-#
-# NOTE: Due to bogus shells found on one common system we must have
-#	an non-empty else clause for every if condition.  *sigh*
-#
-##
-
-distlist: ${DISTLIST}
-	${Q} for i in ${DISTLIST} /dev/null; do \
-	    if [ X"$$i" != X"/dev/null" ]; then \
-		echo custom/$$i; \
-	    fi; \
-	done
-
-distdir:
-	${Q} echo custom
-
-calcliblist: ${CALCLIBLIST}
-	${Q} for i in ${CALCLIBLIST} /dev/null; do \
-	    if [ X"$$i" != X"/dev/null" ]; then \
-		echo custom/$$i; \
-	    fi; \
-	done
-
-#if 0	/* start of skip for non-Gnu makefiles */
-Makefile.simple: Makefile ../Makefile ../Makefile.ship
-	${V} echo '=-=-=-=-= custom/${MAKE_FILE} start of $@ rule =-=-=-=-='
-	${Q} if [ -f $@.bak ]; then \
-		echo "custom/$@.bak exists, remove or move it"; \
-		exit 1; \
-	else \
-	    ${TRUE}; \
-	fi
-	-${Q} if [ -f $@ ]; then \
-	    ${MV} -f $@ $@.bak; \
-	fi
-	${Q} ${AWK} '/^#if 0/{skp=1} {if(!skp){print $$0}} /^#endif/{skp=0}' \
-	    Makefile | \
-	    ${GREP} -v '#\.#' | \
-	    ${SED} -e 's;^# SRC:.*;# SRC: non-GNU Makefile via;' \
-		   -e 's;via$$;via ${MAKE} -f ${MAKE_FILE} custom/$@;' > $@
-	${Q} echo >> $@
-	${Q} echo 'Makefile.simple:' >> $@
-	${Q} echo '	$${Q} if [ ! -f Makefile.simple ]; then '"\\" >> $@
-	${Q} echo '		$${CP} -f $${MAKE_FILE} $$@; fi' >> $@
-	-${Q} if [ -s $@.bak ]; then \
-	    if ${CMP} -s $@.bak $@; then \
-		echo 'custom/$@ was already up to date'; \
-		echo 'restoring original custom/$@'; \
-		${MV} -f $@.bak $@; \
-	    else \
-		echo 'old custom/$@ is now custom/$@.bak'; \
-		echo 'updated custom/$@ formed'; \
-		echo 'try: diff -u custom/$@.bak custom/$@'; \
-	    fi; \
-	else \
-	    echo 'new custom/$@ formed'; \
-	fi
-	${V} echo '=-=-=-=-= custom/${MAKE_FILE} end of $@ rule =-=-=-=-='
-#endif	/* end of skip for non-Gnu makefiles */
-
-##
-#
-# Home grown make dependency rules.  Your system make not support
-# or have the needed tools.  You can ignore this section.
-#
-# 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.
-#
-##
-
-depend:
-	${Q} if [ -f ${MAKE_FILE}.bak ]; then \
-	    echo "custom/${MAKE_FILE}.bak exists, remove or move it"; \
-	    exit 1; \
-	else \
-	    ${TRUE}; \
-	fi
-	${Q} echo forming custom/skel
-	${Q} ${RM} -rf skel
-	${Q} ${MKDIR} -p skel
-	${Q} ${MKDIR} -p skel/custom
-	-${Q} for i in ${C_SRC} /dev/null; do \
-	    if [ X"$$i" != X"/dev/null" ]; then \
-		${SED} -n '/^#[	 ]*include[	 ]*"/p' \
-		    "$$i" > "skel/custom/$$i"; \
-	    fi; \
-	done
-	-${Q} for i in ${H_SRC} /dev/null; do \
-	    if [ "$$i" = "/dev/null" ]; then continue; fi; \
-	    tag="`echo $$i | ${SED} 's/[\.+,:]/_/g'`"; \
-	    echo "#if !defined($$tag)" > "skel/custom/$$i"; \
-	    echo "#define $$tag" >> "skel/custom/$$i"; \
-	    ${SED} -n '/^#[	 ]*include[	 ]*"/p' "$$i" \
-		>> "skel/custom/$$i"; \
-	    echo '#endif /* '"$$tag"' */' >> "skel/custom/$$i"; \
-	done
-	${Q} (cd ..; ${MAKE} -f ${TOP_MAKE_FILE} hsrc)
-	${MAKE} -f ../${TOP_MAKE_FILE} h_list 2>/dev/null | \
-	    while read i; do \
-		if [ ! -f "../$$i" ]; then continue; fi; \
-		tag="`echo $$i | ${SED} 's/[\.+,:]/_/g'`"; \
-		echo "#if !defined($$tag)" > "skel/$$i"; \
-		echo "#define $$tag" >> "skel/$$i"; \
-		${SED} -n '/^#[	 ]*include[	 ]*"/p' "../$$i" \
-		    >> "skel/$$i"; \
-		echo '#endif /* '"$$tag"' */' >> "skel/$$i"; \
-	    done
-	${Q} ${RM} -f skel/custom/makedep.out skel/custom/makedep.in
-	${Q} echo custom/skel formed
-	${Q} echo forming custom dependency list
-	${Q} :> skel/custom/makedep.out
-	${Q} cd skel/custom; ${MAKEDEPEND} \
-	    -I../../.. -w 1 -f makedep.out -- \
-	    ${CFLAGS} -- \
-	    ${C_SRC} 2>/dev/null
-	${Q} ${CP} -f skel/custom/makedep.out skel/custom/makedep.in
-	${Q} ${SED} -e 's|: ../../|: |' -E < skel/custom/makedep.in | \
-	    ${GREP} -v /usr/include > skel/custom/makedep.out
-	-${Q} for i in ${C_SRC} /dev/null; do \
-	    if [ X"$$i" != X"/dev/null" ]; then \
-		echo "$$i" | ${SED} 's/^\(.*\)\.c/\1.o: \1.c/'; \
-	    fi; \
-	done >> skel/custom/makedep.out
-	${Q} LANG=C ${SORT} -u skel/custom/makedep.out \
-			    -o skel/custom/makedep.out
-	${Q} echo custom dependency list formed
-	${Q} echo forming new custom/${MAKE_FILE}
-	${Q} ${RM} -f ${MAKE_FILE}.bak
-	${Q} ${MV} ${MAKE_FILE} ${MAKE_FILE}.bak
-	${Q} ${SED} -n '1,/^# DO NOT DELETE THIS LINE/p' \
-		    ${MAKE_FILE}.bak > ${MAKE_FILE}
-	${Q} ${GREP} -v '^#' skel/custom/makedep.out >> ${MAKE_FILE}
-	${Q} ${TAIL} -4 ${MAKE_FILE}.tail >> ${MAKE_FILE}
-	${Q} echo removing skel
-	${Q} ${RM} -rf skel
-	-${Q} if ${CMP} -s ${MAKE_FILE}.bak ${MAKE_FILE}; then \
-	    echo 'custom/${MAKE_FILE} was already up to date'; \
-	    echo 'restoring original custom/${MAKE_FILE}'; \
-	    ${MV} -f ${MAKE_FILE}.bak ${MAKE_FILE}; \
-	else \
-	    echo 'old custom/${MAKE_FILE} is now custom/${MAKE_FILE}.bak'; \
-	    echo 'new custom/${MAKE_FILE} formed'; \
-	    echo 'try: diff -u custom/${MAKE_FILE}.bak custom/${MAKE_FILE}'; \
-	fi
-
-##
-#
-# rpm rules
-#
-##
-
-echo_inst_files:
-	${Q} for i in ${INSTALL_H_SRC} /dev/null; do \
-	    if [ X"$$i" != X"/dev/null" ]; then \
-		echo __file__ ${CUSTOMINCDIR}/$$i; \
-	    fi; \
-	done
-	${Q} for i in ${CUSTOM_HELP} /dev/null; do \
-	    if [ X"$$i" != X"/dev/null" ]; then \
-		echo __file__ ${CUSTOMHELPDIR}/$$i; \
-	    fi; \
-	done
-	${Q} for i in ${CUSTOM_CALC_FILES} /dev/null; do \
-	    if [ X"$$i" != X"/dev/null" ]; then \
-		echo __file__ ${CUSTOMCALDIR}/$$i; \
-	    fi; \
-	done
-	${Q} for i in ${CALC_DYNAMIC_LIBCUSTCALC} /dev/null; do \
-	    if [ X"$$i" != X"/dev/null" ]; then \
-		echo __file__ ${CUSTOMCALDIR}/$$i; \
-	    fi; \
-	done
-
-##
-#
-# Utility rules
-#
-##
-
-clean:
-	${RM} -f ${CUSTCALC_OBJ}
-
-clobber: clean
-	${RM} -f ${BLD_TYPE}
-	${RM} -f .all ${MAKE_FILE}.tmp ${MAKE_FILE}.bak
-	${RM} -f libcustcalc${LIB_EXT_VERSION}
-	${RM} -f libcustcalc${LIB_EXT}
-	${RM} -f libcustcalc.a
-	${RM} -f libcustcalc*
-	${RM} -rf skel
-	${V} echo remove files that are obsolete
-	-${Q} if [ -e .DS_Store ]; then \
-	    echo ${RM} -rf .DS_Store; \
-	    ${RM} -rf .DS_Store; \
-	fi
-
-# install everything
-#
-# NOTE: Keep the uninstall rule in reverse order to the install rule
-#
-install: all
-	-${Q} if [ ! -d ${T}${LIBDIR} ]; then \
-	    echo ${MKDIR} -p ${T}${LIBDIR}; \
-	    ${MKDIR} -p ${T}${LIBDIR}; \
-	    if [ ! -d "${T}${LIBDIR}" ]; then \
-		echo ${MKDIR} -p "${T}${LIBDIR}"; \
-		${MKDIR} -p "${T}${LIBDIR}"; \
-	    fi; \
-	    echo ${CHMOD} 0755 ${T}${LIBDIR}; \
-	    ${CHMOD} 0755 ${T}${LIBDIR}; \
-	else \
-	    ${TRUE}; \
-	fi
-	-${Q} if [ ! -d ${T}${INCDIR} ]; then \
-	    echo ${MKDIR} -p ${T}${INCDIR}; \
-	    ${MKDIR} -p ${T}${INCDIR}; \
-	    if [ ! -d "${T}${INCDIR}" ]; then \
-		echo ${MKDIR} -p "${T}${INCDIR}"; \
-		${MKDIR} -p "${T}${INCDIR}"; \
-	    fi; \
-	    echo ${CHMOD} 0755 ${T}${INCDIR}; \
-	    ${CHMOD} 0755 ${T}${INCDIR}; \
-	else \
-	    ${TRUE}; \
-	fi
-	-${Q} if [ ! -d ${T}${CALC_SHAREDIR} ]; then \
-	    echo ${MKDIR} -p ${T}${CALC_SHAREDIR}; \
-	    ${MKDIR} -p ${T}${CALC_SHAREDIR}; \
-	    if [ ! -d "${T}${CALC_SHAREDIR}" ]; then \
-		echo ${MKDIR} -p "${T}${CALC_SHAREDIR}"; \
-		${MKDIR} -p "${T}${CALC_SHAREDIR}"; \
-	    fi; \
-	    echo ${CHMOD} 0755 ${T}${CALC_SHAREDIR}; \
-	    ${CHMOD} 0755 ${T}${CALC_SHAREDIR}; \
-	else \
-	    ${TRUE}; \
-	fi
-	-${Q} if [ ! -d ${T}${CALC_INCDIR} ]; then \
-	    echo ${MKDIR} -p ${T}${CALC_INCDIR}; \
-	    ${MKDIR} -p ${T}${CALC_INCDIR}; \
-	    if [ ! -d "${T}${CALC_INCDIR}" ]; then \
-		echo ${MKDIR} -p "${T}${CALC_INCDIR}"; \
-		${MKDIR} -p "${T}${CALC_INCDIR}"; \
-	    fi; \
-	    echo ${CHMOD} 0755 ${T}${CALC_INCDIR}; \
-	    ${CHMOD} 0755 ${T}${CALC_INCDIR}; \
-	else \
-	    ${TRUE}; \
-	fi
-	-${Q} if [ ! -d ${T}${HELPDIR} ]; then \
-	    echo ${MKDIR} -p ${T}${HELPDIR}; \
-	    ${MKDIR} -p ${T}${HELPDIR}; \
-	    if [ ! -d "${T}${HELPDIR}" ]; then \
-		echo ${MKDIR} -p "${T}${HELPDIR}"; \
-		${MKDIR} -p "${T}${HELPDIR}"; \
-	    fi; \
-	    echo ${CHMOD} 0755 ${T}${HELPDIR}; \
-	    ${CHMOD} 0755 ${T}${HELPDIR}; \
-	else \
-	    ${TRUE}; \
-	fi
-	-${Q} if [ ! -d ${T}${CUSTOMCALDIR} ]; then \
-	    echo ${MKDIR} -p ${T}${CUSTOMCALDIR}; \
-	    ${MKDIR} -p ${T}${CUSTOMCALDIR}; \
-	    if [ ! -d "${T}${CUSTOMCALDIR}" ]; then \
-		echo ${MKDIR} -p "${T}${CUSTOMCALDIR}"; \
-		${MKDIR} -p "${T}${CUSTOMCALDIR}"; \
-	    fi; \
-	    echo ${CHMOD} 0755 ${T}${CUSTOMCALDIR}; \
-	    ${CHMOD} 0755 ${T}${CUSTOMCALDIR}; \
-	else \
-	    ${TRUE}; \
-	fi
-	-${Q} if [ ! -d ${T}${CUSTOMHELPDIR} ]; then \
-	    echo ${MKDIR} -p ${T}${CUSTOMHELPDIR}; \
-	    ${MKDIR} -p ${T}${CUSTOMHELPDIR}; \
-	    if [ ! -d "${T}${CUSTOMHELPDIR}" ]; then \
-		echo ${MKDIR} -p "${T}${CUSTOMHELPDIR}"; \
-		${MKDIR} -p "${T}${CUSTOMHELPDIR}"; \
-	    fi; \
-	    echo ${CHMOD} 0755 ${T}${CUSTOMHELPDIR}; \
-	    ${CHMOD} 0755 ${T}${CUSTOMHELPDIR}; \
-	else \
-	    ${TRUE}; \
-	fi
-	-${Q} if [ ! -d ${T}${CUSTOMINCDIR} ]; then \
-	    echo ${MKDIR} -p ${T}${CUSTOMINCDIR}; \
-	    ${MKDIR} -p ${T}${CUSTOMINCDIR}; \
-	    if [ ! -d "${T}${CUSTOMINCDIR}" ]; then \
-		echo ${MKDIR} -p "${T}${CUSTOMINCDIR}"; \
-		${MKDIR} -p "${T}${CUSTOMINCDIR}"; \
-	    fi; \
-	    echo ${CHMOD} 0755 ${T}${CUSTOMINCDIR}; \
-	    ${CHMOD} 0755 ${T}${CUSTOMINCDIR}; \
-	else \
-	    ${TRUE}; \
-	fi
-	-${Q} for i in ${INSTALL_H_SRC} /dev/null; do \
-	    if [ "$$i" = "/dev/null" ]; then \
-		continue; \
-	    fi; \
-	    if ${CMP} -s "$$i" ${T}${CUSTOMINCDIR}/$$i; then \
-		${TRUE}; \
-	    else \
-		${RM} -f ${T}${CUSTOMINCDIR}/$$i.new; \
-		${CP} -f $$i ${T}${CUSTOMINCDIR}/$$i.new; \
-		${CHMOD} 0444 ${T}${CUSTOMINCDIR}/$$i.new; \
-		${MV} -f ${T}${CUSTOMINCDIR}/$$i.new ${T}${CUSTOMINCDIR}/$$i; \
-		echo "installed ${T}${CUSTOMINCDIR}/$$i"; \
-	    fi; \
-	done
-	-${Q} for i in ${CUSTOM_CALC_FILES} /dev/null; do \
-	    if [ "$$i" = "/dev/null" ]; then \
-		continue; \
-	    fi; \
-	    if ${CMP} -s $$i ${T}${CUSTOMCALDIR}/$$i; then \
-		${TRUE}; \
-	    else \
-		${RM} -f ${T}${CUSTOMCALDIR}/$$i.new; \
-		${CP} -f $$i ${T}${CUSTOMCALDIR}/$$i.new; \
-		${CHMOD} 0444 ${T}${CUSTOMCALDIR}/$$i.new; \
-		${MV} -f ${T}${CUSTOMCALDIR}/$$i.new ${T}${CUSTOMCALDIR}/$$i; \
-		echo "installed ${T}${CUSTOMCALDIR}/$$i"; \
-	    fi; \
-	done
-	-${Q} for i in ${CUSTOM_HELP} /dev/null; do \
-	    if [ "$$i" = "/dev/null" ]; then \
-		continue; \
-	    fi; \
-	    if ${CMP} -s $$i ${T}${CUSTOMHELPDIR}/$$i; then \
-		${TRUE}; \
-	    else \
-		${RM} -f ${T}${CUSTOMHELPDIR}/$$i.new; \
-		${CP} -f $$i ${T}${CUSTOMHELPDIR}/$$i.new; \
-		${CHMOD} 0444 ${T}${CUSTOMHELPDIR}/$$i.new; \
-		${MV} -f ${T}${CUSTOMHELPDIR}/$$i.new \
-			 ${T}${CUSTOMHELPDIR}/$$i; \
-		echo "installed ${T}${CUSTOMHELPDIR}/$$i"; \
-	    fi; \
-	done
-	-${Q} if [ -f "${T}${CUSTOMCALDIR}/libcustcalc.a" ]; then \
-	    ${RM} -f ${T}${CUSTOMCALDIR}/libcustcalc.a; \
-	    echo "removed old ${T}${CUSTOMCALDIR}/libcustcalc.a"; \
-	fi
-	-${Q} if [ ! -z ${ALLOW_CUSTOM} ]; then \
-	  if [ -f libcustcalc.a ]; then \
-	    if ${CMP} -s libcustcalc.a ${T}${LIBDIR}/libcustcalc.a; then \
-		${TRUE}; \
-	    else \
-		${RM} -f ${T}${LIBDIR}/libcustcalc.a.new; \
-		${CP} -f libcustcalc.a ${T}${LIBDIR}/libcustcalc.a.new; \
-		${CHMOD} 0644 ${T}${LIBDIR}/libcustcalc.a.new; \
-		${MV} -f ${T}${LIBDIR}/libcustcalc.a.new \
-		      ${T}${LIBDIR}/libcustcalc.a; \
-		${RANLIB} ${T}${LIBDIR}/libcustcalc.a; \
-		echo "installed ${T}${LIBDIR}/libcustcalc.a"; \
-	    fi; \
-	  fi; \
-	fi
-	${Q}# NOTE: The upper level makefile installs the file
-	${Q}#	    libcustcalc${LIB_EXT_VERSION} because we only want to
-	${Q}#	    perform one ${LDCONFIG} for both libcalc${LIB_EXT_VERSION}
-	${Q}#	    and libcustcalc${LIB_EXT_VERSION}.
-
-# Try to remove everything that was installed
-#
-# NOTE: Keep the uninstall rule in reverse order to the install rule
-#
-uninstall:
-	-${Q} if [ -f "${T}${CUSTOMCALDIR}/libcustcalc.a" ]; then \
-	    ${RM} -f "${T}${CUSTOMCALDIR}/libcustcalc.a"; \
-	    if [ -f "${T}${CUSTOMCALDIR}/libcustcalc.a" ]; then \
-		echo "cannot uninstall ${T}${CUSTOMCALDIR}/libcustcalc.a"; \
-	    else \
-		echo "un-installed ${T}${CUSTOMCALDIR}/libcustcalc.a"; \
-	    fi; \
-	fi
-	-${Q} for i in ${CUSTOM_HELP} /dev/null; do \
-	    if [ "$$i" = "/dev/null" ]; then \
-		continue; \
-	    fi; \
-	    if [ -f "${T}${CUSTOMHELPDIR}/$$i" ]; then \
-		${RM} -f "${T}${CUSTOMHELPDIR}/$$i"; \
-		if [ -f "${T}${CUSTOMHELPDIR}/$$i" ]; then \
-		   echo "cannot uninstall ${T}${CUSTOMHELPDIR}/$$i"; \
-		else \
-		   echo "un-installed ${T}${CUSTOMHELPDIR}/$$i"; \
-		fi; \
-	    fi; \
-	done
-	-${Q} for i in ${CUSTOM_CALC_FILES} /dev/null; do \
-	    if [ "$$i" = "/dev/null" ]; then \
-		continue; \
-	    fi; \
-	    if [ -f "${T}${CUSTOMCALDIR}/$$i" ]; then \
-		${RM} -f "${T}${CUSTOMCALDIR}/$$i"; \
-		if [ -f "${T}${CUSTOMCALDIR}/$$i" ]; then \
-		   echo "cannot uninstall ${T}${CUSTOMCALDIR}/$$i"; \
-		else \
-		   echo "un-installed ${T}${CUSTOMCALDIR}/$$i"; \
-		fi; \
-	    fi; \
-	done
-	-${Q} for i in ${INSTALL_H_SRC} /dev/null; do \
-	    if [ "$$i" = "/dev/null" ]; then \
-		continue; \
-	    fi; \
-	    if [ -f "${T}${CUSTOMINCDIR}/$$i" ]; then \
-		${RM} -f "${T}${CUSTOMINCDIR}/$$i"; \
-		if [ -f "${T}${CUSTOMINCDIR}/$$i" ]; then \
-		   echo "cannot uninstall ${T}${CUSTOMINCDIR}/$$i"; \
-		else \
-		   echo "un-installed ${T}${CUSTOMINCDIR}/$$i"; \
-		fi; \
-	    fi; \
-	done
-	-${Q} for i in ${CUSTOMINCDIR} ${CUSTOMHELPDIR} ${CUSTOMCALDIR} \
-		    ${HELPDIR} ${CALC_INCDIR} ${CALC_SHAREDIR} ${INCDIR}; do \
-	    if [ -d "${T}$$i" ]; then \
-		${RMDIR} "${T}$$i" 2>/dev/null; \
-		echo "cleaned up ${T}$$i"; \
-	    fi; \
-	done
-
-##
-#
-# make depend stuff
-#
-##
-
-# DO NOT DELETE THIS LINE -- make depend depends on it.
-
-c_argv.o: ../alloc.h
-c_argv.o: ../banned.h
-c_argv.o: ../block.h
-c_argv.o: ../byteswap.h
-c_argv.o: ../calc.h
-c_argv.o: ../calcerr.h
-c_argv.o: ../cmath.h
-c_argv.o: ../config.h
-c_argv.o: ../custom.h
-c_argv.o: ../decl.h
-c_argv.o: ../endian_calc.h
-c_argv.o: ../hash.h
-c_argv.o: ../have_ban_pragma.h
-c_argv.o: ../have_const.h
-c_argv.o: ../have_memmv.h
-c_argv.o: ../have_newstr.h
-c_argv.o: ../have_stdlib.h
-c_argv.o: ../have_string.h
-c_argv.o: ../have_unused.h
-c_argv.o: ../longbits.h
-c_argv.o: ../nametype.h
-c_argv.o: ../qmath.h
-c_argv.o: ../sha1.h
-c_argv.o: ../str.h
-c_argv.o: ../value.h
-c_argv.o: ../zmath.h
-c_argv.o: c_argv.c
-c_devnull.o: ../alloc.h
-c_devnull.o: ../banned.h
-c_devnull.o: ../block.h
-c_devnull.o: ../byteswap.h
-c_devnull.o: ../calcerr.h
-c_devnull.o: ../cmath.h
-c_devnull.o: ../config.h
-c_devnull.o: ../custom.h
-c_devnull.o: ../decl.h
-c_devnull.o: ../endian_calc.h
-c_devnull.o: ../hash.h
-c_devnull.o: ../have_ban_pragma.h
-c_devnull.o: ../have_const.h
-c_devnull.o: ../have_memmv.h
-c_devnull.o: ../have_newstr.h
-c_devnull.o: ../have_stdlib.h
-c_devnull.o: ../have_string.h
-c_devnull.o: ../have_unistd.h
-c_devnull.o: ../have_unused.h
-c_devnull.o: ../longbits.h
-c_devnull.o: ../nametype.h
-c_devnull.o: ../qmath.h
-c_devnull.o: ../sha1.h
-c_devnull.o: ../str.h
-c_devnull.o: ../value.h
-c_devnull.o: ../zmath.h
-c_devnull.o: c_devnull.c
-c_help.o: ../alloc.h
-c_help.o: ../banned.h
-c_help.o: ../block.h
-c_help.o: ../byteswap.h
-c_help.o: ../calcerr.h
-c_help.o: ../cmath.h
-c_help.o: ../config.h
-c_help.o: ../custom.h
-c_help.o: ../decl.h
-c_help.o: ../endian_calc.h
-c_help.o: ../hash.h
-c_help.o: ../have_ban_pragma.h
-c_help.o: ../have_const.h
-c_help.o: ../have_memmv.h
-c_help.o: ../have_newstr.h
-c_help.o: ../have_stdlib.h
-c_help.o: ../have_string.h
-c_help.o: ../have_unistd.h
-c_help.o: ../have_unused.h
-c_help.o: ../longbits.h
-c_help.o: ../nametype.h
-c_help.o: ../qmath.h
-c_help.o: ../sha1.h
-c_help.o: ../str.h
-c_help.o: ../value.h
-c_help.o: ../zmath.h
-c_help.o: c_help.c
-c_pmodm127.o: ../alloc.h
-c_pmodm127.o: ../banned.h
-c_pmodm127.o: ../block.h
-c_pmodm127.o: ../byteswap.h
-c_pmodm127.o: ../calcerr.h
-c_pmodm127.o: ../cmath.h
-c_pmodm127.o: ../config.h
-c_pmodm127.o: ../custom.h
-c_pmodm127.o: ../decl.h
-c_pmodm127.o: ../endian_calc.h
-c_pmodm127.o: ../hash.h
-c_pmodm127.o: ../have_ban_pragma.h
-c_pmodm127.o: ../have_const.h
-c_pmodm127.o: ../have_memmv.h
-c_pmodm127.o: ../have_newstr.h
-c_pmodm127.o: ../have_stdlib.h
-c_pmodm127.o: ../have_string.h
-c_pmodm127.o: ../have_unused.h
-c_pmodm127.o: ../longbits.h
-c_pmodm127.o: ../nametype.h
-c_pmodm127.o: ../qmath.h
-c_pmodm127.o: ../sha1.h
-c_pmodm127.o: ../str.h
-c_pmodm127.o: ../value.h
-c_pmodm127.o: ../zmath.h
-c_pmodm127.o: c_pmodm127.c
-c_pzasusb8.o: ../alloc.h
-c_pzasusb8.o: ../banned.h
-c_pzasusb8.o: ../block.h
-c_pzasusb8.o: ../byteswap.h
-c_pzasusb8.o: ../calcerr.h
-c_pzasusb8.o: ../cmath.h
-c_pzasusb8.o: ../config.h
-c_pzasusb8.o: ../custom.h
-c_pzasusb8.o: ../decl.h
-c_pzasusb8.o: ../endian_calc.h
-c_pzasusb8.o: ../hash.h
-c_pzasusb8.o: ../have_ban_pragma.h
-c_pzasusb8.o: ../have_const.h
-c_pzasusb8.o: ../have_memmv.h
-c_pzasusb8.o: ../have_newstr.h
-c_pzasusb8.o: ../have_stdlib.h
-c_pzasusb8.o: ../have_string.h
-c_pzasusb8.o: ../have_unused.h
-c_pzasusb8.o: ../longbits.h
-c_pzasusb8.o: ../nametype.h
-c_pzasusb8.o: ../qmath.h
-c_pzasusb8.o: ../sha1.h
-c_pzasusb8.o: ../str.h
-c_pzasusb8.o: ../value.h
-c_pzasusb8.o: ../zmath.h
-c_pzasusb8.o: c_pzasusb8.c
-c_register.o: ../alloc.h
-c_register.o: ../banned.h
-c_register.o: ../block.h
-c_register.o: ../byteswap.h
-c_register.o: ../calc.h
-c_register.o: ../calcerr.h
-c_register.o: ../cmath.h
-c_register.o: ../config.h
-c_register.o: ../custom.h
-c_register.o: ../decl.h
-c_register.o: ../endian_calc.h
-c_register.o: ../hash.h
-c_register.o: ../have_ban_pragma.h
-c_register.o: ../have_const.h
-c_register.o: ../have_memmv.h
-c_register.o: ../have_newstr.h
-c_register.o: ../have_stdlib.h
-c_register.o: ../have_string.h
-c_register.o: ../have_unused.h
-c_register.o: ../longbits.h
-c_register.o: ../nametype.h
-c_register.o: ../qmath.h
-c_register.o: ../sha1.h
-c_register.o: ../str.h
-c_register.o: ../value.h
-c_register.o: ../zmath.h
-c_register.o: c_register.c
-c_sysinfo.o: ../alloc.h
-c_sysinfo.o: ../banned.h
-c_sysinfo.o: ../block.h
-c_sysinfo.o: ../byteswap.h
-c_sysinfo.o: ../calc.h
-c_sysinfo.o: ../calcerr.h
-c_sysinfo.o: ../cmath.h
-c_sysinfo.o: ../conf.h
-c_sysinfo.o: ../config.h
-c_sysinfo.o: ../custom.h
-c_sysinfo.o: ../decl.h
-c_sysinfo.o: ../endian_calc.h
-c_sysinfo.o: ../fposval.h
-c_sysinfo.o: ../hash.h
-c_sysinfo.o: ../have_ban_pragma.h
-c_sysinfo.o: ../have_const.h
-c_sysinfo.o: ../have_memmv.h
-c_sysinfo.o: ../have_newstr.h
-c_sysinfo.o: ../have_stdlib.h
-c_sysinfo.o: ../have_string.h
-c_sysinfo.o: ../have_unused.h
-c_sysinfo.o: ../hist.h
-c_sysinfo.o: ../lib_calc.h
-c_sysinfo.o: ../longbits.h
-c_sysinfo.o: ../nametype.h
-c_sysinfo.o: ../prime.h
-c_sysinfo.o: ../qmath.h
-c_sysinfo.o: ../sha1.h
-c_sysinfo.o: ../str.h
-c_sysinfo.o: ../value.h
-c_sysinfo.o: ../zmath.h
-c_sysinfo.o: ../zrand.h
-c_sysinfo.o: ../zrandom.h
-c_sysinfo.o: c_sysinfo.c
-custtbl.o: ../alloc.h
-custtbl.o: ../banned.h
-custtbl.o: ../block.h
-custtbl.o: ../byteswap.h
-custtbl.o: ../calcerr.h
-custtbl.o: ../cmath.h
-custtbl.o: ../config.h
-custtbl.o: ../custom.h
-custtbl.o: ../decl.h
-custtbl.o: ../endian_calc.h
-custtbl.o: ../hash.h
-custtbl.o: ../have_ban_pragma.h
-custtbl.o: ../have_const.h
-custtbl.o: ../have_memmv.h
-custtbl.o: ../have_newstr.h
-custtbl.o: ../have_stdlib.h
-custtbl.o: ../have_string.h
-custtbl.o: ../longbits.h
-custtbl.o: ../nametype.h
-custtbl.o: ../qmath.h
-custtbl.o: ../sha1.h
-custtbl.o: ../str.h
-custtbl.o: ../value.h
-custtbl.o: ../zmath.h
-custtbl.o: custtbl.c
-
-##################################################
-# NOTE: End of section from custom/Makefile.tail #
-##################################################

help.c

@@ -87,6 +87,7 @@ STATIC struct help_alias {
 	{"dm2d", "dms2d"},
 	{"gm2g", "gms2g"},
 	{"hm2d", "hms2d"},
+	{"release", "releases"},
 	{NULL, NULL}
 };
 

help/Makefile

@@ -106,15 +106,6 @@ PREFIX= /usr/local
 #
 MAKE_FILE= Makefile
 
-# Controlling file makefile basename (without the path)
-#
-# This is the basename same of the makefile that may/does/will drive
-# this makefile.
-#
-# If in doubt, set TOP_MAKE_FILE to Makefile
-#
-TOP_MAKE_FILE= Makefile
-
 # Where the system include (.h) files are kept
 #
 # For DJGPP, select:
@@ -318,7 +309,7 @@ BLT_HELP_FILES_13= bugs changes
 
 STD_HELP_FILES_14= credit
 
-BLT_HELP_FILES_14= contrib COPYING COPYING-LGPL questions
+BLT_HELP_FILES_14= contrib COPYING COPYING-LGPL questions releases
 
 STD_HELP_FILES_15= wishlist todo
 
@@ -529,7 +520,7 @@ usage: ../calc.usage
 	fi
 
 ../calc.usage:
-	(cd ..; ${MAKE} -f ${TOP_MAKE_FILE} calc.usage)
+	(cd ..; ${MAKE} -f ${MAKE_FILE} calc.usage)
 
 custom_cal: ../custom/CUSTOM_CAL
 	${RM} -f $@
@@ -632,6 +623,18 @@ cscript: ../cscript/README
 	${Q} ${RM} -f $@
 	(cd ../cscript; ${MAKE} -f Makefile README)
 
+releases: ../README.RELEASE
+	${RM} -f $@
+	${CP} ../README.RELEASE $@
+	${CHMOD} 0444 $@
+	-@if [ -z "${Q}" ]; then \
+	    echo ''; \
+	    echo '=-=-= skipping the ${CAT} of help/$@ =-=-='; \
+	    echo ''; \
+	else \
+	    ${TRUE}; \
+	fi
+
 full: ${FULL_HELP_FILES} ${MAKE_FILE}
 	${Q} echo "forming full"
 	${Q} ${RM} -f $@

help/archive

@@ -1,21 +1,27 @@
 Where to get the latest versions of calc
 
-    Landon Noll maintains the official calc home page at:
+    Official calc source is maintained on GitHub:
+
+	https://github.com/lcn2/calc
+
+    Calc releases may be found as GitHub tagged releases:
+
+	https://github.com/lcn2/calc/releases?page=2
+
+     At the bottom of a given release is a "> Assets" that may
+     be opened to reveal down-loadable files such as source
+     tarballs, source zip files and RPMs.
+
+    Landon Noll also maintains a calc home page at:
 
 	    http://www.isthe.com/chongo/tech/comp/calc/
 
-    See:
-
-	    http://www.isthe.com/chongo/tech/comp/calc/calc-download.html
-
-    for information on how to obtain up a recent version of calc.
-
 Landon Curt Noll
 http://www.isthe.com/chongo/
 
 chongo <was here> /\../\
 
-## Copyright (C) 1999  Landon Curt Noll
+## Copyright (C) 1999,2021  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

help/help

@@ -48,6 +48,8 @@ following topics:
     copyright		calc copyright and the GNU LGPL
     copying		details on the Calc GNU Lesser General Public License
     copying-lgpl	calc GNU Lesser General Public License text
+    questions		how to ask simple general question about calc
+    release		on calc versions and releases
 
     full		all of the above (in the above order)
 
@@ -123,7 +125,7 @@ Any help file that the help command is able to display may be
 displayed by the man command.  The man command may only display
 calc help files.
 
-## Copyright (C) 1999-2007,2017  Landon Curt Noll
+## Copyright (C) 1999-2007,2017,2021  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

help/srand

@@ -12,6 +12,11 @@ TYPES
 DESCRIPTION
     Seed the pseudo-random number using an subtractive 100 shuffle generator.
 
+    It you want a quick and effective way to seed the generator,
+    we recommended that you call srand() with the seed() value:
+
+	srand(seed())
+
     For integer seed != 0:
 
 	Any buffered rand generator bits are flushed.  The subtractive table
@@ -150,7 +155,7 @@ LINK LIBRARY
 SEE ALSO
     seed, srandom, randbit, isrand, random, srandom, israndom
 
-## Copyright (C) 1999  Landon Curt Noll
+## Copyright (C) 1999,2021  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

help/srandom

@@ -20,6 +20,11 @@ TYPES
 DESCRIPTION
     Seed the pseudo-random number using the Blum-Blum-Shub generator.
 
+    It you want a quick and effective way to seed the generator,
+    we recommended that you call srandom() with the seed() value:
+
+	srandom(seed())
+
     There are two primary values contained inside generator state:
 
 	Blum modulus:
@@ -58,7 +63,7 @@ DESCRIPTION
 	call of srandom(0) will restore the generator to the state
 	found when calc starts.
 
-    1 arg (seed >= 2^32):		srandom(21609139158123209^9+17)
+    1 arg (seed >= 2^32):		srandom(seed())
 
 	The seed value is used to compute the new quadratic residue.
 	The seed passed will be successively squared mod the Blum

seed.c

@@ -708,12 +708,26 @@ pseudo_seed(void)
      * load the hash data into the ZVALUE
      *
      * We do not care about byte-order, nor Endian issues, we just
-     * want to load in data.
+     * want to load in data.  We round up to the next HALF in size
+     * just in case hash_val is not a HALF multiple in length.
      */
-    hash.len = sizeof(hash_val) / sizeof(HALF);
+    hash.len = (sizeof(hash_val)+sizeof(HALF)-1) / sizeof(HALF);
     hash.v = alloc(hash.len);
+    memset(hash.v, 0, hash.len*sizeof(HALF));	/* paranoia */
     hash.sign = 0;
-    memcpy((void *)hash.v, (void *)&hash_val, hash.len*sizeof(HALF));
+    memcpy((void *)hash.v, (void *)&hash_val, sizeof(hash_val));
+
+    /*
+     * Force the hash as ZVALUE to be at most, 64 bits long.
+     * It is almost certainly the case that the hash as ZVALUE
+     * is at most 64 bits in length: this code guarantees it.
+     *
+     * BTW: One can safely assume that 64 is an integer multiple of BASEB:
+     *	    likely 4, 2, or 1 times BASEB.
+     */
+    if (hash.len > 64/BASEB) {
+	hash.len = 64/BASEB;
+    }
     ztrim(&hash);
 
     /*

version.c

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