From: Martin Buck <mbuck@debian.org>
Date: Sun, 15 Oct 2023 23:36:23 +0200
Subject: Debian-Policy & FHS-compliant defaults

Forwarded: not-needed

Author: Martin Buck <mbuck@debian.org>
---
 Makefile.config | 7 ++++---
 Makefile.target | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Makefile.config b/Makefile.config
index 4af112c..421ab43 100644
--- a/Makefile.config
+++ b/Makefile.config
@@ -1041,7 +1041,7 @@ ALLOW_CUSTOM= -DCUSTOM
 # path will be searched for calc resource file routines.
 #
 ifeq ($(ALLOW_CUSTOM),-DCUSTOM)
-CALCPATH= .:./cal:~/.cal:${T}${CALC_SHAREDIR}:${T}${CUSTOMCALDIR}
+CALCPATH= .:./cal:~/.cal:${T}/usr/local/share/calc:${T}${CALC_SHAREDIR}:${T}${CUSTOMCALDIR}
 else	# ($(ALLOW_CUSTOM),-DCUSTOM)
 CALCPATH= .:./cal:~/.cal:${T}${CALC_SHAREDIR}
 endif	# ($(ALLOW_CUSTOM),-DCUSTOM)
@@ -1059,7 +1059,7 @@ endif	# RPM_TOP
 # If the $CALCRC environment variable is not defined, then the following
 # path will be searched for calc resource files.
 #
-CALCRC= ./.calcinit:~/.calcrc:${CALC_SHAREDIR}/startup
+CALCRC= ./.calcinit:~/.calcrc:/usr/local/share/calc/startup:${CALC_SHAREDIR}/startup
 #CALCRC= ./.calcinit;~/.calcrc;${CALC_SHAREDIR}/startup
 
 # Determine of the GNU-readline facility will be used instead of the
@@ -1144,8 +1144,9 @@ endif	# ($(HOMEBREW_PREFIX),)
 #CALCPAGER= more
 #CALCPAGER= pg
 #CALCPAGER= cat
-CALCPAGER= less
+#CALCPAGER= less
 #CALCPAGER= less.exe -ci
+CALCPAGER= sensible-pager
 
 # Debug/Optimize options for ${CC} and ${LCC}
 #
diff --git a/Makefile.target b/Makefile.target
index 3a4fa42..8c8b150 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -106,7 +106,7 @@ ifneq (,$(filter Linux GNU/kFreeBSD GNU,$(target)))
 
 # default build type for this target
 #
-BLD_TYPE= calc-dynamic-only
+BLD_TYPE= calc-static-only
 
 # target specific library parameters
 #
