From 4e92927183f2a60a7466b7ff4a1a339afb9d7aa8 Mon Sep 17 00:00:00 2001 From: Landon Curt Noll Date: Mon, 18 Sep 2006 06:17:30 -0700 Subject: [PATCH] Release calc version 2.12.1.5 --- CHANGES | 13 +++++++++---- HOWTO.INSTALL | 6 +++--- Makefile | 17 +++++++++-------- cal/Makefile | 11 ++++++----- cscript/Makefile | 11 ++++++----- custom/Makefile | 30 +++++++++++++++++++++++------- help/Makefile | 6 +++--- sample/Makefile | 41 +++++++++++++++++++++++++++++++---------- version.c | 6 +++--- 9 files changed, 93 insertions(+), 48 deletions(-) diff --git a/CHANGES b/CHANGES index 8bfe112..b8de472 100644 --- a/CHANGES +++ b/CHANGES @@ -13,8 +13,13 @@ The following are the changes from calc version 2.12.1 to date: Improved the support for cross-compiled environmens by using make symbols for all non-shell commands executed by Makefiles. - Fixed a problem with the make chk (and make check) awk script - which failed under OS X 10.4.7. + Fixed a problem with the make chk awk script which failed under + OS X 10.4.7. + + Fixed a few minor variables that were not set to default values in + lower level Makefiles. + + Fixed a reference to a non-existent make variable in HOWTO.INSTALL. The following are the changes from calc version 2.12.0 to 2.12.0.8: @@ -6211,8 +6216,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.89 $ -## @(#) $Id: CHANGES,v 29.89 2006/09/18 08:01:36 chongo Exp $ +## @(#) $Revision: 29.90 $ +## @(#) $Id: CHANGES,v 29.90 2006/09/18 13:14:03 chongo Exp $ ## @(#) $Source: /usr/local/src/cmd/calc/RCS/CHANGES,v $ ## ## Under source code control: 1993/06/02 18:12:57 diff --git a/HOWTO.INSTALL b/HOWTO.INSTALL index d053c44..66ac6d6 100644 --- a/HOWTO.INSTALL +++ b/HOWTO.INSTALL @@ -52,7 +52,7 @@ Installing calc from the gziped tarball in 4 easy steps: 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 + CUSTOMINCDIR where custom .h files are installed SCRIPTDIR where calc shell scripts are installed If you want to install calc files under a top level directory, @@ -162,8 +162,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.8 $ -## @(#) $Id: HOWTO.INSTALL,v 29.8 2006/09/18 06:27:39 chongo Exp $ +## @(#) $Revision: 29.9 $ +## @(#) $Id: HOWTO.INSTALL,v 29.9 2006/09/18 13:11:57 chongo Exp $ ## @(#) $Source: /usr/local/src/cmd/calc/RCS/HOWTO.INSTALL,v $ ## ## Under source code control: 1999/09/27 20:48:44 diff --git a/Makefile b/Makefile index edf62f9..57c2bb9 100644 --- a/Makefile +++ b/Makefile @@ -32,8 +32,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.80 $$ -# @(#) $Id: Makefile.ship,v 29.80 2006/09/18 06:57:18 chongo Exp $ +MAKEFILE_REV= $$Revision: 29.81 $$ +# @(#) $Id: Makefile.ship,v 29.81 2006/09/18 13:13:25 chongo Exp $ # @(#) $Source: /usr/local/src/cmd/calc/RCS/Makefile.ship,v $ # # Under source code control: 1990/02/15 01:48:41 @@ -617,7 +617,7 @@ CALC_INCDIR= ${INCDIR}/calc # ${HELPDIR} where the help directory is installed # ${CUSTOMCALDIR} where custom *.cal files are installed # ${CUSTOMHELPDIR} where custom help files are installed -# ${CUSTOMINCPDIR} where custom .h files are installed +# ${CUSTOMINCDIR} where custom .h files are installed # ${SCRIPTDIR} where calc shell scripts are installed # # NOTE: The install rule prepends installation paths with ${T}, which @@ -894,14 +894,15 @@ RANLIB=ranlib MAKE_FILE= Makefile #MAKE_FILE= -# If you do not wish to use purify, leave PURIFY commented out. +# If you do not wish to use purify, set PURIFY to an empty string. # -# If in doubt, leave PURIFY commented out. +# If in doubt, use PURIFY= # #PURIFY= purify #PURIFY= purify -m71-engine #PURIFY= purify -logfile=pure.out #PURIFY= purify -m71-engine -logfile=pure.out +PURIFY= # If you want to use a debugging link library such as a malloc debug link # library, or need to add special ld flags after the calc link libraries @@ -1194,8 +1195,8 @@ FMT= fmt XARGS= xargs CMP= cmp MKDIR= mkdir -SPLINT = splint -SPLINT_OPTS = +SPLINT= splint +SPLINT_OPTS= RM= rm TOUCH= touch RMDIR= rmdir @@ -3298,7 +3299,7 @@ env: @echo 'HAVE_GETPGID=${HAVE_GETPGID}'; echo '' @echo 'HAVE_GETTIME=${HAVE_GETTIME}'; echo '' @echo 'HAVE_GETPRID=${HAVE_GETPRID}'; echo '' - @echo 'HAVE_URANDOM=${HAVE_URANDOM}'; echo '' + @echo 'HAVE_URANDOM_H=${HAVE_URANDOM_H}'; echo '' @echo 'ALIGN32=${ALIGN32}'; echo '' @echo 'BINDIR=${BINDIR}'; echo '' @echo 'CALC_SHAREDIR=${CALC_SHAREDIR}'; echo '' diff --git a/cal/Makefile b/cal/Makefile index 60eacf9..6b02530 100644 --- a/cal/Makefile +++ b/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.23 $ -# @(#) $Id: Makefile,v 29.23 2006/09/18 06:27:39 chongo Exp $ +# @(#) $Revision: 29.24 $ +# @(#) $Id: Makefile,v 29.24 2006/09/18 13:13:25 chongo Exp $ # @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/Makefile,v $ # # Under source code control: 1991/07/21 05:00:54 @@ -33,8 +33,8 @@ # required vars # -SHELL = /bin/sh -MAKE_FILE = Makefile +SHELL= /bin/sh +MAKE_FILE= Makefile #### # Normally, the upper level makefile will set these values. We provide @@ -96,7 +96,7 @@ CALC_SHAREDIR= /usr/share/calc # ${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 +# ${CUSTOMINCDIR} where custom .h files are installed # ${SCRIPTDIR} where calc shell scripts are installed # # NOTE: The install rule prepends installation paths with ${T}, which @@ -170,6 +170,7 @@ CP= cp MV= mv CO= co TRUE= true +TOUCH= touch # The calc files to install # diff --git a/cscript/Makefile b/cscript/Makefile index df013f0..cfbec01 100644 --- a/cscript/Makefile +++ b/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.27 $ -# @(#) $Id: Makefile,v 29.27 2006/09/18 07:04:42 chongo Exp $ +# @(#) $Revision: 29.28 $ +# @(#) $Id: Makefile,v 29.28 2006/09/18 13:13:25 chongo Exp $ # @(#) $Source: /usr/local/src/cmd/calc/cscript/RCS/Makefile,v $ # # Under source code control: 1999/11/29 11:10:26 @@ -34,7 +34,7 @@ # required vars # SHELL= /bin/sh -MAKE_FILE = Makefile +MAKE_FILE= Makefile #### # Normally, the upper level makefile will set these values. We provide @@ -96,7 +96,7 @@ CALC_SHAREDIR= /usr/share/calc # ${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 +# ${CUSTOMINCDIR} where custom .h files are installed # ${SCRIPTDIR} where calc shell scripts are installed # # NOTE: The install rule prepends installation paths with ${T}, which @@ -248,7 +248,8 @@ distdir: calcliblist: -# These next rule help me form the ${DETAIL_HELP} makefile variables above. +# These next rule help me form the ${SCRIPT} and ${SCRIPT_SRC} makefile +# variables above. # detaillist: ${Q} -(echo "xxxxxxx"; \ diff --git a/custom/Makefile b/custom/Makefile index 9f56f8c..85255f4 100644 --- a/custom/Makefile +++ b/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.28 $ -# @(#) $Id: Makefile,v 29.28 2006/09/18 07:04:42 chongo Exp $ +# @(#) $Revision: 29.29 $ +# @(#) $Id: Makefile,v 29.29 2006/09/18 13:13:25 chongo Exp $ # @(#) $Source: /usr/local/src/cmd/calc/custom/RCS/Makefile,v $ # # Under source code control: 1997/03/09 02:28:54 @@ -148,7 +148,7 @@ CALC_SHAREDIR= /usr/share/calc # ${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 +# ${CUSTOMINCDIR} where custom .h files are installed # ${SCRIPTDIR} where calc shell scripts are installed # # NOTE: The install rule prepends installation paths with ${T}, which @@ -249,6 +249,20 @@ NO_SHARED= #NO_SHARED= -dn #NO_SHARED= -non_shared +# On some systems where you are disabling dynamic shared link libs, you may +# need to pass a special flag to ${CC} and ${LCC} during linking stage. +# +# System type NO_SHARED recommendation +# +# IRIX with NO_SHARED= -non_shared LD_NO_SHARED= -Wl,-rdata_shared +# IRIX with NO_SHARED= LD_NO_SHARED= +# others LD_NO_SHARED= +# +# If in doubt, use LD_NO_SHARED= +# +LD_NO_SHARED= +#LD_NO_SHARED= -Wl,-rdata_shared + # Normally, the upper level makefile will set these values. We provide # a default here just in case you want to build from this directory. # @@ -275,12 +289,13 @@ 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. # -# If you do not wish to use purify, leave PURIFY commented out. +# If you do not wish to use purify, set PURIFY to an empty string. # -# If in doubt, leave PURIFY commented out. +# If in doubt, use PURIFY= # #PURIFY= purify -logfile=pure.out #PURIFY= purify +PURIFY= # Normally, the upper level makefile will set these values. We provide # a default here just in case you want to build from this directory. @@ -411,6 +426,7 @@ MV= mv CP= cp CO= co TRUE= true +MAKE= make ## # @@ -517,8 +533,8 @@ depend: >> "skel/custom/$$i"; \ echo '#endif /* '"$$tag"' */' >> "skel/custom/$$i"; \ done - ${Q} (cd ..; ${MAKE} hsrc) - ${Q} for i in `cd ..; ${MAKE} h_list 2>&1 | \ + ${Q} (cd ..; $(MAKE) hsrc) + ${Q} for i in `cd ..; $(MAKE) h_list 2>&1 | \ ${SED} -e '/Entering directory/d' \ -e '/Nothing to be done/d' \ -e '/Leaving directory/d'` /dev/null; do \ diff --git a/help/Makefile b/help/Makefile index 59ebb34..d7b4668 100644 --- a/help/Makefile +++ b/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.33 $ -# @(#) $Id: Makefile,v 29.33 2006/09/18 07:04:42 chongo Exp $ +# @(#) $Revision: 29.34 $ +# @(#) $Id: Makefile,v 29.34 2006/09/18 13:13:25 chongo Exp $ # @(#) $Source: /usr/local/src/cmd/calc/help/RCS/Makefile,v $ # # Under source code control: 1991/07/23 06:47:57 @@ -34,7 +34,7 @@ # required vars # SHELL= /bin/sh -MAKE_FILE = Makefile +MAKE_FILE= Makefile #### # Normally, the upper level makefile will set these values. We provide diff --git a/sample/Makefile b/sample/Makefile index 1b03415..63f0149 100644 --- a/sample/Makefile +++ b/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.22 $ -# @(#) $Id: Makefile,v 29.22 2006/09/18 07:04:42 chongo Exp $ +# @(#) $Revision: 29.23 $ +# @(#) $Id: Makefile,v 29.23 2006/09/18 13:13:25 chongo Exp $ # @(#) $Source: /usr/local/src/cmd/calc/sample/RCS/Makefile,v $ # # Under source code control: 1997/04/19 22:46:49 @@ -35,7 +35,6 @@ ############################################################################## # Any .h files that are needed by programs that use libcustcalc.a -# Don't put ${REQUIRED_H_SRC} files in this list. # # Put any .h files that you add which might be useful to other # programs here. @@ -43,7 +42,6 @@ SAMPLE_H_SRC= # Any .c files that are needed to build libcustcalc.a. -# Don't put ${REQUIRED_SRC} files in this list. # # There MUST be a .c in SAMPLE_SRC for every .o in SAMPLE_OBJ. # @@ -52,7 +50,6 @@ SAMPLE_H_SRC= SAMPLE_SRC= many_random.c test_random.c # Any .o files that are needed by program that use libcustcalc.a. -# Don't put ${REQUIRED_OBJ} files in this list. # # There MUST be a .c in SAMPLE_SRC for every .o in SAMPLE_OBJ. # @@ -135,7 +132,7 @@ CALC_SHAREDIR= /usr/share/calc # ${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 +# ${CUSTOMINCDIR} where custom .h files are installed # ${SCRIPTDIR} where calc shell scripts are installed # # NOTE: The install rule prepends installation paths with ${T}, which @@ -236,6 +233,20 @@ NO_SHARED= #NO_SHARED= -dn #NO_SHARED= -non_shared +# On some systems where you are disabling dynamic shared link libs, you may +# need to pass a special flag to ${CC} and ${LCC} during linking stage. +# +# System type NO_SHARED recommendation +# +# IRIX with NO_SHARED= -non_shared LD_NO_SHARED= -Wl,-rdata_shared +# IRIX with NO_SHARED= LD_NO_SHARED= +# others LD_NO_SHARED= +# +# If in doubt, use LD_NO_SHARED= +# +LD_NO_SHARED= +#LD_NO_SHARED= -Wl,-rdata_shared + # Normally, the upper level makefile will set these values. We provide # a default here just in case you want to build from this directory. # @@ -262,12 +273,22 @@ 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. # -# If you do not wish to use purify, leave PURIFY commented out. +# If you do not wish to use purify, set PURIFY to an empty string. # -# If in doubt, leave PURIFY commented out. +# If in doubt, use PURIFY= # #PURIFY= purify -logfile=pure.out #PURIFY= purify +PURIFY= + +# If you want to use a debugging link library such as a malloc debug link +# library, or need to add special ld flags after the calc link libraries +# are included, set ${LD_DEBUG} below. +# +# If in doubt, set LD_DEBUG to empty. +# +#LD_DEBUG= -lmalloc_cv +LD_DEBUG= # Normally, the upper level makefile will set these values. We provide # a default here just in case you want to build from this directory. @@ -492,8 +513,8 @@ depend: fi; \ fi; \ done - ${Q} (cd ..; ${MAKE} hsrc) - ${Q} for i in `cd ..; ${MAKE} h_list 2>&1 | \ + ${Q} (cd ..; $(MAKE) hsrc) + ${Q} for i in `cd ..; $(MAKE) h_list 2>&1 | \ ${SED} -e '/Entering directory/d' \ -e '/Nothing to be done/d' \ -e '/Leaving directory/d'` /dev/null; do \ diff --git a/version.c b/version.c index e9b9e44..bdb24b3 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.70 $ - * @(#) $Id: version.c,v 29.70 2006/09/18 08:01:36 chongo Exp $ + * @(#) $Revision: 29.71 $ + * @(#) $Id: version.c,v 29.71 2006/09/18 13:14:03 chongo Exp $ * @(#) $Source: /usr/local/src/cmd/calc/RCS/version.c,v $ * * Under source code control: 1990/05/22 11:00:58 @@ -48,7 +48,7 @@ static char *program; #define MAJOR_VER 2 /* major version */ #define MINOR_VER 12 /* minor version */ #define MAJOR_PATCH 1 /* patch level or 0 if no patch */ -#define MINOR_PATCH 4 /* test number or 0 if no minor patch */ +#define MINOR_PATCH 5 /* test number or 0 if no minor patch */ /*