Release calc version 2.11.5.8

CHANGES

@@ -20,6 +20,7 @@ The following are the changes from calc version 2.11.5.5 to date:
 
     Removed an obsolete reference to TOPDIR.  This was fixed thanks to
     a bug report by Clifford Kite <kite_public1 at ev1 dot net>.
+    Fixed other inconsistencies related to things like BINDIR.
 
     Fixed calc man page so that is refers to -f instead of the old -S flag.
     Fixed thanks to Clifford Kite <kite_public1 at ev1 dot net> for
@@ -50,6 +51,12 @@ The following are the changes from calc version 2.11.5.5 to date:
     We appreciate their work in this regard.  In the next release, we
     plan to also build and release our own RPMs based on their efforts.
 
+    Changed the Makefile variable CUSTOMLIBDIR to CUSTOMCALDIR.
+    Changed the Makefile variable CSHAREDIR to CALC_SHAREDIR.
+    Changed the Makefile variable INCDIRCALC to CALC_INCDIR.
+    Removed the Makefile variable SHAREDIR.
+
+    Updated the HOWTO.INSTALL and README.WINDOWS files.
 
 The following are the changes from calc version 2.11.5t4.1 to 2.11.5t4.4:
 
@@ -5411,8 +5418,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.46 $
+## @(#) $Revision: 29.48 $
-## @(#) $Id: CHANGES,v 29.46 2002/03/12 10:58:31 chongo Exp $
+## @(#) $Id: CHANGES,v 29.48 2002/03/14 00:28:28 chongo Exp $
 ## @(#) $Source: /usr/local/src/cmd/calc/RCS/CHANGES,v $
 ##
 ## Under source code control:	1993/06/02 18:12:57

HOWTO.INSTALL

@@ -1,50 +1,105 @@
 Installing calc in 4 easy steps:
 
-    1) Look at the makefile, and adjust it to suit your needs.
+    1)	Look at the makefile, and adjust it to suit your needs.
 
-       Here are some Makefile hints:
+	The Makefile, as shipped, is suitable for installation under
+	Linux and Un*x-like environments.  For the most part, the default
+	values should work.  If in doubt, follow the 'When in doubt'
+	suggestion.
 
-	   Select a compiler set by commenting in the appropriate set
+	!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-	   of cc options.  As shipped the Makefile assumes a gcc-like
+	! If you are building under Windoz or a Windoz-like environment !
-	   environment such as Linux.  If a more appropriate cc set if
+	! (such as Cygwin or DJGPP), read the README.WINDOWS file.      !
-	   found below, comment out the Linux set and comment in that
+	!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-	   set or edit the gcc set or the common cc set as needed.
 
-	   You may or may not need RANLIB when building libraries.
+	You should determine if these Makefile variables are reasonable:
-	   As shipped the Makefile assumes RANLIB is needed.
-	   Comment the in/out the RANLIB value if ranlib does
-	   not work or does not exist.
 
-	   You may want to change the default pager used by calc.
+	    INCDIR		Where the system include (.h) files are kept.
-	   As shipped the Makefile assumes 'more'.  On your system
+	    BINDIR		Where to install calc binary files.
-	   you may find 'less' to be a better pager.
+	    LIBDIR		Where to install calc link library (*.a) files.
+	    CALC_SHAREDIR	Where to install calc help, .cal, startup, and
+	    			config files.
 
-	   Set BINDIR to the directory where calc is installed.
+	You may want to change the default installation locations for
-	   As shipped the Makefile assumes BINDIR is /usr/local/bin.
+	these values, which are based on the 4 values listed above:
 
-	   Set SHAREDIR to the place where shared files are kept.
+	    HELPDIR            where the help directory is installed
-	   As shipped the Makefile assumes that SHAREDIR is /usr/share.
+	    CALC_INCDIR        where the calc include files are installed
-	   Calc places its shared files under ${SHAREDIR}/calc.
+	    CUSTOMCALDIR       where custom *.cal files are installed
+	    CUSTOMHELPDIR      where custom help files are installed
+	    CUSTOMINCPDIR      where custom .h files are installed
+	    SCRIPTDIR          where calc shell scripts are installed
 
-	   Set INCDIR to the place where .h header files are kept.
+	If you want to install calc files under a top level directory,
-	   As shipped the Makefile assumes that INCDIR is /usr/include.
+	then set the T value:
-	   Calc places its .h header files under ${INCDIR}/calc.
 
-	   Set LIBDIR to be the place under which help files, calc,
+	    The calc install is performed under $T, the calc build is
-	   include files and calc libs are to be installed.
+	    performed under /.	The purpose for $T is to allow someone
-	   As shipped the Makefile assumes a LIBDIR of /usr/lib.
+	    to install calc somewhere other than into the system area.
-	   The calc library is installed as ${LIBDIR}/libcalc.a.
 
-	   Some compilers (to put it mildly) have bugs.  Sometimes the
+	    For example, if:
-	   DEBUG Makefile variable causes the compiler / optimizer to
+
-	   produce bad code.  Other compilers do just fine.  If possible
+	    	BINDIR= /usr/bin
-	   try to use DEBUG=-O3 -g3 (maximum optimization and debug symbols).
+		LIBDIR= /usr/lib
-	   If the calc test fails (see step 3), try lowering either the
+		CALC_SHAREDIR= /usr/share/calc
-	   -O value and/or the -g3.  Also try using -Osomething without -g.
+
+	    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.
+
+	Look for the section that starts:
+
+	    ################
+	    # compiler set #
+	    ################
+
+	    Select a compiler set by commenting in the appropriate set
+	    of cc options.  As shipped the Makefile assumes a gcc-like
+	    environment such as Linux.  If a more appropriate cc set if
+	    found below, comment out the Linux set and comment in that
+	    set or edit the gcc set or the common cc set as needed.
+
+	You may want to change these Makrfile variables from their defaults:
+
+	    RANLIB
+
+		You may or may not need RANLIB when building libraries.
+		As shipped the Makefile assumes RANLIB is needed.
+		Comment the in/out the RANLIB value if ranlib does
+		not work or does not exist.
+
+	    CALCPAGER
+
+		You may want to change the default pager used by calc.
+		As shipped the Makefile assumes 'more'.  On your system
+		you may find 'less' to be a better pager.
+
+	    DEBUG
+
+	       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:
+    2)	build calc:
 
 	make all
 
@@ -52,13 +107,14 @@ Installing calc in 4 easy steps:
 	    you may find.  See the BUGS file if you find any compiler
 	    warning or errors.
 
-    3) test calc:
+    3)	test calc:
 
 	make check
 
-	==> If you run into problems, follow the BUGS file instructions.
+	==> If you run into problems, read the BUGS file and follow
+	    the instructions found in there.
 
-    4) install calc:
+    4)	install calc:
 
 	make install
 
@@ -81,8 +137,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.4 $
+## @(#) $Revision: 29.6 $
-## @(#) $Id: HOWTO.INSTALL,v 29.4 2002/03/12 09:03:17 chongo Exp $
+## @(#) $Id: HOWTO.INSTALL,v 29.6 2002/03/14 00:28:28 chongo Exp $
 ## @(#) $Source: /usr/local/src/cmd/calc/RCS/HOWTO.INSTALL,v $
 ##
 ## Under source code control:	1999/09/27 20:48:44

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.46 $$
+MAKEFILE_REV= $$Revision: 29.47 $$
-# @(#) $Id: Makefile.ship,v 29.46 2002/03/12 10:43:05 chongo Exp $
+# @(#) $Id: Makefile.ship,v 29.47 2002/03/14 00:28:28 chongo Exp $
 # @(#) $Source: /usr/local/src/cmd/calc/RCS/Makefile.ship,v $
 #
 # Under source code control:	1990/02/15 01:48:41
@@ -541,89 +541,114 @@ HAVE_UNISTD_H=
 #HAVE_UNISTD_H= YES
 #HAVE_UNISTD_H= NO
 
-# where to install the *.cal, *.h and *.a files
+# System include files
 #
-# These 4 values control where things are installed
+# ${INCDIR}		where the system include (.h) files are kept
-# -------------------------------------------------
-# ${BINDIR}		where to install binary files
-# ${SHAREDIR}		where most common shared files are kept
-# ${INCDIR}		where most .h files are kept
-# ${LIBDIR}		where *.a files are installed
 #
 # For DJGPP, select:
 #
-#	BINDIR= /dev/env/DJDIR/bin
-#	SHAREDIR= /dev/env/DJDIR/share
 #	INCDIR= /dev/env/DJDIR/include
-#	LIBDIR= /dev/env/DJDIR/lib
 #
 # If in doubt, set:
 #
-#	BINDIR= /usr/bin
-#	SHAREDIR= /usr/share
 #	INCDIR= /usr/include
-#	LIBDIR= /usr/lib
 #
-#BINDIR= /usr/local/bin
-#BINDIR= /dev/env/DJDIR/bin
-BINDIR= /usr/bin
-
-#SHAREDIR= /usr/local/lib
-#SHAREDIR= /dev/env/DJDIR/share
-SHAREDIR= /usr/share
 
 #INCDIR= /usr/local/include
 #INCDIR= /dev/env/DJDIR/include
 INCDIR= /usr/include
 
+# Where to install calc realted 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= /usr/local/bin
+#BINDIR= /dev/env/DJDIR/bin
+BINDIR= /usr/bin
+
 #LIBDIR= /usr/local/lib
 #LIBDIR= /dev/env/DJDIR/lib
 LIBDIR= /usr/lib
 
-# By default, these values are based on the above 4 values
+#CALC_SHAREDIR= /usr/local/lib/calc
-# --------------------------------------------------------
+#CALC_SHAREDIR= /dev/env/DJDIR/share/calc
-# ${CSHAREDIR}		where most common shared calc files are kept
+CALC_SHAREDIR= /usr/share/calc
+
+# By default, these values are based CALC_SHAREDIR, INCDIR, BINDIR
+# ---------------------------------------------------------------
 # ${HELPDIR}		where the help directory is installed
