diff --git a/CHANGES b/CHANGES index 2c5bf3b..cf35442 100644 --- a/CHANGES +++ b/CHANGES @@ -51,6 +51,9 @@ Following is the change from calc version 2.10.3t5.38 to date: The function version(), now returns a malloced version string without the title. + Consolidated multiple SGI IRIX -n32 sections (for r4k, r5k and r10k) + into a single section. + Following is the change from calc version 2.10.3t5.34 to 2.10.3t5.37: diff --git a/Makefile b/Makefile index 2704ffe..31481b5 100644 --- a/Makefile +++ b/Makefile @@ -556,7 +556,7 @@ CC= ${PURIFY} cc # ### # -# SGI IRIX6.2 (or later) -n32 (v7.1 or later) Compiler for the R4k +# SGI IRIX6.2 (or later) -n32 (v7.1 or later) Compiler # # You must set above: # RANLIB=: @@ -572,87 +572,19 @@ CC= ${PURIFY} cc # #CCWARN= -fullwarn -woff 1209 #CCOPT= ${DEBUG} ${NO_SHARED} -#CCMISC= -use_readonly_const +#CCMISC= -rdata_shared # #CFLAGS= ${CCWARN} ${CCOPT} ${CCMISC} #ICFLAGS= ${CCWARN} ${CCMISC} # #CCMAIN= ${ICFLAGS} ${MAIN} -#CCSHS= ${CFLAGS} +#CCSHS= # #LCFLAGS= #LDFLAGS= ${NO_SHARED} ${LD_NO_SHARED} #ILDFLAGS= # -#CC= ${PURIFY} cc -n32 -r4000 -xansi -# -### -# -# SGI IRIX6.2 (or later) -n32 (v7.1 or later) Compiler for the R5k -# -# You must set above: -# RANLIB=: -# -# for better performance, set the following above: -# DEBUG= -O2 -g3 -# -# If you have the directory /usr/lib32/nonshared, then set the following above: -# NO_SHARED= -non_shared -# LD_NO_SHARED= -Wl,-rdata_shared -# -# woff 1209: cancel 'controlling expression is constant' warnings -# -#CCWARN= -fullwarn -woff 1209 -#CCOPT= ${DEBUG} ${NO_SHARED} -#CCMISC= -use_readonly_const -# -#CFLAGS= ${CCWARN} ${CCOPT} ${CCMISC} -#ICFLAGS= ${CCWARN} ${CCMISC} -# -#CCMAIN= ${ICFLAGS} ${MAIN} -#CCSHS= ${CFLAGS} -# -#LCFLAGS= -#LDFLAGS= ${NO_SHARED} ${LD_NO_SHARED} -#ILDFLAGS= -# -#CC= ${PURIFY} cc -n32 -r5000 -xansi -# -### -# -# SGI IRIX6.5 (or later) -n32 (v7.2 or later) Compiler for the R10k -# -# NOTE: For Pre IRIX6.5 and pre v7.2 compilers, use: -# -# CCSHS= ${CFLAGS} -OPT:fold_arith_limit=1668 -# -# You must set above: -# RANLIB=: -# -# for better performance, set the following above: -# DEBUG= -O2 -g3 -# -# If you have the directory /usr/lib32/nonshared, then set the following above: -# NO_SHARED= -non_shared -# LD_NO_SHARED= -Wl,-rdata_shared -# -# woff 1209: cancel 'controlling expression is constant' warnings -# -#CCWARN= -fullwarn -woff 1209 -#CCOPT= ${DEBUG} ${NO_SHARED} -#CCMISC= -use_readonly_const -# -#CFLAGS= ${CCWARN} ${CCOPT} ${CCMISC} -#ICFLAGS= ${CCWARN} ${CCMISC} -# -#CCMAIN= ${ICFLAGS} ${MAIN} -#CCSHS= ${CFLAGS} -# -#LCFLAGS= -#LDFLAGS= ${NO_SHARED} ${LD_NO_SHARED} -#ILDFLAGS= -# -#CC= ${PURIFY} cc -n32 -r10000 -mips4 -xansi +#CC= ${PURIFY} cc -n32 -xansi # ### # diff --git a/custom/Makefile b/custom/Makefile index 9b2be67..d8c6f0d 100644 --- a/custom/Makefile +++ b/custom/Makefile @@ -470,7 +470,8 @@ install: all else \ true; \ fi - ${Q}for i in ${INSTALL_H_SRC}; do \ + ${Q}for i in ${INSTALL_H_SRC} /dev/null; do \ + if [ X$$i = X/dev/null ]; then continue; fi; \ echo rm -f ${CUSTOMLIBDIR}/$$i; \ rm -f ${CUSTOMLIBDIR}/$$i; \ echo cp $$i ${CUSTOMLIBDIR}; \ diff --git a/version.c b/version.c index 2567337..1e73276 100644 --- a/version.c +++ b/version.c @@ -12,7 +12,7 @@ #define MAJOR_VER 2 /* major version */ #define MINOR_VER 10 /* minor version */ #define MAJOR_PATCH 3 /* patch level or 0 if no patch */ -#define MINOR_PATCH "t5.45" /* test number or empty string if no patch */ +#define MINOR_PATCH "t5.46" /* test number or empty string if no patch */ /* * calc version constants