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
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
|
--- ./Makefile.orig 2013-09-27 08:55:28.000000000 +0000
+++ ./Makefile 2014-07-31 11:42:54.000000000 +0000
@@ -585,7 +585,7 @@
#INCDIR= /usr/local/include
#INCDIR= /dev/env/DJDIR/include
-INCDIR= /usr/include
+INCDIR= ${PREFIX}/include
# Where to install calc related things
#
@@ -624,15 +624,15 @@
#
#BINDIR= /usr/local/bin
#BINDIR= /dev/env/DJDIR/bin
-BINDIR= /usr/bin
+BINDIR= ${PREFIX}/bin
#LIBDIR= /usr/local/lib
#LIBDIR= /dev/env/DJDIR/lib
-LIBDIR= /usr/lib
+LIBDIR= ${PREFIX}/lib
#CALC_SHAREDIR= /usr/local/lib/calc
#CALC_SHAREDIR= /dev/env/DJDIR/share/calc
-CALC_SHAREDIR= /usr/share/calc
+CALC_SHAREDIR= ${PREFIX}/share/calc
# NOTE: Do not set CALC_INCDIR to /usr/include or /usr/local/include!!!
# Always be sure that the CALC_INCDIR path ends in /calc to avoid
@@ -699,7 +699,7 @@
#
# If in doubt, use T=
#
-T=
+T=${DESTDIR}
# where man pages are installed
#
@@ -710,7 +710,7 @@
#MANDIR=
#MANDIR= /usr/local/man/man1
#MANDIR= /usr/man/man1
-MANDIR= /usr/share/man/man1
+MANDIR= ${PREFIX}/man/man1
#MANDIR= /dev/env/DJDIR/man/man1
#MANDIR= /usr/man/u_man/man1
#MANDIR= /usr/contrib/man/man1
@@ -837,14 +837,14 @@
#
# If in doubt, set USE_READLINE, READLINE_LIB and READLINE_INCLUDE to nothing.
#
-USE_READLINE=
-#USE_READLINE= -DUSE_READLINE
+#USE_READLINE=
+USE_READLINE= -DUSE_READLINE
#
-READLINE_LIB=
-READLINE_EXTRAS=
+#READLINE_LIB=
+#READLINE_EXTRAS=
#
-#READLINE_LIB= -lreadline
-#READLINE_EXTRAS= -lhistory -lncurses
+READLINE_LIB= -lreadline
+READLINE_EXTRAS= -lhistory -lncurses
#
#READLINE_LIB= -L/usr/gnu/lib -lreadline
#READLINE_EXTRAS= -lhistory -lncurses
@@ -869,7 +869,7 @@
#CALCPAGER= more
#CALCPAGER= pg
#CALCPAGER= cat
-CALCPAGER= less
+#CALCPAGER= less
#CALCPAGER= less.exe -ci
# Debug/Optimize options for ${CC} and ${LCC}
@@ -1012,35 +1012,36 @@
# standard utilities used during make
#
-SHELL= /bin/sh
+#SHELL= /bin/sh
LANG= C
-MAKE= make
+#MAKE= make
AWK= awk
-SED= sed
+#SED= sed
DIFF= diff
GREP= egrep
SORT= sort
TEE= tee
CTAGS= ctags
-CHMOD= chmod
+#CHMOD= chmod
FMT= fmt
XARGS= xargs
CMP= cmp
-MKDIR= mkdir
+#MKDIR= mkdir
SPLINT= splint
SPLINT_OPTS=
-RM= rm
-TOUCH= touch
+#RM= rm
+#TOUCH= touch
RMDIR= rmdir
-CP= cp
-MV= mv
+#CP= cp
+#MV= mv
CO= co
AR= ar
-TRUE= true
-CAT= cat
+#TRUE= true
+#CAT= cat
COL= col
-LN= ln
-LDCONFIG= ldconfig
+#LN= ln
+#LDCONFIG= ldconfig
+LDCONFIG=
# assume the X11 makedepend tool for the depend rule
MAKEDEPEND= makedepend
STRIP= strip
@@ -1248,13 +1249,15 @@
#
CCWARN= -Wall -W -Wno-comment
CCWERR=
-CCOPT= ${DEBUG}
+#CCOPT= ${DEBUG}
+CCOPT=
CCMISC=
#
-LCC= gcc
-CC= ${PURIFY} ${LCC} ${CCWERR}
+LCC= ${CC}
+#CC= ${PURIFY} ${LCC} ${CCWERR}
#
-MAKE= gmake
+#MAKE= gmake
+MAKE= ${GMAKE}
#
endif
@@ -1516,7 +1519,8 @@
else
ICFLAGS= ${COMMON_CFLAGS} ${CC_SHARE}
endif
-CFLAGS= ${ICFLAGS} ${CCOPT}
+#CFLAGS= ${ICFLAGS} ${CCOPT}
+CFLAGS+= ${ICFLAGS} ${CCOPT}
# Required flags to link files for calc
#
@@ -1728,7 +1732,7 @@
PURIFY="${PURIFY}" \
Q="${Q}" \
RANLIB="${RANLIB}" \
- RM=${RM} \
+ RM="${RM}" \
RMDIR=${RMDIR} \
SCRIPTDIR="${SCRIPTDIR}" \
SED=${SED} \
@@ -1768,7 +1772,7 @@
MKDIR=${MKDIR} \
MV=${MV} \
Q="${Q}" \
- RM=${RM} \
+ RM="${RM}" \
RMDIR=${RMDIR} \
SCRIPTDIR="${SCRIPTDIR}" \
SED=${SED} \
@@ -1797,7 +1801,7 @@
MKDIR=${MKDIR} \
MV=${MV} \
Q="${Q}" \
- RM=${RM} \
+ RM="${RM}" \
RMDIR=${RMDIR} \
SCRIPTDIR="${SCRIPTDIR}" \
T=${T} \
@@ -1826,7 +1830,7 @@
MKDIR=${MKDIR} \
MV=${MV} \
Q="${Q}" \
- RM=${RM} \
+ RM="${RM}" \
RMDIR=${RMDIR} \
SCRIPTDIR="${SCRIPTDIR}" \
SED=${SED} \
|
