Release calc version 2.11.5.6

BUGS

@@ -74,6 +74,53 @@ Known bugs:
 
 Problems with known work-a-rounds:
 
+    * The gcc as shipped with Redhat 7 perhaps other Linux distributions
+      has a bug causes calc to dump core on startup when calc is:
+
+	  compiled optimized (-O, -O1, -O2 or -O3)
+
+	  	AND
+
+      	  compiled with debugging (-g or -g3)
+
+	  	AND
+
+	  when calc is compiled with readline (see USE_READLINE,
+	    READLINE_LIB and READLINE_INCLUDE in the Makefile)
+
+      On Redhat, the gcc -v which has this problem is:
+
+	gcc version 2.96 20000731 (Red Hat Linux 7.1 2.96-85)
+
+      there may be other gcc versions that also suffer this fate.
+
+      The readlines associated with problem are:
+
+	readline-4.1-5
+	readline2.2.1-2.2.1-2
+	readline-devel-4.1-5
+
+      One work-a-round is to compile calc WITHOUT readline.  In the
+      Makefile be sure that:
+
+	USE_READLINE=
+	READLINE_LIB=
+	READLINE_INCLUDE=
+
+      i.e., these Makefile vars are empty.
+
+      If you must use readline, then an alternate work-a-round is to
+      change the DEBUG Makefile variable to either:
+
+	compile for speed:  -O3		(or -O2 if you do not have -O3)
+	compile to debug:   -g3		(or -g if you do not have -g3)
+
+      but not both.
+
+      See RH bug #57889 for details:
+
+	http://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=57889
+
     * There is a bug in gcc-2.95 that causes calc, when compiled with -O2,
       to fail the regression test.  The work-a-round is to compile with -O
       or to use gcc-2.96 or later.
@@ -241,8 +288,8 @@ Problems with known work-a-rounds:
 ## received a copy with calc; if not, write to Free Software Foundation, Inc.
 ## 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
 ##
-## @(#) $Revision: 29.12 $
-## @(#) $Id: BUGS,v 29.12 2001/06/01 11:32:01 chongo Exp $
+## @(#) $Revision: 29.17 $
+## @(#) $Id: BUGS,v 29.17 2001/12/31 22:12:35 chongo Exp $
 ## @(#) $Source: /usr/local/src/cmd/calc/RCS/BUGS,v $
 ##
 ## Under source code control:	1994/03/18 14:06:13

CHANGES

@@ -1,14 +1,38 @@
-The following are the changes from calc version 2.11.5t4.1 to date:
+The following are the changes from calc version 2.11.5.5 to date:
+
+    Now using version numbers of one of these forms:
+
+    	x.y.z.w
+    	x.y.z
+    	x.y
+
+    Changed the READLINE_LIB Makefile variable to not link with -lreadline
+    by default.  If you do have readline, we recommend that you use it.
+    If you can install the GNU readline:
+
+	http://freshmeat.net/projects/gnureadline/
+    	http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html
+
+    we recommend it.  But if not, you should set the USE_READLINE,
+    READLINE_LIB, and READLINE_INCLUDE Makefile variables to empty.
+    NOTE: See the BUGS file for a Linux issue when compiling calc
+    with -O (or -O2 or -O3) AND with -g (or -g3) AND with readline.
+
+
+The following are the changes from calc version 2.11.5t4.1 to 2.11.5t4.4:
 
     Updated dependency rules in Makefiles.
 
+    NOTE: -DSRC, as used in 2.11.5t4.1 was renamed -DCALC_SRC
+    in a later version.
+
     Calc include files use #include "foo.h" to include other calc
-    header files if -DSRC.  Otherwise they use <calc/foo.h>.
-    The -DSRC symbol is defined by default in calc's Makefile
+    header files if -DCALC_SRC.  Otherwise they use <calc/foo.h>.
+    The -DCALC_SRC symbol is defined by default in calc's Makefile
     and so it uses the header files from within the calc src tree.
     If an external non-calc program includes an installed calc
     header file (from under /usr/include), and it does NOT define
-    SRC, then it will obtain the calc header files from the
+    CALC_SRC, then it will obtain the calc header files from the
     correct system location (such as /usr/include/calc/foo.h).
 
     Added calc builtin function: version() which returns the calc
@@ -50,6 +74,27 @@ The following are the changes from calc version 2.11.5t4.1 to date:
     The top level Makefile now sets LANG=C and passes it down to
     lower level Makefiles.
 
+    Updated URLs in cal/lucas.cal comments.
+
+    Now shipping calc.spec, inst_files, spec-template and Makefile.linux
+    with the standard calc source distribution.  Note that the standard
+    Makefile has not changed.  The Makefile.linux only in minor ways
+    needed to build calc rpms.
+
+    Added $T Makefile variable.  $T is the 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 examplewhen forming the calc rpm, the Makefile is called with
+    T=$RPM_BUILD_ROOT.  If $T is empty, calc is installed under /.
+
+    Removed all echo_XXX rules except for echo_inst_files from lower
+    level makefile.  The calc.spec will use a make install rule
+    with T=$RPM_BUILD_ROOT.
+
+    Updated LIBRARY file with instructions related to -DCALC_SRC,
+    the new default include file locatin and -lcustcalc.
+
 
 The following are the changes from calc version 2.11.5t3 to 2.11.5t4:
 