-# ${INCDIRCALC}		where the calc include files are installed
+# ${CALC_INCDIR}	where the calc include files are installed
-# ${CUSTOMLIBDIR}	where custom *.cal files are installed
+# ${CUSTOMCALDIR}	where custom *.cal files are installed
 # ${CUSTOMHELPDIR}	where custom help files are installed
 # ${CUSTOMINCPDIR}	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:
 #
-#	CSHAREDIR= ${SHAREDIR}/calc
+#	HELPDIR= ${CALC_SHAREDIR}/help
-#	HELPDIR= ${CSHAREDIR}/help
+#	CALC_INCDIR= ${INCDIR}/calc
-#	INCDIRCALC= ${INCDIR}/calc
+#	CUSTOMCALDIR= ${CALC_SHAREDIR}/custom
-#	CUSTOMLIBDIR= ${CSHAREDIR}/custom
+#	CUSTOMHELPDIR= ${CALC_SHAREDIR}/custhelp
-#	CUSTOMHELPDIR= ${CSHAREDIR}/custhelp
+#	CUSTOMINCDIR= ${CALC_INCDIR}/custom
-#	CUSTOMINCDIR= ${INCDIRCALC}/custom
 #	SCRIPTDIR= ${BINDIR}/cscript
 #
-CSHAREDIR= ${SHAREDIR}/calc
+HELPDIR= ${CALC_SHAREDIR}/help
-HELPDIR= ${CSHAREDIR}/help
+CALC_INCDIR= ${INCDIR}/calc
-INCDIRCALC= ${INCDIR}/calc
+CUSTOMCALDIR= ${CALC_SHAREDIR}/custom
-CUSTOMLIBDIR= ${CSHAREDIR}/custom
+CUSTOMHELPDIR= ${CALC_SHAREDIR}/custhelp
-CUSTOMHELPDIR= ${CSHAREDIR}/custhelp
+CUSTOMINCDIR= ${CALC_INCDIR}/custom
-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
+# performed under /.	The purpose for $T is to allow someone
-# directory being ${HELPDIR}.  Howeever calc help files are
+# to install calc somewhere other than into the system area.
-# installed under $T${HELPDIR}.
+#
+# 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.
 #
-# 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=
@@ -710,18 +735,18 @@ CATMODE= 0444
 # If the $CALCPATH environment variable is not defined, then the following
 # path will be search for calc resource file routines.
 #
-# Select CALCPATH= .;./cal;~/.cal;${CSHAREDIR};${CUSTOMLIBDIR} for DJGPP.
+# Select CALCPATH= .;./cal;~/.cal;${CALC_SHAREDIR};${CUSTOMCALDIR} for DJGPP.
 #
-CALCPATH= .:./cal:~/.cal:${CSHAREDIR}:${CUSTOMLIBDIR}
+CALCPATH= .:./cal:~/.cal:${CALC_SHAREDIR}:${CUSTOMCALDIR}
-#CALCPATH= .;./cal;~/.cal;${CSHAREDIR};${CUSTOMLIBDIR}
+#CALCPATH= .;./cal;~/.cal;${CALC_SHAREDIR};${CUSTOMCALDIR}
 
 # If the $CALCRC environment variable is not defined, then the following
 # path will be search for calc resource files.
 #
-# Select CALCRC= ${CSHAREDIR}/startup;~/.calcrc;./.calcinit for DJGPP.
+# Select CALCRC= ${CALC_SHAREDIR}/startup;~/.calcrc;./.calcinit for DJGPP.
 #
-CALCRC= ${CSHAREDIR}/startup:~/.calcrc:./.calcinit
+CALCRC= ${CALC_SHAREDIR}/startup:~/.calcrc:./.calcinit
-#CALCRC= ${CSHAREDIR}/startup;~/.calcrc;./.calcinit
+#CALCRC= ${CALC_SHAREDIR}/startup;~/.calcrc;./.calcinit
 
 # Determine of the GNU-readline facility will be used instead of the
 # built-in calc binding method.
@@ -899,7 +924,9 @@ CALC_ENV= CALCPATH=./cal
 ALLOW_CUSTOM= -DCUSTOM
 #ALLOW_CUSTOM=
 
-###
+################
+# compiler set #
+################
 #
 # Select your compiler type by commenting out one of the cc sets below:
 #
@@ -1253,14 +1280,16 @@ UTIL_PROGS= align32 fposval have_uid_t longlong have_const \
 # The complete list of Makefile vars passed down to custom/Makefile.
 #
 CUSTOM_PASSDOWN= Q="${Q}" \
-    SHAREDIR="${SHAREDIR}" \
     INCDIR="${INCDIR}" \
-    CSHAREDIR="${CSHAREDIR}" \
+    BINDIR="${BINDIR}" \
+    LIBDIR="${LIBDIR}" \
+    CALC_SHAREDIR="${CALC_SHAREDIR}" \
     HELPDIR="${HELPDIR}" \
-    INCDIRCALC="${INCDIRCALC}" \
+    CALC_INCDIR="${CALC_INCDIR}" \
-    CUSTOMLIBDIR="${CUSTOMLIBDIR}" \
+    CUSTOMCALDIR="${CUSTOMCALDIR}" \
     CUSTOMHELPDIR="${CUSTOMHELPDIR}" \
     CUSTOMINCDIR="${CUSTOMINCDIR}" \
+    SCRIPTDIR="${SCRIPTDIR}" \
     DEBUG="${DEBUG}" \
     NO_SHARED="${NO_SHARED}" \
     RANLIB="${RANLIB}" \
@@ -1287,12 +1316,16 @@ CUSTOM_PASSDOWN= Q="${Q}" \
 # The complete list of Makefile vars passed down to sample/Makefile.
 #
 SAMPLE_PASSDOWN= Q="${Q}" \
-    BINDIR="${BINDIR}" \
-    SHAREDIR="${SHAREDIR}" \
     INCDIR="${INCDIR}" \
+    BINDIR="${BINDIR}" \
     LIBDIR="${LIBDIR}" \
-    CSHAREDIR="${CSHAREDIR}" \
+    CALC_SHAREDIR="${CALC_SHAREDIR}" \
     HELPDIR="${HELPDIR}" \
+    CALC_INCDIR="${CALC_INCDIR}" \
+    CUSTOMCALDIR="${CUSTOMCALDIR}" \
+    CUSTOMHELPDIR="${CUSTOMHELPDIR}" \
+    CUSTOMINCDIR="${CUSTOMINCDIR}" \
+    SCRIPTDIR="${SCRIPTDIR}" \
     DEBUG="${DEBUG}" \
     NO_SHARED="${NO_SHARED}" \
     RANLIB="${RANLIB}" \
@@ -1320,12 +1353,16 @@ SAMPLE_PASSDOWN= Q="${Q}" \
 # The compelte list of Makefile vars passed down to help/Makefile.
 #
 HELP_PASSDOWN= Q="${Q}" \
-    SHAREDIR="${SHAREDIR}" \
     INCDIR="${INCDIR}" \
+    BINDIR="${BINDIR}" \
     LIBDIR="${LIBDIR}" \
-    CSHAREDIR="${CSHAREDIR}" \
+    CALC_SHAREDIR="${CALC_SHAREDIR}" \
     HELPDIR="${HELPDIR}" \
-    INCDIRCALC="${INCDIRCALC}" \
+    CALC_INCDIR="${CALC_INCDIR}" \
+    CUSTOMCALDIR="${CUSTOMCALDIR}" \
+    CUSTOMHELPDIR="${CUSTOMHELPDIR}" \
+    CUSTOMINCDIR="${CUSTOMINCDIR}" \
+    SCRIPTDIR="${SCRIPTDIR}" \
     ICFLAGS="${ICFLAGS}" \
     ILDFLAGS="${ILDFLAGS}" \
     LCC="${LCC}" \
@@ -1340,8 +1377,16 @@ HELP_PASSDOWN= Q="${Q}" \
 # The compelte list of Makefile vars passed down to cal/Makefile.
 #
 CAL_PASSDOWN= Q="${Q}" \
-    SHAREDIR="${SHAREDIR}" \
+    INCDIR="${INCDIR}" \
-    CSHAREDIR="${CSHAREDIR}" \
+    BINDIR="${BINDIR}" \
+    LIBDIR="${LIBDIR}" \
+    CALC_SHAREDIR="${CALC_SHAREDIR}" \
+    HELPDIR="${HELPDIR}" \
+    CALC_INCDIR="${CALC_INCDIR}" \
+    CUSTOMCALDIR="${CUSTOMCALDIR}" \
+    CUSTOMHELPDIR="${CUSTOMHELPDIR}" \
+    CUSTOMINCDIR="${CUSTOMINCDIR}" \
+    SCRIPTDIR="${SCRIPTDIR}" \
     MAKE_FILE=${MAKE_FILE} \
     CHMOD=${CHMOD} \
     CMP=${CMP} \
@@ -1351,7 +1396,15 @@ CAL_PASSDOWN= Q="${Q}" \
 # The compelte list of Makefile vars passed down to cscript/Makefile.
 #
 CSCRIPT_PASSDOWN= Q="${Q}" \
+    INCDIR="${INCDIR}" \
     BINDIR="${BINDIR}" \
+    LIBDIR="${LIBDIR}" \
+    CALC_SHAREDIR="${CALC_SHAREDIR}" \
+    HELPDIR="${HELPDIR}" \
+    CALC_INCDIR="${CALC_INCDIR}" \
+    CUSTOMCALDIR="${CUSTOMCALDIR}" \
+    CUSTOMHELPDIR="${CUSTOMHELPDIR}" \
+    CUSTOMINCDIR="${CUSTOMINCDIR}" \
     SCRIPTDIR="${SCRIPTDIR}" \
     MAKE_FILE=${MAKE_FILE} \
     CHMOD=${CHMOD} \
