improve the cal/regress.cal regress test suite structure

Improve comments about use of the ${CALC_ENV} Makefile variable.
Noted in Makefile.cal where and how the ${CALC_ENV} is used.
Use ${CALC_ENV} Makefile variable were needed.

Modified regression test cal/regress.cal: in some cases test numbers
were adjusted.  Add comments indicate which test numbers apply to
which code.  Indicated where there is room for new tests.
Expanded the end of test numbers from 9999 to  99999.

CHANGES

@@ -136,6 +136,15 @@ The following are the changes from calc version 2.14.3.5 to date:
     Added new avercos(x, [,eps]) for inverse versed cosine and acovercos(x, [,eps])
     for inverse coversed cosine.
 
+    Improve comments about use of the ${CALC_ENV} Makefile variable.
+    Noted in Makefile.cal where and how the ${CALC_ENV} is used.
+    Use ${CALC_ENV} Makefile variable were needed.
+
+    Modified regression test cal/regress.cal: in some cases test numbers
+    were adjusted.  Add comments indicate which test numbers apply to
+    which code.  Indicated where there is room for new tests.
+    Expanded the end of test numbers from 9999 to  99999.
+
 
 The following are the changes from calc version 2.14.3.4 to 2.14.3.5:
 

Makefile

@@ -2712,11 +2712,12 @@ custom/Makefile.simple:
 ###
 #
 # Doing a 'make check' will cause the regression test suite to be executed.
-# This rule will try to build anything that needs to be built as well.
+# This rule will try to build anything that needs to be built before
+# executing the regression test suite.
 #
-# Doing a 'make chk' will cause only the context around interesting
+# Doing a 'make chk' will cause ONLY the context around interesting
 # (and error) messages to be printed.  Unlike 'make check', this
-# rule does not cause things to be built.  i.e., the all rule is
+# rule does NOT cause things to be built.  I.e., the all rule is
 # not invoked.
 #
 ###
@@ -3123,18 +3124,15 @@ debug:
 
 testfuncsort: ./calc${EXT}
 	@${RM} -f func.show func.sort
-	@CALCPATH=./cal LD_LIBRARY_PATH=. DYLD_LIBRARY_PATH=. CALCHELP=./help CALCCUSTOMHELP=./custom \
+	@${CALC_ENV} ./calc${EXT} -d -u show builtin | grep '^[A-Za-z0-9]' > func.show
-		./calc${EXT} -d -u show builtin | grep '^[A-Za-z0-9]' > func.show
+	@${CALC_ENV} ./calc${EXT} -d -u show builtin | grep '^[A-Za-z0-9]' | LANG=C LC_ALL=C ${SORT} -d -u > func.sort
-	@CALCPATH=./cal LD_LIBRARY_PATH=. DYLD_LIBRARY_PATH=. CALCHELP=./help CALCCUSTOMHELP=./custom \
-		./calc${EXT} -d -u show builtin | grep '^[A-Za-z0-9]' | LANG=C LC_ALL=C ${SORT} -d -u > func.sort
 	@-if ! cmp -s func.show func.sort; then \
 	    echo 1>&2; \
 	    echo "ERROR: builtins[] arrray in func.c is not in dictionary sorted order" 1>&2; \
 	    echo 1>&2; \
-	    echo "CALCPATH=./cal LD_LIBRARY_PATH=. DYLD_LIBRARY_PATH=. CALCHELP=./help CALCCUSTOMHELP=./custom" \
+	    echo "${CALC_ENV} ./calc${EXT} -d -u show builtin | grep '^[A-Za-z0-9]' > func.show" 1>&2; \
-		 "./calc${EXT} -d -u show builtin | grep '^[A-Za-z0-9]' > func.show" 1>&2; \
+	    echo "${CALC_ENV} ./calc${EXT} -d -u show builtin | grep '^[A-Za-z0-9]' |" \
-	    echo "CALCPATH=./cal LD_LIBRARY_PATH=. DYLD_LIBRARY_PATH=. CALCHELP=./help CALCCUSTOMHELP=./custom" \
+	         "LANG=C LC_ALL=C ${SORT} -d -u > func.sort" 1>&2; \
-		 "./calc${EXT} -d -u show builtin | grep '^[A-Za-z0-9]' | LANG=C LC_ALL=C ${SORT} -d -u > func.sort" 1>&2; \
 	    echo 1>&2; \
 	    echo ${SDIFF} func.show func.sort 1>&2; \
 	    echo 1>&2; \
@@ -3196,7 +3194,7 @@ prep:
 	${Q}echo
 
 run:
-	CALCPATH=./cal LD_LIBRARY_PATH=. DYLD_LIBRARY_PATH=. CALCHELP=./help CALCCUSTOMHELP=./custom ./calc${EXT} -q
+	${CALC_ENV} ./calc${EXT} -q
 
 ###
 #

Makefile.config

@@ -1225,20 +1225,24 @@ PURIFY=
 #LD_DEBUG= -lmalloc_cv
 LD_DEBUG=
 
-# When doing a:
+# Environment variables for local directory calc execution and local directory calc testing
+#
+# These environment variables are used in the following rules:
 #
 #	make check
 #	make chk
 #	make debug
+#	make testfuncsort
+#	make prep
+#	make run
 #
-# the ${CALC_ENV} is used to supply the proper environment variables
+# NOTE: An equivalent environment variable setting is found in .lldbinit for lldb use.
-# 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.
 #
-# If in doubt, use:
+# When calc is installed on the local system, it is assumed that variables such as
-#
+# ${LIBDIR} will be set to the default LD_LIBRARY_PATH for the system.  Thus for
-#	CALC_ENV= CALCPATH=./cal LD_LIBRARY_PATH=.:./custom DYLD_LIBRARY_PATH=.
+# normal execution outside of the special rules mentioned in this comment block,
+# the system wide defaults for shared libraries will be used AND that one does NOT
+# need to use set these environment variables for normal calc use.
 #
 ifeq ($(ALLOW_CUSTOM),-DCUSTOM)
 CALC_ENV= CALCPATH=./cal LD_LIBRARY_PATH=. DYLD_LIBRARY_PATH=. CALCHELP=./help \