@@ -180,7 +225,7 @@ The following are the changes from calc version 2.11.5t0 to 2.11.5t1.1:
 
     An effort was made to make calc easier to build under Windoz
     using the Cygwin project (http://sources.redhat.com/cygwin/).
-    Thanks to the work of Thomas Jones-Low (tjoneslo and softstart
+    Thanks to the work of Thomas Jones-Low (tjoneslo at softstart
     dot com), a number of #if defined(_WIN32)'s have been added
     to calc source.  These changes should not effect Windoz
     free system such as GNU/Linux, Solaris, POSIX-like, etc ...
@@ -5334,8 +5379,8 @@ Following is a list of visible changes to calc from version 1.24.7 to 1.26.1:
 ## received a copy with calc; if not, write to Free Software Foundation, Inc.
 ## 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
 ##
-## @(#) $Revision: 29.38 $
-## @(#) $Id: CHANGES,v 29.38 2001/06/06 10:06:48 chongo Exp $
+## @(#) $Revision: 29.45 $
+## @(#) $Id: CHANGES,v 29.45 2001/12/31 22:12:35 chongo Exp $
 ## @(#) $Source: /usr/local/src/cmd/calc/RCS/CHANGES,v $
 ##
 ## Under source code control:	1993/06/02 18:12:57

HOWTO.INSTALL

@@ -26,6 +26,13 @@ Installing calc in 4 easy steps:
 	   Set BINDIR to the place where calc is installed.  As shipped
 	   the Makefile assumes a BINDIR /usr/local/bin.
 
+	   Some compilers (to put it mildly) have bugs.  Sometimes the
+	   DEBUG Makefile variable causes the compiler / optimizer to
+	   produce bad code.  Other compilers do just fine.  If possible
+	   try to use DEBUG=-O3 -g3 (maximum optimization and debug symbols).
+	   If the calc test fails (see step 3), try lowering either the
+	   -O value and/or the -g3.  Also try using -Osomething without -g.
+
 	   Adjust other Makefile variables as needed.
 
     2) build calc:
@@ -65,8 +72,8 @@ the calc help subsystem.  See the README file for details.
 ## received a copy with calc; if not, write to Free Software Foundation, Inc.
 ## 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
 ##
-## @(#) $Revision: 29.2 $
-## @(#) $Id: HOWTO.INSTALL,v 29.2 2000/06/07 14:02:13 chongo Exp $
+## @(#) $Revision: 29.3 $
+## @(#) $Id: HOWTO.INSTALL,v 29.3 2001/12/11 02:51:00 chongo Exp $
 ## @(#) $Source: /usr/local/src/cmd/calc/RCS/HOWTO.INSTALL,v $
 ##
 ## Under source code control:	1999/09/27 20:48:44

LIBRARY

@@ -48,12 +48,30 @@ convenient for outside use.  So you should read the source for a routine
 to see if it really does what you think it does.  I won't guarantee that
 obscure internal routines won't change or disappear in future releases!
 
-When calc is installed, all of the include files needed to build
-libcalc.a along with the link library itself are installed into ${LIBDIR}.
+When calc is installed, all of libraries are installed into ${LIBDIR}.
+All of the calc header files are installed under ${INCDIRCALC}.
+
+If CALC_SRC is defined, then the calc header files will assume that
+they are in or under the current directory.  However, most external
+programs most likely will not be located under calc'c source tree.
+External programs most likely want to use the installed calc header
+files under ${INCDIRCALC}.  External programs most likely NOT want
+to define CALC_SRC.
 
 External programs may want to compile with:
 
-	-I${LIBDIR} -L${LIBDIR} -lcalc
+	-L${LIBDIR} -lcalc
+
+If custom functions are also used, they may want to compile with:
+
+	-L${LIBDIR} -lcalc -lcustcalc
+
+The CALC_SRC symbol should NOT be defined by default.  However if you are
+feeling pedantic you may want to force CALC_SRC to be undefined:
+
+	-UCALC_SRC
+
+as well.
 
 --------------
 ERROR HANDLING
@@ -471,8 +489,8 @@ need call libcalc_call_me_last() only once.
 ## received a copy with calc; if not, write to Free Software Foundation, Inc.
 ## 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
 ##
-## @(#) $Revision: 29.2 $
-## @(#) $Id: LIBRARY,v 29.2 2000/06/07 14:02:13 chongo Exp $
+## @(#) $Revision: 29.5 $
+## @(#) $Id: LIBRARY,v 29.5 2001/06/08 22:57:35 chongo Exp $
 ## @(#) $Source: /usr/local/src/cmd/calc/RCS/LIBRARY,v $
 ##
 ## Under source code control:	1993/07/30 19:44:49

Makefile

@@ -20,8 +20,8 @@
 # received a copy with calc; if not, write to Free Software Foundation, Inc.
 # 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
 #
-MAKEFILE_REV= $$Revision: 29.33 $$
-# @(#) $Id: Makefile.ship,v 29.33 2001/06/06 10:06:48 chongo Exp $
+MAKEFILE_REV= $$Revision: 29.41 $$
+# @(#) $Id: Makefile.ship,v 29.41 2001/12/31 22:12:35 chongo Exp $
 # @(#) $Source: /usr/local/src/cmd/calc/RCS/Makefile.ship,v $
 #
 # Under source code control:	1990/02/15 01:48:41
@@ -33,7 +33,6 @@ MAKEFILE_REV= $$Revision: 29.33 $$
 # calculator by David I. Bell with help/mods from others
 # Makefile by Landon Curt Noll
 
-
 ##############################################################################
 #-=-=-=-=-=-=-=-=- You may want to change some values below -=-=-=-=-=-=-=-=-#
 ##############################################################################
@@ -503,6 +502,13 @@ HAVE_UNISTD_H=
 # ${INCDIR}		where most .h files are kept
 # ${LIBDIR}		where *.a files are installed
 #
+# If in doubt, set:
+#
+#	BINDIR= /usr/bin
+#	SHAREDIR= /usr/share
+#	INCDIR= /usr/include
+#	LIBDIR= /usr/lib
+#
 #BINDIR= /usr/local/bin
 BINDIR= /usr/bin
 
@@ -525,6 +531,16 @@ LIBDIR= /usr/lib
 # ${CUSTOMINCPDIR}	where custom .h files are installed
 # ${SCRIPTDIR}		where calc shell scripts are installed
 #
+# If in doubt, set:
+#
+#	CSHAREDIR= ${SHAREDIR}/calc
+#	HELPDIR= ${CSHAREDIR}/help
+#	INCDIRCALC= ${INCDIR}/calc
+#	CUSTOMLIBDIR= ${CSHAREDIR}/custom
+#	CUSTOMHELPDIR= ${CSHAREDIR}/custhelp
+#	CUSTOMINCDIR= ${INCDIRCALC}/custom
+#	SCRIPTDIR= ${BINDIR}/cscript
+#
 CSHAREDIR= ${SHAREDIR}/calc
 HELPDIR= ${CSHAREDIR}/help
 INCDIRCALC= ${INCDIR}/calc
@@ -533,6 +549,26 @@ CUSTOMHELPDIR= ${CSHAREDIR}/custhelp
 CUSTOMINCDIR= ${INCDIRCALC}/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 /.  For example, calc is built with its help
+# directory being ${HELPDIR}.  Howeever calc help files are
+# installed under $T${HELPDIR}.
+#
+# 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.
+#
+# The purpose for $T is to allow someone to install calc
+# somewhere other than into the system area.  For example when
+# forming the calc rpm, the Makefile is called with T=$RPM_BUILD_ROOT.
+#
+# If in doubt, use T=
+#
+T=
+
 # where man pages are installed
 #
 # Use MANDIR= to disable installation of the calc man (source) page.
@@ -636,8 +672,8 @@ CALCRC= ${CSHAREDIR}/startup:~/.calcrc:./.calcinit
 USE_READLINE=
 #USE_READLINE= -DUSE_READLINE
 #
-#READLINE_LIB=
-READLINE_LIB= -lreadline -lhistory -lncurses
+READLINE_LIB=
+#READLINE_LIB= -lreadline -lhistory -lncurses
 #READLINE_LIB= -L/usr/gnu/lib -lreadline -lhistory -lncurses
 #READLINE_LIB= -L/usr/local/lib -lreadline -lhistory -lncurses
 #
@@ -665,8 +701,8 @@ CALCPAGER= more
 #DEBUG= -O1 -g3
 #
 #DEBUG= -O2
-#DEBUG= -O2 -g
-DEBUG= -O2 -g3
+DEBUG= -O2 -g
+#DEBUG= -O2 -g3
 #DEBUG= -O2 -ipa
 #DEBUG= -O2 -g3 -ipa
 #
@@ -813,8 +849,8 @@ CCWARN= -Wall -Wno-implicit -Wno-comment
 CCOPT= ${DEBUG} ${NO_SHARED}
 CCMISC=
 #
-CFLAGS= -DSRC ${CCWARN} ${CCOPT} ${CCMISC}
-ICFLAGS= -DSRC ${CCWARN} ${CCMISC}
+CFLAGS= -DCALC_SRC ${CCWARN} ${CCOPT} ${CCMISC}
+ICFLAGS= -DCALC_SRC ${CCWARN} ${CCMISC}
 #
 LDFLAGS= ${NO_SHARED} ${LD_NO_SHARED}
 ILDFLAGS=
@@ -833,8 +869,8 @@ CC= ${PURIFY} ${LCC}
 #CCOPT= ${DEBUG} ${NO_SHARED}
 #CCMISC=
 #
-#CFLAGS= -DSRC ${CCWARN} ${CCOPT} ${CCMISC}
-#ICFLAGS= -DSRC ${CCWARN} ${CCMISC}
+#CFLAGS= -DCALC_SRC ${CCWARN} ${CCOPT} ${CCMISC}
+#ICFLAGS= -DCALC_SRC ${CCWARN} ${CCMISC}
 #
 #LDFLAGS= ${NO_SHARED} ${LD_NO_SHARED}
 #ILDFLAGS=
@@ -854,8 +890,8 @@ CC= ${PURIFY} ${LCC}
 #CCOPT= ${DEBUG} ${NO_SHARED}
 #CCMISC=
 #
-#CFLAGS= -DSRC ${CCWARN} ${CCOPT} ${CCMISC}
-#ICFLAGS= -DSRC ${CCWARN} ${CCMISC}
+#CFLAGS= -DCALC_SRC ${CCWARN} ${CCOPT} ${CCMISC}
+#ICFLAGS= -DCALC_SRC ${CCWARN} ${CCMISC}
 #
 #LDFLAGS= ${NO_SHARED} ${LD_NO_SHARED}
 #ILDFLAGS=
@@ -881,8 +917,8 @@ CC= ${PURIFY} ${LCC}
 #CCOPT= ${DEBUG} ${NO_SHARED}
 #CCMISC= -rdata_shared
 #
-#CFLAGS= -DSRC ${CCWARN} ${CCOPT} ${CCMISC}
-#ICFLAGS= -DSRC ${CCWARN} ${CCMISC}
+#CFLAGS= -DCALC_SRC ${CCWARN} ${CCOPT} ${CCMISC}
+#ICFLAGS= -DCALC_SRC ${CCWARN} ${CCMISC}
 #
 #LDFLAGS= ${NO_SHARED} ${LD_NO_SHARED}
 #ILDFLAGS=
@@ -903,8 +939,8 @@ CC= ${PURIFY} ${LCC}
 #CCOPT= ${DEBUG} ${NO_SHARED}
 #CCMISC= +e
 #
-#CFLAGS= -DSRC ${CCWARN} ${CCOPT} ${CCMISC}
-#ICFLAGS= -DSRC ${CCWARN} ${CCMISC}
+#CFLAGS= -DCALC_SRC ${CCWARN} ${CCOPT} ${CCMISC}
+#ICFLAGS= -DCALC_SRC ${CCWARN} ${CCMISC}
 #
 #LDFLAGS= ${NO_SHARED} ${LD_NO_SHARED}
 #ILDFLAGS=
@@ -920,8 +956,8 @@ CC= ${PURIFY} ${LCC}
 #CCOPT= ${DEBUG} ${NO_SHARED}
 #CCMISC= -qlanglvl=ansi
 #
-#CFLAGS= -DSRC ${CCWARN} ${CCOPT} ${CCMISC}
-#ICFLAGS= -DSRC ${CCWARN} ${CCMISC}
+#CFLAGS= -DCALC_SRC ${CCWARN} ${CCOPT} ${CCMISC}
+#ICFLAGS= -DCALC_SRC ${CCWARN} ${CCMISC}
 #
 #LDFLAGS= ${NO_SHARED} ${LD_NO_SHARED}
 #ILDFLAGS=
@@ -942,8 +978,8 @@ CC= ${PURIFY} ${LCC}
 #CCOPT= ${DEBUG} ${NO_SHARED}
 #CCMISC= -DFORCE_STDC
 #
-#CFLAGS= -DSRC ${CCWARN} ${CCOPT} ${CCMISC}
-#ICFLAGS= -DSRC ${CCWARN} ${CCMISC}
+#CFLAGS= -DCALC_SRC ${CCWARN} ${CCOPT} ${CCMISC}
+#ICFLAGS= -DCALC_SRC ${CCWARN} ${CCMISC}
 #
 #LDFLAGS= ${NO_SHARED} ${LD_NO_SHARED}
 #ILDFLAGS=
@@ -962,8 +998,8 @@ CC= ${PURIFY} ${LCC}
 #CCOPT= ${DEBUG} ${NO_SHARED}
 #CCMISC=
 #
-#CFLAGS= -DSRC ${CCWARN} ${CCOPT} ${CCMISC}
-#ICFLAGS= -DSRC ${CCWARN} ${CCMISC} -Wno-unused
+#CFLAGS= -DCALC_SRC ${CCWARN} ${CCOPT} ${CCMISC}
+#ICFLAGS= -DCALC_SRC ${CCWARN} ${CCMISC} -Wno-unused
 #
 #LDFLAGS= ${NO_SHARED} ${LD_NO_SHARED}
 #ILDFLAGS=
@@ -981,8 +1017,8 @@ CC= ${PURIFY} ${LCC}
 #CCOPT= ${DEBUG} ${NO_SHARED}
 #CCMISC=
 #
-#CFLAGS= -DSRC ${CCWARN} ${CCOPT} ${CCMISC}
-#ICFLAGS= -DSRC ${CCWARN} ${CCMISC} -Wno-unused
+#CFLAGS= -DCALC_SRC ${CCWARN} ${CCOPT} ${CCMISC}
+#ICFLAGS= -DCALC_SRC ${CCWARN} ${CCMISC} -Wno-unused
 #
 #LDFLAGS= ${NO_SHARED} ${LD_NO_SHARED}
 #ILDFLAGS=
@@ -1001,6 +1037,7 @@ LANG= C
 MAKE= make
 AWK= awk
 SED= sed
+DIFF= diff
 GREP= egrep
 SORT= sort
 TEE= tee
@@ -1159,7 +1196,8 @@ CUSTOM_PASSDOWN= Q="${Q}" \
     CMP=${CMP} \
     MAKEDEPEND=${MAKEDEPEND} \
     SORT=${SORT} \
-    LANG=${LANG}
+    LANG=${LANG} \
+    T=$T
 
 # The complete list of Makefile vars passed down to sample/Makefile.
 #
@@ -1191,14 +1229,18 @@ SAMPLE_PASSDOWN= Q="${Q}" \
     CMP=${CMP} \
     MAKEDEPEND=${MAKEDEPEND} \
     SORT=${SORT} \
-    LANG=${LANG}
+    LANG=${LANG} \
+    T=$T
 
 # The compelte list of Makefile vars passed down to help/Makefile.
 #
 HELP_PASSDOWN= Q="${Q}" \
     SHAREDIR="${SHAREDIR}" \
+    INCDIR="${INCDIR}" \
+    LIBDIR="${LIBDIR}" \
     CSHAREDIR="${CSHAREDIR}" \
     HELPDIR="${HELPDIR}" \
+    INCDIRCALC="${INCDIRCALC}" \
     ICFLAGS="${ICFLAGS}" \
     ILDFLAGS="${ILDFLAGS}" \
     LCC="${LCC}" \
@@ -1207,7 +1249,8 @@ HELP_PASSDOWN= Q="${Q}" \
     CHMOD=${CHMOD} \
     CMP=${CMP} \
     FMT=${FMT} \
-    LANG=${LANG}
+    LANG=${LANG} \
+    T=$T
 
 # The compelte list of Makefile vars passed down to cal/Makefile.
 #
@@ -1217,7 +1260,8 @@ CAL_PASSDOWN= Q="${Q}" \
     MAKE_FILE=${MAKE_FILE} \
     CHMOD=${CHMOD} \
     CMP=${CMP} \
-    LANG=${LANG}
+    LANG=${LANG} \
+    T=$T
 
 # The compelte list of Makefile vars passed down to cscript/Makefile.
 #
@@ -1230,7 +1274,8 @@ CSCRIPT_PASSDOWN= Q="${Q}" \
     FMT=${FMT} \
     SORT=${SORT} \
     CMP=${CMP} \
-    LANG=${LANG}
+    LANG=${LANG} \
+    T=$T
 
 # complete list of .h files found (but not built) in the distribution
 #
@@ -1277,6 +1322,11 @@ SAMPLE_TARGETS= sample/test_random sample/many_random
 CSCRIPT_TARGETS= cscript/mersenne cscript/piforever cscript/plus \
 		 cscript/square cscript/fproduct cscript/powerterm
 
+# List of miscellaneous files NOT shipped with calc
+#
+NO_SHIP= Makefile.linux calc.spec inst_files spec-template \
+	 rpm.mk.patch rpm.release
+
 # complete list of progs built
 #
 PROGS= calc ${UTIL_PROGS}
@@ -2870,7 +2920,6 @@ distlist: ${DISTLIST}
 	for i in ${BUILD_H_SRC} ${BUILD_C_SRC}; do \
 		echo win32/$$i; \
 	done; \
-	echo spec-template; \
 	(cd help; ${MAKE} ${HELP_PASSDOWN} $@); \
 	(cd cal; ${MAKE} ${CAL_PASSDOWN} $@); \
 	(cd custom; ${MAKE} ${CUSTOM_PASSDOWN} $@); \
@@ -3002,6 +3051,7 @@ env:
 	@echo 'SED=${SED}'; echo ''
 	@echo 'GREP=${GREP}'; echo ''
 	@echo 'LANG=${LANG}'; echo ''
+	@echo 'T=$T'; echo ''
 	@echo 'SORT=${SORT}'; echo ''
 	@echo 'TEE=${TEE}'; echo ''
 	@echo 'CTAGS=${CTAGS}'; echo ''
@@ -3034,11 +3084,12 @@ env:
 	@echo 'TARGETS=${TARGETS}'; echo ''
 	@echo '=-=-=-=-= end of major make variable dump =-=-=-=-='
 
-mkdebug: env version.c
+mkdebug: env version.c rpm.release
 	@echo '=-=-=-=-= start of $@ rule =-=-=-=-='
 	@echo '=-=-=-=-= Determining the source version =-=-=-=-='
 	@${MAKE} -f Makefile Q= V=@ ver_calc
 	-@./ver_calc
+	-@./ver_calc -r rpm.release
 	@echo '=-=-=-=-= Invoking ${MAKE} -f Makefile Q= V=@ all =-=-=-=-='
 	@${MAKE} -f Makefile Q= V=@ all
 	@echo '=-=-=-=-= Back to the main Makefile for $@ rule =-=-=-=-='
@@ -3047,7 +3098,7 @@ mkdebug: env version.c
 	@echo '=-=-=-=-= Back to the main Makefile for $@ rule =-=-=-=-='
 	@echo '=-=-=-=-= end of $@ rule =-=-=-=-='
 
-debug: env
+debug: env rpm.release
 	@echo '=-=-=-=-= start of $@ rule =-=-=-=-='
 	@echo '=-=-=-=-= Invoking ${MAKE} -f Makefile Q= V=@ clobber =-=-=-=-='
 	@${MAKE} -f Makefile Q= V=@ clobber
@@ -3055,6 +3106,7 @@ debug: env
 	@echo '=-=-=-=-= Determining the source version =-=-=-=-='
 	@${MAKE} -f Makefile Q= V=@ ver_calc
 	-@./ver_calc
+	-@./ver_calc -r rpm.release
 	@echo '=-=-=-=-= Invoking ${MAKE} -f Makefile Q= V=@ all =-=-=-=-='
 	@${MAKE} -f Makefile Q= V=@ all
 	@echo '=-=-=-=-= Determining the binary version =-=-=-=-='
@@ -3105,7 +3157,7 @@ gdb:
 # This file is linked to calc-version-rel.spec before the rpm is built.
 #
 calc.spec: spec-template ${MAKE_FILE} help/Makefile cal/Makefile \
-	   custom/Makefile cscript/Makefile ver_calc
+	   custom/Makefile cscript/Makefile ver_calc rpm.release
 	${V} echo '=-=-=-=-= start of $@ rule =-=-=-=-='
 	${Q}rm -f calc.spec calc.spec.sed
 	${Q}echo 's,$${BINDIR},${BINDIR},g' >> calc.spec.sed
@@ -3132,54 +3184,9 @@ calc.spec: spec-template ${MAKE_FILE} help/Makefile cal/Makefile \
 	${Q}echo 's,$${MANMODE},${MANMODE},g' >> calc.spec.sed
 	${Q}echo 's,$${MANEXT},${MANEXT},g' >> calc.spec.sed
 	${Q}echo 's,$${CHMOD},${CHMOD},g' >> calc.spec.sed
-	${Q}cd help; LANG=C \
-	    ${MAKE} -f Makefile ${HELP_PASSDOWN} echo_STD_HELP_FILES | \
-	    ${GREP} '__file__..' | ${SED} -e s'/.*__file__ //' | \
-	    ${SED} -e 's/^/s,$${STD_HELP_FILES},/' \
-	    	   -e 's/$$/,g/' >> ../calc.spec.sed
-	${Q}cd help; LANG=C \
-	    ${MAKE} -f Makefile ${HELP_PASSDOWN} echo_BLT_HELP_FILES | \
-	    ${GREP} '__file__..' | ${SED} -e s'/.*__file__ //' | \
-	    ${SED} -e 's/^/s,$${BLT_HELP_FILES},/' \
-		   -e 's/$$/,g/' >> ../calc.spec.sed
-	${Q}cd help; LANG=C \
-	    ${MAKE} -f Makefile ${HELP_PASSDOWN} echo_DETAIL_HELP | \
-	    ${GREP} '__file__..' | ${SED} -e s'/.*__file__ //' | \
-	    ${SED} -e 's/^/s,$${DETAIL_HELP},/' \
-	    	   -e 's/$$/,g/' >> ../calc.spec.sed
-	${Q}cd help; LANG=C \
-	    ${MAKE} -f Makefile ${HELP_PASSDOWN} echo_SINGULAR_FILES | \
-	    ${GREP} '__file__..' | ${SED} -e s'/.*__file__ //' | \
-	    ${SED} -e 's/^/s,$${SINGULAR_FILES},/' \
-	    	   -e 's/$$/,g/' >> ../calc.spec.sed
-	${Q}cd cal; LANG=C \
-	    ${MAKE} -f Makefile ${CAL_PASSDOWN} echo_CALC_FILES | \
-	    ${GREP} '__file__..' | ${SED} -e s'/.*__file__ //' | \
-	    ${SED} -e 's/^/s,$${CALC_FILES},/' \
-	    	   -e 's/$$/,g/' >> ../calc.spec.sed
-	${Q}cd custom; LANG=C \
-	    ${MAKE} -f Makefile ${CUSTOM_PASSDOWN} echo_INSTALL_H_SRC | \
-	    ${GREP} '__file__..' | ${SED} -e s'/.*__file__ //' | \
-	    ${SED} -e 's/^/s,$${INSTALL_H_SRC},/' \
-	    	   -e 's/$$/,g/' >> ../calc.spec.sed
-	${Q}cd custom; LANG=C \
-	    ${MAKE} -f Makefile ${CUSTOM_PASSDOWN} echo_CUSTOM_CALC_FILES | \
-	    ${GREP} '__file__..' | ${SED} -e s'/.*__file__ //' | \
-	    ${SED} -e 's/^/s,$${CUSTOM_CALC_FILES},/' \
-	    	   -e 's/$$/,g/' >> ../calc.spec.sed
-	${Q}cd custom; LANG=C \
-	    ${MAKE} -f Makefile ${CUSTOM_PASSDOWN} echo_CUSTOM_HELP | \
-	    ${GREP} '__file__..' | ${SED} -e s'/.*__file__ //' | \
-	    ${SED} -e 's/^/s,$${CUSTOM_HELP},/' \
-	    	   -e 's/$$/,g/' >> ../calc.spec.sed
-	${Q}cd cscript; LANG=C \
-	    ${MAKE} -f Makefile ${CSCRIPT_PASSDOWN} echo_SCRIPT | \
-	    ${GREP} '__file__..' | ${SED} -e s'/.*__file__ //' | \
-	    ${SED} -e 's/^/s,$${SCRIPT},/' -e 's/$$/,g/' >> ../calc.spec.sed
 	${Q}echo 's,$${DATE},'`LANG=C date +"%a %b %d %Y"`',g' >> calc.spec.sed
-	${Q}echo 's,$${VER_CALC},'`./ver_calc`',g' >> calc.spec.sed
-	${Q}echo 's,$${VERSION},'`./ver_calc -v`',g' >> calc.spec.sed
-	${Q}echo 's,$${RELEASE},'`./ver_calc -r`',g' >> calc.spec.sed
+	${Q}echo 's,$${VERSION},'`./ver_calc`',g' >> calc.spec.sed
+	${Q}echo 's,$${REL},'`./ver_calc -R rpm.release`',g' >> calc.spec.sed
 	${Q}${SED} -f calc.spec.sed < spec-template > calc.spec
 	${Q}rm -f calc.spec.sed
 	${V} echo '=-=-=-=-= end of $@ rule =-=-=-=-='
@@ -3213,6 +3220,27 @@ inst_files: ${MAKE_FILE} help/Makefile cal/Makefile custom/Makefile \
 	${Q}LANG=C ${SORT} -u inst_files -o inst_files
 	${V} echo '=-=-=-=-= end of $@ rule =-=-=-=-='
 
+# We make a small patch to effectively move Makefile.linux into Makefile.
+#
+rpm.mk.patch: Makefile.linux ${MAKE_FILE}
+	${V} echo '=-=-=-=-= start of $@ rule =-=-=-=-='
+	${Q}rm -f $@
+	${Q}rm -rf tmp.patch
+	${Q}mkdir -p tmp.patch
+	${Q}if [ -e Makefile.ship ]; then \
+	    cp Makefile.ship tmp.patch/Makefile; \
+	else \
+	    cp Makefile tmp.patch/Makefile; \
+	fi
+	${Q}cp Makefile.linux tmp.patch
+	${Q}-cd tmp.patch; \
+	    ${DIFF} -c Makefile Makefile.linux > $@; \
+	    true
+	${Q}cp tmp.patch/$@ $@
+	${Q}${CHMOD} 0444 $@
+	${Q}rm -rf tmp.patch
+	${V} echo '=-=-=-=-= end of $@ rule =-=-=-=-='
+
 ##
 #
 # Utility rules
@@ -3299,8 +3327,8 @@ clobber:
 	-rm -f calc.1 *.pure_linkinfo
 	-rm -f have_args *.u
 	-rm -f calc.pixie calc.rf calc.Counts calc.cord
-	-rm -rf gen_h skel Makefile.bak
-	-rm -f calc.spec inst_files tmp
+	-rm -rf gen_h skel Makefile.bak tmp.patch
+	-rm -f calc.spec inst_files rpm.mk.patch tmp
 	${V} echo '=-=-=-=-= Invoking $@ rule for help =-=-=-=-='
 	-cd help; ${MAKE} -f Makefile ${HELP_PASSDOWN} clobber
 	${V} echo '=-=-=-=-= Back to the main Makefile for $@ rule =-=-=-=-='
@@ -3325,100 +3353,161 @@ clobber:
 
 install: calc libcalc.a ${LIB_H_SRC} ${BUILD_H_SRC} calc.1
 	${V} echo '=-=-=-=-= start of $@ rule =-=-=-=-='
-	-${Q}if [ ! -d ${BINDIR} ]; then \
-		echo mkdir ${BINDIR}; \
-		mkdir ${BINDIR}; \
-		echo ${CHMOD} 0755 ${BINDIR}; \
-		${CHMOD} 0755 ${BINDIR}; \
-	else \
-		true; \
+	-${Q}if [ ! -z "$T" ]; then \
+	    if [ ! -d $T ]; then \
+		echo mkdir $T; \
+		mkdir $T; \
+		if [ ! -d "$T" ]; then \
+		    echo mkdir -p "$T"; \
+		    mkdir -p "$T"; \
+		fi; \
+		echo ${CHMOD} 0755 $T; \
+		${CHMOD} 0755 $T; \
+	    fi; \
 	fi
-	-${Q}if [ ! -d ${SHAREDIR} ]; then \
-		echo mkdir ${SHAREDIR}; \
-		mkdir ${SHAREDIR}; \
-		echo ${CHMOD} 0755 ${SHAREDIR}; \
-		${CHMOD} 0755 ${SHAREDIR}; \
+	-${Q}if [ ! -d $T${BINDIR} ]; then \
+	    echo mkdir $T${BINDIR}; \
+	    mkdir $T${BINDIR}; \
+	    if [ ! -d "$T${BINDIR}" ]; then \
+		echo mkdir -p "$T${BINDIR}"; \
+		mkdir -p "$T${BINDIR}"; \
+	    fi; \
+	    echo ${CHMOD} 0755 $T${BINDIR}; \
+	    ${CHMOD} 0755 $T${BINDIR}; \
 	else \
-		true; \
+	    true; \
 	fi
-	-${Q}if [ ! -d ${INCDIR} ]; then \
-		echo mkdir ${INCDIR}; \
-		mkdir ${INCDIR}; \
-		echo ${CHMOD} 0755 ${INCDIR}; \
-		${CHMOD} 0755 ${INCDIR}; \
+	-${Q}if [ ! -d $T${SHAREDIR} ]; then \
+	    echo mkdir $T${SHAREDIR}; \
+	    mkdir $T${SHAREDIR}; \
+	    if [ ! -d "$T${SHAREDIR}" ]; then \
+		echo mkdir -p "$T${SHAREDIR}"; \
+		mkdir -p "$T${SHAREDIR}"; \
+	    fi; \
+	    echo ${CHMOD} 0755 $T${SHAREDIR}; \
+	    ${CHMOD} 0755 $T${SHAREDIR}; \
 	else \
-		true; \
+	    true; \
 	fi
-	-${Q}if [ ! -d ${LIBDIR} ]; then \
-		echo mkdir ${LIBDIR}; \
-		mkdir ${LIBDIR}; \
-		echo ${CHMOD} 0755 ${LIBDIR}; \
-		${CHMOD} 0755 ${LIBDIR}; \
+	-${Q}if [ ! -d $T${INCDIR} ]; then \
+	    echo mkdir $T${INCDIR}; \
+	    mkdir $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; \
+	    true; \
 	fi
-	-${Q}if [ ! -d ${CSHAREDIR} ]; then \
-		echo mkdir ${CSHAREDIR}; \
-		mkdir ${CSHAREDIR}; \
-		echo ${CHMOD} 0755 ${CSHAREDIR}; \
-		${CHMOD} 0755 ${CSHAREDIR}; \
+	-${Q}if [ ! -d $T${LIBDIR} ]; then \
+	    echo mkdir $T${LIBDIR}; \
+	    mkdir $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; \
+	    true; \
 	fi
-	-${Q}if [ ! -d ${HELPDIR} ]; then \
-		echo mkdir ${HELPDIR}; \
-		mkdir ${HELPDIR}; \
-		echo ${CHMOD} 0755 ${HELPDIR}; \
-		${CHMOD} 0755 ${HELPDIR}; \
+	-${Q}if [ ! -d $T${CSHAREDIR} ]; then \
+	    mkdir $T${CSHAREDIR}; \
+	    echo mkdir $T${CSHAREDIR}; \
+	    if [ ! -d "$T${CSHAREDIR}" ]; then \
+		echo mkdir -p "$T${CSHAREDIR}"; \
+		mkdir -p "$T${CSHAREDIR}"; \
+	    fi; \
+	    mkdir $T${CSHAREDIR}; \
+	    echo ${CHMOD} 0755 $T${CSHAREDIR}; \
+	    ${CHMOD} 0755 $T${CSHAREDIR}; \
 	else \
-		true; \
+	    true; \
 	fi
-	-${Q}if [ ! -d ${INCDIRCALC} ]; then \
-		echo mkdir ${INCDIRCALC}; \
-		mkdir ${INCDIRCALC}; \
-		echo ${CHMOD} 0755 ${INCDIRCALC}; \
-		${CHMOD} 0755 ${INCDIRCALC}; \
+	-${Q}if [ ! -d $T${HELPDIR} ]; then \
+	    echo mkdir $T${HELPDIR}; \
+	    mkdir $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; \
+	    true; \
 	fi
-	-${Q}if [ ! -d ${CUSTOMLIBDIR} ]; then \
-		echo mkdir ${CUSTOMLIBDIR}; \
-		mkdir ${CUSTOMLIBDIR}; \
-		echo ${CHMOD} 0755 ${CUSTOMLIBDIR}; \
-		${CHMOD} 0755 ${CUSTOMLIBDIR}; \
+	-${Q}if [ ! -d $T${INCDIRCALC} ]; then \
+	    echo mkdir $T${INCDIRCALC}; \
+	    mkdir $T${INCDIRCALC}; \
+	    if [ ! -d "$T${INCDIRCALC}" ]; then \
+		echo mkdir -p "$T${INCDIRCALC}"; \
+		mkdir -p "$T${INCDIRCALC}"; \
+	    fi; \
+	    echo ${CHMOD} 0755 $T${INCDIRCALC}; \
+	    ${CHMOD} 0755 $T${INCDIRCALC}; \
 	else \
-		true; \
+	    true; \
 	fi
-	-${Q}if [ ! -d ${CUSTOMHELPDIR} ]; then \
-		echo mkdir ${CUSTOMHELPDIR}; \
-		mkdir ${CUSTOMHELPDIR}; \
-		echo ${CHMOD} 0755 ${CUSTOMHELPDIR}; \
-		${CHMOD} 0755 ${CUSTOMHELPDIR}; \
+	-${Q}if [ ! -d $T${CUSTOMLIBDIR} ]; then \
+	    echo mkdir $T${CUSTOMLIBDIR}; \
+	    mkdir $T${CUSTOMLIBDIR}; \
+	    if [ ! -d "$T${CUSTOMLIBDIR}" ]; then \
+		echo mkdir -p "$T${CUSTOMLIBDIR}"; \
+		mkdir -p "$T${CUSTOMLIBDIR}"; \
+	    fi; \
+	    echo ${CHMOD} 0755 $T${CUSTOMLIBDIR}; \
+	    ${CHMOD} 0755 $T${CUSTOMLIBDIR}; \
 	else \
-		true; \
+	    true; \
 	fi
-	-${Q}if [ ! -d ${CUSTOMINCDIR} ]; then \
-		echo mkdir ${CUSTOMINCDIR}; \
-		mkdir ${CUSTOMINCDIR}; \
-		echo ${CHMOD} 0755 ${CUSTOMINCDIR}; \
-		${CHMOD} 0755 ${CUSTOMINCDIR}; \
+	-${Q}if [ ! -d $T${CUSTOMHELPDIR} ]; then \
+	    echo mkdir $T${CUSTOMHELPDIR}; \
+	    mkdir $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; \
+	    true; \
 	fi
-	-${Q}if [ ! -d ${SCRIPTDIR} ]; then \
-		echo mkdir ${SCRIPTDIR}; \
-		mkdir ${SCRIPTDIR}; \
-		echo ${CHMOD} 0755 ${SCRIPTDIR}; \
-		${CHMOD} 0755 ${SCRIPTDIR}; \
+	-${Q}if [ ! -d $T${CUSTOMINCDIR} ]; then \
+	    echo mkdir $T${CUSTOMINCDIR}; \
+	    mkdir $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}if [ ! -d $T${SCRIPTDIR} ]; then \
+	    echo mkdir $T${SCRIPTDIR}; \
+	    mkdir $T${SCRIPTDIR}; \
+	    if [ ! -d "$T${SCRIPTDIR}" ]; then \
+		echo mkdir -p "$T${SCRIPTDIR}"; \
+		mkdir -p "$T${SCRIPTDIR}"; \
+	    fi; \
+	    echo ${CHMOD} 0755 $T${SCRIPTDIR}; \
+	    ${CHMOD} 0755 $T${SCRIPTDIR}; \
 	else \
 	    true; \
 	fi
 	-${Q}if [ ! -z "${MANDIR}" ]; then \