@@ -1445,8 +1498,8 @@ calc.1: calc.man ${MAKE_FILE}
 	       -e 's,$${BINDIR},${BINDIR},g' \
 	       -e 's,$${CALCPATH},${CALCPATH},g' \
 	       -e 's,$${SCRIPTDIR},${SCRIPTDIR},g' \
-	       -e 's,$${INCDIRCALC},${INCDIRCALC},g' \
+	       -e 's,$${CALC_INCDIR},${CALC_INCDIR},g' \
-	       -e 's,$${CUSTOMLIBDIR},${CUSTOMLIBDIR},g' \
+	       -e 's,$${CUSTOMCALDIR},${CUSTOMCALDIR},g' \
 	       -e 's,$${CUSTOMINCDIR},${CUSTOMINCDIR},g' \
 	       -e 's,$${CUSTOMHELPDIR},${CUSTOMHELPDIR},g' \
 	       -e 's,$${CALCRC},${CALCRC},g' < calc.man > calc.1
@@ -1569,6 +1622,15 @@ endian_calc.h: endian ${MAKE_FILE}
 	    elif [ -f ${INCDIR}/sys/endian.h ]; then \
 		echo '#include <sys/endian.h>' >> endian_calc.h; \
 		echo '#define CALC_BYTE_ORDER BYTE_ORDER' >> endian_calc.h; \
+	    elif [ -f /usr/include/endian.h ]; then \
+		echo '#include <endian.h>' >> endian_calc.h; \
+		echo '#define CALC_BYTE_ORDER BYTE_ORDER' >> endian_calc.h; \
+	    elif [ -f /usr/include/machine/endian.h ]; then \
+		echo '#include <machine/endian.h>' >> endian_calc.h; \
+		echo '#define CALC_BYTE_ORDER BYTE_ORDER' >> endian_calc.h; \
+	    elif [ -f /usr/include/sys/endian.h ]; then \
+		echo '#include <sys/endian.h>' >> endian_calc.h; \
+		echo '#define CALC_BYTE_ORDER BYTE_ORDER' >> endian_calc.h; \
 	    else \
 		./endian >> endian_calc.h; \
 	    fi; \
@@ -1628,13 +1690,15 @@ have_malloc.h: ${MAKE_FILE}
 	${Q}echo '#define __HAVE_MALLOC_H__' >> have_malloc.h
 	${Q}echo '' >> have_malloc.h
 	${Q}echo '' >> have_malloc.h
-	${Q}echo '/* do we have ${INCDIR}/malloc.h? */' >> have_malloc.h
+	${Q}echo '/* do we have <malloc.h>? */' >> have_malloc.h
 	-${Q}if [ X"${HAVE_MALLOC_H}" = X"YES" ]; then \
 	    echo '#define HAVE_MALLOC_H	 /* yes */' >> have_malloc.h; \
 	elif [ X"${HAVE_MALLOC_H}" = X"NO" ]; then \
 	    echo '#undef HAVE_MALLOC_H	/* no */' >> have_malloc.h; \
 	elif [ -f ${INCDIR}/malloc.h ]; then \
 	    echo '#define HAVE_MALLOC_H	 /* yes */' >> have_malloc.h; \
+	elif [ -f /usr/include/malloc.h ]; then \
+	    echo '#define HAVE_MALLOC_H	 /* yes */' >> have_malloc.h; \
 	else \
 	    echo '#undef HAVE_MALLOC_H	/* no */' >> have_malloc.h; \
 	fi
@@ -1664,13 +1728,15 @@ have_times.h: ${MAKE_FILE}
 	${Q}echo '#define __HAVE_TIMES_H__' >> have_times.h
 	${Q}echo '' >> have_times.h
 	${Q}echo '' >> have_times.h
-	${Q}echo '/* do we have ${INCDIR}/times.h? */' >> have_times.h
+	${Q}echo '/* do we have <times.h>? */' >> have_times.h
 	-${Q}if [ X"${HAVE_TIMES_H}" = X"YES" ]; then \
 	    echo '#define HAVE_TIMES_H	/* yes */' >> have_times.h; \
 	elif [ X"${HAVE_TIMES_H}" = X"NO" ]; then \
 	    echo '#undef HAVE_TIMES_H  /* no */' >> have_times.h; \
 	elif [ -f ${INCDIR}/times.h ]; then \
 	    echo '#define HAVE_TIMES_H	/* yes */' >> have_times.h; \
+	elif [ -f /usr/include/times.h ]; then \
+	    echo '#define HAVE_TIMES_H	/* yes */' >> have_times.h; \
 	else \
 	    echo '#undef HAVE_TIMES_H  /* no */' >> have_times.h; \
 	fi
@@ -1680,6 +1746,8 @@ have_times.h: ${MAKE_FILE}
 	    echo '#undef HAVE_SYS_TIMES_H  /* no */' >> have_times.h; \
 	elif [ -f ${INCDIR}/sys/times.h ]; then \
 	    echo '#define HAVE_SYS_TIMES_H  /* yes */' >> have_times.h; \
+	elif [ -f /usr/include/sys/times.h ]; then \
+	    echo '#define HAVE_SYS_TIMES_H  /* yes */' >> have_times.h; \
 	else \
 	    echo '#undef HAVE_SYS_TIMES_H  /* no */' >> have_times.h; \
 	fi
@@ -1689,6 +1757,8 @@ have_times.h: ${MAKE_FILE}
 	    echo '#undef HAVE_TIME_H  /* no */' >> have_times.h; \
 	elif [ -f ${INCDIR}/time.h ]; then \
 	    echo '#define HAVE_TIME_H  /* yes */' >> have_times.h; \
+	elif [ -f /usr/include/time.h ]; then \
+	    echo '#define HAVE_TIME_H  /* yes */' >> have_times.h; \
 	else \
 	    echo '#undef HAVE_TIME_H  /* no */' >> have_times.h; \
 	fi
@@ -1698,6 +1768,8 @@ have_times.h: ${MAKE_FILE}
 	    echo '#undef HAVE_SYS_TIME_H  /* no */' >> have_times.h; \
 	elif [ -f ${INCDIR}/sys/time.h ]; then \
 	    echo '#define HAVE_SYS_TIME_H  /* yes */' >> have_times.h; \
+	elif [ -f /usr/include/sys/time.h ]; then \
+	    echo '#define HAVE_SYS_TIME_H  /* yes */' >> have_times.h; \
 	else \
 	    echo '#undef HAVE_SYS_TIME_H  /* no */' >> have_times.h; \
 	fi
@@ -1727,13 +1799,15 @@ have_stdlib.h: ${MAKE_FILE}
 	${Q}echo '#define __HAVE_STDLIB_H__' >> have_stdlib.h
 	${Q}echo '' >> have_stdlib.h
 	${Q}echo '' >> have_stdlib.h
-	${Q}echo '/* do we have ${INCDIR}/stdlib.h? */' >> have_stdlib.h
+	${Q}echo '/* do we have <stdlib.h>? */' >> have_stdlib.h
 	-${Q}if [ X"${HAVE_STDLIB_H}" = X"YES" ]; then \
 	    echo '#define HAVE_STDLIB_H	/* yes */' >> have_stdlib.h; \
 	elif [ X"${HAVE_STDLIB_H}" = X"NO" ]; then \
 	    echo '#undef HAVE_STDLIB_H  /* no */' >> have_stdlib.h; \
 	elif [ -f ${INCDIR}/stdlib.h ]; then \
 	    echo '#define HAVE_STDLIB_H	 /* yes */' >> have_stdlib.h; \
+	elif [ -f /usr/include/stdlib.h ]; then \
+	    echo '#define HAVE_STDLIB_H	 /* yes */' >> have_stdlib.h; \
 	else \
 	    echo '#undef HAVE_STDLIB_H	/* no */' >> have_stdlib.h; \
 	fi
@@ -1763,13 +1837,15 @@ have_unistd.h: ${MAKE_FILE}
 	${Q}echo '#define __HAVE_UNISTD_H__' >> have_unistd.h
 	${Q}echo '' >> have_unistd.h
 	${Q}echo '' >> have_unistd.h
-	${Q}echo '/* do we have ${INCDIR}/unistd.h? */' >> have_unistd.h
+	${Q}echo '/* do we have <unistd.h>? */' >> have_unistd.h
 	-${Q}if [ X"${HAVE_UNISTD_H}" = X"YES" ]; then \
 	    echo '#define HAVE_UNISTD_H	/* yes */' >> have_unistd.h; \
 	elif [ X"${HAVE_UNISTD_H}" = X"NO" ]; then \
 	    echo '#undef HAVE_UNISTD_H  /* no */' >> have_unistd.h; \
 	elif [ -f ${INCDIR}/unistd.h ]; then \
 	    echo '#define HAVE_UNISTD_H	 /* yes */' >> have_unistd.h; \
+	elif [ -f /usr/include/unistd.h ]; then \
+	    echo '#define HAVE_UNISTD_H	 /* yes */' >> have_unistd.h; \
 	else \
 	    echo '#undef HAVE_UNISTD_H	/* no */' >> have_unistd.h; \
 	fi
@@ -1799,13 +1875,15 @@ have_string.h: ${MAKE_FILE}
 	${Q}echo '#define __HAVE_STRING_H__' >> have_string.h
 	${Q}echo '' >> have_string.h
 	${Q}echo '' >> have_string.h
