1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
|
--- Makefile.ship.orig 2021-03-29 17:08:06 UTC
+++ Makefile.ship
@@ -662,7 +662,7 @@ else
#endif /* end of skip for non-Gnu makefiles */
# default INCDIR for non-macOS
-INCDIR= /usr/include
+INCDIR= ${LOCALBASE}/include
#INCDIR= /usr/local/include
#INCDIR= /dev/env/DJDIR/include
@@ -725,7 +725,7 @@ else
#endif /* end of skip for non-Gnu makefiles */
# default BINDIR for non-macOS
-BINDIR= /usr/bin
+BINDIR= ${PREFIX}/bin
#BINDIR= /usr/local/bin
#BINDIR= /dev/env/DJDIR/bin
@@ -741,7 +741,7 @@ else
#endif /* end of skip for non-Gnu makefiles */
# default LIBDIR for non-macOS
-LIBDIR= /usr/lib
+LIBDIR= ${PREFIX}/lib
#LIBDIR= /usr/local/lib
#LIBDIR= /dev/env/DJDIR/lib
@@ -757,7 +757,7 @@ else
#endif /* end of skip for non-Gnu makefiles */
# default CALC_SHAREDIR for non-macOS
-CALC_SHAREDIR= /usr/share/calc
+CALC_SHAREDIR= ${DATADIR}
#CALC_SHAREDIR= /usr/local/lib/calc
#CALC_SHAREDIR= /dev/env/DJDIR/share/calc
@@ -771,7 +771,7 @@ endif
#
#CALC_INCDIR= /usr/local/include/calc
#CALC_INCDIR= /dev/env/DJDIR/include/calc
-CALC_INCDIR= ${INCDIR}/calc
+CALC_INCDIR= ${PREFIX}/include/calc
# By default, these values are based CALC_SHAREDIR, INCDIR, BINDIR
# ---------------------------------------------------------------
@@ -798,7 +798,7 @@ HELPDIR= ${CALC_SHAREDIR}/help
CUSTOMCALDIR= ${CALC_SHAREDIR}/custom
CUSTOMHELPDIR= ${CALC_SHAREDIR}/custhelp
CUSTOMINCDIR= ${CALC_INCDIR}/custom
-SCRIPTDIR= ${BINDIR}/cscript
+SCRIPTDIR= ${PREFIX}/libexec/cscript
# T - top level directory under which calc will be installed
#
@@ -830,7 +830,7 @@ SCRIPTDIR= ${BINDIR}/cscript
#
# If in doubt, use T=
#
-T=
+T= ${DESTDIR}
# where man section 1 pages are installed
#
@@ -852,7 +852,7 @@ ifeq ($(target),Darwin)
MANDIR= /usr/local/share/man/man1
else
#endif /* end of skip for non-Gnu makefiles */
-MANDIR= /usr/share/man/man1
+MANDIR= ${PREFIX}/man/man1
#if 0 /* start of skip for non-Gnu makefiles */
endif
#endif /* end of skip for non-Gnu makefiles */
@@ -993,11 +993,11 @@ CALCRC= ${CALC_SHAREDIR}/startup:~/.calcrc:./.calcinit
#
# If in doubt, set USE_READLINE, READLINE_LIB and READLINE_INCLUDE to nothing.
#
-USE_READLINE=
+USE_READLINE= -DUSE_READLINE
#USE_READLINE= -DUSE_READLINE
#
-READLINE_LIB=
-READLINE_EXTRAS=
+READLINE_LIB= -L${LOCALBASE}/lib -lreadline
+READLINE_EXTRAS= -lhistory -lncurses
#
#READLINE_LIB= -lreadline
#READLINE_EXTRAS= -lhistory -lncurses
@@ -1023,7 +1023,7 @@ READLINE_EXTRAS=
#READLINE_LIB= -L/usr/local/opt/readline/lib -lreadline
#READLINE_EXTRAS= -lhistory -lncurses
#
-READLINE_INCLUDE=
+READLINE_INCLUDE= -I${LOCALBASE}/include
#READLINE_INCLUDE= -I/usr/gnu/include
#READLINE_INCLUDE= -I/usr/local/include
@@ -1034,7 +1034,7 @@ READLINE_INCLUDE=
#CALCPAGER= more
#CALCPAGER= pg
#CALCPAGER= cat
-CALCPAGER= less
+CALCPAGER= more
#CALCPAGER= less.exe -ci
# Debug/Optimize options for ${CC} and ${LCC}
@@ -1228,7 +1228,7 @@ EXTRA_LDFLAGS=
# The ARCH_CFLAGS are ${CC} when compiling C files. They follow
# CCMISC and precede EXTRA_CFLAGS.
#
-ARCH_CFLAGS= -march=native
+#ARCH_CFLAGS= -march=native
#ARCH_CFLAGS=
# COMMON_CFLAGS are the common ${CC} flags used for all programs, both
@@ -1511,8 +1511,8 @@ CCWERR=
CCOPT= ${DEBUG}
CCMISC=
#
-LCC= gcc
-CC= ${PURIFY} ${LCC} ${CCWERR}
+LCC= ${CC}
+#CC= ${PURIFY} ${LCC} ${CCWERR}
#
MAKE= gmake
#
@@ -1725,7 +1725,7 @@ CC= ${PURIFY} ${LCC} ${CCWERR}
# LDFLAGS for ${CC} in linking calc programs other than intermediate programs
#
ICFLAGS= ${COMMON_CFLAGS} ${CCBAN} ${CC_STATIC}
-CFLAGS= ${ICFLAGS} ${CCOPT}
+CFLAGS+= ${ICFLAGS} ${CCOPT}
#
ILDFLAGS= ${COMMON_LDFLAGS} ${LD_STATIC}
LDFLAGS= ${LD_DEBUG} ${ILDFLAGS} ${LIBCALC_STATIC} ${LIBCUSTCALC_STATIC}
@@ -1853,7 +1853,7 @@ ICFLAGS= ${COMMON_CFLAGS} ${CCBAN} ${CC_STATIC}
else
ICFLAGS= ${COMMON_CFLAGS} ${CCBAN} ${CC_SHARE}
endif
-CFLAGS= ${ICFLAGS} ${CCOPT}
+CFLAGS+= ${ICFLAGS} ${CCOPT}
# Required flags to link files for calc
#
|