-	    if [ ! -d ${MANDIR} ]; then \
-		echo mkdir ${MANDIR}; \
-		mkdir ${MANDIR}; \
-		echo ${CHMOD} 0755 ${MANDIR}; \
-		${CHMOD} 0755 ${MANDIR}; \
+	    if [ ! -d $T${MANDIR} ]; then \
+		echo mkdir $T${MANDIR}; \
+		mkdir $T${MANDIR}; \
+		if [ ! -d "$T${MANDIR}" ]; then \
+		    echo mkdir -p "$T${MANDIR}"; \
+		    mkdir -p "$T${MANDIR}"; \
+		fi; \
+		echo ${CHMOD} 0755 $T${MANDIR}; \
+		${CHMOD} 0755 $T${MANDIR}; \
 	    else \
 		true; \
 	    fi; \
@@ -3426,25 +3515,29 @@ install: calc libcalc.a ${LIB_H_SRC} ${BUILD_H_SRC} calc.1
 	    true; \
 	fi
 	-${Q}if [ ! -z "${CATDIR}" ]; then \
-	    if [ ! -d ${CATDIR} ]; then \
-		echo mkdir ${CATDIR}; \
-		mkdir ${CATDIR}; \
-		echo ${CHMOD} 0755 ${CATDIR}; \
-		${CHMOD} 0755 ${CATDIR}; \
+	    if [ ! -d $T${CATDIR} ]; then \
+		echo mkdir $T${CATDIR}; \
+		mkdir $T${CATDIR}; \
+		if [ ! -d "$T${CATDIR}" ]; then \
+		    echo mkdir -p "$T${CATDIR}"; \
+		    mkdir -p "$T${CATDIR}"; \
+		fi; \
+		echo ${CHMOD} 0755 $T${CATDIR}; \
+		${CHMOD} 0755 $T${CATDIR}; \
 	    else \
 		true; \
 	    fi; \
 	else \
 	    true; \
 	fi