-	${Q}echo '/* do we have ${INCDIR}/string.h? */' >> have_string.h
+	${Q}echo '/* do we have <string.h>? */' >> have_string.h
 	-${Q}if [ X"${HAVE_STRING_H}" = X"YES" ]; then \
 	    echo '#define HAVE_STRING_H	/* yes */' >> have_string.h; \
 	elif [ X"${HAVE_STRING_H}" = X"NO" ]; then \
 	    echo '#undef HAVE_STRING_H  /* no */' >> have_string.h; \
 	elif [ -f ${INCDIR}/string.h ]; then \
 	    echo '#define HAVE_STRING_H	 /* yes */' >> have_string.h; \
+	elif [ -f /usr/include/string.h ]; then \
+	    echo '#define HAVE_STRING_H	 /* yes */' >> have_string.h; \
 	else \
 	    echo '#undef HAVE_STRING_H	/* no */' >> have_string.h; \
 	fi
@@ -1854,6 +1932,16 @@ terminal.h: ${MAKE_FILE}
 	    echo '#undef USE_TERMIOS   /* <termios.h> */' >> terminal.h; \
 	    echo '#define USE_TERMIO   /* <termio.h> */' >> terminal.h; \
 	    echo '#undef USE_SGTTY     /* <sys/ioctl.h> */' >> terminal.h; \
+	elif [ -f /usr/include/termios.h ]; then \
+	    echo '/* use termios */' >> terminal.h; \
+	    echo '#define USE_TERMIOS  /* <termios.h> */' >> terminal.h; \
+	    echo '#undef USE_TERMIO    /* <termio.h> */' >> terminal.h; \
+	    echo '#undef USE_SGTTY     /* <sys/ioctl.h> */' >> terminal.h; \
+	elif [ -f /usr/include/termio.h ]; then \
+	    echo '/* use termio */' >> terminal.h; \
+	    echo '#undef USE_TERMIOS   /* <termios.h> */' >> terminal.h; \
+	    echo '#define USE_TERMIO   /* <termio.h> */' >> terminal.h; \
+	    echo '#undef USE_SGTTY     /* <sys/ioctl.h> */' >> terminal.h; \
 	else \
 	    echo '/* use sgtty */' >> terminal.h; \
 	    echo '#undef USE_TERMIOS   /* <termios.h> */' >> terminal.h; \
@@ -3108,11 +3196,10 @@ env:
 	@echo 'HAVE_URANDOM=${HAVE_URANDOM}'; echo ''
 	@echo 'ALIGN32=${ALIGN32}'; echo ''
 	@echo 'BINDIR=${BINDIR}'; echo ''
-	@echo 'SHAREDIR=${SHAREDIR}'; echo ''
+	@echo 'CALC_SHAREDIR=${CALC_SHAREDIR}'; echo ''
-	@echo 'CSHAREDIR=${CSHAREDIR}'; echo ''
 	@echo 'LIBDIR=${LIBDIR}'; echo ''
 	@echo 'HELPDIR=${HELPDIR}'; echo ''
-	@echo 'CUSTOMLIBDIR=${CUSTOMLIBDIR}'; echo ''
+	@echo 'CUSTOMCALDIR=${CUSTOMCALDIR}'; echo ''
 	@echo 'CUSTOMINCDIR=${CUSTOMINCDIR}'; echo ''
 	@echo 'CUSTOMHELPDIR=${CUSTOMHELPDIR}'; echo ''
 	@echo 'SCRIPTDIR=${SCRIPTDIR}'; echo ''
@@ -3260,13 +3347,12 @@ calc.spec: spec-template ${MAKE_FILE} help/Makefile cal/Makefile \
 	${V} echo '=-=-=-=-= start of $@ rule =-=-=-=-='
 	${Q}rm -f calc.spec calc.spec.sed
 	${Q}echo 's,$${BINDIR},${BINDIR},g' >> calc.spec.sed
-	${Q}echo 's:$${SHAREDIR}:${SHAREDIR}:g' >> calc.spec.sed
 	${Q}echo 's,$${INCDIR},${INCDIR},g' >> calc.spec.sed
 	${Q}echo 's:$${LIBDIR}:${LIBDIR}:g' >> calc.spec.sed
-	${Q}echo 's:$${CSHAREDIR}:${CSHAREDIR}:g' >> calc.spec.sed
+	${Q}echo 's:$${CALC_SHAREDIR}:${CALC_SHAREDIR}:g' >> calc.spec.sed
 	${Q}echo 's,$${HELPDIR},${HELPDIR},g' >> calc.spec.sed
-	${Q}echo 's,$${INCDIRCALC},${INCDIRCALC},g' >> calc.spec.sed
+	${Q}echo 's,$${CALC_INCDIR},${CALC_INCDIR},g' >> calc.spec.sed
-	${Q}echo 's,$${CUSTOMLIBDIR},${CUSTOMLIBDIR},g' >> calc.spec.sed
+	${Q}echo 's,$${CUSTOMCALDIR},${CUSTOMCALDIR},g' >> calc.spec.sed
 	${Q}echo 's,$${CUSTOMINCDIR},${CUSTOMINCDIR},g' >> calc.spec.sed
 	${Q}echo 's,$${CUSTOMHELPDIR},${CUSTOMHELPDIR},g' >> calc.spec.sed
 	${Q}echo 's,$${SCRIPTDIR},${SCRIPTDIR},g' >> calc.spec.sed
@@ -3312,7 +3398,7 @@ inst_files: ${MAKE_FILE} help/Makefile cal/Makefile custom/Makefile \
 	${Q}echo ${LIBDIR}/libcalc.a >> inst_files
 	${Q}for i in ${LIB_H_SRC} ${BUILD_H_SRC} /dev/null; do \
 	    if [ X"$$i" != X"/dev/null" ]; then \
-		echo ${INCDIRCALC}/$$i; \
+		echo ${CALC_INCDIR}/$$i; \
 	    fi; \
 	done >> inst_files
 	${Q}if [ ! -z "${MANDIR}" ]; then \
@@ -3350,7 +3436,7 @@ rpm.mk.patch: Makefile.linux ${MAKE_FILE}
 
 # The olduninstall rule will remove calc files from the older, histroic
 # locations under the /usr/local directory.  If you are using the
-# new default values for ${BINDIR}, ${SHAREDIR}, ${INCDIR} and ${LIBDIR}
+# new default values for ${BINDIR}, ${CALC_SHAREDIR}, ${INCDIR} and ${LIBDIR}
 # then you can use this rule to clean out the older calc stuff under
 # the /usr/local directory.
 #
@@ -3358,13 +3444,12 @@ olduninstall:
 	-rm -f inst_files
 	${MAKE} -f Makefile \
 		BINDIR=/usr/local/bin \
-		SHAREDIR=/usr/local/lib \
 		INCDIR=/usr/local/include \
 		LIBDIR=/usr/local/lib/calc \
-		CSHAREDIR=/usr/local/lib/calc \
+		CALC_SHAREDIR=/usr/local/lib/calc \
 		HELPDIR=/usr/local/lib/calc/help \
-		INCDIRCALC=/usr/local/include/calc \
+		CALC_INCDIR=/usr/local/include/calc \
-		CUSTOMLIBDIR=/usr/local/lib/calc/custom \
+		CUSTOMCALDIR=/usr/local/lib/calc/custom \
 		CUSTOMHELPDIR=/usr/local/lib/calc/help/custhelp \
 		CUSTOMINCDIR=/usr/local/lib/calc/custom \
 		SCRIPTDIR=/usr/local/bin/cscript \
@@ -3478,18 +3563,6 @@ install: calc libcalc.a ${LIB_H_SRC} ${BUILD_H_SRC} calc.1
 	else \
 	    true; \
 	fi
-	-${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 $T${INCDIR} ]; then \
 	    echo mkdir $T${INCDIR}; \
 	    mkdir $T${INCDIR}; \
@@ -3514,16 +3587,15 @@ install: calc libcalc.a ${LIB_H_SRC} ${BUILD_H_SRC} calc.1
 	else \
 	    true; \
 	fi
-	-${Q}if [ ! -d $T${CSHAREDIR} ]; then \
+	-${Q}if [ ! -d $T${CALC_SHAREDIR} ]; then \
-	    mkdir $T${CSHAREDIR}; \
+	    mkdir $T${CALC_SHAREDIR}; \
-	    echo mkdir $T${CSHAREDIR}; \
+	    echo mkdir $T${CALC_SHAREDIR}; \
-	    if [ ! -d "$T${CSHAREDIR}" ]; then \
+	    if [ ! -d "$T${CALC_SHAREDIR}" ]; then \
-		echo mkdir -p "$T${CSHAREDIR}"; \
+		echo mkdir -p "$T${CALC_SHAREDIR}"; \
-		mkdir -p "$T${CSHAREDIR}"; \
+		mkdir -p "$T${CALC_SHAREDIR}"; \
 	    fi; \
-	    mkdir $T${CSHAREDIR}; \
+	    echo ${CHMOD} 0755 $T${CALC_SHAREDIR}; \
-	    echo ${CHMOD} 0755 $T${CSHAREDIR}; \
+	    ${CHMOD} 0755 $T${CALC_SHAREDIR}; \
-	    ${CHMOD} 0755 $T${CSHAREDIR}; \
 	else \
 	    true; \
 	fi
@@ -3539,27 +3611,27 @@ install: calc libcalc.a ${LIB_H_SRC} ${BUILD_H_SRC} calc.1
 	else \
 	    true; \
 	fi
-	-${Q}if [ ! -d $T${INCDIRCALC} ]; then \
+	-${Q}if [ ! -d $T${CALC_INCDIR} ]; then \
-	    echo mkdir $T${INCDIRCALC}; \
+	    echo mkdir $T${CALC_INCDIR}; \
-	    mkdir $T${INCDIRCALC}; \
+	    mkdir $T${CALC_INCDIR}; \
-	    if [ ! -d "$T${INCDIRCALC}" ]; then \
+	    if [ ! -d "$T${CALC_INCDIR}" ]; then \
-		echo mkdir -p "$T${INCDIRCALC}"; \
+		echo mkdir -p "$T${CALC_INCDIR}"; \
-		mkdir -p "$T${INCDIRCALC}"; \
+		mkdir -p "$T${CALC_INCDIR}"; \
 	    fi; \
