From ecba35fc260d1d7f5074ea4ddca20d44cf300fc5 Mon Sep 17 00:00:00 2001 From: Landon Curt Noll Date: Mon, 6 Sep 2021 16:52:03 -0700 Subject: [PATCH] Reverse default CALCRC :-order The :-separated default CALCRC value has been reversed. The default CALCRC was: ${CALC_SHAREDIR}/startup:~/.calcrc:./.calcinit The default CALCRC is now: ./.calcinit:~/.calcrc:${CALC_SHAREDIR}/startup See "help environment" for details. --- CHANGES | 16 +++++++++++++++- Makefile.ship | 8 ++++---- README.WINDOWS | 2 +- custom/Makefile | 2 +- win32.mkdef | 2 +- 5 files changed, 22 insertions(+), 8 deletions(-) diff --git a/CHANGES b/CHANGES index e017165..5def079 100644 --- a/CHANGES +++ b/CHANGES @@ -1,5 +1,19 @@ The following are the changes from calc version 2.13.0.1 to date: + The :-separated default CALCRC value has been reversed. + The default CALCRC was: + + ${CALC_SHAREDIR}/startup:~/.calcrc:./.calcinit + + The default CALCRC is now: + + ./.calcinit:~/.calcrc:${CALC_SHAREDIR}/startup + + See "help environment" for details. + + +The following are the changes from calc version 2.13.0.1: + Replaced /usr/local with the use of ${PREFIX} in calc Makefiles. The ${PREFIX} is not the same as ${T}. The ${T} specifies @@ -31,7 +45,7 @@ The following are the changes from calc version 2.13.0.1 to date: Updated HOWTO.INSTALL to mention Makefile.local. -The following are the changes from calc version 2.13.0.0 to date: +The following are the changes from calc version 2.13.0.0: Fixed typo (missing quotes) in the env rule. diff --git a/Makefile.ship b/Makefile.ship index f35f20e..5a09951 100644 --- a/Makefile.ship +++ b/Makefile.ship @@ -1007,10 +1007,10 @@ endif # If the $CALCRC environment variable is not defined, then the following # path will be searched for calc resource files. # -# Select CALCRC= ${CALC_SHAREDIR}/startup;~/.calcrc;./.calcinit for DJGPP. +# Select CALCRC= ./.calcinit:~/.calcrc:${CALC_SHAREDIR}/startup for DJGPP. # -CALCRC= ${CALC_SHAREDIR}/startup:~/.calcrc:./.calcinit -#CALCRC= ${CALC_SHAREDIR}/startup;~/.calcrc;./.calcinit +CALCRC= ./.calcinit:~/.calcrc:${CALC_SHAREDIR}/startup +#CALCRC= ./.calcinit;~/.calcrc;${CALC_SHAREDIR}/startup # Determine of the GNU-readline facility will be used instead of the # builtin calc binding method. @@ -1794,7 +1794,7 @@ CALCPATH= .;./cal;~/.cal;${T}${CALC_SHAREDIR};${T}${CUSTOMCALDIR} else CALCPATH= .;./cal;~/.cal;${T}${CALC_SHAREDIR} endif -CALCRC= ${CALC_SHAREDIR}/startup;~/.calcrc;./.calcinit +CALCRC= ./.calcinit;~/.calcrc;${CALC_SHAREDIR}/startup # BLD_TYPE= calc-static-only # diff --git a/README.WINDOWS b/README.WINDOWS index 13b6210..07c3c05 100644 --- a/README.WINDOWS +++ b/README.WINDOWS @@ -126,7 +126,7 @@ recommends the following settings: CATDIR= /dev/env/DJDIR/man/cat1 NROFF= groff CALCPATH= .;./cal;~/.cal;${CALC_SHAREDIR};${CUSTOMCALDIR} - CALCRC= ${CALC_SHAREDIR}/startup;~/.calcrc;./.calcinit + CALCRC= ./.calcinit;~/.calcrc;${CALC_SHAREDIR}/startup CALCPAGER= less.exe -ci DEBUG= -O2 -gstabs+ -DWINDOZ diff --git a/custom/Makefile b/custom/Makefile index 8081c36..fc2c14c 100644 --- a/custom/Makefile +++ b/custom/Makefile @@ -1077,7 +1077,7 @@ CALCPATH= .;./cal;~/.cal;${T}${CALC_SHAREDIR};${T}${CUSTOMCALDIR} else CALCPATH= .;./cal;~/.cal;${T}${CALC_SHAREDIR} endif -CALCRC= ${CALC_SHAREDIR}/startup;~/.calcrc;./.calcinit +CALCRC= ./.calcinit;~/.calcrc;${CALC_SHAREDIR}/startup # BLD_TYPE= calc-static-only # diff --git a/win32.mkdef b/win32.mkdef index 8278409..2c50dee 100644 --- a/win32.mkdef +++ b/win32.mkdef @@ -49,7 +49,7 @@ NROFF_ARG= MANMAKE= MANMODE= CALCPATH=./cal -CALCRC='/lib/calc/startup:~/.calcrc:./.calcinit' +CALCRC='./.calcinit:~/.calcrc:/lib/calc/startup' USE_READLINE=-DUSE_READLINE READLINE_LIB= READLINE_INCLUDE=