diff --git a/CHANGES b/CHANGES index 2529992..e639980 100644 --- a/CHANGES +++ b/CHANGES @@ -22,6 +22,9 @@ The following are the changes from calc version 2.12.3.0 to date: if it is empty. Now when ${ALLOW_CUSTOM} make variable is empty, an empty ${CALC_INCDIR}/custom may be left hehind. + Fixed a problem where a "make clobber" would remove custom/Makefile + and fail to rebuilt it. + The following are the changes from calc version 2.12.2.3 to 2.12.2.4: @@ -6731,8 +6734,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.16 $ -## @(#) $Id: CHANGES,v 30.16 2008/05/09 20:30:04 chongo Exp $ +## @(#) $Revision: 30.17 $ +## @(#) $Id: CHANGES,v 30.17 2008/05/10 10:53:34 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 212ddcb..73181ea 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.33 $$ -# @(#) $Id: Makefile.ship,v 30.33 2008/05/09 20:30:04 chongo Exp $ +MAKEFILE_REV= $$Revision: 30.35 $$ +# @(#) $Id: Makefile.ship,v 30.35 2008/05/10 11:58:05 chongo Exp $ # @(#) $Source: /usr/local/src/cmd/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.3.2 +VERSION= 2.12.3.3 VERS= 2.12.3 VER= 2.12 VE= 2 @@ -4256,6 +4256,7 @@ clobber: custom/Makefile clean #if 0 /* start of skip for non-Gnu makefiles */ ${RM} -f Makefile.simple ${RM} -f custom/Makefile + -${MAKE} -f ${MAKE_FILE} custom/Makefile #endif /* end of skip for non-Gnu makefiles */ ${RM} -f .static .dynamic calc-dynamic-only calc-static-only ${V} echo '=-=-=-=-= ${MAKE_FILE} end of $@ rule =-=-=-=-=' diff --git a/Makefile.simple b/Makefile.simple index ae5f2b5..b0e9ed2 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.33 $$ -# @(#) $Id: Makefile.ship,v 30.33 2008/05/09 20:30:04 chongo Exp $ +MAKEFILE_REV= $$Revision: 30.35 $$ +# @(#) $Id: Makefile.ship,v 30.35 2008/05/10 11:58:05 chongo Exp $ # @(#) $Source: /usr/local/src/cmd/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.3.2 +VERSION= 2.12.3.3 VERS= 2.12.3 VER= 2.12 VE= 2 diff --git a/custom/Makefile b/custom/Makefile index cc42a75..35a15f0 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.17 $ -# @(#) $Id: Makefile.head,v 30.17 2008/04/15 20:50:07 chongo Exp $ +# @(#) $Revision: 30.18 $ +# @(#) $Id: Makefile.head,v 30.18 2008/05/10 11:58:05 chongo Exp $ # @(#) $Source: /usr/local/src/cmd/calc/custom/RCS/Makefile.head,v $ # # Under source code control: 1997/03/09 02:28:54 @@ -366,7 +366,7 @@ EXT= # The default calc versions # -VERSION= 2.12.3.1 +VERSION= 2.12.3.3 VERS= 2.12.3 VER= 2.12 VE= 2 diff --git a/custom/Makefile.head b/custom/Makefile.head index 7d21956..caf5b08 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.17 $ -# @(#) $Id: Makefile.head,v 30.17 2008/04/15 20:50:07 chongo Exp $ +# @(#) $Revision: 30.18 $ +# @(#) $Id: Makefile.head,v 30.18 2008/05/10 11:58:05 chongo Exp $ # @(#) $Source: /usr/local/src/cmd/calc/custom/RCS/Makefile.head,v $ # # Under source code control: 1997/03/09 02:28:54 @@ -366,7 +366,7 @@ EXT= # The default calc versions # -VERSION= 2.12.3.1 +VERSION= 2.12.3.3 VERS= 2.12.3 VER= 2.12 VE= 2 diff --git a/custom/Makefile.simple b/custom/Makefile.simple index 4ab3dcc..946479f 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.17 $ -# @(#) $Id: Makefile.head,v 30.17 2008/04/15 20:50:07 chongo Exp $ +# @(#) $Revision: 30.18 $ +# @(#) $Id: Makefile.head,v 30.18 2008/05/10 11:58:05 chongo Exp $ # @(#) $Source: /usr/local/src/cmd/calc/custom/RCS/Makefile.head,v $ # # Under source code control: 1997/03/09 02:28:54 @@ -351,7 +351,7 @@ EXT= # The default calc versions # -VERSION= 2.12.3.1 +VERSION= 2.12.3.3 VERS= 2.12.3 VER= 2.12 VE= 2 diff --git a/version.c b/version.c index 6672b7f..ffa3664 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.8 $ - * @(#) $Id: version.c,v 30.8 2008/05/09 19:45:39 chongo Exp $ + * @(#) $Revision: 30.9 $ + * @(#) $Id: version.c,v 30.9 2008/05/10 10:53:34 chongo Exp $ * @(#) $Source: /usr/local/src/cmd/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 3 /* 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 */ /*