-	-${Q}if ${CMP} -s calc ${BINDIR}/calc; then \
-		true; \
+	-${Q}if ${CMP} -s calc $T${BINDIR}/calc; then \
+	    true; \
 	else \
-		rm -f ${BINDIR}/calc.new; \
-		cp -f calc ${BINDIR}/calc.new; \
-		${CHMOD} 0555 ${BINDIR}/calc.new; \
-		mv -f ${BINDIR}/calc.new ${BINDIR}/calc; \
-		echo "installed ${BINDIR}/calc"; \
+	    rm -f $T${BINDIR}/calc.new; \
+	    cp -f calc $T${BINDIR}/calc.new; \
+	    ${CHMOD} 0555 $T${BINDIR}/calc.new; \
+	    mv -f $T${BINDIR}/calc.new $T${BINDIR}/calc; \
+	    echo "installed $T${BINDIR}/calc"; \
 	fi
 	${V} echo '=-=-=-=-= Invoking $@ rule for help =-=-=-=-='
 	${Q}cd help; ${MAKE} -f Makefile ${HELP_PASSDOWN} install
@@ -3461,61 +3554,61 @@ install: calc libcalc.a ${LIB_H_SRC} ${BUILD_H_SRC} calc.1
 	${V} echo '=-=-=-=-= Invoking $@ rule for cscript =-=-=-=-='
 	${Q}cd cscript; ${MAKE} -f Makefile ${CSCRIPT_PASSDOWN} install
 	${V} echo '=-=-=-=-= Back to the main Makefile for $@ rule =-=-=-=-='
-	-${Q}if ${CMP} -s libcalc.a ${LIBDIR}/libcalc.a; then \
+	-${Q}if ${CMP} -s libcalc.a $T${LIBDIR}/libcalc.a; then \
 		true; \
 	else \
-		rm -f ${LIBDIR}/libcalc.a.new; \
-		cp -f libcalc.a ${LIBDIR}/libcalc.a.new; \
-		mv -f ${LIBDIR}/libcalc.a.new ${LIBDIR}/libcalc.a; \
-		${RANLIB} ${LIBDIR}/libcalc.a; \
-		${CHMOD} 0444 ${LIBDIR}/libcalc.a; \
-		echo "installed ${LIBDIR}/libcalc.a"; \
+		rm -f $T${LIBDIR}/libcalc.a.new; \
+		cp -f libcalc.a $T${LIBDIR}/libcalc.a.new; \
+		mv -f $T${LIBDIR}/libcalc.a.new $T${LIBDIR}/libcalc.a; \
+		${RANLIB} $T${LIBDIR}/libcalc.a; \
+		${CHMOD} 0444 $T${LIBDIR}/libcalc.a; \
+		echo "installed $T${LIBDIR}/libcalc.a"; \
 	fi
 	-${Q}for i in ${LIB_H_SRC} ${BUILD_H_SRC}; do \
 	    rm -f tmp; \
 	    ${SED} -e 's/^\(#[ 	]*include[ 	][ 	]*\)"/\1"calc\//' $$i > tmp; \
-	    if ${CMP} -s tmp ${INCDIRCALC}/$$i; then \
+	    if ${CMP} -s tmp $T${INCDIRCALC}/$$i; then \
 		true; \
 	    else \
-		rm -f ${INCDIRCALC}/$$i.new; \
-		cp -f tmp ${INCDIRCALC}/$$i.new; \
-		${CHMOD} 0444 ${INCDIRCALC}/$$i.new; \
-		mv -f ${INCDIRCALC}/$$i.new ${INCDIRCALC}/$$i; \
-		echo "installed ${INCDIRCALC}/$$i"; \
+		rm -f $T${INCDIRCALC}/$$i.new; \
+		cp -f tmp $T${INCDIRCALC}/$$i.new; \
+		${CHMOD} 0444 $T${INCDIRCALC}/$$i.new; \
+		mv -f $T${INCDIRCALC}/$$i.new $T${INCDIRCALC}/$$i; \
+		echo "installed $T${INCDIRCALC}/$$i"; \
 	    fi; \
 	done
 	${Q}rm -f tmp
 	-${Q}if [ -z "${MANDIR}" ]; then \
 	    true; \
 	else \
-	    if ${CMP} -s calc.1 ${MANDIR}/calc.${MANEXT}; then \
+	    if ${CMP} -s calc.1 $T${MANDIR}/calc.${MANEXT}; then \
 		true; \
 	    else \
-		rm -f ${MANDIR}/calc.${MANEXT}.new; \
-		cp -f calc.1 ${MANDIR}/calc.${MANEXT}.new; \
-		${CHMOD} 0444 ${MANDIR}/calc.${MANEXT}.new; \
-		mv -f ${MANDIR}/calc.${MANEXT}.new \
-		      ${MANDIR}/calc.${MANEXT}; \
-		echo "installed ${MANDIR}/calc.${MANEXT}"; \
+		rm -f $T${MANDIR}/calc.${MANEXT}.new; \
+		cp -f calc.1 $T${MANDIR}/calc.${MANEXT}.new; \
+		${CHMOD} 0444 $T${MANDIR}/calc.${MANEXT}.new; \
+		mv -f $T${MANDIR}/calc.${MANEXT}.new \
+		      $T${MANDIR}/calc.${MANEXT}; \
+		echo "installed $T${MANDIR}/calc.${MANEXT}"; \
 	    fi; \
 	fi
 	-${Q}if [ -z "${CATDIR}" ]; then \
 	    true; \
 	else \
-	    if ${CMP} -s calc.1 ${MANDIR}/calc.${MANEXT}; then \
+	    if ${CMP} -s calc.1 $T${MANDIR}/calc.${MANEXT}; then \
 		true; \
 	    else \
 		if [ -z "${NROFF}" ]; then \
-		    echo "${MANMAKE} calc.1 ${CATDIR}"; \
-		    ${MANMAKE} calc.1 ${CATDIR}; \
+		    echo "${MANMAKE} calc.1 $T${CATDIR}"; \
+		    ${MANMAKE} calc.1 $T${CATDIR}; \
 		else \
-		    rm -f ${CATDIR}/calc.${CATEXT}.new; \
+		    rm -f $T${CATDIR}/calc.${CATEXT}.new; \
 		    ${NROFF} ${NROFF_ARG} calc.1 > \
-			     ${CATDIR}/calc.${CATEXT}.new; \
-		    ${CHMOD} ${MANMODE} ${MANDIR}/calc.${CATEXT}.new; \
-		    mv -f ${CATDIR}/calc.${CATEXT}.new \
-			  ${CATDIR}/calc.${CATEXT}; \
-		    echo "installed ${CATDIR}/calc.${CATEXT}"; \
+			     $T${CATDIR}/calc.${CATEXT}.new; \
+		    ${CHMOD} ${MANMODE} $T${MANDIR}/calc.${CATEXT}.new; \
+		    mv -f $T${CATDIR}/calc.${CATEXT}.new \
+			  $T${CATDIR}/calc.${CATEXT}; \
+		    echo "installed $T${CATDIR}/calc.${CATEXT}"; \
 		fi; \
 	    fi; \
 	fi

alloc.h

@@ -17,8 +17,8 @@
  * received a copy with calc; if not, write to Free Software Foundation, Inc.
  * 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
  *
