From 2c0d0bbc1bd145b0994210189e376b4d092c550e Mon Sep 17 00:00:00 2001 From: Landon Curt Noll Date: Sun, 17 Sep 2006 17:18:43 -0700 Subject: [PATCH] Release calc version 2.12.1.2 --- Makefile | 78 +++++++++++++++++++------------------- cal/Makefile | 20 +++++----- cscript/Makefile | 56 +++++++++++++-------------- custom/Makefile | 98 ++++++++++++++++++++++++------------------------ help/Makefile | 62 +++++++++++++++--------------- sample/Makefile | 58 ++++++++++++++-------------- version.c | 6 +-- 7 files changed, 189 insertions(+), 189 deletions(-) diff --git a/Makefile b/Makefile index 5632489..1333df1 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.77 $$ -# @(#) $Id: Makefile.ship,v 29.77 2006/09/17 23:49:27 chongo Exp $ +MAKEFILE_REV= $$Revision: 29.78 $$ +# @(#) $Id: Makefile.ship,v 29.78 2006/09/18 00:13:59 chongo Exp $ # @(#) $Source: /usr/local/src/cmd/calc/RCS/Makefile.ship,v $ # # Under source code control: 1990/02/15 01:48:41 @@ -1326,7 +1326,7 @@ UTIL_PROGS= align32${EXT} fposval${EXT} have_uid_t${EXT} have_const${EXT} \ # The complete list of Makefile vars passed down to custom/Makefile. # -CUSTOM_PASSDOWN= Q="${Q} " \ +CUSTOM_PASSDOWN= Q="${Q}" \ INCDIR="${INCDIR}" \ BINDIR="${BINDIR}" \ LIBDIR="${LIBDIR}" \ @@ -1362,7 +1362,7 @@ CUSTOM_PASSDOWN= Q="${Q} " \ # The complete list of Makefile vars passed down to sample/Makefile. # -SAMPLE_PASSDOWN= Q="${Q} " \ +SAMPLE_PASSDOWN= Q="${Q}" \ INCDIR="${INCDIR}" \ BINDIR="${BINDIR}" \ LIBDIR="${LIBDIR}" \ @@ -1399,7 +1399,7 @@ SAMPLE_PASSDOWN= Q="${Q} " \ # The compelte list of Makefile vars passed down to help/Makefile. # -HELP_PASSDOWN= Q="${Q} " \ +HELP_PASSDOWN= Q="${Q}" \ INCDIR="${INCDIR}" \ BINDIR="${BINDIR}" \ LIBDIR="${LIBDIR}" \ @@ -1424,7 +1424,7 @@ HELP_PASSDOWN= Q="${Q} " \ # The compelte list of Makefile vars passed down to cal/Makefile. # -CAL_PASSDOWN= Q="${Q} " \ +CAL_PASSDOWN= Q="${Q}" \ INCDIR="${INCDIR}" \ BINDIR="${BINDIR}" \ LIBDIR="${LIBDIR}" \ @@ -1443,7 +1443,7 @@ CAL_PASSDOWN= Q="${Q} " \ # The compelte list of Makefile vars passed down to cscript/Makefile. # -CSCRIPT_PASSDOWN= Q="${Q} " \ +CSCRIPT_PASSDOWN= Q="${Q}" \ INCDIR="${INCDIR}" \ BINDIR="${BINDIR}" \ LIBDIR="${LIBDIR}" \ @@ -1641,7 +1641,7 @@ conf.h: ${MAKE_FILE} ${Q} echo '' >> conf.h ${Q} echo '#endif /* !__CONF_H__ */' >> conf.h ${Q} echo 'conf.h formed' - -@if [ -z "${Q} " ]; then \ + -@if [ -z "${Q}" ]; then \ echo ''; \ echo '=-=-= start of $@ =-=-='; \ cat $@; \ @@ -1693,7 +1693,7 @@ endian_calc.h: endian${EXT} ${MAKE_FILE} ${Q} echo '' >> endian_calc.h ${Q} echo '#endif /* !__ENDIAN_CALC_H__ */' >> endian_calc.h ${Q} echo 'endian_calc.h formed' - -@if [ -z "${Q} " ]; then \ + -@if [ -z "${Q}" ]; then \ echo ''; \ echo '=-=-= start of $@ =-=-='; \ cat $@; \ @@ -1720,7 +1720,7 @@ longbits.h: longbits${EXT} ${MAKE_FILE} ${Q} echo '' >> longbits.h ${Q} echo '#endif /* !__LONGBITS_H__ */' >> longbits.h ${Q} echo 'longbits.h formed' - -@if [ -z "${Q} " ]; then \ + -@if [ -z "${Q}" ]; then \ echo ''; \ echo '=-=-= start of $@ =-=-='; \ cat $@; \ @@ -1758,7 +1758,7 @@ have_malloc.h: ${MAKE_FILE} ${Q} echo '' >> have_malloc.h ${Q} echo '#endif /* !__HAVE_MALLOC_H__ */' >> have_malloc.h ${Q} echo 'have_malloc.h formed' - -@if [ -z "${Q} " ]; then \ + -@if [ -z "${Q}" ]; then \ echo ''; \ echo '=-=-= start of $@ =-=-='; \ cat $@; \ @@ -1829,7 +1829,7 @@ have_times.h: ${MAKE_FILE} ${Q} echo '' >> have_times.h ${Q} echo '#endif /* !__HAVE_TIMES_H__ */' >> have_times.h ${Q} echo 'have_times.h formed' - -@if [ -z "${Q} " ]; then \ + -@if [ -z "${Q}" ]; then \ echo ''; \ echo '=-=-= start of $@ =-=-='; \ cat $@; \ @@ -1867,7 +1867,7 @@ have_stdlib.h: ${MAKE_FILE} ${Q} echo '' >> have_stdlib.h ${Q} echo '#endif /* !__HAVE_STDLIB_H__ */' >> have_stdlib.h ${Q} echo 'have_stdlib.h formed' - -@if [ -z "${Q} " ]; then \ + -@if [ -z "${Q}" ]; then \ echo ''; \ echo '=-=-= start of $@ =-=-='; \ cat $@; \ @@ -1905,7 +1905,7 @@ have_unistd.h: ${MAKE_FILE} ${Q} echo '' >> have_unistd.h ${Q} echo '#endif /* !__HAVE_UNISTD_H__ */' >> have_unistd.h ${Q} echo 'have_unistd.h formed' - -@if [ -z "${Q} " ]; then \ + -@if [ -z "${Q}" ]; then \ echo ''; \ echo '=-=-= start of $@ =-=-='; \ cat $@; \ @@ -1943,7 +1943,7 @@ have_string.h: ${MAKE_FILE} ${Q} echo '' >> have_string.h ${Q} echo '#endif /* !__HAVE_STRING_H__ */' >> have_string.h ${Q} echo 'have_string.h formed' - -@if [ -z "${Q} " ]; then \ + -@if [ -z "${Q}" ]; then \ echo ''; \ echo '=-=-= start of $@ =-=-='; \ cat $@; \ @@ -2007,7 +2007,7 @@ terminal.h: ${MAKE_FILE} ${Q} echo '' >> terminal.h ${Q} echo '#endif /* !__TERMINAL_H__ */' >> terminal.h ${Q} echo 'terminal.h formed' - -@if [ -z "${Q} " ]; then \ + -@if [ -z "${Q}" ]; then \ echo ''; \ echo '=-=-= start of $@ =-=-='; \ cat $@; \ @@ -2047,7 +2047,7 @@ have_fpos.h: have_fpos.c ${MAKE_FILE} ${Q} echo '#endif /* !__HAVE_FPOS_H__ */' >> have_fpos.h -${Q} rm -f have_fpos${EXT} have_fpos.o fpos_tmp ${Q} echo 'have_fpos.h formed' - -@if [ -z "${Q} " ]; then \ + -@if [ -z "${Q}" ]; then \ echo ''; \ echo '=-=-= start of $@ =-=-='; \ cat $@; \ @@ -2091,7 +2091,7 @@ have_fpos_pos.h: have_fpos_pos.c have_fpos.h have_posscl.h ${MAKE_FILE} ${Q} echo '#endif /* !__HAVE_FPOS_POS_H__ */' >> have_fpos_pos.h -${Q} rm -f have_fpos_pos${EXT} have_fpos_pos.o fpos_tmp ${Q} echo 'have_fpos_pos.h formed' - -@if [ -z "${Q} " ]; then \ + -@if [ -z "${Q}" ]; then \ echo ''; \ echo '=-=-= start of $@ =-=-='; \ cat $@; \ @@ -2126,7 +2126,7 @@ fposval.h: fposval.c have_fpos.h have_fpos_pos.h have_offscl.h have_posscl.h \ ${Q} echo '#endif /* !__FPOSVAL_H__ */' >> fposval.h -${Q} rm -f fposval${EXT} fposval.o fposv_tmp ${Q} echo 'fposval.h formed' - -@if [ -z "${Q} " ]; then \ + -@if [ -z "${Q}" ]; then \ echo ''; \ echo '=-=-= start of $@ =-=-='; \ cat $@; \ @@ -2167,7 +2167,7 @@ have_const.h: have_const.c ${MAKE_FILE} ${Q} echo '#endif /* !__HAVE_CONST_H__ */' >> have_const.h -${Q} rm -f have_const${EXT} have_const.o const_tmp ${Q} echo 'have_const.h formed' - -@if [ -z "${Q} " ]; then \ + -@if [ -z "${Q}" ]; then \ echo ''; \ echo '=-=-= start of $@ =-=-='; \ cat $@; \ @@ -2207,7 +2207,7 @@ have_offscl.h: have_offscl.c ${MAKE_FILE} ${Q} echo '#endif /* !__HAVE_OFFSCL_H__ */' >> have_offscl.h -${Q} rm -f have_offscl${EXT} have_offscl.o offscl_tmp ${Q} echo 'have_offscl.h formed' - -@if [ -z "${Q} " ]; then \ + -@if [ -z "${Q}" ]; then \ echo ''; \ echo '=-=-= start of $@ =-=-='; \ cat $@; \ @@ -2247,7 +2247,7 @@ have_posscl.h: have_posscl.c have_fpos.h ${MAKE_FILE} ${Q} echo '#endif /* !__HAVE_POSSCL_H__ */' >> have_posscl.h -${Q} rm -f have_posscl have_posscl.o posscl_tmp ${Q} echo 'have_posscl.h formed' - -@if [ -z "${Q} " ]; then \ + -@if [ -z "${Q}" ]; then \ echo ''; \ echo '=-=-= start of $@ =-=-='; \ cat $@; \ @@ -2301,7 +2301,7 @@ align32.h: align32.c longbits.h have_unistd.h ${MAKE_FILE} ${Q} echo '' >> align32.h ${Q} echo '#endif /* !__MUST_ALIGN32_H__ */' >> align32.h ${Q} echo 'align32.h formed' - -@if [ -z "${Q} " ]; then \ + -@if [ -z "${Q}" ]; then \ echo ''; \ echo '=-=-= start of $@ =-=-='; \ cat $@; \ @@ -2340,7 +2340,7 @@ have_uid_t.h: have_uid_t.c have_unistd.h ${MAKE_FILE} ${Q} echo '#endif /* !__HAVE_UID_T_H__ */' >> have_uid_t.h -${Q} rm -f have_uid_t${EXT} have_uid_t.o uid_tmp ${Q} echo 'have_uid_t.h formed' - -@if [ -z "${Q} " ]; then \ + -@if [ -z "${Q}" ]; then \ echo ''; \ echo '=-=-= start of $@ =-=-='; \ cat $@; \ @@ -2381,7 +2381,7 @@ have_newstr.h: have_newstr.c ${MAKE_FILE} ${Q} echo '#endif /* !__HAVE_NEWSTR_H__ */' >> have_newstr.h -${Q} rm -f have_newstr${EXT} have_newstr.o newstr_tmp ${Q} echo 'have_newstr.h formed' - -@if [ -z "${Q} " ]; then \ + -@if [ -z "${Q}" ]; then \ echo ''; \ echo '=-=-= start of $@ =-=-='; \ cat $@; \ @@ -2421,7 +2421,7 @@ have_memmv.h: have_memmv.c ${MAKE_FILE} ${Q} echo '#endif /* !__HAVE_MEMMV_H__ */' >> have_memmv.h -${Q} rm -f have_memmv have_memmv.o memmv_tmp ${Q} echo 'have_memmv.h formed' - -@if [ -z "${Q} " ]; then \ + -@if [ -z "${Q}" ]; then \ echo ''; \ echo '=-=-= start of $@ =-=-='; \ cat $@; \ @@ -2461,7 +2461,7 @@ have_ustat.h: have_ustat.c ${MAKE_FILE} ${Q} echo '#endif /* !__HAVE_USTAT_H__ */' >> have_ustat.h -${Q} rm -f have_ustat${EXT} have_ustat.o ustat_tmp ${Q} echo 'have_ustat.h formed' - -@if [ -z "${Q} " ]; then \ + -@if [ -z "${Q}" ]; then \ echo ''; \ echo '=-=-= start of $@ =-=-='; \ cat $@; \ @@ -2501,7 +2501,7 @@ have_getsid.h: have_getsid.c ${MAKE_FILE} ${Q} echo '#endif /* !__HAVE_GETSID_H__ */' >> have_getsid.h -${Q} rm -f have_getsid${EXT} have_getsid.o getsid_tmp ${Q} echo 'have_getsid.h formed' - -@if [ -z "${Q} " ]; then \ + -@if [ -z "${Q}" ]; then \ echo ''; \ echo '=-=-= start of $@ =-=-='; \ cat $@; \ @@ -2541,7 +2541,7 @@ have_getpgid.h: have_getpgid.c ${MAKE_FILE} ${Q} echo '#endif /* !__HAVE_GETPGID_H__ */' >> have_getpgid.h -${Q} rm -f have_getpgid${EXT} have_getpgid.o getpgid_tmp ${Q} echo 'have_getpgid.h formed' - -@if [ -z "${Q} " ]; then \ + -@if [ -z "${Q}" ]; then \ echo ''; \ echo '=-=-= start of $@ =-=-='; \ cat $@; \ @@ -2581,7 +2581,7 @@ have_gettime.h: have_gettime.c ${MAKE_FILE} ${Q} echo '#endif /* !__HAVE_GETTIME_H__ */' >> have_gettime.h -${Q} rm -f have_gettime${EXT} have_gettime.o gettime_tmp ${Q} echo 'have_gettime.h formed' - -@if [ -z "${Q} " ]; then \ + -@if [ -z "${Q}" ]; then \ echo ''; \ echo '=-=-= start of $@ =-=-='; \ cat $@; \ @@ -2621,7 +2621,7 @@ have_getprid.h: have_getprid.c ${MAKE_FILE} ${Q} echo '#endif /* !__HAVE_GETPRID_H__ */' >> have_getprid.h -${Q} rm -f have_getprid${EXT} have_getprid.o getprid_tmp ${Q} echo 'have_getprid.h formed' - -@if [ -z "${Q} " ]; then \ + -@if [ -z "${Q}" ]; then \ echo ''; \ echo '=-=-= start of $@ =-=-='; \ cat $@; \ @@ -2657,7 +2657,7 @@ have_urandom.h: ${MAKE_FILE} ${Q} echo '' >> have_urandom.h ${Q} echo '#endif /* !__HAVE_URANDOM_H__ */' >> have_urandom.h ${Q} echo 'have_urandom.h formed' - -@if [ -z "${Q} " ]; then \ + -@if [ -z "${Q}" ]; then \ echo ''; \ echo '=-=-= start of $@ =-=-='; \ cat $@; \ @@ -2697,7 +2697,7 @@ have_rusage.h: have_rusage.c ${MAKE_FILE} ${Q} echo '#endif /* !__HAVE_RUSAGE_H__ */' >> have_rusage.h -${Q} rm -f have_rusage${EXT} have_rusage.o rusage_tmp ${Q} echo 'have_rusage.h formed' - -@if [ -z "${Q} " ]; then \ + -@if [ -z "${Q}" ]; then \ echo ''; \ echo '=-=-= start of $@ =-=-='; \ cat $@; \ @@ -2737,7 +2737,7 @@ have_strdup.h: have_strdup.c ${MAKE_FILE} ${Q} echo '#endif /* !__HAVE_RUSAGE_H__ */' >> have_strdup.h -${Q} rm -f have_strdup${EXT} have_strdup.o strdup_tmp ${Q} echo 'have_strdup.h formed' - -@if [ -z "${Q} " ]; then \ + -@if [ -z "${Q}" ]; then \ echo ''; \ echo '=-=-= start of $@ =-=-='; \ cat $@; \ @@ -2795,7 +2795,7 @@ args.h: have_stdvs.c have_varvs.c have_string.h have_unistd.h have_string.h ${Q} echo '#endif /* !__ARGS_H__ */' >> args.h -${Q} rm -f have_stdvs.o have_varvs.o have_varvs${EXT} have_args.sh core ${Q} echo 'args.h formed' - -@if [ -z "${Q} " ]; then \ + -@if [ -z "${Q}" ]; then \ echo ''; \ echo '=-=-= start of $@ =-=-='; \ cat $@; \ @@ -2825,7 +2825,7 @@ calcerr.h: calcerr.tbl calcerr_h.sed calcerr_h.awk ${MAKE_FILE} ${Q} echo '' >> calcerr.h ${Q} echo '#endif /* !__CALCERR_H__ */' >> calcerr.h ${Q} echo 'calcerr.h formed' - -@if [ -z "${Q} " ]; then \ + -@if [ -z "${Q}" ]; then \ echo ''; \ echo '=-=-= start of $@ =-=-='; \ cat $@; \ @@ -2847,7 +2847,7 @@ calcerr.c: calcerr.tbl calcerr_c.sed calcerr_c.awk ${MAKE_FILE} ${Q} ${SED} -f calcerr_c.sed < calcerr.tbl | \ ${AWK} -f calcerr_c.awk >> calcerr.c ${Q} echo 'calcerr.c formed' - -@if [ -z "${Q} " ]; then \ + -@if [ -z "${Q}" ]; then \ echo ''; \ echo '=-=-= start of $@ =-=-='; \ cat $@; \ @@ -2872,7 +2872,7 @@ no_implicit.arg: no_implicit.c ${MAKE_FILE} >/dev/null 2>&1; true; \ fi ${Q} echo 'no_implicit.arg formed' - -@if [ -z "${Q} " ]; then \ + -@if [ -z "${Q}" ]; then \ echo ''; \ echo '=-=-= start of $@ =-=-='; \ cat $@; \ @@ -2912,7 +2912,7 @@ have_unused.h: have_unused.c ${MAKE_FILE} ${Q} echo '#endif /* !__HAVE_UNUSED_H__ */' >> have_unused.h -${Q} rm -f have_unused${EXT} have_unused.o unused_tmp ${Q} echo 'have_unused.h formed' - -@if [ -z "${Q} " ]; then \ + -@if [ -z "${Q}" ]; then \ echo ''; \ echo '=-=-= start of $@ =-=-='; \ cat $@; \ diff --git a/cal/Makefile b/cal/Makefile index 7b9b642..efae209 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.21 $ -# @(#) $Id: Makefile,v 29.21 2006/06/26 05:46:06 chongo Exp $ +# @(#) $Revision: 29.22 $ +# @(#) $Id: Makefile,v 29.22 2006/09/18 00:08:42 chongo Exp $ # @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/Makefile,v $ # # Under source code control: 1991/07/21 05:00:54 @@ -209,17 +209,17 @@ all: ${CALC_FILES} ${MAKE_FILE} .all ## distlist: ${DISTLIST} - ${Q}for i in ${DISTLIST} /dev/null; do \ + ${Q} for i in ${DISTLIST} /dev/null; do \ if [ X"$$i" != X"/dev/null" ]; then \ echo cal/$$i; \ fi; \ done distdir: - ${Q}echo cal + ${Q} echo cal calcliblist: - ${Q}for i in ${CALCLIBLIST} /dev/null; do \ + ${Q} for i in ${CALCLIBLIST} /dev/null; do \ if [ X"$$i" != X"/dev/null" ]; then \ echo cal/$$i; \ fi; \ @@ -232,7 +232,7 @@ calcliblist: ## echo_inst_files: - ${Q}for i in ${CALC_FILES} /dev/null; do \ + ${Q} for i in ${CALC_FILES} /dev/null; do \ if [ X"$$i" != X"/dev/null" ]; then \ echo __file__ ${CALC_SHAREDIR}/$$i; \ fi; \ @@ -254,7 +254,7 @@ clobber: # NOTE: Keep the uninstall rule in reverse order to the install rule # install: all - -${Q}if [ ! -d $T${CALC_SHAREDIR} ]; then \ + -${Q} if [ ! -d $T${CALC_SHAREDIR} ]; then \ echo mkdir $T${CALC_SHAREDIR}; \ mkdir $T${CALC_SHAREDIR}; \ if [ ! -d "$T${CALC_SHAREDIR}" ]; then \ @@ -266,7 +266,7 @@ install: all else \ true; \ fi - ${Q}for i in ${CALC_FILES} /dev/null; do \ + ${Q} for i in ${CALC_FILES} /dev/null; do \ if [ "$$i" = "/dev/null" ]; then \ continue; \ fi; \ @@ -286,7 +286,7 @@ install: all # NOTE: Keep the uninstall rule in reverse order to the install rule # uninstall: - -${Q}for i in ${CALC_FILES} /dev/null; do \ + -${Q} for i in ${CALC_FILES} /dev/null; do \ if [ "$$i" = "/dev/null" ]; then \ continue; \ fi; \ @@ -299,7 +299,7 @@ uninstall: fi; \ fi; \ done - -${Q}for i in ${CALC_SHAREDIR}; do \ + -${Q} for i in ${CALC_SHAREDIR}; do \ if [ -d "$T$$i" ]; then \ rmdir "$T$$i" 2>/dev/null; \ echo "cleaned up $T$$i"; \ diff --git a/cscript/Makefile b/cscript/Makefile index 00774c7..e5d5f47 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.24 $ -# @(#) $Id: Makefile,v 29.24 2006/06/26 05:46:06 chongo Exp $ +# @(#) $Revision: 29.25 $ +# @(#) $Id: Makefile,v 29.25 2006/09/18 00:13:59 chongo Exp $ # @(#) $Source: /usr/local/src/cmd/calc/cscript/RCS/Makefile,v $ # # Under source code control: 1999/11/29 11:10:26 @@ -229,21 +229,21 @@ all: ${TARGETS} .all ## distlist: ${DISTLIST} - ${Q}for i in ${DISTLIST} /dev/null; do \ + ${Q} for i in ${DISTLIST} /dev/null; do \ if [ X"$$i" != X"/dev/null" ]; then \ echo cscript/$$i; \ fi; \ done | LANG=C ${SORT} distdir: - ${Q}echo cscript + ${Q} echo cscript calcliblist: # These next rule help me form the ${DETAIL_HELP} makefile variables above. # detaillist: - ${Q}-(echo "xxxxxxx"; \ + ${Q} -(echo "xxxxxxx"; \ for i in ${SCRIPT} /dev/null; do \ if [ X"$$i" != X"/dev/null" ]; then \ if [ ! -f RCS/$$i.calc,v ]; then \ @@ -255,8 +255,8 @@ detaillist: done | LANG=C ${SORT}) | ${FMT} -70 | \ ${SED} -e '1s/xxxxxxx/SCRIPT=/' -e '2,$$s/^/ /' \ -e 's/$$/ \\/' -e '$$s/ \\$$//' - ${Q}echo - ${Q}-(echo "xxxxxxxxxxx"; \ + ${Q} echo + ${Q} -(echo "xxxxxxxxxxx"; \ for i in ${SCRIPT} /dev/null; do \ if [ X"$$i" != X"/dev/null" ]; then \ if [ ! -f RCS/$$i.calc,v ]; then \ @@ -282,18 +282,18 @@ detaillist: ## depend: - ${Q}if [ -f Makefile.bak ]; then \ + ${Q} if [ -f Makefile.bak ]; then \ echo "Makefile.bak exists, remove or move it out of the way"; \ exit 1; \ else \ true; \ fi - -${Q}rm -f makedep.out - ${Q}echo forming cscript dependency list - ${Q}echo "# DO NOT DELETE THIS LINE -- make depend depends on it." > \ + -${Q} rm -f makedep.out + ${Q} echo forming cscript dependency list + ${Q} echo "# DO NOT DELETE THIS LINE -- make depend depends on it." > \ makedep.out - ${Q}echo "" >> makedep.out - ${Q}for i in ${SCRIPT} /dev/null; do \ + ${Q} echo "" >> makedep.out + ${Q} for i in ${SCRIPT} /dev/null; do \ if [ X"$$i" != X"/dev/null" ]; then \ echo "$$i: $$i.calc"; \ echo ' @rm -f $$@'; \ @@ -301,15 +301,15 @@ depend: echo ' @$${CHMOD} +x $$@'; \ fi; \ done >> makedep.out - ${Q}echo sample dependency list formed - ${Q}echo forming new cscript/Makefile - -${Q}rm -f Makefile.bak - ${Q}mv Makefile Makefile.bak - ${Q}${SED} -n '1,/^# DO NOT DELETE THIS LINE/p' Makefile.bak > Makefile - ${Q}echo "" >> Makefile - ${Q}${SED} -n '3,$$p' makedep.out >> Makefile - -${Q}rm -f makedep.out - -${Q}if ${CMP} -s Makefile.bak Makefile; then \ + ${Q} echo sample dependency list formed + ${Q} echo forming new cscript/Makefile + -${Q} rm -f Makefile.bak + ${Q} mv Makefile Makefile.bak + ${Q} ${SED} -n '1,/^# DO NOT DELETE THIS LINE/p' Makefile.bak > Makefile + ${Q} echo "" >> Makefile + ${Q} ${SED} -n '3,$$p' makedep.out >> Makefile + -${Q} rm -f makedep.out + -${Q} if ${CMP} -s Makefile.bak Makefile; then \ echo 'sample Makefile was already up to date'; \ mv -f Makefile.bak Makefile; \ else \ @@ -331,7 +331,7 @@ depend: ## echo_inst_files: - ${Q}for i in ${SCRIPT} /dev/null; do \ + ${Q} for i in ${SCRIPT} /dev/null; do \ if [ X"$$i" != X"/dev/null" ]; then \ echo __file__ ${SCRIPTDIR}/$$i; \ fi; \ @@ -354,7 +354,7 @@ clobber: # NOTE: Keep the uninstall rule in reverse order to the install rule # install: all - -${Q}if [ ! -d $T${BINDIR} ]; then \ + -${Q} if [ ! -d $T${BINDIR} ]; then \ echo mkdir $T${BINDIR}; \ mkdir $T${BINDIR}; \ if [ ! -d "$T${BINDIR}" ]; then \ @@ -366,7 +366,7 @@ install: all else \ true; \ fi - -${Q}if [ ! -d $T${SCRIPTDIR} ]; then \ + -${Q} if [ ! -d $T${SCRIPTDIR} ]; then \ echo mkdir $T${SCRIPTDIR}; \ mkdir $T${SCRIPTDIR}; \ if [ ! -d "$T${SCRIPTDIR}" ]; then \ @@ -378,7 +378,7 @@ install: all else \ true; \ fi - ${Q}for i in ${SCRIPT} /dev/null; do \ + ${Q} for i in ${SCRIPT} /dev/null; do \ if [ "$$i" = "/dev/null" ]; then \ continue; \ fi; \ @@ -398,7 +398,7 @@ install: all # NOTE: Keep the uninstall rule in reverse order to the install rule # uninstall: - -${Q}for i in ${SCRIPT} /dev/null; do \ + -${Q} for i in ${SCRIPT} /dev/null; do \ if [ "$$i" = "/dev/null" ]; then \ continue; \ fi; \ @@ -411,7 +411,7 @@ uninstall: fi; \ fi; \ done - -${Q}for i in ${SCRIPTDIR} ${BINDIR}; do \ + -${Q} for i in ${SCRIPTDIR} ${BINDIR}; do \ if [ -d "$T$$i" ]; then \ rmdir "$T$$i" 2>/dev/null; \ echo "cleaned up $T$$i"; \ diff --git a/custom/Makefile b/custom/Makefile index 063df70..da40d0b 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.25 $ -# @(#) $Id: Makefile,v 29.25 2006/06/26 05:46:06 chongo Exp $ +# @(#) $Revision: 29.26 $ +# @(#) $Id: Makefile,v 29.26 2006/09/18 00:13:59 chongo Exp $ # @(#) $Source: /usr/local/src/cmd/calc/custom/RCS/Makefile,v $ # # Under source code control: 1997/03/09 02:28:54 @@ -452,17 +452,17 @@ c_sysinfo.o: c_sysinfo.c ${MAKE_FILE} ## distlist: ${DISTLIST} - ${Q}for i in ${DISTLIST} /dev/null; do \ + ${Q} for i in ${DISTLIST} /dev/null; do \ if [ X"$$i" != X"/dev/null" ]; then \ echo custom/$$i; \ fi; \ done distdir: - ${Q}echo custom + ${Q} echo custom calcliblist: ${CALCLIBLIST} - ${Q}for i in ${CALCLIBLIST} /dev/null; do \ + ${Q} for i in ${CALCLIBLIST} /dev/null; do \ if [ X"$$i" != X"/dev/null" ]; then \ echo custom/$$i; \ fi; \ @@ -481,23 +481,23 @@ calcliblist: ${CALCLIBLIST} ## depend: - ${Q}if [ -f Makefile.bak ]; then \ + ${Q} if [ -f Makefile.bak ]; then \ echo "Makefile.bak exists, remove or move it out of the way"; \ exit 1; \ else \ true; \ fi - ${Q}echo forming custom/skel - -${Q}rm -rf skel - ${Q}mkdir skel - ${Q}mkdir skel/custom - -${Q}for i in ${C_SRC} /dev/null; do \ + ${Q} echo forming custom/skel + -${Q} rm -rf skel + ${Q} mkdir skel + ${Q} mkdir skel/custom + -${Q} for i in ${C_SRC} /dev/null; do \ if [ X"$$i" != X"/dev/null" ]; then \ ${SED} -n '/^#[ ]*include[ ]*"/p' \ "$$i" > "skel/custom/$$i"; \ fi; \ done - -${Q}for i in ${H_SRC} /dev/null; do \ + -${Q} for i in ${H_SRC} /dev/null; do \ if [ "$$i" = "/dev/null" ]; then \ continue; \ fi; \ @@ -508,8 +508,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 \ @@ -523,27 +523,27 @@ depend: >> "skel/$$i"; \ echo '#endif /* '"$$tag"' */' >> "skel/$$i"; \ done - -${Q}rm -f skel/custom/makedep.out - ${Q}echo custom/skel formed - ${Q}echo forming custom dependency list - ${Q}echo "# DO NOT DELETE THIS LINE -- make depend depends on it." > \ + -${Q} rm -f skel/custom/makedep.out + ${Q} echo custom/skel formed + ${Q} echo forming custom dependency list + ${Q} echo "# DO NOT DELETE THIS LINE -- make depend depends on it." > \ skel/custom/makedep.out - ${Q}cd skel/custom; ${MAKEDEPEND} -w 1 -f makedep.out ${C_SRC} - -${Q}for i in ${C_SRC} /dev/null; do \ + ${Q} cd skel/custom; ${MAKEDEPEND} -w 1 -f makedep.out ${C_SRC} + -${Q} for i in ${C_SRC} /dev/null; do \ if [ X"$$i" != X"/dev/null" ]; then \ echo "$$i" | ${SED} 's/^\(.*\)\.c/\1.o: \1.c/'; \ fi; \ done >> skel/custom/makedep.out - ${Q}echo custom dependency list formed - ${Q}echo forming new custom/Makefile - -${Q}rm -f Makefile.bak - ${Q}mv Makefile Makefile.bak - ${Q}${SED} -n '1,/^# DO NOT DELETE THIS LINE/p' Makefile.bak > Makefile - ${Q}echo "" >> Makefile - ${Q}${SED} -n '3,$$p' skel/custom/makedep.out | \ + ${Q} echo custom dependency list formed + ${Q} echo forming new custom/Makefile + -${Q} rm -f Makefile.bak + ${Q} mv Makefile Makefile.bak + ${Q} ${SED} -n '1,/^# DO NOT DELETE THIS LINE/p' Makefile.bak > Makefile + ${Q} echo "" >> Makefile + ${Q} ${SED} -n '3,$$p' skel/custom/makedep.out | \ LANG=C ${SORT} -u >> Makefile - -${Q}rm -rf skel - -${Q}if ${CMP} -s Makefile.bak Makefile; then \ + -${Q} rm -rf skel + -${Q} if ${CMP} -s Makefile.bak Makefile; then \ echo 'custom Makefile was already up to date'; \ mv -f Makefile.bak Makefile; \ else \ @@ -565,22 +565,22 @@ depend: ## echo_inst_files: - ${Q}for i in ${INSTALL_H_SRC} /dev/null; do \ + ${Q} for i in ${INSTALL_H_SRC} /dev/null; do \ if [ X"$$i" != X"/dev/null" ]; then \ echo __file__ ${CUSTOMINCDIR}/$$i; \ fi; \ done - ${Q}for i in ${CUSTOM_HELP} /dev/null; do \ + ${Q} for i in ${CUSTOM_HELP} /dev/null; do \ if [ X"$$i" != X"/dev/null" ]; then \ echo __file__ ${CUSTOMHELPDIR}/$$i; \ fi; \ done - ${Q}for i in ${CUSTOM_CALC_FILES} /dev/null; do \ + ${Q} for i in ${CUSTOM_CALC_FILES} /dev/null; do \ if [ X"$$i" != X"/dev/null" ]; then \ echo __file__ ${CUSTOMCALDIR}/$$i; \ fi; \ done - ${Q}for i in ${CALC_LIBCUSTOM} /dev/null; do \ + ${Q} for i in ${CALC_LIBCUSTOM} /dev/null; do \ if [ X"$$i" != X"/dev/null" ]; then \ echo __file__ ${CUSTOMCALDIR}/$$i; \ fi; \ @@ -604,7 +604,7 @@ clobber: # NOTE: Keep the uninstall rule in reverse order to the install rule # install: all - -${Q}if [ ! -d $T${INCDIR} ]; then \ + -${Q} if [ ! -d $T${INCDIR} ]; then \ echo mkdir $T${INCDIR}; \ mkdir $T${INCDIR}; \ if [ ! -d "$T${INCDIR}" ]; then \ @@ -616,7 +616,7 @@ install: all else \ true; \ fi - -${Q}if [ ! -d $T${CALC_SHAREDIR} ]; then \ + -${Q} if [ ! -d $T${CALC_SHAREDIR} ]; then \ echo mkdir $T${CALC_SHAREDIR}; \ mkdir $T${CALC_SHAREDIR}; \ if [ ! -d "$T${CALC_SHAREDIR}" ]; then \ @@ -628,7 +628,7 @@ install: all else \ true; \ fi - -${Q}if [ ! -d $T${CALC_INCDIR} ]; then \ + -${Q} if [ ! -d $T${CALC_INCDIR} ]; then \ echo mkdir $T${CALC_INCDIR}; \ mkdir $T${CALC_INCDIR}; \ if [ ! -d "$T${CALC_INCDIR}" ]; then \ @@ -640,7 +640,7 @@ install: all else \ true; \ fi - -${Q}if [ ! -d $T${HELPDIR} ]; then \ + -${Q} if [ ! -d $T${HELPDIR} ]; then \ echo mkdir $T${HELPDIR}; \ mkdir $T${HELPDIR}; \ if [ ! -d "$T${HELPDIR}" ]; then \ @@ -652,7 +652,7 @@ install: all else \ true; \ fi - -${Q}if [ ! -d $T${CUSTOMCALDIR} ]; then \ + -${Q} if [ ! -d $T${CUSTOMCALDIR} ]; then \ echo mkdir $T${CUSTOMCALDIR}; \ mkdir $T${CUSTOMCALDIR}; \ if [ ! -d "$T${CUSTOMCALDIR}" ]; then \ @@ -664,7 +664,7 @@ install: all else \ true; \ fi - -${Q}if [ ! -d $T${CUSTOMHELPDIR} ]; then \ + -${Q} if [ ! -d $T${CUSTOMHELPDIR} ]; then \ echo mkdir $T${CUSTOMHELPDIR}; \ mkdir $T${CUSTOMHELPDIR}; \ if [ ! -d "$T${CUSTOMHELPDIR}" ]; then \ @@ -676,7 +676,7 @@ install: all else \ true; \ fi - -${Q}if [ ! -d $T${CUSTOMINCDIR} ]; then \ + -${Q} if [ ! -d $T${CUSTOMINCDIR} ]; then \ echo mkdir $T${CUSTOMINCDIR}; \ mkdir $T${CUSTOMINCDIR}; \ if [ ! -d "$T${CUSTOMINCDIR}" ]; then \ @@ -688,7 +688,7 @@ install: all else \ true; \ fi - -${Q}for i in ${INSTALL_H_SRC} /dev/null; do \ + -${Q} for i in ${INSTALL_H_SRC} /dev/null; do \ if [ "$$i" = "/dev/null" ]; then \ continue; \ fi; \ @@ -702,7 +702,7 @@ install: all echo "installed $T${CUSTOMINCDIR}/$$i"; \ fi; \ done - -${Q}for i in ${CUSTOM_CALC_FILES} /dev/null; do \ + -${Q} for i in ${CUSTOM_CALC_FILES} /dev/null; do \ if [ "$$i" = "/dev/null" ]; then \ continue; \ fi; \ @@ -716,7 +716,7 @@ install: all echo "installed $T${CUSTOMCALDIR}/$$i"; \ fi; \ done - -${Q}for i in ${CUSTOM_HELP} /dev/null; do \ + -${Q} for i in ${CUSTOM_HELP} /dev/null; do \ if [ "$$i" = "/dev/null" ]; then \ continue; \ fi; \ @@ -730,7 +730,7 @@ install: all echo "installed $T${CUSTOMHELPDIR}/$$i"; \ fi; \ done - -${Q}if [ ! -z ${ALLOW_CUSTOM} ]; then \ + -${Q} if [ ! -z ${ALLOW_CUSTOM} ]; then \ if ${CMP} -s libcustcalc.a $T${CUSTOMCALDIR}/libcustcalc.a; then \ true; \ else \ @@ -749,7 +749,7 @@ install: all # NOTE: Keep the uninstall rule in reverse order to the install rule # uninstall: - -${Q}if [ -f "$T${CUSTOMCALDIR}/libcustcalc.a" ]; then \ + -${Q} if [ -f "$T${CUSTOMCALDIR}/libcustcalc.a" ]; then \ rm -f "$T${CUSTOMCALDIR}/libcustcalc.a"; \ if [ -f "$T${CUSTOMCALDIR}/libcustcalc.a" ]; then \ echo "cannot uninstall $T${CUSTOMCALDIR}/libcustcalc.a"; \ @@ -757,7 +757,7 @@ uninstall: echo "uninstalled $T${CUSTOMCALDIR}/libcustcalc.a"; \ fi; \ fi - -${Q}for i in ${CUSTOM_HELP} /dev/null; do \ + -${Q} for i in ${CUSTOM_HELP} /dev/null; do \ if [ "$$i" = "/dev/null" ]; then \ continue; \ fi; \ @@ -770,7 +770,7 @@ uninstall: fi; \ fi; \ done - -${Q}for i in ${CUSTOM_CALC_FILES} /dev/null; do \ + -${Q} for i in ${CUSTOM_CALC_FILES} /dev/null; do \ if [ "$$i" = "/dev/null" ]; then \ continue; \ fi; \ @@ -783,7 +783,7 @@ uninstall: fi; \ fi; \ done - -${Q}for i in ${INSTALL_H_SRC} /dev/null; do \ + -${Q} for i in ${INSTALL_H_SRC} /dev/null; do \ if [ "$$i" = "/dev/null" ]; then \ continue; \ fi; \ @@ -796,7 +796,7 @@ uninstall: fi; \ fi; \ done - -${Q}for i in ${CUSTOMINCDIR} ${CUSTOMHELPDIR} ${CUSTOMCALDIR} \ + -${Q} for i in ${CUSTOMINCDIR} ${CUSTOMHELPDIR} ${CUSTOMCALDIR} \ ${HELPDIR} ${CALC_INCDIR} ${CALC_SHAREDIR} ${INCDIR}; do \ if [ -d "$T$$i" ]; then \ rmdir "$T$$i" 2>/dev/null; \ diff --git a/help/Makefile b/help/Makefile index 1a559c3..b274ca9 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.30 $ -# @(#) $Id: Makefile,v 29.30 2006/08/20 15:01:57 chongo Exp $ +# @(#) $Revision: 29.31 $ +# @(#) $Id: Makefile,v 29.31 2006/09/18 00:13:59 chongo Exp $ # @(#) $Source: /usr/local/src/cmd/calc/help/RCS/Makefile,v $ # # Under source code control: 1991/07/23 06:47:57 @@ -487,9 +487,9 @@ cscript: ../cscript/README fi full: ${FULL_HELP_FILES} ${MAKE_FILE} - ${Q}echo "forming full" - -${Q}rm -f $@ - -${Q}for i in ${FULL_HELP_FILES}; do \ + ${Q} echo "forming full" + -${Q} rm -f $@ + -${Q} for i in ${FULL_HELP_FILES}; do \ if [ Xintro != X"$$i" ]; then \ echo " "; \ else \ @@ -506,7 +506,7 @@ full: ${FULL_HELP_FILES} ${MAKE_FILE} echo ""; \ cat $$i; \ done > $@ - ${Q}echo "full formed" + ${Q} echo "full formed" -@if [ -z "${Q}" ]; then \ echo ''; \ echo '=-=-= skipping the cat of help/$@ =-=-='; \ @@ -518,7 +518,7 @@ full: ${FULL_HELP_FILES} ${MAKE_FILE} # Singular files are the same files as their plural form. # ${SINGULAR_FILES}: ${PLURAL_FILES} - ${Q}for i in ${SINGULAR_FILES} /dev/null; do \ + ${Q} for i in ${SINGULAR_FILES} /dev/null; do \ if [ X"$$i" != X"/dev/null" ]; then \ echo "rm -f $${i}"; \ rm -f $${i}; \ @@ -553,19 +553,19 @@ ${SINGULAR_FILES}: ${PLURAL_FILES} # do not treat -I.. correctly! # builtin: builtin.top builtin.end ../func.c funclist.sed - ${Q}echo "forming builtin help file" - -${Q}rm -f funclist.c - ${Q}${SED} -n -f funclist.sed ../func.c > funclist.c - -${Q}rm -f funclist.o funclist${EXT} - ${Q}${LCC} ${ICFLAGS} -DFUNCLIST -I/usr/include \ + ${Q} echo "forming builtin help file" + -${Q} rm -f funclist.c + ${Q} ${SED} -n -f funclist.sed ../func.c > funclist.c + -${Q} rm -f funclist.o funclist${EXT} + ${Q} ${LCC} ${ICFLAGS} -DFUNCLIST -I/usr/include \ -I.. funclist.c -c 2>/dev/null - ${Q}${LCC} ${ILDFLAGS} funclist.o -o funclist${EXT} - -${Q}rm -f builtin - ${Q}cat builtin.top > builtin - ${Q}./funclist${EXT} | \ + ${Q} ${LCC} ${ILDFLAGS} funclist.o -o funclist${EXT} + -${Q} rm -f builtin + ${Q} cat builtin.top > builtin + ${Q} ./funclist${EXT} | \ ${SED} -e 's/^/ /' -e 's/[ ][ ]*$$//' >> builtin - ${Q}cat builtin.end >> builtin - ${Q}echo "builtin help file formed" + ${Q} cat builtin.end >> builtin + ${Q} echo "builtin help file formed" -@if [ -z "${Q}" ]; then \ echo ''; \ echo '=-=-= skipping the cat of help/$@ =-=-='; \ @@ -585,17 +585,17 @@ builtin: builtin.top builtin.end ../func.c funclist.sed ## distlist: ${DISTLIST} - ${Q}for i in ${DISTLIST} /dev/null; do \ + ${Q} for i in ${DISTLIST} /dev/null; do \ if [ X"$$i" != X"/dev/null" ]; then \ echo help/$$i; \ fi; \ done | LANG=C ${SORT} distdir: - ${Q}echo help + ${Q} echo help calcliblist: - ${Q}for i in ${CALCLIBLIST} /dev/null; do \ + ${Q} for i in ${CALCLIBLIST} /dev/null; do \ if [ X"$$i" != X"/dev/null" ]; then \ echo help/$$i; \ fi; \ @@ -612,7 +612,7 @@ bsdi: all # These next rule help me form the ${DETAIL_HELP} makefile variables above. # detaillist: - ${Q}-(echo "xxxxx"; \ + ${Q} -(echo "xxxxx"; \ for i in ${DETAIL_HELP} /dev/null; do \ if [ X"$$i" != X"/dev/null" ]; then \ if [ ! -f RCS/$$i,v ]; then \ @@ -632,13 +632,13 @@ detaillist: ## echo_inst_files: - ${Q}for i in ${STD_HELP_FILES} full ${BLT_HELP_FILES} \ + ${Q} for i in ${STD_HELP_FILES} full ${BLT_HELP_FILES} \ builtin ${DETAIL_HELP} ${SINGULAR_FILES} /dev/null; do \ if [ X"$$i" != X"/dev/null" ]; then \ echo __file__ ${HELPDIR}/$$i; \ fi; \ done - ${Q}echo __file__ ${HELPDIR}/obj + ${Q} echo __file__ ${HELPDIR}/obj ## # @@ -661,7 +661,7 @@ clobber: # NOTE: Keep the uninstall rule in reverse order to the install rule # install: all - -${Q}if [ ! -d $T${CALC_SHAREDIR} ]; then \ + -${Q} if [ ! -d $T${CALC_SHAREDIR} ]; then \ echo mkdir $T${CALC_SHAREDIR}; \ mkdir $T${CALC_SHAREDIR}; \ if [ ! -d "$T${CALC_SHAREDIR}" ]; then \ @@ -673,7 +673,7 @@ install: all else \ true; \ fi - -${Q}if [ ! -d $T${HELPDIR} ]; then \ + -${Q} if [ ! -d $T${HELPDIR} ]; then \ echo mkdir $T${HELPDIR}; \ mkdir $T${HELPDIR}; \ if [ ! -d "$T${HELPDIR}" ]; then \ @@ -685,7 +685,7 @@ install: all else \ true; \ fi - -${Q}for i in ${STD_HELP_FILES} ${BLT_HELP_FILES} builtin \ + -${Q} for i in ${STD_HELP_FILES} ${BLT_HELP_FILES} builtin \ full ${DETAIL_HELP} ${SINGULAR_FILES} /dev/null; do \ if [ "$$i" = "/dev/null" ]; then \ continue; \ @@ -700,7 +700,7 @@ install: all echo "installed $T${HELPDIR}/$$i"; \ fi; \ done - -${Q}if ${CMP} -s obj.file $T${HELPDIR}/obj; then \ + -${Q} if ${CMP} -s obj.file $T${HELPDIR}/obj; then \ true; \ else \ rm -f $T${HELPDIR}/obj.new; \ @@ -715,7 +715,7 @@ install: all # NOTE: Keep the uninstall rule in reverse order to the install rule # uninstall: - -${Q}if [ -f "$T${HELPDIR}/obj" ]; then \ + -${Q} if [ -f "$T${HELPDIR}/obj" ]; then \ rm -f "$T${HELPDIR}/obj"; \ if [ -f "$T${HELPDIR}/obj" ]; then \ echo "cannot uninstall $T${HELPDIR}/obj"; \ @@ -723,7 +723,7 @@ uninstall: echo "uninstalled $T${HELPDIR}/obj"; \ fi; \ fi - -${Q}for i in ${SINGULAR_FILES} ${DETAIL_HELP} full builtin \ + -${Q} for i in ${SINGULAR_FILES} ${DETAIL_HELP} full builtin \ ${BLT_HELP_FILES} ${STD_HELP_FILES} /dev/null; do \ if [ "$$i" = "/dev/null" ]; then \ continue; \ @@ -737,7 +737,7 @@ uninstall: fi; \ fi; \ done - -${Q}for i in ${HELPDIR} ${CALC_SHAREDIR}; do \ + -${Q} for i in ${HELPDIR} ${CALC_SHAREDIR}; do \ if [ -d "$T$$i" ]; then \ rmdir "$T$$i" 2>/dev/null; \ echo "cleaned up $T$$i"; \ diff --git a/sample/Makefile b/sample/Makefile index ffc7eb0..fa756bd 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.18 $ -# @(#) $Id: Makefile,v 29.18 2006/06/26 05:46:06 chongo Exp $ +# @(#) $Revision: 29.19 $ +# @(#) $Id: Makefile,v 29.19 2006/09/18 00:14:13 chongo Exp $ # @(#) $Source: /usr/local/src/cmd/calc/sample/RCS/Makefile,v $ # # Under source code control: 1997/04/19 22:46:49 @@ -429,17 +429,17 @@ many_random: many_random.o ../libcalc.a ## distlist: ${DISTLIST} - ${Q}for i in ${DISTLIST} /dev/null; do \ + ${Q} for i in ${DISTLIST} /dev/null; do \ if [ X"$$i" != X"/dev/null" ]; then \ echo sample/$$i; \ fi; \ done distdir: - ${Q}echo sample + ${Q} echo sample calcliblist: - ${Q}for i in ${CALCLIBLIST} /dev/null; do \ + ${Q} for i in ${CALCLIBLIST} /dev/null; do \ if [ X"$$i" != X"/dev/null" ]; then \ echo sample/$$i; \ fi; \ @@ -458,23 +458,23 @@ calcliblist: ## depend: - ${Q}if [ -f Makefile.bak ]; then \ + ${Q} if [ -f Makefile.bak ]; then \ echo "Makefile.bak exists, remove or move it out of the way"; \ exit 1; \ else \ true; \ fi - ${Q}echo forming sample/skel - -${Q}rm -rf skel - ${Q}mkdir skel - ${Q}mkdir skel/sample - -${Q}for i in ${C_SRC} /dev/null; do \ + ${Q} echo forming sample/skel + -${Q} rm -rf skel + ${Q} mkdir skel + ${Q} mkdir skel/sample + -${Q} for i in ${C_SRC} /dev/null; do \ if [ X"$$i" != X"/dev/null" ]; then \ ${SED} -n '/^#[ ]*include[ ]*"/p' \ "$$i" > "skel/sample/$$i"; \ fi; \ done - -${Q}for i in ${H_SRC} /dev/null; do \ + -${Q} for i in ${H_SRC} /dev/null; do \ if [ X"$$i" != X"/dev/null" ]; then \ if [ X"$$i" != X"/dev/null" ]; then \ tag="`echo $$i | ${SED} 's/[\.+,:]/_/g'`"; \ @@ -486,8 +486,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 \ @@ -500,27 +500,27 @@ depend: echo '#endif /* '"$$tag"' */' >> "skel/$$i"; \ fi; \ done - -${Q}rm -f skel/sample/makedep.out - ${Q}echo sample/skel formed - ${Q}echo forming sample dependency list - ${Q}echo "# DO NOT DELETE THIS LINE -- make depend depends on it." > \ + -${Q} rm -f skel/sample/makedep.out + ${Q} echo sample/skel formed + ${Q} echo forming sample dependency list + ${Q} echo "# DO NOT DELETE THIS LINE -- make depend depends on it." > \ skel/sample/makedep.out - ${Q}cd skel/sample; ${MAKEDEPEND} -w 1 -f makedep.out -I.. ${C_SRC} - -${Q}for i in ${C_SRC} /dev/null; do \ + ${Q} cd skel/sample; ${MAKEDEPEND} -w 1 -f makedep.out -I.. ${C_SRC} + -${Q} for i in ${C_SRC} /dev/null; do \ if [ X"$$i" != X"/dev/null" ]; then \ echo "$$i" | ${SED} 's/^\(.*\)\.c/\1.o: \1.c/'; \ fi; \ done >> skel/sample/makedep.out - ${Q}echo sample dependency list formed - ${Q}echo forming new sample/Makefile - -${Q}rm -f Makefile.bak - ${Q}mv Makefile Makefile.bak - ${Q}${SED} -n '1,/^# DO NOT DELETE THIS LINE/p' Makefile.bak > Makefile - ${Q}echo "" >> Makefile - ${Q}${SED} -n '3,$$p' skel/sample/makedep.out | \ + ${Q} echo sample dependency list formed + ${Q} echo forming new sample/Makefile + -${Q} rm -f Makefile.bak + ${Q} mv Makefile Makefile.bak + ${Q} ${SED} -n '1,/^# DO NOT DELETE THIS LINE/p' Makefile.bak > Makefile + ${Q} echo "" >> Makefile + ${Q} ${SED} -n '3,$$p' skel/sample/makedep.out | \ LANG=C ${SORT} -u >> Makefile - -${Q}rm -rf skel - -${Q}if ${CMP} -s Makefile.bak Makefile; then \ + -${Q} rm -rf skel + -${Q} if ${CMP} -s Makefile.bak Makefile; then \ echo 'sample Makefile was already up to date'; \ mv -f Makefile.bak Makefile; \ else \ diff --git a/version.c b/version.c index afd6047..42d94a5 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.67 $ - * @(#) $Id: version.c,v 29.67 2006/09/17 23:50:45 chongo Exp $ + * @(#) $Revision: 29.68 $ + * @(#) $Id: version.c,v 29.68 2006/09/18 00:14:46 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 1 /* test number or 0 if no minor patch */ +#define MINOR_PATCH 2 /* test number or 0 if no minor patch */ /*