drygdryg/calc
1
0
Fork 0
mirror of https://github.com/lcn2/calc.git synced 2025-08-16 01:03:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

Reverse default CALCRC :-order

Browse Source 
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.
This commit is contained in:
Landon Curt Noll
2021-09-06 16:52:03 -07:00
parent 3d33c6c6f4
commit ecba35fc26
5 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
CHANGES
View File

@@ -1,5 +1,19 @@
The following are the changes from calc version 2.13.0.1 to date: 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. Replaced /usr/local with the use of ${PREFIX} in calc Makefiles.
The ${PREFIX} is not the same as ${T}. The ${T} specifies 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. 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. Fixed typo (missing quotes) in the env rule.

8
Makefile.ship
View File

@@ -1007,10 +1007,10 @@ endif
# If the $CALCRC environment variable is not defined, then the following # If the $CALCRC environment variable is not defined, then the following
# path will be searched for calc resource files. # 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= ./.calcinit:~/.calcrc:${CALC_SHAREDIR}/startup
#CALCRC= ${CALC_SHAREDIR}/startup;~/.calcrc;./.calcinit #CALCRC= ./.calcinit;~/.calcrc;${CALC_SHAREDIR}/startup
# Determine of the GNU-readline facility will be used instead of the # Determine of the GNU-readline facility will be used instead of the
# builtin calc binding method. # builtin calc binding method.
@@ -1794,7 +1794,7 @@ CALCPATH= .;./cal;~/.cal;${T}${CALC_SHAREDIR};${T}${CUSTOMCALDIR}
else else
CALCPATH= .;./cal;~/.cal;${T}${CALC_SHAREDIR} CALCPATH= .;./cal;~/.cal;${T}${CALC_SHAREDIR}
endif endif
CALCRC= ${CALC_SHAREDIR}/startup;~/.calcrc;./.calcinit CALCRC= ./.calcinit;~/.calcrc;${CALC_SHAREDIR}/startup
# #
BLD_TYPE= calc-static-only BLD_TYPE= calc-static-only
# #

2
README.WINDOWS
View File

@@ -126,7 +126,7 @@ recommends the following settings:
CATDIR= /dev/env/DJDIR/man/cat1 CATDIR= /dev/env/DJDIR/man/cat1
NROFF= groff NROFF= groff
CALCPATH= .;./cal;~/.cal;${CALC_SHAREDIR};${CUSTOMCALDIR} CALCPATH= .;./cal;~/.cal;${CALC_SHAREDIR};${CUSTOMCALDIR}
CALCRC= ${CALC_SHAREDIR}/startup;~/.calcrc;./.calcinit CALCRC= ./.calcinit;~/.calcrc;${CALC_SHAREDIR}/startup
CALCPAGER= less.exe -ci CALCPAGER= less.exe -ci
DEBUG= -O2 -gstabs+ -DWINDOZ DEBUG= -O2 -gstabs+ -DWINDOZ

2
custom/Makefile
View File

@@ -1077,7 +1077,7 @@ CALCPATH= .;./cal;~/.cal;${T}${CALC_SHAREDIR};${T}${CUSTOMCALDIR}
else else
CALCPATH= .;./cal;~/.cal;${T}${CALC_SHAREDIR} CALCPATH= .;./cal;~/.cal;${T}${CALC_SHAREDIR}
endif endif
CALCRC= ${CALC_SHAREDIR}/startup;~/.calcrc;./.calcinit CALCRC= ./.calcinit;~/.calcrc;${CALC_SHAREDIR}/startup
# #
BLD_TYPE= calc-static-only BLD_TYPE= calc-static-only
# #

2
win32.mkdef
View File

@@ -49,7 +49,7 @@ NROFF_ARG=
MANMAKE= MANMAKE=
MANMODE= MANMODE=
CALCPATH=./cal CALCPATH=./cal
CALCRC='/lib/calc/startup:~/.calcrc:./.calcinit' CALCRC='./.calcinit:~/.calcrc:/lib/calc/startup'
USE_READLINE=-DUSE_READLINE USE_READLINE=-DUSE_READLINE
READLINE_LIB= READLINE_LIB=
READLINE_INCLUDE= READLINE_INCLUDE=