-	    echo ${CHMOD} 0755 $T${INCDIRCALC}; \
+	    echo ${CHMOD} 0755 $T${CALC_INCDIR}; \
-	    ${CHMOD} 0755 $T${INCDIRCALC}; \
+	    ${CHMOD} 0755 $T${CALC_INCDIR}; \
 	else \
 	    true; \
 	fi
-	-${Q}if [ ! -d $T${CUSTOMLIBDIR} ]; then \
+	-${Q}if [ ! -d $T${CUSTOMCALDIR} ]; then \
-	    echo mkdir $T${CUSTOMLIBDIR}; \
+	    echo mkdir $T${CUSTOMCALDIR}; \
-	    mkdir $T${CUSTOMLIBDIR}; \
+	    mkdir $T${CUSTOMCALDIR}; \
-	    if [ ! -d "$T${CUSTOMLIBDIR}" ]; then \
+	    if [ ! -d "$T${CUSTOMCALDIR}" ]; then \
-		echo mkdir -p "$T${CUSTOMLIBDIR}"; \
+		echo mkdir -p "$T${CUSTOMCALDIR}"; \
-		mkdir -p "$T${CUSTOMLIBDIR}"; \
+		mkdir -p "$T${CUSTOMCALDIR}"; \
 	    fi; \
-	    echo ${CHMOD} 0755 $T${CUSTOMLIBDIR}; \
+	    echo ${CHMOD} 0755 $T${CUSTOMCALDIR}; \
-	    ${CHMOD} 0755 $T${CUSTOMLIBDIR}; \
+	    ${CHMOD} 0755 $T${CUSTOMCALDIR}; \
 	else \
 	    true; \
 	fi
@@ -3671,14 +3743,14 @@ install: calc libcalc.a ${LIB_H_SRC} ${BUILD_H_SRC} calc.1
 	    fi; \
 	    rm -f tmp; \
 	    ${SED} -e 's/^\(#[ 	]*include[ 	][ 	]*\)"/\1"calc\//' $$i > tmp; \
-	    if ${CMP} -s tmp $T${INCDIRCALC}/$$i; then \
+	    if ${CMP} -s tmp $T${CALC_INCDIR}/$$i; then \
 		true; \
 	    else \
-		rm -f $T${INCDIRCALC}/$$i.new; \
+		rm -f $T${CALC_INCDIR}/$$i.new; \
-		cp -f tmp $T${INCDIRCALC}/$$i.new; \
+		cp -f tmp $T${CALC_INCDIR}/$$i.new; \
-		${CHMOD} 0444 $T${INCDIRCALC}/$$i.new; \
+		${CHMOD} 0444 $T${CALC_INCDIR}/$$i.new; \
-		mv -f $T${INCDIRCALC}/$$i.new $T${INCDIRCALC}/$$i; \
+		mv -f $T${CALC_INCDIR}/$$i.new $T${CALC_INCDIR}/$$i; \
-		echo "installed $T${INCDIRCALC}/$$i"; \
+		echo "installed $T${CALC_INCDIR}/$$i"; \
 	    fi; \
 	done
 	${Q}rm -f tmp

README.WINDOWS

@@ -10,9 +10,68 @@ NOTE: The main developers do not have access to a Windoz based platform.
       Of course you are welcome to send us any patches that fix your
       Windoz build environment.
 
