Release calc version 2.11.5t4.4

CHANGES

@@ -21,6 +21,35 @@ 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.
+
+    Applied Makefile, cscript/Makefile and custom/Makefile patches to
+    fix install mode problems, to deal with sorting and dates in I18n
+    environments (such as Japanese), to fix some problems with calc.spec
+    and to fix the cscript #! header lines.  Thanks goes to KAWAMURA Masao
+    (kawamura at mlb.co.jp) for the bug report and patch!
+
+    Fixed headers on fproduct.calc powerterm.calc 4dsphere.calc so
+    that they are correcly changed on installation.
+
+    Added ${GREP} Makefile variable.
+
+    The top level Makefile now sets LANG=C and passes it down to
+    lower level Makefiles.
+
 
 The following are the changes from calc version 2.11.5t3 to 2.11.5t4:
 
@@ -5305,8 +5334,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.38 $
+## @(#) $Id: CHANGES,v 29.38 2001/06/06 10:06:48 chongo Exp $
 ## @(#) $Source: /usr/local/src/cmd/calc/RCS/CHANGES,v $
 ##
 ## Under source code control:	1993/06/02 18:12:57

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.33 $$
+# @(#) $Id: Makefile.ship,v 29.33 2001/06/06 10:06:48 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
@@ -996,9 +997,11 @@ CC= ${PURIFY} ${LCC}
 # standard utilities used during make
 #
 SHELL= /bin/sh
+LANG= C
 MAKE= make
 AWK= awk
 SED= sed
+GREP= egrep
 SORT= sort
 TEE= tee
 CTAGS= ctags
@@ -1155,7 +1158,8 @@ CUSTOM_PASSDOWN= Q="${Q}" \
     CHMOD=${CHMOD} \
     CMP=${CMP} \
     MAKEDEPEND=${MAKEDEPEND} \
-    SORT=${SORT}
+    SORT=${SORT} \
+    LANG=${LANG}
 
 # The complete list of Makefile vars passed down to sample/Makefile.
 #
@@ -1186,7 +1190,8 @@ SAMPLE_PASSDOWN= Q="${Q}" \
     CHMOD=${CHMOD} \
     CMP=${CMP} \
     MAKEDEPEND=${MAKEDEPEND} \
-    SORT=${SORT}
+    SORT=${SORT} \
+    LANG=${LANG}
 
 # The compelte list of Makefile vars passed down to help/Makefile.
 #
@@ -1201,7 +1206,8 @@ HELP_PASSDOWN= Q="${Q}" \
     SED=${SED} \
     CHMOD=${CHMOD} \
     CMP=${CMP} \
-    FMT=${FMT}
+    FMT=${FMT} \
+    LANG=${LANG}
 
 # The compelte list of Makefile vars passed down to cal/Makefile.
 #
@@ -1210,7 +1216,8 @@ CAL_PASSDOWN= Q="${Q}" \
     CSHAREDIR="${CSHAREDIR}" \
     MAKE_FILE=${MAKE_FILE} \
     CHMOD=${CHMOD} \
-    CMP=${CMP}
+    CMP=${CMP} \
+    LANG=${LANG}
 
 # The compelte list of Makefile vars passed down to cscript/Makefile.
 #
@@ -1222,7 +1229,8 @@ CSCRIPT_PASSDOWN= Q="${Q}" \
     SED=${SED} \
     FMT=${FMT} \
     SORT=${SORT} \
-    CMP=${CMP}
+    CMP=${CMP} \
+    LANG=${LANG}
 
 # complete list of .h files found (but not built) in the distribution
 #
@@ -2992,6 +3000,8 @@ env:
 	@echo 'MAKE=${MAKE}'; echo ''
 	@echo 'AWK=${AWK}'; echo ''
 	@echo 'SED=${SED}'; echo ''
+	@echo 'GREP=${GREP}'; echo ''
+	@echo 'LANG=${LANG}'; echo ''
 	@echo 'SORT=${SORT}'; echo ''
 	@echo 'TEE=${TEE}'; echo ''
 	@echo 'CTAGS=${CTAGS}'; echo ''
