Description: Debian-Policy & FHS-compliant defaults
Forwarded: not-needed
Author: Martin Buck <mbuck@debian.org>
---
--- a/Makefile
+++ b/Makefile
@@ -758,8 +758,8 @@
 # and CATDIR to empty and ignore the NROFF, NROFF_ARG and MANMAKE
 # lines below.
 #
-#NROFF= nroff
-NROFF=
+NROFF= nroff
+#NROFF=
 #NROFF= groff
 NROFF_ARG= -man
 #NROFF_ARG= -mandoc
@@ -789,7 +789,7 @@
 #if 0	/* start of skip for non-Gnu makefiles */
 ifdef ALLOW_CUSTOM
 #endif	/* end of skip for non-Gnu makefiles */
-CALCPATH= .:./cal:~/.cal:${CALC_SHAREDIR}:${CUSTOMCALDIR}
+CALCPATH= .:./cal:~/.cal:/usr/local/share/calc:${CALC_SHAREDIR}:${CUSTOMCALDIR}
 #if 0	/* start of skip for non-Gnu makefiles */
 else
 CALCPATH= .:./cal:~/.cal:${CALC_SHAREDIR}
@@ -801,7 +801,7 @@
 #
 # Select CALCRC= ${CALC_SHAREDIR}/startup;~/.calcrc;./.calcinit for DJGPP.
 #
-CALCRC= ${CALC_SHAREDIR}/startup:~/.calcrc:./.calcinit
+CALCRC= ${CALC_SHAREDIR}/startup:/usr/local/share/calc/startup:~/.calcrc:./.calcinit
 #CALCRC= ${CALC_SHAREDIR}/startup;~/.calcrc;./.calcinit
 
 # Determine of the GNU-readline facility will be used instead of the
@@ -854,10 +854,11 @@
 #
 # Select CALCPAGER= less.exe -ci for DJGPP.
 #
+CALCPAGER= sensible-pager
 #CALCPAGER= more
 #CALCPAGER= pg
 #CALCPAGER= cat
-CALCPAGER= less
+#CALCPAGER= less
 #CALCPAGER= less.exe -ci
 
 # Debug/Optimize options for ${CC} and ${LCC}
@@ -1133,7 +1134,7 @@
 
 ifneq (,$(filter Linux GNU/kFreeBSD GNU,$(target)))
 #
-BLD_TYPE= calc-dynamic-only
+BLD_TYPE= calc-static-only
 #
 CC_SHARE= -fPIC
 DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:/usr/local/lib