- * @(#) $Revision: 29.3 $
- * @(#) $Id: alloc.h,v 29.3 2001/05/29 00:16:53 chongo Exp $
+ * @(#) $Revision: 29.4 $
+ * @(#) $Id: alloc.h,v 29.4 2001/06/08 21:00:58 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/alloc.h,v $
  *
  * Under source code control:	1990/02/15 01:48:29
@@ -32,7 +32,7 @@
 #define __ALLOC_H__
 
 
-#if defined(SRC)	/* if we are building from the calc source tree */
+#if defined(CALC_SRC)	/* if we are building from the calc source tree */
 # include "have_malloc.h"
 # include "have_newstr.h"
 # include "have_string.h"

byteswap.h

@@ -17,8 +17,8 @@
  * received a copy with calc; if not, write to Free Software Foundation, Inc.
  * 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
  *
- * @(#) $Revision: 29.3 $
- * @(#) $Id: byteswap.h,v 29.3 2001/05/29 00:16:53 chongo Exp $
+ * @(#) $Revision: 29.4 $
+ * @(#) $Id: byteswap.h,v 29.4 2001/06/08 21:00:58 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/byteswap.h,v $
  *
  * Under source code control:	1995/10/11 04:44:01
@@ -33,7 +33,7 @@
 #define __BYTESWAP_H__
 
 
-#if defined(SRC)	/* if we are building from the calc source tree */
+#if defined(CALC_SRC)	/* if we are building from the calc source tree */
 # include "longbits.h"
 #else
 # include <calc/longbits.h>

cal/Makefile

@@ -18,8 +18,8 @@
 # received a copy with calc; if not, write to Free Software Foundation, Inc.
 # 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
 #
-# @(#) $Revision: 29.10 $
-# @(#) $Id: Makefile,v 29.10 2001/06/06 10:06:48 chongo Exp $
+# @(#) $Revision: 29.12 $
+# @(#) $Id: Makefile,v 29.12 2001/06/08 22:38:53 chongo Exp $
 # @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/Makefile,v $
 #
 # Under source code control:	1991/07/21 05:00:54
@@ -47,6 +47,22 @@ SHAREDIR= /usr/share
 
 CSHAREDIR= ${SHAREDIR}/calc
 
+# 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
+# when forming the calc rpm, the Makefile is called with T=$RPM_BUILD_ROOT.
+#
+# If $T is empty, calc is installed under /, which is the same
+# top of tree for which it was built.  If $T is non-empty, then
+# calc is installed under $T, as if one had to chroot under
+# $T for calc to operate.
+#
+# If in doubt, use T=
+#
+T=
+
 # Makefile debug
 #
 # Q=@	do not echo internal makefile actions (quiet mode)
@@ -124,9 +140,6 @@ calcliblist:
 #
 ##
 
-echo_CALC_FILES:
-	${Q}echo __file__ ${CALC_FILES}
-
 echo_inst_files:
 	${Q}for i in ${CALC_FILES}; do \
 	    echo __file__ ${CSHAREDIR}/$$i; \
@@ -144,30 +157,38 @@ clobber:
 	rm -f .all
 
 install: all
-	-${Q}if [ ! -d ${SHAREDIR} ]; then \
-		echo mkdir ${SHAREDIR}; \
-		mkdir ${SHAREDIR}; \
-		echo ${CHMOD} 0755 ${SHAREDIR}; \
-		${CHMOD} 0755 ${SHAREDIR}; \
+	-${Q}if [ ! -d $T${SHAREDIR} ]; then \
+	    echo mkdir $T${SHAREDIR}; \
+	    mkdir $T${SHAREDIR}; \
+	    if [ ! -d "$T${SHAREDIR}" ]; then \
+		echo mkdir -p "$T${SHAREDIR}"; \
+		mkdir -p "$T${SHAREDIR}"; \
+	    fi; \
+	    echo ${CHMOD} 0755 $T${SHAREDIR}; \
+	    ${CHMOD} 0755 $T${SHAREDIR}; \
 	else \
 	    true; \
 	fi
-	-${Q}if [ ! -d ${CSHAREDIR} ]; then \
-		echo mkdir ${CSHAREDIR}; \
-		mkdir ${CSHAREDIR}; \
-		echo ${CHMOD} 0755 ${CSHAREDIR}; \
-		${CHMOD} 0755 ${CSHAREDIR}; \
+	-${Q}if [ ! -d $T${CSHAREDIR} ]; then \
+	    echo mkdir $T${CSHAREDIR}; \
+	    mkdir $T${CSHAREDIR}; \
+	    if [ ! -d "$T${CSHAREDIR}" ]; then \
+		echo mkdir -p "$T${CSHAREDIR}"; \
+		mkdir -p "$T${CSHAREDIR}"; \
+	    fi; \
+	    echo ${CHMOD} 0755 $T${CSHAREDIR}; \
+	    ${CHMOD} 0755 $T${CSHAREDIR}; \
 	else \
 	    true; \
 	fi
 	${Q}for i in ${CALC_FILES}; do \
-	    if ${CMP} -s $$i ${CSHAREDIR}/$$i; then \
+	    if ${CMP} -s $$i $T${CSHAREDIR}/$$i; then \
 		true; \
 	    else \
-		rm -f ${CSHAREDIR}/$$i.new; \
-		cp -f $$i ${CSHAREDIR}/$$i.new; \
-		${CHMOD} 0444 ${CSHAREDIR}/$$i.new; \
-		mv -f ${CSHAREDIR}/$$i.new ${CSHAREDIR}/$$i; \
-		echo "installed ${CSHAREDIR}/$$i"; \
+		rm -f $T${CSHAREDIR}/$$i.new; \
+		cp -f $$i $T${CSHAREDIR}/$$i.new; \
+		${CHMOD} 0444 $T${CSHAREDIR}/$$i.new; \
+		mv -f $T${CSHAREDIR}/$$i.new $T${CSHAREDIR}/$$i; \
+		echo "installed $T${CSHAREDIR}/$$i"; \
 	    fi; \
 	done

cal/lucas.cal

@@ -17,8 +17,8 @@
  * received a copy with calc; if not, write to Free Software Foundation, Inc.
  * 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
  *
- * @(#) $Revision: 29.3 $
- * @(#) $Id: lucas.cal,v 29.3 2001/03/31 13:31:34 chongo Exp $
+ * @(#) $Revision: 29.5 $
+ * @(#) $Id: lucas.cal,v 29.5 2001/06/08 20:07:29 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/lucas.cal,v $
  *
  * Under source code control:	1990/05/03 16:49:51
@@ -28,6 +28,16 @@
  * Share and enjoy!  :-)	http://www.isthe.com/chongo/tech/comp/calc/
  */
 
+/*
+ * NOTE: This is a standard calc resource file.  For information on calc see:
+ *
+ *	http://www.isthe.com/chongo/tech/comp/calc/index.html
+ *
+ * To obtain your own copy of calc, see:
+ *
+ *	http://www.isthe.com/chongo/tech/comp/calc/calc-download.html
+ */
+
 /*
  * HISTORICAL NOTE:
  *
@@ -52,12 +62,19 @@
  *
  * At the time of discovery, this was the largest known twin prime pair.
  *
+ * See:
+ *
+ *	http://www.isthe.com/chongo/tech/math/prime/amdahl6.html
+ *
+ * for more information on the Amdahl 6 group.
+ *
  * NOTE: Both largest known and largest known twin prime records have been
  *	 broken.  Rather than update this file each time, I'll just
  *	 congratulate the finders and encourage others to try for
  *	 larger finds.	Records were made to be broken afterall!
- *
- * ON GAINING A WORLD RECORD:
+ */
+
+/* ON GAINING A WORLD RECORD:
  *
  * The routines in calc were designed to be portable, and to work on
  * numbers of 'sane' size.  The Amdahl 6 team used a 'ultra-high speed

calc.h

@@ -17,8 +17,8 @@
  * received a copy with calc; if not, write to Free Software Foundation, Inc.
  * 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
  *
- * @(#) $Revision: 29.7 $
- * @(#) $Id: calc.h,v 29.7 2001/05/29 00:16:53 chongo Exp $
+ * @(#) $Revision: 29.9 $
+ * @(#) $Id: calc.h,v 29.9 2001/12/11 02:28:47 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/calc.h,v $
  *
  * Under source code control:	1990/02/15 01:48:31
@@ -32,7 +32,7 @@
 #define __CALC_H__
 
 #include <setjmp.h>
-#if defined(SRC)	/* if we are building from the calc source tree */
+#if defined(CALC_SRC)	/* if we are building from the calc source tree */
 # include "win32dll.h"
 # include "value.h"
 # include "have_const.h"
@@ -258,7 +258,7 @@ extern DLL char *run_state_name(run state);
 extern int calc_major_ver;
 extern int calc_minor_ver;
 extern int calc_major_patch;
-extern char *calc_minor_patch;
+extern int calc_minor_patch;
 extern char *Copyright;
 extern DLL char *version(void);
 

cmath.h

@@ -17,8 +17,8 @@
  * received a copy with calc; if not, write to Free Software Foundation, Inc.
  * 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
  *
- * @(#) $Revision: 29.4 $
- * @(#) $Id: cmath.h,v 29.4 2001/05/29 00:16:53 chongo Exp $
+ * @(#) $Revision: 29.5 $
+ * @(#) $Id: cmath.h,v 29.5 2001/06/08 21:00:58 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/cmath.h,v $
  *
  * Under source code control:	1993/07/30 19:42:45
@@ -32,7 +32,7 @@
 #define __CMATH_H__
 
 
-#if defined(SRC)	/* if we are building from the calc source tree */
+#if defined(CALC_SRC)	/* if we are building from the calc source tree */
 # include "qmath.h"
 #else
 # include <calc/qmath.h>

config.h

@@ -19,8 +19,8 @@
  * received a copy with calc; if not, write to Free Software Foundation, Inc.
  * 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
  *
- * @(#) $Revision: 29.10 $
- * @(#) $Id: config.h,v 29.10 2001/05/29 00:16:53 chongo Exp $
+ * @(#) $Revision: 29.11 $
+ * @(#) $Id: config.h,v 29.11 2001/06/08 21:00:58 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/config.h,v $
  *
  * Under source code control:	1995/11/01 22:20:17
@@ -35,7 +35,7 @@
 #define __CONFIG_H__
 
 
-#if defined(SRC)	/* if we are building from the calc source tree */
+#if defined(CALC_SRC)	/* if we are building from the calc source tree */
 # include "win32dll.h"
 # include "nametype.h"
 # include "qmath.h"

cscript/Makefile

@@ -17,8 +17,8 @@
 # received a copy with calc; if not, write to Free Software Foundation, Inc.
 # 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
 #
-# @(#) $Revision: 29.16 $
-# @(#) $Id: Makefile,v 29.16 2001/06/06 10:06:48 chongo Exp $
+# @(#) $Revision: 29.20 $
+# @(#) $Id: Makefile,v 29.20 2001/06/10 19:35:02 chongo Exp $
 # @(#) $Source: /usr/local/src/cmd/calc/cscript/RCS/Makefile,v $
 #
 # Under source code control:	1999/11/29 11:10:26
@@ -45,6 +45,22 @@ BINDIR= /usr/bin
 #
 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
+# when forming the calc rpm, the Makefile is called with T=$RPM_BUILD_ROOT.
+#
+# If $T is empty, calc is installed under /, which is the same
+# top of tree for which it was built.  If $T is non-empty, then
+# calc is installed under $T, as if one had to chroot under
+# $T for calc to operate.
+#
+# If in doubt, use T=
+#
+T=
+
 # Makefile debug
 #
 # Q=@	do not echo internal makefile actions (quiet mode)
@@ -77,11 +93,11 @@ CMP= cmp
 #
 #		make detaillist
 #
-SCRIPT= 4dsphere fproduct mersenne piforever plus powerterm simple \
-	square
+SCRIPT= 4dsphere fproduct mersenne piforever plus powerterm \
+	simple square
 
-SCRIPT_SRC= 4dsphere.calc fproduct.calc mersenne.calc piforever.calc \
-	plus.calc powerterm.calc simple.calc square.calc
+SCRIPT_SRC= 4dsphere.calc fproduct.calc mersenne.calc \
+	piforever.calc plus.calc powerterm.calc simple.calc square.calc
 
 # These files are found (but not built) in the distribution
 #
@@ -216,9 +232,6 @@ depend:
 #
 ##
 
-echo_SCRIPT:
-	${Q}echo __file__ ${SCRIPT}
-
 echo_inst_files:
 	${Q}for i in ${SCRIPT}; do \
 	    echo __file__ ${SCRIPTDIR}/$$i; \
@@ -237,31 +250,39 @@ clobber:
 	-rm -f ${TARGETS}
 
 install: all
-	-${Q}if [ ! -d ${BINDIR} ]; then \
-	    echo mkdir ${BINDIR}; \
-	    mkdir ${BINDIR}; \
-	    echo ${CHMOD} 0755 ${BINDIR}; \
-	    ${CHMOD} 0755 ${BINDIR}; \
+	-${Q}if [ ! -d $T${BINDIR} ]; then \
+	    echo mkdir $T${BINDIR}; \
+	    mkdir $T${BINDIR}; \
+	    if [ ! -d "$T${BINDIR}" ]; then \
+		echo mkdir -p "$T${BINDIR}"; \
+		mkdir -p "$T${BINDIR}"; \
+	    fi; \
+	    echo ${CHMOD} 0755 $T${BINDIR}; \
+	    ${CHMOD} 0755 $T${BINDIR}; \
 	else \
 	    true; \
 	fi
-	-${Q}if [ ! -d ${SCRIPTDIR} ]; then \
-	    echo mkdir ${SCRIPTDIR}; \
-	    mkdir ${SCRIPTDIR}; \
-	    echo ${CHMOD} 0755 ${SCRIPTDIR}; \
-	    ${CHMOD} 0755 ${SCRIPTDIR}; \
+	-${Q}if [ ! -d $T${SCRIPTDIR} ]; then \
+	    echo mkdir $T${SCRIPTDIR}; \
+	    mkdir $T${SCRIPTDIR}; \
+	    if [ ! -d "$T${SCRIPTDIR}" ]; then \
+		echo mkdir -p "$T${SCRIPTDIR}"; \
+		mkdir -p "$T${SCRIPTDIR}"; \
+	    fi; \
+	    echo ${CHMOD} 0755 $T${SCRIPTDIR}; \
+	    ${CHMOD} 0755 $T${SCRIPTDIR}; \
 	else \
 	    true; \
 	fi
 	${Q}for i in ${SCRIPT}; do \
-	    if ${CMP} -s $$i ${SCRIPTDIR}/$$i; then \
+	    if ${CMP} -s $$i $T${SCRIPTDIR}/$$i; then \
 		true; \
 	    else \
-		rm -f ${SCRIPTDIR}/$$i.new; \
-		cp -f $$i ${SCRIPTDIR}/$$i.new; \
-		${CHMOD} 0555 ${SCRIPTDIR}/$$i.new; \
-		mv -f ${SCRIPTDIR}/$$i.new ${SCRIPTDIR}/$$i; \
-		echo "installed ${SCRIPTDIR}/$$i"; \
+		rm -f $T${SCRIPTDIR}/$$i.new; \
+		cp -f $$i $T${SCRIPTDIR}/$$i.new; \
+		${CHMOD} 0555 $T${SCRIPTDIR}/$$i.new; \
+		mv -f $T${SCRIPTDIR}/$$i.new $T${SCRIPTDIR}/$$i; \
+		echo "installed $T${SCRIPTDIR}/$$i"; \
 	    fi; \
 	done
 

cscript/README

@@ -21,14 +21,14 @@ For more info, see:
 
 4dsphere
 
-    determine if 6 points lie on the surface of a sphere in R^4
+    Determine if 6 points lie on the surface of a 4-dimensional sphere in R^4.
 
-     usage: 4dsphere x0 y0 z0 w0 x1 y1 z1 w1 ... x5 y5 z5 w5
+    4dsphere x0 y0 z0 w0   x1 y1 z1 w1   ...   x5 y5 z5 w5
 
-        x0 y0 z0 w0     point 0 in R^4
-        x1 y1 z1 w1     point 1 in R^4
-        ...             ...
-        x5 y5 z5 w5     point 5 in R^4
+	x0 y0 z0 w0     point 0 in R^4
+	x1 y1 z1 w1     point 1 in R^4
+	...             ...
+	x5 y5 z5 w5     point 5 in R^4
 
 
 fproduct filename term ...
@@ -77,8 +77,8 @@ simple
 ## received a copy with calc; if not, write to Free Software Foundation, Inc.
 ## 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
 ##
-## @(#) $Revision: 29.7 $
-## @(#) $Id: README,v 29.7 2001/05/28 23:08:22 chongo Exp $
+## @(#) $Revision: 29.10 $
+## @(#) $Id: README,v 29.10 2001/06/10 19:34:40 chongo Exp $
 ## @(#) $Source: /usr/local/src/cmd/calc/cscript/RCS/README,v $
 ##
 ## Under source code control:	1999/12/17 10:23:40

custom/Makefile

@@ -18,8 +18,8 @@
 # received a copy with calc; if not, write to Free Software Foundation, Inc.
 # 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
 #
-# @(#) $Revision: 29.15 $
-# @(#) $Id: Makefile,v 29.15 2001/06/06 10:06:48 chongo Exp $
+# @(#) $Revision: 29.17 $
+# @(#) $Id: Makefile,v 29.17 2001/06/08 22:38:53 chongo Exp $
 # @(#) $Source: /usr/local/src/cmd/calc/custom/RCS/Makefile,v $
 #
 # Under source code control:	1997/03/09 02:28:54
@@ -116,6 +116,22 @@ CUSTOMLIBDIR= ${CSHAREDIR}/custom
 CUSTOMHELPDIR= ${CSHAREDIR}/custhelp
 CUSTOMINCDIR= ${INCDIRCALC}/custom
 
+# 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
+# when forming the calc rpm, the Makefile is called with T=$RPM_BUILD_ROOT.
+#
+# 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=
+
 # Normally, the upper level makefile will set these values.  We provide
 # a default here just in case you want to build from this directory.
 #
@@ -468,15 +484,6 @@ depend:
 #
 ##
 
-echo_INSTALL_H_SRC:
-	${Q}echo __file__ ${INSTALL_H_SRC}
-
-echo_CUSTOM_CALC_FILES:
-	${Q}echo __file__ ${CUSTOM_CALC_FILES}
-
-echo_CUSTOM_HELP:
-	${Q}echo __file__ ${CUSTOM_HELP}
-
 echo_inst_files:
 	${Q}for i in ${INSTALL_H_SRC}; do \
 	    echo __file__ ${CUSTOMINCDIR}/$$i; \
@@ -505,118 +512,147 @@ clobber:
 	rm -f .all Makefile.tmp Makefile.bak
 
 install: all
-	-${Q}if [ ! -d ${SHAREDIR} ]; then \
-		echo mkdir ${SHAREDIR}; \
-		mkdir ${SHAREDIR}; \
-		echo ${CHMOD} 0755 ${SHAREDIR}; \
-		${CHMOD} 0755 ${SHAREDIR}; \
+	-${Q}if [ ! -d $T${SHAREDIR} ]; then \
+	    echo mkdir $T${SHAREDIR}; \
+	    mkdir $T${SHAREDIR}; \
+	    if [ ! -d "$T${SHAREDIR}" ]; then \
+		echo mkdir -p "$T${SHAREDIR}"; \
+		mkdir -p "$T${SHAREDIR}"; \
+	    fi; \
+	    echo ${CHMOD} 0755 $T${SHAREDIR}; \
+	    ${CHMOD} 0755 $T${SHAREDIR}; \
 	else \
 	    true; \
 	fi
-	-${Q}if [ ! -d ${INCDIR} ]; then \
-		echo mkdir ${INCDIR}; \
-		mkdir ${INCDIR}; \
-		echo ${CHMOD} 0755 ${INCDIR}; \
-		${CHMOD} 0755 ${INCDIR}; \
+	-${Q}if [ ! -d $T${INCDIR} ]; then \
+	    echo mkdir $T${INCDIR}; \
+	    mkdir $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 ${CSHAREDIR} ]; then \
-		echo mkdir ${CSHAREDIR}; \
-		mkdir ${CSHAREDIR}; \
-		echo ${CHMOD} 0755 ${CSHAREDIR}; \
-		${CHMOD} 0755 ${CSHAREDIR}; \
+	-${Q}if [ ! -d $T${CSHAREDIR} ]; then \
+	    echo mkdir $T${CSHAREDIR}; \
+	    mkdir $T${CSHAREDIR}; \
+	    if [ ! -d "$T${CSHAREDIR}" ]; then \
+		echo mkdir -p "$T${CSHAREDIR}"; \
+		mkdir -p "$T${CSHAREDIR}"; \
+	    fi; \
+	    echo ${CHMOD} 0755 $T${CSHAREDIR}; \
+	    ${CHMOD} 0755 $T${CSHAREDIR}; \
 	else \
 	    true; \
 	fi
-	-${Q}if [ ! -d ${INCDIRCALC} ]; then \
-		echo mkdir ${INCDIRCALC}; \
-		mkdir ${INCDIRCALC}; \
-		echo ${CHMOD} 0755 ${INCDIRCALC}; \
-		${CHMOD} 0755 ${INCDIRCALC}; \
+	-${Q}if [ ! -d $T${INCDIRCALC} ]; then \
+	    echo mkdir $T${INCDIRCALC}; \
+	    mkdir $T${INCDIRCALC}; \
+	    if [ ! -d "$T${INCDIRCALC}" ]; then \
+		echo mkdir -p "$T${INCDIRCALC}"; \
+		mkdir -p "$T${INCDIRCALC}"; \
+	    fi; \
+	    echo ${CHMOD} 0755 $T${INCDIRCALC}; \
+	    ${CHMOD} 0755 $T${INCDIRCALC}; \
 	else \
 	    true; \
 	fi
-	-${Q}if [ ! -d ${HELPDIR} ]; then \
-		echo mkdir ${HELPDIR}; \
-		mkdir ${HELPDIR}; \
-		echo ${CHMOD} 0755 ${HELPDIR}; \
-		${CHMOD} 0755 ${HELPDIR}; \
+	-${Q}if [ ! -d $T${HELPDIR} ]; then \
+	    echo mkdir $T${HELPDIR}; \
+	    mkdir $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 ${CUSTOMLIBDIR} ]; then \
-		echo mkdir ${CUSTOMLIBDIR}; \
-		mkdir ${CUSTOMLIBDIR}; \
-		echo ${CHMOD} 0755 ${CUSTOMLIBDIR}; \
-		${CHMOD} 0755 ${CUSTOMLIBDIR}; \
+	-${Q}if [ ! -d $T${CUSTOMLIBDIR} ]; then \
+	    echo mkdir $T${CUSTOMLIBDIR}; \
+	    mkdir $T${CUSTOMLIBDIR}; \
+	    if [ ! -d "$T${CUSTOMLIBDIR}" ]; then \
+		echo mkdir -p "$T${CUSTOMLIBDIR}"; \
+		mkdir -p "$T${CUSTOMLIBDIR}"; \
+	    fi; \
+	    echo ${CHMOD} 0755 $T${CUSTOMLIBDIR}; \
+	    ${CHMOD} 0755 $T${CUSTOMLIBDIR}; \
 	else \
 	    true; \
 	fi
-	-${Q}if [ ! -d ${CUSTOMHELPDIR} ]; then \
-		echo mkdir ${CUSTOMHELPDIR}; \
-		mkdir ${CUSTOMHELPDIR}; \
-		echo ${CHMOD} 0755 ${CUSTOMHELPDIR}; \
-		${CHMOD} 0755 ${CUSTOMHELPDIR}; \
+	-${Q}if [ ! -d $T${CUSTOMHELPDIR} ]; then \
+	    echo mkdir $T${CUSTOMHELPDIR}; \
+	    mkdir $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 ${CUSTOMINCDIR} ]; then \
-		echo mkdir ${CUSTOMINCDIR}; \
-		mkdir ${CUSTOMINCDIR}; \
-		echo ${CHMOD} 0755 ${CUSTOMINCDIR}; \
-		${CHMOD} 0755 ${CUSTOMINCDIR}; \
+	-${Q}if [ ! -d $T${CUSTOMINCDIR} ]; then \
+	    echo mkdir $T${CUSTOMINCDIR}; \
+	    mkdir $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}; do \
-	    rm -f tmp; \
-	    ${SED} -e 's/^\(#[ 	]*include[ 	][ 	]*\)"/\1"calc\//' $$i > tmp; \
-	    if ${CMP} -s tmp ${CUSTOMINCDIR}/$$i; then \
+	    if ${CMP} -s tmp $T${CUSTOMINCDIR}/$$i; then \
 		true; \
 	    else \
-		rm -f ${CUSTOMINCDIR}/$$i.new; \
-		cp -f tmp ${INCDIRCALC}/$$i.new; \
-		cp -f $$i ${CUSTOMINCDIR}/$$i.new; \
-		${CHMOD} 0444 ${CUSTOMINCDIR}/$$i.new; \
-		mv -f ${CUSTOMINCDIR}/$$i.new ${CUSTOMINCDIR}/$$i; \
-		echo "installed ${CUSTOMINCDIR}/$$i"; \
+		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}rm -f tmp
 	-${Q}for i in ${CUSTOM_CALC_FILES}; do \
-	    if ${CMP} -s $$i ${CUSTOMLIBDIR}/$$i; then \
+	    if ${CMP} -s $$i $T${CUSTOMLIBDIR}/$$i; then \
 		true; \
 	    else \
-		rm -f ${CUSTOMLIBDIR}/$$i.new; \
-		cp -f $$i ${CUSTOMLIBDIR}/$$i.new; \
-		${CHMOD} 0444 ${CUSTOMLIBDIR}/$$i.new; \
-		mv -f ${CUSTOMLIBDIR}/$$i.new ${CUSTOMLIBDIR}/$$i; \
-		echo "installed ${CUSTOMLIBDIR}/$$i"; \
+		rm -f $T${CUSTOMLIBDIR}/$$i.new; \
+		cp -f $$i $T${CUSTOMLIBDIR}/$$i.new; \
+		${CHMOD} 0444 $T${CUSTOMLIBDIR}/$$i.new; \
+		mv -f $T${CUSTOMLIBDIR}/$$i.new $T${CUSTOMLIBDIR}/$$i; \
+		echo "installed $T${CUSTOMLIBDIR}/$$i"; \
 	    fi; \
 	done
 	-${Q}for i in ${CUSTOM_HELP}; do \
-	    if ${CMP} -s $$i ${CUSTOMHELPDIR}/$$i; then \
+	    if ${CMP} -s $$i $T${CUSTOMHELPDIR}/$$i; then \
 		true; \
 	    else \
-		rm -f ${CUSTOMHELPDIR}/$$i.new; \
-		cp -f $$i ${CUSTOMHELPDIR}/$$i.new; \
-		${CHMOD} 0444 ${CUSTOMHELPDIR}/$$i.new; \
-		mv -f ${CUSTOMHELPDIR}/$$i.new ${CUSTOMHELPDIR}/$$i; \
-		echo "installed ${CUSTOMHELPDIR}/$$i"; \
+		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 [ ! -z ${ALLOW_CUSTOM} ]; then \
-	    if ${CMP} -s libcustcalc.a ${CUSTOMLIBDIR}/libcustcalc.a; then \
+	    if ${CMP} -s libcustcalc.a $T${CUSTOMLIBDIR}/libcustcalc.a; then \
 		true; \
 	    else \
-		rm -f ${CUSTOMLIBDIR}/libcustcalc.a.new; \
-		cp -f libcustcalc.a ${CUSTOMLIBDIR}/libcustcalc.a.new; \
-		${CHMOD} 0644 ${CUSTOMLIBDIR}/libcustcalc.a.new; \
-		mv -f ${CUSTOMLIBDIR}/libcustcalc.a.new \
-		      ${CUSTOMLIBDIR}/libcustcalc.a; \
-		${RANLIB} ${CUSTOMLIBDIR}/libcustcalc.a; \
-		echo "installed ${CUSTOMLIBDIR}/libcustcalc.a"; \
+		rm -f $T${CUSTOMLIBDIR}/libcustcalc.a.new; \
+		cp -f libcustcalc.a $T${CUSTOMLIBDIR}/libcustcalc.a.new; \
+		${CHMOD} 0644 $T${CUSTOMLIBDIR}/libcustcalc.a.new; \
+		mv -f $T${CUSTOMLIBDIR}/libcustcalc.a.new \
+		      $T${CUSTOMLIBDIR}/libcustcalc.a; \
+		${RANLIB} $T${CUSTOMLIBDIR}/libcustcalc.a; \
+		echo "installed $T${CUSTOMLIBDIR}/libcustcalc.a"; \
 	    fi; \
 	fi
 

file.h

@@ -19,8 +19,8 @@
  * received a copy with calc; if not, write to Free Software Foundation, Inc.
  * 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
  *
- * @(#) $Revision: 29.4 $
- * @(#) $Id: file.h,v 29.4 2001/05/29 00:16:53 chongo Exp $
+ * @(#) $Revision: 29.5 $
+ * @(#) $Id: file.h,v 29.5 2001/06/08 21:00:58 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/file.h,v $
  *
  * Under source code control:	1996/05/24 05:55:58
@@ -35,7 +35,7 @@
 #define __FILE_H__
 
 
-#if defined(SRC)	/* if we are building from the calc source tree */
+#if defined(CALC_SRC)	/* if we are building from the calc source tree */
 # include "have_fpos.h"
 #else
 # include <calc/have_fpos.h>

func.h

@@ -17,8 +17,8 @@
  * received a copy with calc; if not, write to Free Software Foundation, Inc.
  * 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
  *
- * @(#) $Revision: 29.3 $
- * @(#) $Id: func.h,v 29.3 2001/05/29 00:16:53 chongo Exp $
+ * @(#) $Revision: 29.4 $
+ * @(#) $Id: func.h,v 29.4 2001/06/08 21:00:58 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/func.h,v $
  *
  * Under source code control:	1990/02/15 01:48:33
@@ -32,7 +32,7 @@
 #define __FUNC_H__
 
 
-#if defined(SRC)	/* if we are building from the calc source tree */
+#if defined(CALC_SRC)	/* if we are building from the calc source tree */
 # include "calc.h"
 # include "label.h"
 #else

hash.h

@@ -17,8 +17,8 @@
  * received a copy with calc; if not, write to Free Software Foundation, Inc.
  * 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
  *
- * @(#) $Revision: 29.3 $
- * @(#) $Id: hash.h,v 29.3 2001/05/29 00:16:53 chongo Exp $
+ * @(#) $Revision: 29.4 $
+ * @(#) $Id: hash.h,v 29.4 2001/06/08 21:00:58 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/hash.h,v $
  *
  * Under source code control:	1995/11/14 23:57:45
@@ -33,7 +33,7 @@
 #define __HASH_H__
 
 
-#if defined(SRC)	/* if we are building from the calc source tree */
+#if defined(CALC_SRC)	/* if we are building from the calc source tree */
 # include "shs.h"
 # include "shs1.h"
 # include "md5.h"

help/Makefile

@@ -18,8 +18,8 @@
 # received a copy with calc; if not, write to Free Software Foundation, Inc.
 # 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
 #
-# @(#) $Revision: 29.14 $
-# @(#) $Id: Makefile,v 29.14 2001/06/06 10:06:48 chongo Exp $
+# @(#) $Revision: 29.18 $
+# @(#) $Id: Makefile,v 29.18 2001/06/08 22:57:54 chongo Exp $
 # @(#) $Source: /usr/local/src/cmd/calc/help/RCS/Makefile,v $
 #
 # Under source code control:	1991/07/23 06:47:57
@@ -37,15 +37,41 @@ SHELL= /bin/sh
 MAKE_FILE = Makefile
 
 # ${SHAREDIR}		where most common shared files are kept
+# ${INCDIR}		where most .h files are kept
+# ${LIBDIR}		where *.a files are installed
 #
 # ${CSHAREDIR}		where most common shared calc files are kept
 # ${HELPDIR}		where the help directory is installed.
+# ${INCDIRCALC}		where the calc include files are installed
 #
 #SHAREDIR= /usr/local/lib
 SHAREDIR= /usr/share
 
+#INCDIR= /usr/local/include
+INCDIR= /usr/include
+
+#LIBDIR= /usr/local/lib
+LIBDIR= /usr/lib
+
 CSHAREDIR= ${SHAREDIR}/calc
 HELPDIR= ${CSHAREDIR}/help
+INCDIRCALC= ${INCDIR}/calc
+
+# 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
+# when forming the calc rpm, the Makefile is called with T=$RPM_BUILD_ROOT.
+#
+# If $T is empty, calc is installed under /, which is the same
+# top of tree for which it was built.  If $T is non-empty, then
+# calc is installed under $T, as if one had to chroot under
+# $T for calc to operate.
+#
+# If in doubt, use T=
+#
+T=
 
 # Makefile debug
 #
@@ -240,7 +266,8 @@ changes: ../CHANGES
 
 libcalc: ../LIBRARY
 	rm -f $@
-	${SED} -e 's:$${LIBDIR}:${LIBDIR}:g' < ../LIBRARY > $@
+	${SED} -e 's:$${LIBDIR}:${LIBDIR}:g' \
+	       -e 's:$${INCDIRCALC}:${INCDIRCALC}:g' < ../LIBRARY > $@
 	${CHMOD} 0444 $@
 	-@if [ -z "${Q}" ]; then \
 	    echo ''; \
@@ -497,18 +524,6 @@ detaillist:
 #
 ##
 
-echo_STD_HELP_FILES:
-	${Q}echo __file__ ${STD_HELP_FILES}
-
-echo_BLT_HELP_FILES:
-	${Q}echo __file__ ${BLT_HELP_FILES}
-
-echo_DETAIL_HELP:
-	${Q}echo __file__ ${DETAIL_HELP}
-
-echo_SINGULAR_FILES:
-	${Q}echo __file__ ${SINGULAR_FILES}
-
 echo_inst_files:
 	${Q}for i in ${STD_HELP_FILES} full ${BLT_HELP_FILES} \
 		  builtin ${DETAIL_HELP} ${SINGULAR_FILES}; do \
@@ -534,47 +549,59 @@ clobber:
 
 install: all
 	-${Q}if [ ! -d ${SHAREDIR} ]; then \
-		echo mkdir ${SHAREDIR}; \
-		mkdir ${SHAREDIR}; \
-		echo ${CHMOD} 0755 ${SHAREDIR}; \
-		${CHMOD} 0755 ${SHAREDIR}; \
+	    echo mkdir $T${SHAREDIR}; \
+	    mkdir $T${SHAREDIR}; \
+	    if [ ! -d "$T${SHAREDIR}" ]; then \
+		echo mkdir -p "$T${SHAREDIR}"; \
+		mkdir -p "$T${SHAREDIR}"; \
+	    fi; \
+	    echo ${CHMOD} 0755 $T${SHAREDIR}; \
+	    ${CHMOD} 0755 $T${SHAREDIR}; \
 	else \
 	    true; \
 	fi
-	-${Q}if [ ! -d ${CSHAREDIR} ]; then \
-		echo mkdir ${CSHAREDIR}; \
-		mkdir ${CSHAREDIR}; \
-		echo ${CHMOD} 0755 ${CSHAREDIR}; \
-		${CHMOD} 0755 ${CSHAREDIR}; \
+	-${Q}if [ ! -d $T${CSHAREDIR} ]; then \
+	    echo mkdir $T${CSHAREDIR}; \
+	    mkdir $T${CSHAREDIR}; \
+	    if [ ! -d "$T${CSHAREDIR}" ]; then \
+		echo mkdir -p "$T${CSHAREDIR}"; \
+		mkdir -p "$T${CSHAREDIR}"; \
+	    fi; \
+	    echo ${CHMOD} 0755 $T${CSHAREDIR}; \
+	    ${CHMOD} 0755 $T${CSHAREDIR}; \
 	else \
 	    true; \
 	fi
-	-${Q}if [ ! -d ${HELPDIR} ]; then \
-		echo mkdir ${HELPDIR}; \
-		mkdir ${HELPDIR}; \
-		echo ${CHMOD} 0755 ${HELPDIR}; \
-		${CHMOD} 0755 ${HELPDIR}; \
+	-${Q}if [ ! -d $T${HELPDIR} ]; then \
+	    echo mkdir $T${HELPDIR}; \
+	    mkdir $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}for i in ${STD_HELP_FILES} ${BLT_HELP_FILES} builtin \
 		  full ${DETAIL_HELP} ${SINGULAR_FILES}; do \
-	    if ${CMP} -s $$i ${HELPDIR}/$$i; then \
+	    if ${CMP} -s $$i $T${HELPDIR}/$$i; then \
 		true; \
 	    else \
-		rm -f ${HELPDIR}/$$i.new; \
-		cp -f $$i ${HELPDIR}/$$i.new; \
-		${CHMOD} 0444 ${HELPDIR}/$$i.new; \
-		mv -f ${HELPDIR}/$$i.new ${HELPDIR}/$$i; \
-		echo "installed ${HELPDIR}/$$i"; \
+		rm -f $T${HELPDIR}/$$i.new; \
+		cp -f $$i $T${HELPDIR}/$$i.new; \
+		${CHMOD} 0444 $T${HELPDIR}/$$i.new; \
+		mv -f $T${HELPDIR}/$$i.new $T${HELPDIR}/$$i; \
+		echo "installed $T${HELPDIR}/$$i"; \
 	    fi; \
 	done
-	-${Q}if ${CMP} -s obj.file ${HELPDIR}/obj; then \
+	-${Q}if ${CMP} -s obj.file $T${HELPDIR}/obj; then \
 	    true; \
 	else \
-	    rm -f ${HELPDIR}/obj.new; \
-	    cp -f obj.file ${HELPDIR}/obj.new; \
-	    ${CHMOD} 0444 ${HELPDIR}/obj.new; \
-	    mv -f ${HELPDIR}/obj.new ${HELPDIR}/obj; \
-	    echo "installed ${HELPDIR}/obj"; \
+	    rm -f $T${HELPDIR}/obj.new; \
+	    cp -f obj.file $T${HELPDIR}/obj.new; \
+	    ${CHMOD} 0444 $T${HELPDIR}/obj.new; \
+	    mv -f $T${HELPDIR}/obj.new $T${HELPDIR}/obj; \
+	    echo "installed $T${HELPDIR}/obj"; \
 	fi

help/version

@@ -12,8 +12,7 @@ DESCRIPTION
 
     Calc version strings can be of the form:
 
-    	x.y.ztw.v
-    	x.y.ztw
+    	x.y.z.w
     	x.y.z
     	x.y
 
@@ -22,7 +21,7 @@ DESCRIPTION
 
 EXAMPLE
     > version()
-    	    "2.11.5t4.1"
+    	    "2.11.5.4"
 
 LIMITS
     none
@@ -49,8 +48,8 @@ SEE ALSO
 ## received a copy with calc; if not, write to Free Software Foundation, Inc.
 ## 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
 ##
-## @(#) $Revision: 29.2 $
-## @(#) $Id: version,v 29.2 2001/05/29 00:43:54 chongo Exp $
+## @(#) $Revision: 29.3 $
+## @(#) $Id: version,v 29.3 2001/06/09 23:32:45 chongo Exp $
 ## @(#) $Source: /usr/local/src/cmd/calc/help/RCS/version,v $
 ##
 ## Under source code control:	2001/05/28 17:38:01

jump.h

@@ -17,8 +17,8 @@
  * received a copy with calc; if not, write to Free Software Foundation, Inc.
  * 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
  *
- * @(#) $Revision: 29.3 $
- * @(#) $Id: jump.h,v 29.3 2001/05/29 00:16:53 chongo Exp $
+ * @(#) $Revision: 29.4 $
+ * @(#) $Id: jump.h,v 29.4 2001/06/08 21:00:58 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/jump.h,v $
  *
  * Under source code control:	1994/06/29 04:03:55
@@ -66,7 +66,7 @@
 #define __JUMP_H__
 
 
-#if defined(SRC)	/* if we are building from the calc source tree */
+#if defined(CALC_SRC)	/* if we are building from the calc source tree */
 # include "have_const.h"
 #else
 # include <calc/have_const.h>

label.h

@@ -17,8 +17,8 @@
  * received a copy with calc; if not, write to Free Software Foundation, Inc.
  * 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
  *
- * @(#) $Revision: 29.3 $
- * @(#) $Id: label.h,v 29.3 2001/05/29 00:16:53 chongo Exp $
+ * @(#) $Revision: 29.4 $
+ * @(#) $Id: label.h,v 29.4 2001/06/08 21:00:58 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/label.h,v $
  *
  * Under source code control:	1990/02/15 01:48:33
@@ -32,7 +32,7 @@
 #define __LABEL_H__
 
 
-#if defined(SRC)	/* if we are building from the calc source tree */
+#if defined(CALC_SRC)	/* if we are building from the calc source tree */
 # include "zmath.h"
 #else
 # include <calc/zmath.h>

math_error.h

@@ -17,8 +17,8 @@
  * received a copy with calc; if not, write to Free Software Foundation, Inc.
  * 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
  *
- * @(#) $Revision: 29.4 $
- * @(#) $Id: math_error.h,v 29.4 2001/05/29 00:16:53 chongo Exp $
+ * @(#) $Revision: 29.5 $
+ * @(#) $Id: math_error.h,v 29.5 2001/06/08 21:00:58 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/math_error.h,v $
  *
  * Under source code control:	1997/03/23 18:37:10
@@ -33,7 +33,7 @@
 #define __MATH_ERROR_H__
 
 
-#if defined(SRC)	/* if we are building from the calc source tree */
+#if defined(CALC_SRC)	/* if we are building from the calc source tree */
 # include "win32dll.h"
 #else
 # include <calc/win32dll.h>

opcodes.h

@@ -17,8 +17,8 @@
  * received a copy with calc; if not, write to Free Software Foundation, Inc.
  * 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
  *
- * @(#) $Revision: 29.5 $
- * @(#) $Id: opcodes.h,v 29.5 2001/05/29 00:16:53 chongo Exp $
+ * @(#) $Revision: 29.6 $
+ * @(#) $Id: opcodes.h,v 29.6 2001/06/08 21:00:58 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/opcodes.h,v $
  *
  * Under source code control:	1990/02/15 01:48:35
@@ -32,7 +32,7 @@
 #define __OPCODES_H__
 
 
-#if defined(SRC)	/* if we are building from the calc source tree */
+#if defined(CALC_SRC)	/* if we are building from the calc source tree */
 # include "win32dll.h"
 #else
 # include <calc/win32dll.h>

prime.h

@@ -17,8 +17,8 @@
  * received a copy with calc; if not, write to Free Software Foundation, Inc.
  * 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
  *
- * @(#) $Revision: 29.3 $
- * @(#) $Id: prime.h,v 29.3 2001/05/29 00:16:53 chongo Exp $
+ * @(#) $Revision: 29.4 $
+ * @(#) $Id: prime.h,v 29.4 2001/06/08 21:00:58 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/prime.h,v $
  *
  * Under source code control:	1994/06/04 03:26:15
@@ -33,7 +33,7 @@
 #define __PRIME_H__
 
 
-#if defined(SRC)	/* if we are building from the calc source tree */
+#if defined(CALC_SRC)	/* if we are building from the calc source tree */
 # include "qmath.h"
 # include "have_const.h"
 #else

qmath.h

@@ -17,8 +17,8 @@
  * received a copy with calc; if not, write to Free Software Foundation, Inc.
  * 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
  *
- * @(#) $Revision: 29.4 $
- * @(#) $Id: qmath.h,v 29.4 2001/05/29 00:16:53 chongo Exp $
+ * @(#) $Revision: 29.5 $
+ * @(#) $Id: qmath.h,v 29.5 2001/06/08 21:00:58 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/qmath.h,v $
  *
  * Under source code control:	1993/07/30 19:42:47
@@ -32,7 +32,7 @@
 #define __QMATH_H__
 
 
-#if defined(SRC)	/* if we are building from the calc source tree */
+#if defined(CALC_SRC)	/* if we are building from the calc source tree */
 # include "zmath.h"
 #else
 # include <calc/zmath.h>

sample/Makefile

@@ -17,8 +17,8 @@
 # received a copy with calc; if not, write to Free Software Foundation, Inc.
 # 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
 #
-# @(#) $Revision: 29.12 $
-# @(#) $Id: Makefile,v 29.12 2001/06/06 10:06:48 chongo Exp $
+# @(#) $Revision: 29.14 $
+# @(#) $Id: Makefile,v 29.14 2001/06/08 22:38:53 chongo Exp $
 # @(#) $Source: /usr/local/src/cmd/calc/sample/RCS/Makefile,v $
 #
 # Under source code control:	1997/04/19 22:46:49
@@ -104,6 +104,22 @@ LIBDIR= /usr/lib
 CSHAREDIR= ${SHAREDIR}/calc
 HELPDIR= ${LIBDIR}/help
 
+# 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
+# when forming the calc rpm, the Makefile is called with T=$RPM_BUILD_ROOT.
+#
+# 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=
+
 # Normally, the upper level makefile will set these values.  We provide
 # a default here just in case you want to build from this directory.
 #

spec-template

@@ -1,98 +0,0 @@
-Summary: C-style arbitrary precision calculator
-Name: calc
-Version: ${VERSION}
-Release: ${RELEASE}
-Copyright: LGPL
-Group: Applications/Engineering
-Source: http://www.isthe.com/chongo/src/calc/calc-${VER_CALC}.tar.gz
-BuildRoot: /var/tmp/%{name}-buildroot
-
-%description
-Calc is an interactive calculator which provides for easy large numeric
-calculations, but which also can be easily programmed for difficult or
-long calculations.
-
-All numbers are represented as fractions with arbitrarily large numerators
-and denominators which are always reduced to lowest terms.  Real or
-exponential format numbers are converted to the equivalent fraction.
-One use enter decinal, hex, octal, binary and complex values.
-
-Commands are statements in a C-like language, where each input line is
-treated as the body of a procedure.  You can define your own functions
-by using the 'define' keyword, followed by a function declaration very
-similar to C.  Calc also comes with a rich set of builtin functions
-and calc shell commands.
-
-In addition to numeric global, local and static variables, Calc as
-lists, associated arrays, matrices, byte blocks, dymanic strings and
-user defined objects.
-
-%prep
-%setup -q
-
-%build
-make RPM_OPT_FLAGS="$RPM_OPT_FLAGS"
-
-%install
-rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT${BINDIR}
-mkdir -p $RPM_BUILD_ROOT${SHAREDIR}
-mkdir -p $RPM_BUILD_ROOT${INCDIR}
-mkdir -p $RPM_BUILD_ROOT${LIBDIR}
-mkdir -p $RPM_BUILD_ROOT${CSHAREDIR}
-mkdir -p $RPM_BUILD_ROOT${HELPDIR}
-mkdir -p $RPM_BUILD_ROOT${INCDIRCALC}
-mkdir -p $RPM_BUILD_ROOT${CUSTOMLIBDIR}
-mkdir -p $RPM_BUILD_ROOT${CUSTOMHELPDIR}
-mkdir -p $RPM_BUILD_ROOT${CUSTOMINCDIR}
-mkdir -p $RPM_BUILD_ROOT${SCRIPTDIR}
-mkdir -p $RPM_BUILD_ROOT${MANDIR}
-
-install -m 0555 calc $RPM_BUILD_ROOT${BINDIR}
-
-(cd help
- install -m 0444 ${STD_HELP_FILES} $RPM_BUILD_ROOT${HELPDIR}
- install -m 0444 ${BLT_HELP_FILES} $RPM_BUILD_ROOT${HELPDIR}
- install -m 0444 builtin full $RPM_BUILD_ROOT${HELPDIR}
- install -m 0444 ${DETAIL_HELP} $RPM_BUILD_ROOT${HELPDIR}
- install -m 0444 ${SINGULAR_FILES} $RPM_BUILD_ROOT${HELPDIR}
- install -m 0444 obj.file $RPM_BUILD_ROOT${HELPDIR}/obj
-)
-
-(cd cal; install -m 0444 ${CALC_FILES} $RPM_BUILD_ROOT${LIBDIR})
-
-(cd custom
- if [ ! -z "${INSTALL_H_SRC}" ]; then
-     install -m 0444 ${INSTALL_H_SRC} $RPM_BUILD_ROOT${CUSTOMINCDIR}
- fi
- install -m 0444 ${CUSTOM_CALC_FILES} $RPM_BUILD_ROOT${CUSTOMLIBDIR}
- install -m 0444 ${CUSTOM_HELP} $RPM_BUILD_ROOT${CUSTOMHELPDIR}
- if [ ! -z "${ALLOW_CUSTOM}" ]; then
-    install -m 0644 libcustcalc.a $RPM_BUILD_ROOT${CUSTOMLIBDIR}
-    ${RANLIB} $RPM_BUILD_ROOT${CUSTOMLIBDIR}
- fi
-)
-
-(cd cscript
- install -m 0555 ${SCRIPT} $RPM_BUILD_ROOT${SCRIPTDIR}
-)
-
-install -m 0444 libcalc.a $RPM_BUILD_ROOT${LIBDIR}
-${RANLIB} $RPM_BUILD_ROOT${LIBDIR}
-install -m 0444 ${LIB_H_SRC} $RPM_BUILD_ROOT${INCDIRCALC}
-install -m 0444 ${BUILD_H_SRC} $RPM_BUILD_ROOT${INCDIRCALC}
-install -m 0444 calc.1 $RPM_BUILD_ROOT${MANDIR}.${MANEXT}
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%files -f install.list
-%defattr(-,root,root)
-%doc BUGS README COPYING COPYING-LGPL HOWTO.INSTALL
-%doc README LIBRARY README.WINDOWS calc.1
-%doc help/resource help/errorcodes help/custom_cal help/new_custom
-%doc help/cscript help/full
-
-%changelog
-* ${DATE} Landon Curt Noll <http://www.isthe.com/chongo/index.html>
-- calc version ${VER_CALC}

string.h

@@ -17,8 +17,8 @@
  * received a copy with calc; if not, write to Free Software Foundation, Inc.
  * 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
  *
- * @(#) $Revision: 29.3 $
- * @(#) $Id: string.h,v 29.3 2001/05/29 00:16:53 chongo Exp $
+ * @(#) $Revision: 29.4 $
+ * @(#) $Id: string.h,v 29.4 2001/06/08 21:00:58 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/string.h,v $
  *
  * Under source code control:	1990/02/15 01:48:36
@@ -32,7 +32,7 @@
 #define __CALCSTRING_H__
 
 
-#if defined(SRC)	/* if we are building from the calc source tree */
+#if defined(CALC_SRC)	/* if we are building from the calc source tree */
 # include "zmath.h"
 #else
 # include <calc/zmath.h>

symbol.h

@@ -17,8 +17,8 @@
  * received a copy with calc; if not, write to Free Software Foundation, Inc.
  * 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
  *
- * @(#) $Revision: 29.3 $
- * @(#) $Id: symbol.h,v 29.3 2001/05/29 00:16:53 chongo Exp $
+ * @(#) $Revision: 29.4 $
+ * @(#) $Id: symbol.h,v 29.4 2001/06/08 21:00:58 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/symbol.h,v $
  *
  * Under source code control:	1990/02/15 01:48:37
@@ -32,7 +32,7 @@
 #define __SYMBOL_H__
 
 
-#if defined(SRC)	/* if we are building from the calc source tree */
+#if defined(CALC_SRC)	/* if we are building from the calc source tree */
 # include "zmath.h"
 #else
 # include <calc/zmath.h>

token.h

@@ -17,8 +17,8 @@
  * received a copy with calc; if not, write to Free Software Foundation, Inc.
  * 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
  *
- * @(#) $Revision: 29.3 $
- * @(#) $Id: token.h,v 29.3 2001/05/29 00:16:53 chongo Exp $
+ * @(#) $Revision: 29.4 $
+ * @(#) $Id: token.h,v 29.4 2001/06/08 21:00:58 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/token.h,v $
  *
  * Under source code control:	1990/02/15 01:48:37
@@ -32,7 +32,7 @@
 #define __TOKEN_H__
 
 
-#if defined(SRC)	/* if we are building from the calc source tree */
+#if defined(CALC_SRC)	/* if we are building from the calc source tree */
 # include "zmath.h"
 #else
 # include <calc/zmath.h>

value.h

@@ -17,8 +17,8 @@
  * received a copy with calc; if not, write to Free Software Foundation, Inc.
  * 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
  *
- * @(#) $Revision: 29.6 $
- * @(#) $Id: value.h,v 29.6 2001/05/29 00:16:53 chongo Exp $
+ * @(#) $Revision: 29.7 $
+ * @(#) $Id: value.h,v 29.7 2001/06/08 21:00:58 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/value.h,v $
  *
  * Under source code control:	1993/07/30 19:42:47
@@ -32,7 +32,7 @@
 #define __VALUE_H__
 
 
-#if defined(SRC)	/* if we are building from the calc source tree */
+#if defined(CALC_SRC)	/* if we are building from the calc source tree */
 # include "win32dll.h"
 # include "cmath.h"
 # include "config.h"

version.c

@@ -19,8 +19,8 @@
  * received a copy with calc; if not, write to Free Software Foundation, Inc.
  * 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
  *
- * @(#) $Revision: 29.30 $
- * @(#) $Id: version.c,v 29.30 2001/06/06 08:48:46 chongo Exp $
+ * @(#) $Revision: 29.37 $
+ * @(#) $Id: version.c,v 29.37 2001/12/31 22:12:35 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/version.c,v $
  *
  * Under source code control:	1990/05/22 11:00:58
@@ -32,6 +32,9 @@
 
 
 #include <stdio.h>
+#include <errno.h>
+#include <string.h>
+
 #if defined(CALC_VER)
 #include <stdlib.h>
 #include <unistd.h>
@@ -43,7 +46,8 @@ static char *program;
 #define MAJOR_VER	2	/* major version */
 #define MINOR_VER	11	/* minor version */
 #define MAJOR_PATCH	5	/* patch level or 0 if no patch */
-#define MINOR_PATCH	"4.4"	/* test number or empty string if no patch */
+#define MINOR_PATCH	6	/* test number or 0 if no minor patch */
+
 
 /*
  * calc version constants
@@ -51,7 +55,7 @@ static char *program;
 int calc_major_ver = MAJOR_VER;
 int calc_minor_ver = MINOR_VER;
 int calc_major_patch = MAJOR_PATCH;
-char *calc_minor_patch = MINOR_PATCH;
+int calc_minor_patch = MINOR_PATCH;
 
 
 /*
@@ -95,7 +99,7 @@ char *Copyright = "\n"
  * This function returns a malloced version string.  This version
  * string does not contain the title, just:
  *
- *		x.y.ztw
+ *		x.y.z.w
  *		x.y.z
  *		x.y
  */
@@ -114,15 +118,17 @@ version(void)
 	/*
 	 * form the version buffer
 	 */
-	if (sizeof(MINOR_PATCH) > 1) {
-	    sprintf(verbuf,
-		"%d.%d.%dt%s", calc_major_ver, calc_minor_ver,
-		 calc_major_patch, calc_minor_patch);
+	if (MINOR_PATCH > 0) {
+		snprintf(verbuf, BUFSIZ,
+		    "%d.%d.%d.%d", calc_major_ver, calc_minor_ver,
+		     calc_major_patch, calc_minor_patch);
 	} else if (MAJOR_PATCH > 0) {
-	    sprintf(verbuf,
-		"%d.%d.%d", calc_major_ver, calc_minor_ver, calc_major_patch);
+		snprintf(verbuf, BUFSIZ,
+		    "%d.%d.%d", calc_major_ver,
+		    calc_minor_ver, calc_major_patch);
 	} else {
-	    sprintf(verbuf, "%d.%d", calc_major_ver, calc_minor_ver);
+		snprintf(verbuf, BUFSIZ,
+		    "%d.%d", calc_major_ver, calc_minor_ver);
 	}
 
 	/*
@@ -131,7 +137,7 @@ version(void)
 	stored_version = (char *)malloc(strlen(verbuf)+1);
 	if (stored_version == NULL) {
 		fprintf(stderr, "%s: version formation value\n", program);
-		exit(2);
+		exit(1);
 	}
 	strcpy(stored_version, verbuf);
 
@@ -146,76 +152,123 @@ version(void)
 
 
 /*
- * print_rpm_version_release - print the rpm style version-release
+ * print_rpm_version - print just the version string, rpm style
  *
- * This function prints a version-release string, rpm style:
+ * This function prints a version string, rpm style:
  *
- *		x.y.z-w
- *		x.y.z-0
- *		x.y-0
+ *		x.y.z.w-r
+ *		x.y.z-r
+ *		x.y-r
+ *
+ * where 'r' comes from the content of the release file.
  */
 void
-print_rpm_version_release(void)
+print_rpm_version(char *release)
 {
+	FILE *file;		/* open file */
+	char buf[BUFSIZ+1];	/* release file buffer */
+	char *p;
+
+	/*
+	 * obtain the release
+	 */
+	file = fopen(release, "r");
+	if (file == NULL) {
+		fprintf(stderr, "%s: cannot open %s: %s\n",
+		    program, release, strerror(errno));
+		exit(2);
+	}
+	buf[BUFSIZ] = '\0';
+	if (fgets(buf, BUFSIZ, file) == NULL) {
+		fprintf(stderr, "%s: cannot read %s: %s\n",
+		    program, release, strerror(errno));
+		exit(3);
+	}
+	p = strchr(buf, '\n');
+	if (p != NULL) {
+		*p = '\0';
+	}
+
 	/*
 	 * form the version buffer
 	 */
-	if (sizeof(MINOR_PATCH) > 1) {
-	    printf("%d.%d.%d-%s\n", calc_major_ver, calc_minor_ver,
-		 		  calc_major_patch, calc_minor_patch);
+	if (MINOR_PATCH > 0) {
+		printf("%d.%d.%d.%d-%s\n", calc_major_ver, calc_minor_ver,
+				      calc_major_patch, calc_minor_patch, buf);
 	} else if (MAJOR_PATCH > 0) {
-	    printf("%d.%d.%d-0\n", calc_major_ver, calc_minor_ver,
-	    			 calc_major_patch);
+		printf("%d.%d.%d-%s\n", calc_major_ver, calc_minor_ver,
+				     calc_major_patch, buf);
 	} else {
-	    printf("%d.%d-0\n", calc_major_ver, calc_minor_ver);
+		printf("%d.%d-%s\n", calc_major_ver, calc_minor_ver, buf);
 	}
 	return;
 }
 
 
 /*
- * print_rpm_version - print just the version string, rpm style
+ * print_rpm_major - print just the major part version string
  *
- * This function prints a version string, rpm style:
+ * This function prints the major part version string:
  *
  *		x.y.z
  *		x.y
  */
 void
-print_rpm_version(void)
+print_rpm_major(void)
 {
 	/*
 	 * form the version buffer
 	 */
 	if (MAJOR_PATCH > 0) {
-	    printf("%d.%d.%d\n", calc_major_ver, calc_minor_ver,
-	    			 calc_major_patch);
+		printf("%d.%d.%d\n", calc_major_ver, calc_minor_ver,
+				     calc_major_patch);
 	} else {
-	    printf("%d.%d\n", calc_major_ver, calc_minor_ver);
+		printf("%d.%d\n", calc_major_ver, calc_minor_ver);
 	}
 	return;
 }
 
 
 /*
- * print_rpm_release - print just the release string, rpm style
+ * print_rpm_release - print just the rpm release
  *
- * This function prints a release string, rpm style:
+ * This function prints the rpm release:
  *
- *		w
- *		0
+ *		r
+ *
+ * where 'r' comes from the content of the release file.
  */
 void
-print_rpm_release(void)
+print_rpm_release(char *release)
 {
+	FILE *file;		/* open file */
+	char buf[BUFSIZ+1];	/* release file buffer */
+	char *p;
+
+	/*
+	 * obtain the release
+	 */
+	file = fopen(release, "r");
+	if (file == NULL) {
+		fprintf(stderr, "%s: cannot open %s: %s\n",
+		    program, release, strerror(errno));
+		exit(2);
+	}
+	buf[BUFSIZ] = '\0';
+	if (fgets(buf, BUFSIZ, file) == NULL) {
+		fprintf(stderr, "%s: cannot read %s: %s\n",
+		    program, release, strerror(errno));
+		exit(3);
+	}
+	p = strchr(buf, '\n');
+	if (p != NULL) {
+		*p = '\0';
+	}
+
 	/*
 	 * form the version buffer
 	 */
-	if (sizeof(MINOR_PATCH) > 1) {
-	    printf("%s\n", calc_minor_patch);
-	} else {
-	    printf("0\n");
-	}
+	printf("%s\n", buf);
 	return;
 }
 
@@ -227,17 +280,26 @@ print_rpm_release(void)
 int
 main(int argc, char *argv[])
 {
-    program = argv[0];
-    if (argc == 2 && strcmp(argv[1], "-R") == 0) {
-	print_rpm_version_release();
-    } else if (argc == 2 && strcmp(argv[1], "-v") == 0) {
-	print_rpm_version();
-    } else if (argc == 2 && strcmp(argv[1], "-r") == 0) {
-	print_rpm_release();
-    } else {
-	printf("%s\n", version());
-    }
-    return 0;
+	program = argv[0];
+	if (argc == 3 && strcmp(argv[1], "-r") == 0) {
+		print_rpm_version(argv[2]);
+
+	} else if (argc == 3 && strcmp(argv[1], "-R") == 0) {
+		print_rpm_release(argv[2]);
+
+	} else if (argc == 2 && strcmp(argv[1], "-V") == 0) {
+		print_rpm_major();
+
+	} else if (argc == 1) {
+		printf("%s\n", version());
+
+	} else {
+		fprintf(stderr,
+		    "usage: %s [-V] [-R release_file] [-r release_file]\n",
+		    program);
+		exit(4);
+	}
+	return 0;
 }
 
 #endif /* CALC_VER */

zmath.h

@@ -17,8 +17,8 @@
  * received a copy with calc; if not, write to Free Software Foundation, Inc.
  * 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
  *
- * @(#) $Revision: 29.6 $
- * @(#) $Id: zmath.h,v 29.6 2001/05/29 00:16:53 chongo Exp $
+ * @(#) $Revision: 29.7 $
+ * @(#) $Id: zmath.h,v 29.7 2001/06/08 21:00:58 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/zmath.h,v $
  *
  * Under source code control:	1993/07/30 19:42:48
@@ -38,7 +38,7 @@
 #define __ZMATH_H__
 
 
-#if defined(SRC)	/* if we are building from the calc source tree */
+#if defined(CALC_SRC)	/* if we are building from the calc source tree */
 # include "win32dll.h"
 # include "alloc.h"
 # include "endian_calc.h"

zrand.h

@@ -17,8 +17,8 @@
  * received a copy with calc; if not, write to Free Software Foundation, Inc.
  * 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
  *
- * @(#) $Revision: 29.4 $
- * @(#) $Id: zrand.h,v 29.4 2001/05/29 00:16:53 chongo Exp $
+ * @(#) $Revision: 29.5 $
+ * @(#) $Id: zrand.h,v 29.5 2001/06/08 21:00:58 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/zrand.h,v $
  *
  * Under source code control:	1995/01/07 09:45:26
@@ -37,7 +37,7 @@
 #define __ZRAND_H__
 
 
-#if defined(SRC)	/* if we are building from the calc source tree */
+#if defined(CALC_SRC)	/* if we are building from the calc source tree */
 # include "value.h"
 # include "have_const.h"
 #else

zrandom.h

@@ -17,8 +17,8 @@
  * received a copy with calc; if not, write to Free Software Foundation, Inc.
  * 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
  *
- * @(#) $Revision: 29.3 $
- * @(#) $Id: zrandom.h,v 29.3 2001/05/29 00:16:53 chongo Exp $
+ * @(#) $Revision: 29.4 $
+ * @(#) $Id: zrandom.h,v 29.4 2001/06/08 21:00:58 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/zrandom.h,v $
  *
  * Under source code control:	1997/02/15 04:01:56
@@ -33,7 +33,7 @@
 #define __ZRANDOM_H__
 
 
-#if defined(SRC)	/* if we are building from the calc source tree */
+#if defined(CALC_SRC)	/* if we are building from the calc source tree */
 # include "value.h"
 # include "have_const.h"
 #else