-=-=-=-=-=
+=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-=-=-=-=-=
+=-= compiling under DJGPP =-=
-=-=-=-=-=
+=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
+
+You might want to try using the DJGPP system to compile calc.  See:
+
+	http://www.delorie.com/djgpp/
+
+for DJGPP details and availability.
+
+To compile with DJGPP, one needs to select a number of Makefile
+variable changes.  Eli Zaretskii <eliz at is dot elta dot co dot il>
+recommends the following settings:
+
+	TERMCONTROL= -DUSE_TERMIOS
+	BYTE_ORDER= -DLITTLE_ENDIAN
+	LONG_BITS= 32
+	LONGLONG_BITS= 64
+	HAVE_FPOS_POS= -DHAVE_NO_FPOS_POS
+	FPOS_BITS= 32
+	OFF_T_BITS= 32
+	DEV_BITS= 32
+	INODE_BITS= 32
+	HAVE_USTAT= -DHAVE_NO_USTAT
+	HAVE_GETSID= -DHAVE_NO_GETSID
+	HAVE_GETPGID= -DHAVE_NO_GETPGID
+	HAVE_GETTIME= -DHAVE_NO_GETTIME
+	HAVE_GETPRID= -DHAVE_NO_GETPRID
+	HAVE_URANDOM_H= NO
+	ALIGN32= -UMUST_ALIGN32
+	HAVE_MALLOC_H= YES
+	HAVE_STDLIB_H= YES
+	HAVE_STRING_H= YES
+	HAVE_TIMES_H= NO
+	HAVE_SYS_TIMES_H= YES
+	HAVE_TIME_H= YES
+	HAVE_SYS_TIME_H= YES
+	HAVE_UNISTD_H= YES
+	BINDIR= /dev/env/DJDIR/bin
+	INCDIR= /dev/env/DJDIR/include
+	LIBDIR= /dev/env/DJDIR/lib
+	MANDIR= /dev/env/DJDIR/man/man1
+	CATDIR= /dev/env/DJDIR/man/cat1
+	NROFF= groff
+	CALCPATH= .;./cal;~/.cal;${CALC_SHAREDIR};${CUSTOMCALDIR}
+	CALCRC= ${CALC_SHAREDIR}/startup;~/.calcrc;./.calcinit
+	CALCPAGER= less.exe -ci
+	DEBUG= -O2 -gstabs+
+
+The 'Linux set' or 'gcc set' (see the Select your compiler type section)
+should work for DJGPP systems if you set the above Makefile variables.
+
+Look for Makefile comments of the form:
+
+	# Select ...something... for DJGPP.
+
+Follow those recommendations.  In cases where they conflict with
+the above Makefile list, follow the recommendation in the Makefile.
+
+=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
+=-= compiling with Cygwin =-=
+=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 
 An effort is being made to allow windows users to compile calc using the
 Cygwin project (http://sources.redhat.com/cygwin/) with the GCC compiler
@@ -79,69 +138,6 @@ was changed to:
 
     DLL extern int configtype(char*);
 
-=-=-=-=-=
-=-=-=-=-=
-=-=-=-=-=
-
-There is a different approach to the Cygwin approach above
-----------------------------------------------------------
-
-You might want to try using the DJGPP system to compile calc.  See:
-
-	http://www.delorie.com/djgpp/
-
-for DJGPP details and availability.
-
-To compile with DJGPP, one needs to select a number of Makefile
-variable changes.  Eli Zaretskii <eliz at is dot elta dot co dot il>
-recommends the following settings:
-
-	TERMCONTROL= -DUSE_TERMIOS
-	BYTE_ORDER= -DLITTLE_ENDIAN
-	LONG_BITS= 32
-	LONGLONG_BITS= 64
-	HAVE_FPOS_POS= -DHAVE_NO_FPOS_POS
-	FPOS_BITS= 32
-	OFF_T_BITS= 32
-	DEV_BITS= 32
-	INODE_BITS= 32
-	HAVE_USTAT= -DHAVE_NO_USTAT
-	HAVE_GETSID= -DHAVE_NO_GETSID
-	HAVE_GETPGID= -DHAVE_NO_GETPGID
-	HAVE_GETTIME= -DHAVE_NO_GETTIME
-	HAVE_GETPRID= -DHAVE_NO_GETPRID
-	HAVE_URANDOM_H= NO
-	ALIGN32= -UMUST_ALIGN32
-	HAVE_MALLOC_H= YES
-	HAVE_STDLIB_H= YES
-	HAVE_STRING_H= YES
-	HAVE_TIMES_H= NO
-	HAVE_SYS_TIMES_H= YES
-	HAVE_TIME_H= YES
-	HAVE_SYS_TIME_H= YES
-	HAVE_UNISTD_H= YES
-	BINDIR= /dev/env/DJDIR/bin
-	SHAREDIR= /dev/env/DJDIR/share
-	INCDIR= /dev/env/DJDIR/include
-	LIBDIR= /dev/env/DJDIR/lib
-	MANDIR= /dev/env/DJDIR/man/man1
-	CATDIR= /dev/env/DJDIR/man/cat1
-	NROFF= groff
-	CALCPATH= .;./cal;~/.cal;${CSHAREDIR};${CUSTOMLIBDIR}
-	CALCRC= ${CSHAREDIR}/startup;~/.calcrc;./.calcinit
-	CALCPAGER= less.exe -ci
-	DEBUG= -O2 -gstabs+
-
-The 'Linux set' or 'gcc set' (see the Select your compiler type section)
-should work for DJGPP systems if you set the above Makefile variables.
-
-Look for Makefile comments of the form:
-
-	# Select ...something... for DJGPP.
-
-Follow those recommendations.  In cases where they conflict with
-the above Makefile list, follow the recommendation in the Makefile.
-
 
 ## Copyright (C) 2002  Landon Curt Noll and Thomas Jones-Low
 ##
@@ -159,8 +155,8 @@ the above Makefile list, follow the recommendation in the Makefile.
 ## 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 $
+## @(#) $Revision: 29.8 $
-## @(#) $Id: README.WINDOWS,v 29.7 2002/03/12 10:50:25 chongo Exp $
+## @(#) $Id: README.WINDOWS,v 29.8 2002/03/14 00:28:28 chongo Exp $
 ## @(#) $Source: /usr/local/src/cmd/calc/RCS/README.WINDOWS,v $
 ##
 ## Under source code control:	2001/02/25 14:00:05

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.13 $
+# @(#) $Revision: 29.14 $
-# @(#) $Id: Makefile,v 29.13 2002/03/12 08:32:35 chongo Exp $
+# @(#) $Id: Makefile,v 29.14 2002/03/14 00:28:28 chongo Exp $
 # @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/Makefile,v $
 #
 # Under source code control:	1991/07/21 05:00:54
@@ -36,23 +36,111 @@
 SHELL = /bin/sh
 MAKE_FILE = Makefile
 
+####
 # 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 to install things
-#SHAREDIR= /usr/local/lib
-#SHAREDIR= /usr/lib
-SHAREDIR= /usr/share
-#SHAREDIR= /usr/libdata
 
-CSHAREDIR= ${SHAREDIR}/calc
+# Where the system include (.h) files are kept
+#
+# For DJGPP, select:
+#
+#	INCDIR= /dev/env/DJDIR/include
+#
+# If in doubt, set:
+#
+#	INCDIR= /usr/include
+#
+
+#INCDIR= /usr/local/include
+#INCDIR= /dev/env/DJDIR/include
+INCDIR= /usr/include
+
+# where to install calc realted 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= /usr/local/bin
+#BINDIR= /dev/env/DJDIR/bin
+BINDIR= /usr/bin
+
+#LIBDIR= /usr/local/lib
+#LIBDIR= /dev/env/DJDIR/lib
+LIBDIR= /usr/lib
+
+#CALC_SHAREDIR= /usr/local/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
+# ${CUSTOMINCPDIR}	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
+# performed under /.	The purpose for $T is to allow someone
-# install calc somewhere other than into the system area.  For example
+# to install calc somewhere other than into the system area.
-# when forming the calc rpm, the Makefile is called with T=$RPM_BUILD_ROOT.
+#
+# 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
@@ -145,7 +233,7 @@ calcliblist:
 echo_inst_files:
 	${Q}for i in ${CALC_FILES} /dev/null; do \
 	    if [ X"$$i" != X"/dev/null" ]; then \
-		echo __file__ ${CSHAREDIR}/$$i; \
+		echo __file__ ${CALC_SHAREDIR}/$$i; \
 	    fi; \
 	done
 
@@ -161,27 +249,15 @@ clobber:
 	rm -f .all
 
 install: all
-	-${Q}if [ ! -d $T${SHAREDIR} ]; then \
+	-${Q}if [ ! -d $T${CALC_SHAREDIR} ]; then \
-	    echo mkdir $T${SHAREDIR}; \
+	    echo mkdir $T${CALC_SHAREDIR}; \
-	    mkdir $T${SHAREDIR}; \
+	    mkdir $T${CALC_SHAREDIR}; \
-	    if [ ! -d "$T${SHAREDIR}" ]; then \
+	    if [ ! -d "$T${CALC_SHAREDIR}" ]; then \
-		echo mkdir -p "$T${SHAREDIR}"; \
+		echo mkdir -p "$T${CALC_SHAREDIR}"; \
-		mkdir -p "$T${SHAREDIR}"; \
+		mkdir -p "$T${CALC_SHAREDIR}"; \
 	    fi; \
-	    echo ${CHMOD} 0755 $T${SHAREDIR}; \
+	    echo ${CHMOD} 0755 $T${CALC_SHAREDIR}; \
-	    ${CHMOD} 0755 $T${SHAREDIR}; \
+	    ${CHMOD} 0755 $T${CALC_SHAREDIR}; \
-	else \
-	    true; \
-	fi
-	-${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
@@ -189,13 +265,13 @@ install: all
 	    if [ "$$i" = "/dev/null" ]; then \
 		continue; \
 	    fi; \
-	    if ${CMP} -s $$i $T${CSHAREDIR}/$$i; then \
+	    if ${CMP} -s $$i $T${CALC_SHAREDIR}/$$i; then \
 		true; \
 	    else \
-		rm -f $T${CSHAREDIR}/$$i.new; \
+		rm -f $T${CALC_SHAREDIR}/$$i.new; \
-		cp -f $$i $T${CSHAREDIR}/$$i.new; \
+		cp -f $$i $T${CALC_SHAREDIR}/$$i.new; \
-		${CHMOD} 0444 $T${CSHAREDIR}/$$i.new; \
+		${CHMOD} 0444 $T${CALC_SHAREDIR}/$$i.new; \
-		mv -f $T${CSHAREDIR}/$$i.new $T${CSHAREDIR}/$$i; \
+		mv -f $T${CALC_SHAREDIR}/$$i.new $T${CALC_SHAREDIR}/$$i; \
-		echo "installed $T${CSHAREDIR}/$$i"; \
+		echo "installed $T${CALC_SHAREDIR}/$$i"; \
 	    fi; \
 	done

calc.man

@@ -15,8 +15,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.8 $
+.\" @(#) $Revision: 29.9 $
-.\" @(#) $Id: calc.man,v 29.8 2002/03/12 09:02:58 chongo Exp $
+.\" @(#) $Id: calc.man,v 29.9 2002/03/14 00:28:28 chongo Exp $
 .\" @(#) $Source: /usr/local/src/cmd/calc/RCS/calc.man,v $
 .\"
 .\" Under source code control:	    1991/07/23 05:48:26
@@ -514,8 +514,8 @@ searches in succession:
 ./myfile.cal
 ${LIBDIR}/myfile
 ${LIBDIR}/myfile.cal
-${CUSTOMLIBDIR}/myfile
+${CUSTOMCALDIR}/myfile
-${CUSTOMLIBDIR}/myfile.cal
+${CUSTOMCALDIR}/myfile.cal
 .fi
 .in -5n
 .sp 1
@@ -837,7 +837,7 @@ ${LIBDIR}/bindings
 non-GNU-readline command line editor bindings
 .sp 1
 .TP 5
-${INCDIRCALC}/*.h
+${CALC_INCDIR}/*.h
 include files for C interface use
 .sp 1
 .TP 5
@@ -849,7 +849,7 @@ ${LIBDIR}/libcustcalc.a
 custom binary link library
 .sp 1
 .TP 5
-${CUSTOMLIBDIR}/*.cal
+${CUSTOMCALDIR}/*.cal
 custom resource files
 .sp 1
 .TP 5

cscript/Makefile

@@ -17,9 +17,9 @@
 # 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.21 $
+# @(#) $Revision: 29.22 $
-# @(#) $Id: Makefile,v 29.21 2002/03/12 08:36:11 chongo Exp $
+# @(#) $Id: Makefile,v 29.22 2002/03/14 00:28:28 chongo Exp $
-# @(#) $Source: /usr/local/src/cmd/calc/cal/../cscript/RCS/Makefile,v $
+# @(#) $Source: /usr/local/src/cmd/calc/cscript/RCS/Makefile,v $
 #
 # Under source code control:	1999/11/29 11:10:26
 # File existed as early as:	1999
@@ -36,21 +36,111 @@
 SHELL= /bin/sh
 MAKE_FILE = Makefile
 
+####
 # 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= /usr/local/include
+#INCDIR= /dev/env/DJDIR/include
+INCDIR= /usr/include
+
+# where to install calc realted 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= /usr/local/bin
+#BINDIR= /dev/env/DJDIR/bin
 BINDIR= /usr/bin
-#BINDIR= /usr/contrib/bin
+
+#LIBDIR= /usr/local/lib
+#LIBDIR= /dev/env/DJDIR/lib
+LIBDIR= /usr/lib
+
+#CALC_SHAREDIR= /usr/local/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
+# ${CUSTOMINCPDIR}	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
+# performed under /.	The purpose for $T is to allow someone
-# install calc somewhere other than into the system area.  For example
+# to install calc somewhere other than into the system area.
-# when forming the calc rpm, the Makefile is called with T=$RPM_BUILD_ROOT.
+#
+# 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

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.18 $
+# @(#) $Revision: 29.19 $
-# @(#) $Id: Makefile,v 29.18 2002/03/12 08:30:43 chongo Exp $
+# @(#) $Id: Makefile,v 29.19 2002/03/14 00:28:28 chongo Exp $
 # @(#) $Source: /usr/local/src/cmd/calc/custom/RCS/Makefile,v $
 #
 # Under source code control:	1997/03/09 02:28:54
@@ -88,40 +88,111 @@ CUSTOM_OBJ= c_argv.o c_devnull.o c_help.o c_sysinfo.o c_pzasusb8.o
 #Q=
 Q=@
 
+####
 # 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
 #
-# where to install things
+# For DJGPP, select:
 #
-# ${SHAREDIR}		where most common shared files are kept
+#	INCDIR= /dev/env/DJDIR/include
-# ${INCDIR}		where most .h files are kept
 #
-# ${CSHAREDIR}		where most common shared calc files are kept
+# If in doubt, set:
-# ${HELPDIR}		where the help directory is installed.
-# ${INCDIRCALC}		where the calc include files are installed
-# ${CUSTOMLIBDIR}	where custom *.cal files & libcustcalc.a are installed.
-# ${CUSTOMHELPDIR}	where custom help files are installed.
-# ${CUSTOMINCPDIR}	where custom .h files are installed.
 #
-#SHAREDIR= /usr/local/lib
+#	INCDIR= /usr/include
-SHAREDIR= /usr/share
 #
+
 #INCDIR= /usr/local/include
+#INCDIR= /dev/env/DJDIR/include
 INCDIR= /usr/include
+
+# where to install calc realted things
 #
-CSHAREDIR= ${SHAREDIR}/calc
+# ${BINDIR}		where to install calc binary files
-HELPDIR= ${CSHAREDIR}/help
+# ${LIBDIR}		where calc link library (*.a) files are installed
-INCDIRCALC= ${INCDIR}/calc
+# ${CALC_SHAREDIR}	where to install calc help, .cal, startup, config files
-CUSTOMLIBDIR= ${CSHAREDIR}/custom
+#
-CUSTOMHELPDIR= ${CSHAREDIR}/custhelp
+# NOTE: The install rule prepends installation paths with $T, which
-CUSTOMINCDIR= ${INCDIRCALC}/custom
+#	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= /usr/local/bin
+#BINDIR= /dev/env/DJDIR/bin
+BINDIR= /usr/bin
+
+#LIBDIR= /usr/local/lib
+#LIBDIR= /dev/env/DJDIR/lib
+LIBDIR= /usr/lib
+
+#CALC_SHAREDIR= /usr/local/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
+# ${CUSTOMINCPDIR}	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
+# performed under /.	The purpose for $T is to allow someone
-# install calc somewhere other than into the system area.  For example
+# to install calc somewhere other than into the system area.
-# when forming the calc rpm, the Makefile is called with T=$RPM_BUILD_ROOT.
+#
+# 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
@@ -279,7 +350,7 @@ REQUIRED_SRC= custtbl.c
 #
 REQUIRED_OBJ= custtbl.o
 
-# These .h files are installed under ${CUSTOMLIBDIR} by the install rule.
+# These .h files are installed under ${CUSTOMCALDIR} by the install rule.
 #
 INSTALL_H_SRC= ${CUSTOM_H_SRC}
 
@@ -506,12 +577,12 @@ echo_inst_files:
 	done
 	${Q}for i in ${CUSTOM_CALC_FILES} /dev/null; do \
 	    if [ X"$$i" != X"/dev/null" ]; then \
-		echo __file__ ${CUSTOMLIBDIR}/$$i; \
+		echo __file__ ${CUSTOMCALDIR}/$$i; \
 	    fi; \
 	done
 	${Q}for i in ${CALC_LIBCUSTOM} /dev/null; do \
 	    if [ X"$$i" != X"/dev/null" ]; then \
-		echo __file__ ${CUSTOMLIBDIR}/$$i; \
+		echo __file__ ${CUSTOMCALDIR}/$$i; \
 	    fi; \
 	done
 
@@ -529,18 +600,6 @@ clobber:
 	rm -f .all Makefile.tmp Makefile.bak
 
 install: all
-	-${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 $T${INCDIR} ]; then \
 	    echo mkdir $T${INCDIR}; \
 	    mkdir $T${INCDIR}; \
@@ -553,27 +612,27 @@ install: all
 	else \
 	    true; \
 	fi
-	-${Q}if [ ! -d $T${CSHAREDIR} ]; then \
+	-${Q}if [ ! -d $T${CALC_SHAREDIR} ]; then \
-	    echo mkdir $T${CSHAREDIR}; \
+	    echo mkdir $T${CALC_SHAREDIR}; \
-	    mkdir $T${CSHAREDIR}; \
+	    mkdir $T${CALC_SHAREDIR}; \
-	    if [ ! -d "$T${CSHAREDIR}" ]; then \
+	    if [ ! -d "$T${CALC_SHAREDIR}" ]; then \
-		echo mkdir -p "$T${CSHAREDIR}"; \
+		echo mkdir -p "$T${CALC_SHAREDIR}"; \
-		mkdir -p "$T${CSHAREDIR}"; \
+		mkdir -p "$T${CALC_SHAREDIR}"; \
 	    fi; \
-	    echo ${CHMOD} 0755 $T${CSHAREDIR}; \
+	    echo ${CHMOD} 0755 $T${CALC_SHAREDIR}; \
-	    ${CHMOD} 0755 $T${CSHAREDIR}; \
+	    ${CHMOD} 0755 $T${CALC_SHAREDIR}; \
 	else \
 	    true; \
 	fi
-	-${Q}if [ ! -d $T${INCDIRCALC} ]; then \
+	-${Q}if [ ! -d $T${CALC_INCDIR} ]; then \
-	    echo mkdir $T${INCDIRCALC}; \
+	    echo mkdir $T${CALC_INCDIR}; \
-	    mkdir $T${INCDIRCALC}; \
+	    mkdir $T${CALC_INCDIR}; \
-	    if [ ! -d "$T${INCDIRCALC}" ]; then \
+	    if [ ! -d "$T${CALC_INCDIR}" ]; then \
-		echo mkdir -p "$T${INCDIRCALC}"; \
+		echo mkdir -p "$T${CALC_INCDIR}"; \
-		mkdir -p "$T${INCDIRCALC}"; \
+		mkdir -p "$T${CALC_INCDIR}"; \
 	    fi; \
-	    echo ${CHMOD} 0755 $T${INCDIRCALC}; \
+	    echo ${CHMOD} 0755 $T${CALC_INCDIR}; \
-	    ${CHMOD} 0755 $T${INCDIRCALC}; \
+	    ${CHMOD} 0755 $T${CALC_INCDIR}; \
 	else \
 	    true; \
 	fi
@@ -589,15 +648,15 @@ install: all
 	else \
 	    true; \
 	fi
-	-${Q}if [ ! -d $T${CUSTOMLIBDIR} ]; then \
+	-${Q}if [ ! -d $T${CUSTOMCALDIR} ]; then \
-	    echo mkdir $T${CUSTOMLIBDIR}; \
+	    echo mkdir $T${CUSTOMCALDIR}; \
-	    mkdir $T${CUSTOMLIBDIR}; \
+	    mkdir $T${CUSTOMCALDIR}; \
-	    if [ ! -d "$T${CUSTOMLIBDIR}" ]; then \
+	    if [ ! -d "$T${CUSTOMCALDIR}" ]; then \
-		echo mkdir -p "$T${CUSTOMLIBDIR}"; \
+		echo mkdir -p "$T${CUSTOMCALDIR}"; \
-		mkdir -p "$T${CUSTOMLIBDIR}"; \
+		mkdir -p "$T${CUSTOMCALDIR}"; \
 	    fi; \
-	    echo ${CHMOD} 0755 $T${CUSTOMLIBDIR}; \
+	    echo ${CHMOD} 0755 $T${CUSTOMCALDIR}; \
-	    ${CHMOD} 0755 $T${CUSTOMLIBDIR}; \
+	    ${CHMOD} 0755 $T${CUSTOMCALDIR}; \
 	else \
 	    true; \
 	fi
@@ -644,14 +703,14 @@ install: all
 	    if [ "$$i" = "/dev/null" ]; then \
 		continue; \
 	    fi; \
-	    if ${CMP} -s $$i $T${CUSTOMLIBDIR}/$$i; then \
+	    if ${CMP} -s $$i $T${CUSTOMCALDIR}/$$i; then \
 		true; \
 	    else \
-		rm -f $T${CUSTOMLIBDIR}/$$i.new; \
+		rm -f $T${CUSTOMCALDIR}/$$i.new; \
-		cp -f $$i $T${CUSTOMLIBDIR}/$$i.new; \
+		cp -f $$i $T${CUSTOMCALDIR}/$$i.new; \
-		${CHMOD} 0444 $T${CUSTOMLIBDIR}/$$i.new; \
+		${CHMOD} 0444 $T${CUSTOMCALDIR}/$$i.new; \
-		mv -f $T${CUSTOMLIBDIR}/$$i.new $T${CUSTOMLIBDIR}/$$i; \
+		mv -f $T${CUSTOMCALDIR}/$$i.new $T${CUSTOMCALDIR}/$$i; \
-		echo "installed $T${CUSTOMLIBDIR}/$$i"; \
+		echo "installed $T${CUSTOMCALDIR}/$$i"; \
 	    fi; \
 	done
 	-${Q}for i in ${CUSTOM_HELP} /dev/null; do \
@@ -669,16 +728,16 @@ install: all
 	    fi; \
 	done
 	-${Q}if [ ! -z ${ALLOW_CUSTOM} ]; then \
-	    if ${CMP} -s libcustcalc.a $T${CUSTOMLIBDIR}/libcustcalc.a; then \
+	    if ${CMP} -s libcustcalc.a $T${CUSTOMCALDIR}/libcustcalc.a; then \
 		true; \
 	    else \
-		rm -f $T${CUSTOMLIBDIR}/libcustcalc.a.new; \
+		rm -f $T${CUSTOMCALDIR}/libcustcalc.a.new; \
-		cp -f libcustcalc.a $T${CUSTOMLIBDIR}/libcustcalc.a.new; \
+		cp -f libcustcalc.a $T${CUSTOMCALDIR}/libcustcalc.a.new; \
-		${CHMOD} 0644 $T${CUSTOMLIBDIR}/libcustcalc.a.new; \
+		${CHMOD} 0644 $T${CUSTOMCALDIR}/libcustcalc.a.new; \
-		mv -f $T${CUSTOMLIBDIR}/libcustcalc.a.new \
+		mv -f $T${CUSTOMCALDIR}/libcustcalc.a.new \
-		      $T${CUSTOMLIBDIR}/libcustcalc.a; \
+		      $T${CUSTOMCALDIR}/libcustcalc.a; \
-		${RANLIB} $T${CUSTOMLIBDIR}/libcustcalc.a; \
+		${RANLIB} $T${CUSTOMCALDIR}/libcustcalc.a; \
-		echo "installed $T${CUSTOMLIBDIR}/libcustcalc.a"; \
+		echo "installed $T${CUSTOMCALDIR}/libcustcalc.a"; \
 	    fi; \
 	fi
 

help/Makefile

@@ -18,9 +18,9 @@
 # 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.19 $
+# @(#) $Revision: 29.20 $
-# @(#) $Id: Makefile,v 29.19 2002/03/12 08:39:14 chongo Exp $
+# @(#) $Id: Makefile,v 29.20 2002/03/14 00:28:28 chongo Exp $
-# @(#) $Source: /usr/local/src/cmd/calc/cal/../help/RCS/Makefile,v $
+# @(#) $Source: /usr/local/src/cmd/calc/help/RCS/Makefile,v $
 #
 # Under source code control:	1991/07/23 06:47:57
 # File existed as early as:	1991
@@ -36,33 +36,111 @@
 SHELL= /bin/sh
 MAKE_FILE = Makefile
 
-# ${SHAREDIR}		where most common shared files are kept
+####
-# ${INCDIR}		where most .h files are kept
+# Normally, the upper level makefile will set these values.  We provide
-# ${LIBDIR}		where *.a files are installed
+# a default here just in case you want to build from this directory.
+####
+
+# Where the system include (.h) files are kept
 #
-# ${CSHAREDIR}		where most common shared calc files are kept
+# For DJGPP, select:
-# ${HELPDIR}		where the help directory is installed.
+#
-# ${INCDIRCALC}		where the calc include files are installed
+#	INCDIR= /dev/env/DJDIR/include
+#
+# If in doubt, set:
+#
+#	INCDIR= /usr/include
 #
-#SHAREDIR= /usr/local/lib
-SHAREDIR= /usr/share
 
 #INCDIR= /usr/local/include
+#INCDIR= /dev/env/DJDIR/include
 INCDIR= /usr/include
 
+# where to install calc realted 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= /usr/local/bin
+#BINDIR= /dev/env/DJDIR/bin
+BINDIR= /usr/bin
+
 #LIBDIR= /usr/local/lib
+#LIBDIR= /dev/env/DJDIR/lib
 LIBDIR= /usr/lib
 
-CSHAREDIR= ${SHAREDIR}/calc
+#CALC_SHAREDIR= /usr/local/lib/calc
-HELPDIR= ${CSHAREDIR}/help
+#CALC_SHAREDIR= /dev/env/DJDIR/share/calc
-INCDIRCALC= ${INCDIR}/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
+# ${CUSTOMINCPDIR}	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
+# performed under /.	The purpose for $T is to allow someone
-# install calc somewhere other than into the system area.  For example
+# to install calc somewhere other than into the system area.
-# when forming the calc rpm, the Makefile is called with T=$RPM_BUILD_ROOT.
+#
+# 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
@@ -267,7 +345,7 @@ changes: ../CHANGES
 libcalc: ../LIBRARY
 	rm -f $@
 	${SED} -e 's:$${LIBDIR}:${LIBDIR}:g' \
-	       -e 's:$${INCDIRCALC}:${INCDIRCALC}:g' < ../LIBRARY > $@
+	       -e 's:$${CALC_INCDIR}:${CALC_INCDIR}:g' < ../LIBRARY > $@
 	${CHMOD} 0444 $@
 	-@if [ -z "${Q}" ]; then \
 	    echo ''; \
@@ -556,27 +634,15 @@ clobber:
 	rm -f ${SINGULAR_FILES} ${DETAIL_CLONE}
 
 install: all
-	-${Q}if [ ! -d ${SHAREDIR} ]; then \
+	-${Q}if [ ! -d $T${CALC_SHAREDIR} ]; then \
-	    echo mkdir $T${SHAREDIR}; \
+	    echo mkdir $T${CALC_SHAREDIR}; \
-	    mkdir $T${SHAREDIR}; \
+	    mkdir $T${CALC_SHAREDIR}; \
-	    if [ ! -d "$T${SHAREDIR}" ]; then \
+	    if [ ! -d "$T${CALC_SHAREDIR}" ]; then \
-		echo mkdir -p "$T${SHAREDIR}"; \
+		echo mkdir -p "$T${CALC_SHAREDIR}"; \
-		mkdir -p "$T${SHAREDIR}"; \
+		mkdir -p "$T${CALC_SHAREDIR}"; \
 	    fi; \
-	    echo ${CHMOD} 0755 $T${SHAREDIR}; \
+	    echo ${CHMOD} 0755 $T${CALC_SHAREDIR}; \
-	    ${CHMOD} 0755 $T${SHAREDIR}; \
+	    ${CHMOD} 0755 $T${CALC_SHAREDIR}; \
-	else \
-	    true; \
-	fi
-	-${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

help/usage

@@ -249,8 +249,8 @@ Calc command line
 			./myfile.cal
 			${LIBDIR}/myfile
 			${LIBDIR}/myfile.cal
-			${CUSTOMLIBDIR}/myfile
+			${CUSTOMCALDIR}/myfile
-			${CUSTOMLIBDIR}/myfile.cal
+			${CUSTOMCALDIR}/myfile.cal
 
 	  If the file is found, the search stops and the commands in
 	  the file are executed.  It is an error if no readable file
@@ -354,7 +354,7 @@ For more information use the following calc commands:
 ## 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
 ##
 ## @(#) $Revision: 29.3 $
-## @(#) $Id: usage,v 29.3 2000/06/07 14:02:33 chongo Exp $
+## @(#) $Id: usage,v 29.3 2000/06/07 14:02:33 chongo Exp chongo $
 ## @(#) $Source: /usr/local/src/cmd/calc/help/RCS/usage,v $
 ##
 ## Under source code control:	1991/07/21 04:37:25

sample/Makefile

@@ -17,9 +17,9 @@
 # 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 $
+# @(#) $Revision: 29.16 $
-# @(#) $Id: Makefile,v 29.15 2002/03/12 08:41:05 chongo Exp $
+# @(#) $Id: Makefile,v 29.16 2002/03/14 00:28:28 chongo Exp $
-# @(#) $Source: /usr/local/src/cmd/calc/cal/../sample/RCS/Makefile,v $
+# @(#) $Source: /usr/local/src/cmd/calc/sample/RCS/Makefile,v $
 #
 # Under source code control:	1997/04/19 22:46:49
 # File existed as early as:	1997
@@ -75,41 +75,111 @@ SAMPLE_OBJ= many_random.o test_random.o
 #Q=
 Q=@
 
+####
 # 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
 #
-# where things go
+# For DJGPP, select:
 #
-# ${BINDIR}		where to install binary files
+#	INCDIR= /dev/env/DJDIR/include
-# ${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
+# If in doubt, set:
-# ${HELPDIR}		where the help directory is installed.
+#
+#	INCDIR= /usr/include
+#
+
+#INCDIR= /usr/local/include
+#INCDIR= /dev/env/DJDIR/include
+INCDIR= /usr/include
+
+# where to install calc realted 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= /usr/local/bin
+#BINDIR= /dev/env/DJDIR/bin
 BINDIR= /usr/bin
-#BINDIR= /usr/contrib/bin
+
-#
-#SHAREDIR= /usr/local/lib
-SHAREDIR= /usr/share
-#
-#INCDIR= /usr/local/include
-INCDIR= /usr/include
-#
 #LIBDIR= /usr/local/lib
+#LIBDIR= /dev/env/DJDIR/lib
 LIBDIR= /usr/lib
 
-CSHAREDIR= ${SHAREDIR}/calc
+#CALC_SHAREDIR= /usr/local/lib/calc
-HELPDIR= ${LIBDIR}/help
+#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
+# ${CUSTOMINCPDIR}	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
+# performed under /.	The purpose for $T is to allow someone
-# install calc somewhere other than into the system area.  For example
+# to install calc somewhere other than into the system area.
-# when forming the calc rpm, the Makefile is called with T=$RPM_BUILD_ROOT.
+#
+# 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

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.38 $
+ * @(#) $Revision: 29.39 $
- * @(#) $Id: version.c,v 29.38 2002/03/12 11:00:08 chongo Exp $
+ * @(#) $Id: version.c,v 29.39 2002/03/14 00:28:28 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/version.c,v $
  *
  * Under source code control:	1990/05/22 11:00:58
@@ -46,7 +46,7 @@ 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	7	/* test number or 0 if no minor patch */
+#define MINOR_PATCH	8	/* test number or 0 if no minor patch */
 
 
 /*

win32.mkdef

@@ -36,8 +36,8 @@ HAVE_UNISTD_H=NO
 
 LIBDIR=/lib/calc
 HELPDIR=/lib/calc/help
-INCDIRCALC=/include/calc
+CALC_INCDIR=/include/calc
-CUSTOMLIBDIR=/lib/calc/custom
+CUSTOMCALDIR=/lib/calc/custom
 CUSTOMHELPDIR=/lib/calc/help/custhelp
 SCRIPTDIR=/lib/calc/cscript
 MANDIR=

win32/have_malloc.h

@@ -7,7 +7,7 @@
 #define __HAVE_MALLOC_H__
 
 
-/* do we have /usr/include/malloc.h? */
+/* do we have <malloc.h>? */
 #define HAVE_MALLOC_H	 /* yes */
 
 

win32/have_stdlib.h

@@ -7,7 +7,7 @@
 #define __HAVE_STDLIB_H__
 
 
-/* do we have /usr/include/stdlib.h? */
+/* do we have <stdlib.h>? */
 #define HAVE_STDLIB_H	/* yes */
 
 

win32/have_string.h

@@ -7,7 +7,7 @@
 #define __HAVE_STRING_H__
 
 
-/* do we have /usr/include/string.h? */
+/* do we have <string.h>? */
 #define HAVE_STRING_H	/* yes */
 
 

win32/have_times.h

@@ -7,7 +7,7 @@
 #define __HAVE_TIMES_H__
 
 
-/* do we have /usr/include/times.h? */
+/* do we have <times.h>? */
 #undef HAVE_TIMES_H  /* no */
 #undef HAVE_SYS_TIMES_H  /* no */
 #define HAVE_TIME_H	/* yes */

win32/have_unistd.h

@@ -7,7 +7,7 @@
 #define __HAVE_UNISTD_H__
 
 
-/* do we have /usr/include/unistd.h? */
+/* do we have <unistd.h>? */
 #undef HAVE_UNISTD_H  /* no */