diff --git a/CHANGES b/CHANGES index 69bb700..91e1fd8 100644 --- a/CHANGES +++ b/CHANGES @@ -21,6 +21,21 @@ The following are the changes from calc version 2.11.5t4.1 to date: for details. + Corrected a bug that incorrectly set the default calc path + back in version 2.11.5t4. The default CALCPATH is now: + + .:./cal:~/.cal:/usr/share/calc:/usr/share/calc/custom + + and the default CALCRC is now: + + /usr/share/calc/startup:~/.calcrc:./.calcinit + + This fixes the missing bindings error and it places the calc + resource files into the default path. + + If you are using the GNU readline then the Makefile recommends that + you link with the ncurses library. + The following are the changes from calc version 2.11.5t3 to 2.11.5t4: @@ -5305,8 +5320,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.34 $ -## @(#) $Id: CHANGES,v 29.34 2001/06/01 11:26:53 chongo Exp chongo $ +## @(#) $Revision: 29.35 $ +## @(#) $Id: CHANGES,v 29.35 2001/06/01 21:44:44 chongo Exp $ ## @(#) $Source: /usr/local/src/cmd/calc/RCS/CHANGES,v $ ## ## Under source code control: 1993/06/02 18:12:57 diff --git a/Makefile b/Makefile index 0999ff6..141656a 100644 --- a/Makefile +++ b/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.30 $$ -# @(#) $Id: Makefile.ship,v 29.30 2001/05/29 00:16:53 chongo Exp $ +MAKEFILE_REV= $$Revision: 29.31 $$ +# @(#) $Id: Makefile.ship,v 29.31 2001/06/01 21:44:44 chongo Exp $ # @(#) $Source: /usr/local/src/cmd/calc/RCS/Makefile.ship,v $ # # Under source code control: 1990/02/15 01:48:41 @@ -607,12 +607,12 @@ CATMODE= 0444 # If the $CALCPATH environment variable is not defined, then the following # path will be search for calc resource file routines. # -CALCPATH= .:./cal:~/cal:${LIBDIR}:${CUSTOMLIBDIR} +CALCPATH= .:./cal:~/.cal:${CSHAREDIR}:${CUSTOMLIBDIR} # If the $CALCRC environment variable is not defined, then the following # path will be search for calc resource files. # -CALCRC= ${LIBDIR}/startup:~/.calcrc:./.calcinit +CALCRC= ${CSHAREDIR}/startup:~/.calcrc:./.calcinit # Determine of the GNU-readline facility will be used instead of the # built-in calc binding method. @@ -625,6 +625,7 @@ CALCRC= ${LIBDIR}/startup:~/.calcrc:./.calcinit # READLINE_LIB The flags needed to link in the readline # and history link libraries # READLINE_INCLUDE Where the readline include files reside +# (leave blank if they are /usr/include/readline) # # NOTE: The GNU-readline code is not shipped with calc. You must have # the appropriate headers and link libs installed on your system in @@ -635,10 +636,10 @@ CALCRC= ${LIBDIR}/startup:~/.calcrc:./.calcinit USE_READLINE= #USE_READLINE= -DUSE_READLINE # -READLINE_LIB= -#READLINE_LIB= -L/usr/gnu/lib -lreadline -lhistory -#READLINE_LIB= -lreadline -lhistory -#READLINE_LIB= -L/usr/local/lib -lreadline -lhistory +#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 # READLINE_INCLUDE= #READLINE_INCLUDE= -I/usr/gnu/include diff --git a/version.c b/version.c index b8e6031..87b69bc 100644 --- a/version.c +++ b/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.28 $ - * @(#) $Id: version.c,v 29.28 2001/06/01 11:27:38 chongo Exp $ + * @(#) $Revision: 29.29 $ + * @(#) $Id: version.c,v 29.29 2001/06/01 21:44:44 chongo Exp $ * @(#) $Source: /usr/local/src/cmd/calc/RCS/version.c,v $ * * Under source code control: 1990/05/22 11:00:58 @@ -43,7 +43,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 "4.2" /* test number or empty string if no patch */ +#define MINOR_PATCH "4.3" /* test number or empty string if no patch */ /* * calc version constants