@@ -3099,10 +3109,10 @@ 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:$${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:$${CSHAREDIR}:${CSHAREDIR}: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,$${CUSTOMLIBDIR},${CUSTOMLIBDIR},g' >> calc.spec.sed
@@ -3122,51 +3132,51 @@ calc.spec: spec-template ${MAKE_FILE} help/Makefile cal/Makefile \
 	${Q}echo 's,$${MANMODE},${MANMODE},g' >> calc.spec.sed
 	${Q}echo 's,$${MANEXT},${MANEXT},g' >> calc.spec.sed
 	${Q}echo 's,$${CHMOD},${CHMOD},g' >> calc.spec.sed
-	${Q}cd help; \
+	${Q}cd help; LANG=C \
 	    ${MAKE} -f Makefile ${HELP_PASSDOWN} echo_STD_HELP_FILES | \
-	    grep -v '^make\[[0-9][0-9]*\]: .*ing directory ' | \
+	    ${GREP} '__file__..' | ${SED} -e s'/.*__file__ //' | \
 	    ${SED} -e 's/^/s,$${STD_HELP_FILES},/' \
 	    	   -e 's/$$/,g/' >> ../calc.spec.sed
-	${Q}cd help; \
+	${Q}cd help; LANG=C \
 	    ${MAKE} -f Makefile ${HELP_PASSDOWN} echo_BLT_HELP_FILES | \
-	    grep -v '^make\[[0-9][0-9]*\]: .*ing directory ' | \
+	    ${GREP} '__file__..' | ${SED} -e s'/.*__file__ //' | \
 	    ${SED} -e 's/^/s,$${BLT_HELP_FILES},/' \
 		   -e 's/$$/,g/' >> ../calc.spec.sed
-	${Q}cd help; \
+	${Q}cd help; LANG=C \
 	    ${MAKE} -f Makefile ${HELP_PASSDOWN} echo_DETAIL_HELP | \
-	    grep -v '^make\[[0-9][0-9]*\]: .*ing directory ' | \
+	    ${GREP} '__file__..' | ${SED} -e s'/.*__file__ //' | \
 	    ${SED} -e 's/^/s,$${DETAIL_HELP},/' \
 	    	   -e 's/$$/,g/' >> ../calc.spec.sed
-	${Q}cd help; \
+	${Q}cd help; LANG=C \
 	    ${MAKE} -f Makefile ${HELP_PASSDOWN} echo_SINGULAR_FILES | \
-	    grep -v '^make\[[0-9][0-9]*\]: .*ing directory ' | \
+	    ${GREP} '__file__..' | ${SED} -e s'/.*__file__ //' | \
 	    ${SED} -e 's/^/s,$${SINGULAR_FILES},/' \
 	    	   -e 's/$$/,g/' >> ../calc.spec.sed
-	${Q}cd cal; \
+	${Q}cd cal; LANG=C \
 	    ${MAKE} -f Makefile ${CAL_PASSDOWN} echo_CALC_FILES | \
-	    grep -v '^make\[[0-9][0-9]*\]: .*ing directory ' | \
+	    ${GREP} '__file__..' | ${SED} -e s'/.*__file__ //' | \
 	    ${SED} -e 's/^/s,$${CALC_FILES},/' \
 	    	   -e 's/$$/,g/' >> ../calc.spec.sed
-	${Q}cd custom; \
+	${Q}cd custom; LANG=C \
 	    ${MAKE} -f Makefile ${CUSTOM_PASSDOWN} echo_INSTALL_H_SRC | \
-	    grep -v '^make\[[0-9][0-9]*\]: .*ing directory ' | \
+	    ${GREP} '__file__..' | ${SED} -e s'/.*__file__ //' | \
 	    ${SED} -e 's/^/s,$${INSTALL_H_SRC},/' \
 	    	   -e 's/$$/,g/' >> ../calc.spec.sed
-	${Q}cd custom; \
+	${Q}cd custom; LANG=C \
 	    ${MAKE} -f Makefile ${CUSTOM_PASSDOWN} echo_CUSTOM_CALC_FILES | \
-	    grep -v '^make\[[0-9][0-9]*\]: .*ing directory ' | \
+	    ${GREP} '__file__..' | ${SED} -e s'/.*__file__ //' | \
 	    ${SED} -e 's/^/s,$${CUSTOM_CALC_FILES},/' \
 	    	   -e 's/$$/,g/' >> ../calc.spec.sed
-	${Q}cd custom; \
+	${Q}cd custom; LANG=C \
 	    ${MAKE} -f Makefile ${CUSTOM_PASSDOWN} echo_CUSTOM_HELP | \
-	    grep -v '^make\[[0-9][0-9]*\]: .*ing directory ' | \
+	    ${GREP} '__file__..' | ${SED} -e s'/.*__file__ //' | \
 	    ${SED} -e 's/^/s,$${CUSTOM_HELP},/' \
 	    	   -e 's/$$/,g/' >> ../calc.spec.sed
-	${Q}cd cscript; \
+	${Q}cd cscript; LANG=C \
 	    ${MAKE} -f Makefile ${CSCRIPT_PASSDOWN} echo_SCRIPT | \
-	    grep -v '^make\[[0-9][0-9]*\]: .*ing directory ' | \
+	    ${GREP} '__file__..' | ${SED} -e s'/.*__file__ //' | \
 	    ${SED} -e 's/^/s,$${SCRIPT},/' -e 's/$$/,g/' >> ../calc.spec.sed
-	${Q}echo 's,$${DATE},'`date +"%a %b %d %Y"`',g' >> calc.spec.sed
+	${Q}echo 's,$${DATE},'`LANG=C date +"%a %b %d %Y"`',g' >> calc.spec.sed
 	${Q}echo 's,$${VER_CALC},'`./ver_calc`',g' >> calc.spec.sed
 	${Q}echo 's,$${VERSION},'`./ver_calc -v`',g' >> calc.spec.sed
 	${Q}echo 's,$${RELEASE},'`./ver_calc -r`',g' >> calc.spec.sed
@@ -3176,31 +3186,31 @@ calc.spec: spec-template ${MAKE_FILE} help/Makefile cal/Makefile \
 
 # Form the installed file list
 #
-install.list: ${MAKE_FILE} help/Makefile cal/Makefile custom/Makefile \
+inst_files: ${MAKE_FILE} help/Makefile cal/Makefile custom/Makefile \
 	   cscript/Makefile ver_calc
 	${V} echo '=-=-=-=-= start of $@ rule =-=-=-=-='
-	${Q}rm -f install.list
-	${Q}echo ${BINDIR}/calc > install.list
-	${Q}cd help; \
-	    ${MAKE} -f Makefile ${HELP_PASSDOWN} echo_install.list | \
-	    grep -v '^make\[[0-9][0-9]*\]: .*ing directory ' >> ../install.list
-	${Q}cd cal; \
-	    ${MAKE} -f Makefile ${CAL_PASSDOWN} echo_install.list | \
-	    grep -v '^make\[[0-9][0-9]*\]: .*ing directory ' >> ../install.list
-	${Q}cd custom; \
-	    ${MAKE} -f Makefile ${CUSTOM_PASSDOWN} echo_install.list | \
-	    grep -v '^make\[[0-9][0-9]*\]: .*ing directory ' >> ../install.list
-	${Q}cd cscript; \
-	    ${MAKE} -f Makefile ${CSCRIPT_PASSDOWN} echo_install.list | \
-	    grep -v '^make\[[0-9][0-9]*\]: .*ing directory ' >> ../install.list
-	${Q}echo ${LIBDIR}/libcalc.a >> install.list
+	${Q}rm -f inst_files
+	${Q}echo ${BINDIR}/calc > inst_files
+	${Q}cd help; LANG=C \
+	    ${MAKE} -f Makefile ${HELP_PASSDOWN} echo_inst_files | \
+	    ${GREP} '__file__..' | ${SED} -e s'/.*__file__ //' >> ../inst_files
+	${Q}cd cal; LANG=C \
+	    ${MAKE} -f Makefile ${CAL_PASSDOWN} echo_inst_files | \
+	    ${GREP} '__file__..' | ${SED} -e s'/.*__file__ //' >> ../inst_files
+	${Q}cd custom; LANG=C \
+	    ${MAKE} -f Makefile ${CUSTOM_PASSDOWN} echo_inst_files | \
+	    ${GREP} '__file__..' | ${SED} -e s'/.*__file__ //' >> ../inst_files
+	${Q}cd cscript; LANG=C \
+	    ${MAKE} -f Makefile ${CSCRIPT_PASSDOWN} echo_inst_files | \
+	    ${GREP} '__file__..' | ${SED} -e s'/.*__file__ //' >> ../inst_files
+	${Q}echo ${LIBDIR}/libcalc.a >> inst_files
 	${Q}for i in ${LIB_H_SRC} ${BUILD_H_SRC}; do \
 	    echo ${INCDIRCALC}/$$i; \
-	done >> install.list
+	done >> inst_files
 	${Q}if [ ! -z "${MANDIR}" ]; then \
 	    echo ${MANDIR}/calc.${MANEXT}; \
-	fi >> install.list
-	${Q}LANG=C ${SORT} -u install.list -o install.list
+	fi >> inst_files
+	${Q}LANG=C ${SORT} -u inst_files -o inst_files
 	${V} echo '=-=-=-=-= end of $@ rule =-=-=-=-='
 
 ##
@@ -3216,7 +3226,7 @@ install.list: ${MAKE_FILE} help/Makefile cal/Makefile custom/Makefile \
 # the /usr/local directory.
 #
 olduninstall:
-	-rm -f install.list
+	-rm -f inst_files
 	${MAKE} -f Makefile \
 		BINDIR=/usr/local/bin \
 		SHAREDIR=/usr/local/lib \
@@ -3230,19 +3240,19 @@ olduninstall:
 		CUSTOMINCDIR=/usr/local/lib/calc/custom \
 		SCRIPTDIR=/usr/local/bin/cscript \
 		MANDIR=/usr/local/man/man1 \
-		install.list
-	-${XARGS} rm -f < install.list
+		inst_files
+	-${XARGS} rm -f < inst_files
 	-rmdir /usr/local/lib/calc/help/custhelp
 	-rmdir /usr/local/lib/calc/help
 	-rmdir /usr/local/lib/calc/custom
 	-rmdir /usr/local/lib/calc
 	-rmdir /usr/local/include/calc
 	-rmdir /usr/local/bin/cscript
-	-rm -f install.list
+	-rm -f inst_files
 
 tags: ${CALCSRC} ${LIBSRC} ${H_SRC} ${BUILD_H_SRC} ${MAKE_FILE}
 	-${CTAGS} ${CALCSRC} ${LIBSRC} ${H_SRC} ${BUILD_H_SRC} 2>&1 | \
-	    egrep -v 'Duplicate entry|Second entry ignored'
+	    ${GREP} -v 'Duplicate entry|Second entry ignored'
 
 clean:
 	${V} echo '=-=-=-=-= start of $@ rule =-=-=-=-='
@@ -3290,7 +3300,7 @@ clobber:
 	-rm -f have_args *.u
 	-rm -f calc.pixie calc.rf calc.Counts calc.cord
 	-rm -rf gen_h skel Makefile.bak
-	-rm -f calc.spec install.list tmp
+	-rm -f calc.spec inst_files tmp
 	${V} echo '=-=-=-=-= Invoking $@ rule for help =-=-=-=-='
 	-cd help; ${MAKE} -f Makefile ${HELP_PASSDOWN} clobber
 	${V} echo '=-=-=-=-= Back to the main Makefile for $@ rule =-=-=-=-='

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.9 $
-# @(#) $Id: Makefile,v 29.9 2001/05/28 21:56:08 chongo Exp $
+# @(#) $Revision: 29.10 $
+# @(#) $Id: Makefile,v 29.10 2001/06/06 10:06:48 chongo Exp $
 # @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/Makefile,v $
 #
 # Under source code control:	1991/07/21 05:00:54
@@ -124,12 +124,12 @@ calcliblist:
 #
 ##
 
-echo_CALC_FILES: ${MAKE_FILE}
-	@echo ${CALC_FILES}
+echo_CALC_FILES:
+	${Q}echo __file__ ${CALC_FILES}
 
-echo_install.list: ${MAKE_FILE}
-	@for i in ${CALC_FILES}; do \
-	    echo ${CSHAREDIR}/$$i; \
+echo_inst_files:
+	${Q}for i in ${CALC_FILES}; do \
+	    echo __file__ ${CSHAREDIR}/$$i; \
 	done
 
 ##

cscript/4dsphere.calc

@@ -1,4 +1,4 @@
-#!/usr/local/bin/calc -q -s -f
+#!/usr/local/src/cmd/calc/calc -q -s -f
 /*
  * 4dsphere - determine if 6 points lie on the surface of a sphere in R^4
  *
@@ -26,8 +26,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: 1.2 $
- * @(#) $Id: 4dsphere.calc,v 1.2 2001/05/29 00:48:46 chongo Exp $
+ * @(#) $Revision: 1.3 $
+ * @(#) $Id: 4dsphere.calc,v 1.3 2001/06/06 09:06:29 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/cscript/RCS/4dsphere.calc,v $
  *
  * Under source code control:   2001/05/03 19:02:03

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.14 $
-# @(#) $Id: Makefile,v 29.14 2001/05/28 23:08:22 chongo Exp $
+# @(#) $Revision: 29.16 $
+# @(#) $Id: Makefile,v 29.16 2001/06/06 10:06:48 chongo Exp $
 # @(#) $Source: /usr/local/src/cmd/calc/cscript/RCS/Makefile,v $
 #
 # Under source code control:	1999/11/29 11:10:26
@@ -216,14 +216,14 @@ depend:
 #
 ##
 
-echo_SCRIPT: ${MAKE_FILE}
-	@echo ${SCRIPT}
+echo_SCRIPT:
+	${Q}echo __file__ ${SCRIPT}
 
-
-echo_install.list: ${MAKE_FILE}
-	@for i in ${SCRIPT}; do \
-	    echo ${SCRIPTDIR}/$$i; \
+echo_inst_files:
+	${Q}for i in ${SCRIPT}; do \
+	    echo __file__ ${SCRIPTDIR}/$$i; \
 	done
+
 ##
 #
 # Utility rules
@@ -259,7 +259,7 @@ install: all
 	    else \
 		rm -f ${SCRIPTDIR}/$$i.new; \
 		cp -f $$i ${SCRIPTDIR}/$$i.new; \
-		${CHMOD} 0555 ${SCRIPTDIR}/$$i; \
+		${CHMOD} 0555 ${SCRIPTDIR}/$$i.new; \
 		mv -f ${SCRIPTDIR}/$$i.new ${SCRIPTDIR}/$$i; \
 		echo "installed ${SCRIPTDIR}/$$i"; \
 	    fi; \

cscript/fproduct.calc

@@ -1,4 +1,4 @@
-#!/usr/local/bin/calc -q -s -f
+#!/usr/local/src/cmd/calc/calc -q -s -f
 /*
  * fproduct - write the big Endian product of terms to a file
  *
@@ -24,8 +24,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.1 $
- * @(#) $Id: fproduct.calc,v 29.1 2001/04/08 08:25:15 chongo Exp $
+ * @(#) $Revision: 29.2 $
+ * @(#) $Id: fproduct.calc,v 29.2 2001/06/06 09:06:29 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/cscript/RCS/fproduct.calc,v $
  *
  * Under source code control:   2001/04/07 20:13:11

cscript/powerterm.calc

@@ -1,4 +1,4 @@
-#!/usr/local/bin/calc -q -s -f
+#!/usr/local/src/cmd/calc/calc -q -s -f
 /*
  * powerterm - print the argument as a sum of powers of integers
  *
@@ -24,8 +24,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.5 $
- * @(#) $Id: powerterm.calc,v 29.5 2001/04/25 08:41:36 chongo Exp $
+ * @(#) $Revision: 29.6 $
+ * @(#) $Id: powerterm.calc,v 29.6 2001/06/06 09:06:29 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/cscript/RCS/powerterm.calc,v $
  *
  * Under source code control:   2001/04/24 23:49:11

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.13 $
-# @(#) $Id: Makefile,v 29.13 2001/05/28 23:54:53 chongo Exp $
+# @(#) $Revision: 29.15 $
+# @(#) $Id: Makefile,v 29.15 2001/06/06 10:06:48 chongo Exp $
 # @(#) $Source: /usr/local/src/cmd/calc/custom/RCS/Makefile,v $
 #
 # Under source code control:	1997/03/09 02:28:54
@@ -468,27 +468,27 @@ depend:
 #
 ##
 
-echo_INSTALL_H_SRC: ${MAKE_FILE}
-	@echo ${INSTALL_H_SRC}
+echo_INSTALL_H_SRC:
+	${Q}echo __file__ ${INSTALL_H_SRC}
 
-echo_CUSTOM_CALC_FILES: ${MAKE_FILE}
-	@echo ${CUSTOM_CALC_FILES}
+echo_CUSTOM_CALC_FILES:
+	${Q}echo __file__ ${CUSTOM_CALC_FILES}
 
-echo_CUSTOM_HELP: ${MAKE_FILE}
-	@echo ${CUSTOM_HELP}
+echo_CUSTOM_HELP:
+	${Q}echo __file__ ${CUSTOM_HELP}
 
-echo_install.list: ${MAKE_FILE}
-	@for i in ${INSTALL_H_SRC}; do \
-	    echo ${CUSTOMINCDIR}/$$i; \
+echo_inst_files:
+	${Q}for i in ${INSTALL_H_SRC}; do \
+	    echo __file__ ${CUSTOMINCDIR}/$$i; \
 	done
-	@for i in ${CUSTOM_HELP}; do \
-	    echo ${CUSTOMHELPDIR}/$$i; \
+	${Q}for i in ${CUSTOM_HELP}; do \
+	    echo __file__ ${CUSTOMHELPDIR}/$$i; \
 	done
-	@for i in ${CUSTOM_CALC_FILES}; do \
-	    echo ${CUSTOMLIBDIR}/$$i; \
+	${Q}for i in ${CUSTOM_CALC_FILES}; do \
+	    echo __file__ ${CUSTOMLIBDIR}/$$i; \
 	done
-	@for i in ${CALC_LIBCUSTOM}; do \
-	    echo ${CUSTOMLIBDIR}/$$i; \
+	${Q}for i in ${CALC_LIBCUSTOM}; do \
+	    echo __file__ ${CUSTOMLIBDIR}/$$i; \
 	done
 
 ##
@@ -575,7 +575,7 @@ install: all
 	    if ${CMP} -s tmp ${CUSTOMINCDIR}/$$i; then \
 		true; \
 	    else \
-		rm -f ${CUSTOMINCDIR}/$$i; \
+		rm -f ${CUSTOMINCDIR}/$$i.new; \
 		cp -f tmp ${INCDIRCALC}/$$i.new; \
 		cp -f $$i ${CUSTOMINCDIR}/$$i.new; \
 		${CHMOD} 0444 ${CUSTOMINCDIR}/$$i.new; \
@@ -588,8 +588,8 @@ install: all
 	    if ${CMP} -s $$i ${CUSTOMLIBDIR}/$$i; then \
 		true; \
 	    else \
-		rm -f ${CUSTOMLIBDIR}/$$i; \
-		cp -f $$i ${CUSTOMLIBDIR}/$$i; \
+		rm -f ${CUSTOMLIBDIR}/$$i.new; \
+		cp -f $$i ${CUSTOMLIBDIR}/$$i.new; \
 		${CHMOD} 0444 ${CUSTOMLIBDIR}/$$i.new; \
 		mv -f ${CUSTOMLIBDIR}/$$i.new ${CUSTOMLIBDIR}/$$i; \
 		echo "installed ${CUSTOMLIBDIR}/$$i"; \
@@ -599,7 +599,7 @@ install: all
 	    if ${CMP} -s $$i ${CUSTOMHELPDIR}/$$i; then \
 		true; \
 	    else \
-		rm -f ${CUSTOMHELPDIR}/$$i; \
+		rm -f ${CUSTOMHELPDIR}/$$i.new; \
 		cp -f $$i ${CUSTOMHELPDIR}/$$i.new; \
 		${CHMOD} 0444 ${CUSTOMHELPDIR}/$$i.new; \
 		mv -f ${CUSTOMHELPDIR}/$$i.new ${CUSTOMHELPDIR}/$$i; \
@@ -612,7 +612,7 @@ install: all
 	    else \
 		rm -f ${CUSTOMLIBDIR}/libcustcalc.a.new; \
 		cp -f libcustcalc.a ${CUSTOMLIBDIR}/libcustcalc.a.new; \
-		${CHMOD} 0644 ${CUSTOMLIBDIR}/libcustcalc.a; \
+		${CHMOD} 0644 ${CUSTOMLIBDIR}/libcustcalc.a.new; \
 		mv -f ${CUSTOMLIBDIR}/libcustcalc.a.new \
 		      ${CUSTOMLIBDIR}/libcustcalc.a; \
 		${RANLIB} ${CUSTOMLIBDIR}/libcustcalc.a; \

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.13 $
-# @(#) $Id: Makefile,v 29.13 2001/05/29 00:41:11 chongo Exp $
+# @(#) $Revision: 29.14 $
+# @(#) $Id: Makefile,v 29.14 2001/06/06 10:06:48 chongo Exp $
 # @(#) $Source: /usr/local/src/cmd/calc/help/RCS/Makefile,v $
 #
 # Under source code control:	1991/07/23 06:47:57
@@ -497,24 +497,24 @@ detaillist:
 #
 ##
 
-echo_STD_HELP_FILES: ${MAKE_FILE}
-	@echo ${STD_HELP_FILES}
+echo_STD_HELP_FILES:
+	${Q}echo __file__ ${STD_HELP_FILES}
 
-echo_BLT_HELP_FILES: ${MAKE_FILE}
-	@echo ${BLT_HELP_FILES}
+echo_BLT_HELP_FILES:
+	${Q}echo __file__ ${BLT_HELP_FILES}
 
-echo_DETAIL_HELP: ${MAKE_FILE}
-	@echo ${DETAIL_HELP}
+echo_DETAIL_HELP:
+	${Q}echo __file__ ${DETAIL_HELP}
 
-echo_SINGULAR_FILES: ${MAKE_FILE}
-	@echo ${SINGULAR_FILES}
+echo_SINGULAR_FILES:
+	${Q}echo __file__ ${SINGULAR_FILES}
 
-echo_install.list: ${MAKE_FILE}
-	@for i in ${STD_HELP_FILES} full ${BLT_HELP_FILES} \
+echo_inst_files:
+	${Q}for i in ${STD_HELP_FILES} full ${BLT_HELP_FILES} \
 		  builtin ${DETAIL_HELP} ${SINGULAR_FILES}; do \
-	    echo ${HELPDIR}/$$i; \
+	    echo __file__ ${HELPDIR}/$$i; \
 	done
-	@echo ${HELPDIR}/obj
+	${Q}echo __file__ ${HELPDIR}/obj
 
 ##
 #

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.11 $
-# @(#) $Id: Makefile,v 29.11 2001/05/28 23:54:53 chongo Exp $
+# @(#) $Revision: 29.12 $
+# @(#) $Id: Makefile,v 29.12 2001/06/06 10:06:48 chongo Exp $
 # @(#) $Source: /usr/local/src/cmd/calc/sample/RCS/Makefile,v $
 #
 # Under source code control:	1997/04/19 22:46:49
@@ -445,7 +445,7 @@ depend:
 #
 ##
 
-echo_install.list: Makefile
+echo_inst_files: Makefile
 
 
 ##

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.30 $
+ * @(#) $Id: version.c,v 29.30 2001/06/06 08:48:46 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.4"	/* test number or empty string if no patch */
 
 /*
  * calc version constants