diff --git a/CHANGES b/CHANGES index 96d4652..bbd85ee 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,25 @@ -The following are the changes from calc version 2.12.5.1 to date: +The following are the changes from calc version 2.12.5.3 to date: + + Calc version 2.12.5.2 for Darwin (Mac OS X) users, code to installed + calc under /opt/calc. Moreover the CHANGES file did not mention + /opt/calc. Sorry about that!. + + A much better tree for Darwin (Mac OS X) users would have been + to install cal under /opt/calc. This release ONLY changes the Darwin + (Mac OS X) install tree to /usr/local. + + Darwin (Mac OS X) users who installed calc version 2.12.5.2 + should, after installing version 2.12.5.3: + + rm -rf /opt/calc + + +The following are the changes from calc version 2.12.5.1 to 2.12.5.2: + + NOTE: calc version 2.12.5.2, for Darwin (Mac OS X) users, + installed under /opt/calc. We neglected to mention this + AND /usr/local would have been a better choice. Sorry! + Fixed in calc version 2.12.5.3. Removed rules and makefile variables assocated with shortened calc version numbers of less than 4 levels. @@ -7136,8 +7157,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. ## 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ## -## @(#) $Revision: 30.49 $ -## @(#) $Id: CHANGES,v 30.49 2016/02/06 08:42:57 chongo Exp $ +## @(#) $Revision: 30.50 $ +## @(#) $Id: CHANGES,v 30.50 2016/02/08 22:09:34 chongo Exp $ ## @(#) $Source: /usr/local/src/bin/calc/RCS/CHANGES,v $ ## ## Under source code control: 1993/06/02 18:12:57 diff --git a/Makefile b/Makefile index f1bea82..79d7089 100644 --- a/Makefile +++ b/Makefile @@ -39,8 +39,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: 30.83 $$ -# @(#) $Id: Makefile.ship,v 30.83 2016/02/06 08:16:06 chongo Exp $ +MAKEFILE_REV= $$Revision: 30.85 $$ +# @(#) $Id: Makefile.ship,v 30.85 2016/02/08 22:10:13 chongo Exp $ # @(#) $Source: /usr/local/src/bin/calc/RCS/Makefile.ship,v $ # # Under source code control: 1990/02/15 01:48:41 @@ -984,7 +984,7 @@ EXT= # The default calc versions # -VERSION= 2.12.5.2 +VERSION= 2.12.5.3 # Names of shared libraries with versions # @@ -1224,9 +1224,9 @@ LDCONFIG:= DARWIN_ARCH= # native binary # # Starting with El Capitan OS X 10.11, root by default could not -# mkdir under system locations, so we now use the /opt/calc tree. +# mkdir under system locations, so we now use the /usr/local tree. # -OPTDIR:= /opt/calc +OPTDIR:= /usr/local BINDIR:= /${OPTDIR}/bin LIBDIR:= /${OPTDIR}/lib CALC_SHAREDIR:= /${OPTDIR}/share diff --git a/Makefile.simple b/Makefile.simple index edb286c..8646a23 100644 --- a/Makefile.simple +++ b/Makefile.simple @@ -39,8 +39,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: 30.83 $$ -# @(#) $Id: Makefile.ship,v 30.83 2016/02/06 08:16:06 chongo Exp $ +MAKEFILE_REV= $$Revision: 30.85 $$ +# @(#) $Id: Makefile.ship,v 30.85 2016/02/08 22:10:13 chongo Exp $ # @(#) $Source: /usr/local/src/bin/calc/RCS/Makefile.ship,v $ # # Under source code control: 1990/02/15 01:48:41 @@ -961,7 +961,7 @@ EXT= # The default calc versions # -VERSION= 2.12.5.2 +VERSION= 2.12.5.3 # Names of shared libraries with versions # diff --git a/custom/Makefile b/custom/Makefile index 0e56fdf..41efe89 100644 --- a/custom/Makefile +++ b/custom/Makefile @@ -18,8 +18,8 @@ # received a copy with calc; if not, write to Free Software Foundation, Inc. # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # -# @(#) $Revision: 30.39 $ -# @(#) $Id: Makefile.head,v 30.39 2016/01/17 09:02:17 chongo Exp $ +# @(#) $Revision: 30.40 $ +# @(#) $Id: Makefile.head,v 30.40 2016/02/08 22:10:13 chongo Exp $ # @(#) $Source: /usr/local/src/bin/calc/custom/RCS/Makefile.head,v $ # # Under source code control: 1997/03/09 02:28:54 @@ -352,7 +352,7 @@ EXT= # The default calc versions # -VERSION= 2.12.5.2 +VERSION= 2.12.5.3 # Names of shared libraries with versions # @@ -599,9 +599,9 @@ LDCONFIG:= DARWIN_ARCH= # native binary # # Starting with El Capitan OS X 10.11, root by default could not -# mkdir under system locations, so we now use the /opt/calc tree. +# mkdir under system locations, so we now use the /usr/local tree. # -OPTDIR:= /opt/calc +OPTDIR:= /usr/local BINDIR:= /${OPTDIR}/bin LIBDIR:= /${OPTDIR}/lib CALC_SHAREDIR:= /${OPTDIR}/share diff --git a/custom/Makefile.head b/custom/Makefile.head index f80205e..bece627 100644 --- a/custom/Makefile.head +++ b/custom/Makefile.head @@ -18,8 +18,8 @@ # received a copy with calc; if not, write to Free Software Foundation, Inc. # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # -# @(#) $Revision: 30.39 $ -# @(#) $Id: Makefile.head,v 30.39 2016/01/17 09:02:17 chongo Exp $ +# @(#) $Revision: 30.40 $ +# @(#) $Id: Makefile.head,v 30.40 2016/02/08 22:10:13 chongo Exp $ # @(#) $Source: /usr/local/src/bin/calc/custom/RCS/Makefile.head,v $ # # Under source code control: 1997/03/09 02:28:54 @@ -352,7 +352,7 @@ EXT= # The default calc versions # -VERSION= 2.12.5.2 +VERSION= 2.12.5.3 # Names of shared libraries with versions # diff --git a/custom/Makefile.simple b/custom/Makefile.simple index a201af6..4240182 100644 --- a/custom/Makefile.simple +++ b/custom/Makefile.simple @@ -18,8 +18,8 @@ # received a copy with calc; if not, write to Free Software Foundation, Inc. # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # -# @(#) $Revision: 30.39 $ -# @(#) $Id: Makefile.head,v 30.39 2016/01/17 09:02:17 chongo Exp $ +# @(#) $Revision: 30.40 $ +# @(#) $Id: Makefile.head,v 30.40 2016/02/08 22:10:13 chongo Exp $ # @(#) $Source: /usr/local/src/bin/calc/custom/RCS/Makefile.head,v $ # # Under source code control: 1997/03/09 02:28:54 @@ -337,7 +337,7 @@ EXT= # The default calc versions # -VERSION= 2.12.5.2 +VERSION= 2.12.5.3 # Names of shared libraries with versions # diff --git a/version.c b/version.c index 7dc04d8..a6a9a1f 100644 --- a/version.c +++ b/version.c @@ -19,8 +19,8 @@ * received a copy with calc; if not, write to Free Software Foundation, Inc. * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * @(#) $Revision: 30.29 $ - * @(#) $Id: version.c,v 30.29 2016/02/06 08:42:57 chongo Exp $ + * @(#) $Revision: 30.30 $ + * @(#) $Id: version.c,v 30.30 2016/02/08 22:09:34 chongo Exp $ * @(#) $Source: /usr/local/src/bin/calc/RCS/version.c,v $ * * Under source code control: 1990/05/22 11:00:58 @@ -49,7 +49,7 @@ static char *program; #define MAJOR_VER 2 /* major library version */ #define MINOR_VER 12 /* minor library version */ #define MAJOR_PATCH 5 /* major software level under library version */ -#define MINOR_PATCH 2 /* minor software level or 0 if not patched */ +#define MINOR_PATCH 3 /* minor software level or 0 if not patched */ /*