]> git.pld-linux.org Git - packages/Radiance.git/blame - Radiance-PLD.patch
projects / packages / Radiance.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
0928bf0d2ae47ef6c4fe46656ff6074f SOURCES/rad3r1p8.tar.Z
[packages/Radiance.git] / Radiance-PLD.patch
CommitLineData
196b4671 1diff -ur ray.orig/src/cal/calc/Makefile ray/src/cal/calc/Makefile
2--- ray.orig/src/cal/calc/Makefile Fri Dec 10 02:24:21 1993
3+++ ray/src/cal/calc/Makefile Sun Jun 17 17:16:16 2001
4@@ -24,7 +24,7 @@
5 caldefn.o calfunc.o calprnt.o ealloc.o savestr.o $(COMPAT) $(MLIB)
6
7 install: calc
8- cp calc $(INSTDIR)
9+ cp calc $(DESTDIR)$(INSTDIR)
10
11 clean:
12 set nonomatch; rm -f *.o calc
13diff -ur ray.orig/src/cal/calc/Rmakefile ray/src/cal/calc/Rmakefile
14--- ray.orig/src/cal/calc/Rmakefile Fri Dec 10 02:24:21 1993
15+++ ray/src/cal/calc/Rmakefile Sun Jun 17 17:16:16 2001
16@@ -24,7 +24,7 @@
17 caldefn.o calfunc.o calprnt.o ealloc.o savestr.o $(COMPAT) $(MLIB)
18
19 install: calc
20- cp calc $(INSTDIR)
21+ cp calc $(DESTDIR)$(INSTDIR)
22
23 clean:
24 set nonomatch; rm -f *.o calc
25diff -ur ray.orig/src/cal/ev/Makefile ray/src/cal/ev/Makefile
26--- ray.orig/src/cal/ev/Makefile Fri Dec 10 02:24:58 1993
27+++ ray/src/cal/ev/Makefile Sun Jun 17 17:16:16 2001
28@@ -21,7 +21,7 @@
29 calfunc.o ealloc.o savestr.o $(MLIB)
30
31 install: ev
32- cp ev $(INSTDIR)
33+ cp ev $(DESTDIR)$(INSTDIR)
34
35 clean:
36 set nonomatch; rm -f *.o ev
37diff -ur ray.orig/src/cal/ev/Rmakefile ray/src/cal/ev/Rmakefile
38--- ray.orig/src/cal/ev/Rmakefile Fri Dec 10 02:24:58 1993
39+++ ray/src/cal/ev/Rmakefile Sun Jun 17 17:16:16 2001
40@@ -21,7 +21,7 @@
41 calfunc.o ealloc.o savestr.o $(MLIB)
42
43 install: ev
44- cp ev $(INSTDIR)
45+ cp ev $(DESTDIR)$(INSTDIR)
46
47 clean:
48 set nonomatch; rm -f *.o ev
49diff -ur ray.orig/src/cal/rcalc/Makefile ray/src/cal/rcalc/Makefile
50--- ray.orig/src/cal/rcalc/Makefile Fri Dec 10 02:24:36 1993
51+++ ray/src/cal/rcalc/Makefile Sun Jun 17 17:16:16 2001
52@@ -24,7 +24,7 @@
53 caldefn.o calfunc.o ealloc.o savestr.o $(COMPAT) $(MLIB)
54
55 install: rcalc
56- cp rcalc $(INSTDIR)
57+ cp rcalc $(DESTDIR)$(INSTDIR)
58
59 clean:
60 set nonomatch; rm -f *.o rcalc
61diff -ur ray.orig/src/cal/rcalc/Rmakefile ray/src/cal/rcalc/Rmakefile
62--- ray.orig/src/cal/rcalc/Rmakefile Fri Dec 10 02:24:36 1993
63+++ ray/src/cal/rcalc/Rmakefile Sun Jun 17 17:16:16 2001
64@@ -24,7 +24,7 @@
65 caldefn.o calfunc.o ealloc.o savestr.o $(COMPAT) $(MLIB)
66
67 install: rcalc
68- cp rcalc $(INSTDIR)
69+ cp rcalc $(DESTDIR)$(INSTDIR)
70
71 clean:
72 set nonomatch; rm -f *.o rcalc
73diff -ur ray.orig/src/cal/util/Makefile ray/src/cal/util/Makefile
74--- ray.orig/src/cal/util/Makefile Fri Sep 6 05:47:47 1996
75+++ ray/src/cal/util/Makefile Sun Jun 17 17:16:16 2001
76@@ -17,7 +17,7 @@
77 all: $(PROGS)
78
79 install: $(PROGS)
80- cp $(PROGS) $(INSTDIR)
81+ cp $(PROGS) $(DESTDIR)$(INSTDIR)
82
83 clean:
84 set nonomatch; rm -f *.o $(PROGS)
85diff -ur ray.orig/src/cal/util/Rmakefile ray/src/cal/util/Rmakefile
86--- ray.orig/src/cal/util/Rmakefile Wed Jan 28 01:59:42 1998
87+++ ray/src/cal/util/Rmakefile Sun Jun 17 17:16:16 2001
88@@ -19,7 +19,7 @@
89 all: $(PROGS)
90
91 install: $(PROGS)
92- cp $(PROGS) $(INSTDIR)
93+ cp $(PROGS) $(DESTDIR)$(INSTDIR)
94
95 clean:
96 set nonomatch; rm -f *.o $(PROGS)
97diff -ur ray.orig/src/common/Rmakefile ray/src/common/Rmakefile
98--- ray.orig/src/common/Rmakefile Wed Apr 16 01:53:33 1997
99+++ ray/src/common/Rmakefile Sun Jun 17 17:16:16 2001
100@@ -32,7 +32,7 @@
101 -ranlib librt.a
102
103 install: librt.a
104- mv librt.a ../lib/librt.a
105+ mv librt.a ../lib/librayt.a
106
107 clean:
108 rm -f *.o librt.a
109diff -ur ray.orig/src/common/error.c ray/src/common/error.c
110--- ray.orig/src/common/error.c Sat Apr 6 01:48:19 1996
111+++ ray/src/common/error.c Sun Jun 17 17:16:16 2001
112@@ -10,7 +10,9 @@
113
114 #include "standard.h"
115
116+#ifndef linux
117 extern char *sys_errlist[]; /* system error list */
118+#endif
119 extern int sys_nerr; /* number of system errors */
120
121 char errmsg[512]; /* global error message buffer */
122diff -ur ray.orig/src/common/lookup.h ray/src/common/lookup.h
123--- ray.orig/src/common/lookup.h Wed Jan 28 01:59:42 1998
124+++ ray/src/common/lookup.h Sun Jun 17 17:16:16 2001
125@@ -5,6 +5,7 @@
126 /*
127 * Header file for general associative table lookup routines
128 */
129+#include <string.h>
130
131 typedef struct {
132 char *key; /* key name */
133@@ -73,4 +74,4 @@
134 extern void lu_done();
135 extern long lu_shash();
136
137-extern int strcmp();
138+// extern int strcmp();
139diff -ur ray.orig/src/cv/Rmakefile ray/src/cv/Rmakefile
140--- ray.orig/src/cv/Rmakefile Fri Jan 19 18:47:36 1996
141+++ ray/src/cv/Rmakefile Sun Jun 17 17:16:16 2001
142@@ -25,9 +25,9 @@
143 all: $(PROGS)
144
145 install: $(PROGS) $(LIBFILES)
146- cp $(PROGS) $(INSTDIR)
147- cd $(LIBDIR) ; rm -f $(LIBFILES)
148- cp $(LIBFILES) $(LIBDIR)
149+ cp $(PROGS) $(DESTDIR)$(INSTDIR)
150+ cd $(DESTDIR)$(LIBDIR) ; rm -f $(LIBFILES)
151+ cp $(LIBFILES) $(DESTDIR)$(LIBDIR)
152
153 clean:
154 set nonomatch; rm -f $(PROGS) *.o core
155@@ -37,31 +37,31 @@
156 $(CC) $(CFLAGS) -o thf2rad thf2rad.o
157
158 ies2rad: ies2rad.o
159- $(CC) $(CFLAGS) -o ies2rad ies2rad.o -lrt -lm
160+ $(CC) $(CFLAGS) -o ies2rad ies2rad.o -lrayt -lm
161
162 arch2rad: arch2rad.o trans.o
163- $(CC) $(CFLAGS) -o arch2rad arch2rad.o trans.o -lrt
164+ $(CC) $(CFLAGS) -o arch2rad arch2rad.o trans.o -lrayt
165
166 nff2rad: nff2rad.o
167 $(CC) $(CFLAGS) -o nff2rad nff2rad.o
168
169 lampcolor: lampcolor.o
170- $(CC) $(CFLAGS) -o lampcolor lampcolor.o -lrt
171+ $(CC) $(CFLAGS) -o lampcolor lampcolor.o -lrayt
172
173 tmesh2rad: tmesh2rad.o tmesh.o
174- $(CC) $(CFLAGS) -o tmesh2rad tmesh2rad.o tmesh.o -lrt $(MLIB)
175+ $(CC) $(CFLAGS) -o tmesh2rad tmesh2rad.o tmesh.o -lrayt $(MLIB)
176
177 obj2rad: obj2rad.o trans.o tmesh.o
178- $(CC) $(CFLAGS) -o obj2rad obj2rad.o trans.o tmesh.o -lrt $(MLIB)
179+ $(CC) $(CFLAGS) -o obj2rad obj2rad.o trans.o tmesh.o -lrayt $(MLIB)
180
181 mgf2rad: MGF_LIB mgf2rad.o tmesh.o
182- $(CC) $(CFLAGS) -o mgf2rad mgf2rad.o tmesh.o -lmgf -lrt $(MLIB)
183+ $(CC) $(CFLAGS) -o mgf2rad mgf2rad.o tmesh.o -lmgf -lrayt $(MLIB)
184
185 rad2mgf: rad2mgf.o
186- $(CC) $(CFLAGS) -o rad2mgf rad2mgf.o -lrt $(MLIB)
187+ $(CC) $(CFLAGS) -o rad2mgf rad2mgf.o -lrayt $(MLIB)
188
189 mgf2meta: MGF_LIB mgf2meta.o
190- $(CC) $(CFLAGS) -o mgf2meta mgf2meta.o -lmgf -lmeta -lrt $(MLIB)
191+ $(CC) $(CFLAGS) -o mgf2meta mgf2meta.o -lmgf -lmeta -lrayt $(MLIB)
192
193 mgfilt:
194 cd mgflib ; rm -f mgfilt ; \
195diff -ur ray.orig/src/cv/mgf2rad.c ray/src/cv/mgf2rad.c
196--- ray.orig/src/cv/mgf2rad.c Wed Jul 24 22:07:53 1996
197+++ ray/src/cv/mgf2rad.c Sun Jun 17 17:20:06 2001
198@@ -23,7 +23,7 @@
199
200 double emult = 1.; /* emitter multiplier */
201
202-FILE *matfp = stdout; /* material output file */
203+FILE *matfp;// = stdout; /* material output file */
204
205 int r_comment(), r_cone(), r_cyl(), r_face(), r_ies(), r_ring(), r_sph();
206 char *material(), *object(), *addarg();
207@@ -34,6 +34,8 @@
208 char *argv[];
209 {
210 int i;
211+ matfp=stdout;
212+
213 /* print out parser version */
214 printf("## Translated from MGF Version %d.%d\n", MG_VMAJOR, MG_VMINOR);
215 /* initialize dispatch table */
216diff -ur ray.orig/src/gen/Rmakefile ray/src/gen/Rmakefile
217--- ray.orig/src/gen/Rmakefile Tue Mar 19 21:37:46 1996
218+++ ray/src/gen/Rmakefile Sun Jun 17 17:16:16 2001
219@@ -22,9 +22,9 @@
220 all: $(PROGS)
221
222 install: $(PROGS) $(LIBFILES)
223- cp $(PROGS) $(INSTDIR)
224- cd $(LIBDIR) ; rm -f $(LIBFILES)
225- cp $(LIBFILES) $(LIBDIR)
226+ cp $(PROGS) $(DESTDIR)$(INSTDIR)
227+ cd $(DESTDIR)$(LIBDIR) ; rm -f $(LIBFILES)
228+ cp $(LIBFILES) $(DESTDIR)$(LIBDIR)
229
230 clean:
231 set nonomatch; rm -f $(PROGS) *.o core
232@@ -48,22 +48,22 @@
233 $(CC) $(CFLAGS) -o genprism genprism.o $(MLIB)
234
235 xform: xform.o
236- $(CC) $(CFLAGS) -o xform xform.o -lrt $(MLIB)
237+ $(CC) $(CFLAGS) -o xform xform.o -lrayt $(MLIB)
238
239 replmarks: replmarks.o
240- $(CC) $(CFLAGS) -o replmarks replmarks.o -lrt $(MLIB)
241+ $(CC) $(CFLAGS) -o replmarks replmarks.o -lrayt $(MLIB)
242
243 mkillum: mkillum.o mkillum2.o mkillum3.o
244- $(CC) $(CFLAGS) -o mkillum mkillum.o mkillum2.o mkillum3.o -lrt $(MLIB)
245+ $(CC) $(CFLAGS) -o mkillum mkillum.o mkillum2.o mkillum3.o -lrayt $(MLIB)
246
247 genrev: genrev.o
248- $(CC) $(CFLAGS) -o genrev genrev.o -lrt $(MLIB)
249+ $(CC) $(CFLAGS) -o genrev genrev.o -lrayt $(MLIB)
250
251 genworm: genworm.o
252- $(CC) $(CFLAGS) -o genworm genworm.o -lrt $(MLIB)
253+ $(CC) $(CFLAGS) -o genworm genworm.o -lrayt $(MLIB)
254
255 gensurf: gensurf.o
256- $(CC) $(CFLAGS) -o gensurf gensurf.o -lrt $(MLIB)
257+ $(CC) $(CFLAGS) -o gensurf gensurf.o -lrayt $(MLIB)
258
259 genclock: genclock.o
260 $(CC) $(CFLAGS) -o genclock genclock.o $(MLIB)
261diff -ur ray.orig/src/meta/Rmakefile ray/src/meta/Rmakefile
262--- ray.orig/src/meta/Rmakefile Fri Dec 10 02:24:07 1993
263+++ ray/src/meta/Rmakefile Sun Jun 17 17:16:16 2001
264@@ -29,122 +29,103 @@
265 clean:
266 set nonomatch; rm -f *.o a.out core
267
268-general: $(INSTDIR)/mx80 $(INSTDIR)/meta2tga \
269-$(INSTDIR)/t4014 $(INSTDIR)/pexpand $(INSTDIR)/psort \
270-$(INSTDIR)/cv $(INSTDIR)/psmeta $(EXEC2)/plotin \
271-$(INSTDIR)/imagew $(INSTDIR)/impress $(INSTDIR)/x11meta \
272-../lib/libmeta.a $(INSTDIR)/bgraph $(INSTDIR)/igraph \
273-$(INSTDIR)/dgraph $(INSTDIR)/gcomp $(INSTDIR)/aed5 $(INSTDIR)/plot4
274+general: $(DESTDIR)$(INSTDIR)/mx80 $(DESTDIR)$(INSTDIR)/meta2tga \
275+$(DESTDIR)$(INSTDIR)/t4014 $(DESTDIR)$(INSTDIR)/pexpand $(DESTDIR)$(INSTDIR)/psort \
276+$(DESTDIR)$(INSTDIR)/cv $(DESTDIR)$(INSTDIR)/psmeta $(DESTDIR)$(EXEC2)/plotin \
277+$(DESTDIR)$(INSTDIR)/imagew $(DESTDIR)$(INSTDIR)/impress $(DESTDIR)$(INSTDIR)/x11meta \
278+../lib/libmeta.a $(DESTDIR)$(INSTDIR)/bgraph $(DESTDIR)$(INSTDIR)/igraph \
279+$(DESTDIR)$(INSTDIR)/dgraph $(DESTDIR)$(INSTDIR)/gcomp $(DESTDIR)$(INSTDIR)/aed5 $(DESTDIR)$(INSTDIR)/plot4
280
281 special: $(EXEC2)/mt160l $(EXEC2)/mt160 $(EXEC2)/mtext \
282 $(EXEC2)/plotout $(EXEC2)/xmeta $(EXEC2)/okimate $(EXEC2)/tbar
283
284-$(INSTDIR)/meta2tga $(EXEC2)/okimate $(INSTDIR)/impress \
285-$(INSTDIR)/mx80 $(INSTDIR)/t4014 $(INSTDIR)/plotout $(INSTDIR)/x11meta \
286-$(EXEC2)/mt160l $(EXEC2)/mt160 $(INSTDIR)/pexpand $(INSTDIR)/plot4 \
287-$(INSTDIR)/psort $(INSTDIR)/imagew $(INSTDIR)/tcurve $(EXEC2)/mtext \
288-$(INSTDIR)/tscat $(INSTDIR)/plotin $(INSTDIR)/tbar $(INSTDIR)/xmeta \
289-../lib/libmeta.a $(INSTDIR)/aed5 $(INSTDIR)/psmeta: $(common)
290+$(DESTDIR)$(INSTDIR)/meta2tga $(DESTDIR)$(EXEC2)/okimate $(DESTDIR)$(INSTDIR)/impress \
291+$(DESTDIR)$(INSTDIR)/mx80 $(DESTDIR)$(INSTDIR)/t4014 $(DESTDIR)$(INSTDIR)/plotout $(DESTDIR)$(INSTDIR)/x11meta \
292+$(DESTDIR)$(EXEC2)/mt160l $(DESTDIR)$(EXEC2)/mt160 $(DESTDIR)$(INSTDIR)/pexpand $(DESTDIR)$(INSTDIR)/plot4 \
293+$(DESTDIR)$(INSTDIR)/psort $(DESTDIR)$(INSTDIR)/imagew $(DESTDIR)$(INSTDIR)/tcurve $(DESTDIR)$(EXEC2)/mtext \
294+$(DESTDIR)$(INSTDIR)/tscat $(DESTDIR)$(INSTDIR)/plotin $(DESTDIR)$(INSTDIR)/tbar $(DESTDIR)$(INSTDIR)/xmeta \
295+../lib/libmeta.a $(DESTDIR)$(INSTDIR)/aed5 $(DESTDIR)$(INSTDIR)/psmeta: $(common)
296
297-$(EXEC2)/mt160l: mt160l.o mplot.o plot.o palloc.o
298- $(CC) $(CFLAGS) -o $(EXEC2)/mt160l mt160l.o mplot.o plot.o \
299+$(DESTDIR)$(EXEC2)/mt160l: mt160l.o mplot.o plot.o palloc.o
300+ $(CC) $(CFLAGS) -o $(DESTDIR)$(EXEC2)/mt160l mt160l.o mplot.o plot.o \
301 $(common) palloc.o
302
303-$(EXEC2)/okimate: okimate.o mplot.o plot.o palloc.o
304- $(CC) $(CFLAGS) -o $(EXEC2)/okimate okimate.o mplot.o plot.o \
305+$(DESTDIR)$(EXEC2)/okimate: okimate.o mplot.o plot.o palloc.o
306+ $(CC) $(CFLAGS) -o $(DESTDIR)$(EXEC2)/okimate okimate.o mplot.o plot.o \
307 $(common) palloc.o
308
309-$(INSTDIR)/imagew: imagew.o mplot.o plot.o palloc.o
310+$(DESTDIR)$(INSTDIR)/imagew: imagew.o mplot.o plot.o palloc.o
311 $(CC) $(CFLAGS) imagew.o mplot.o plot.o $(common) \
312-palloc.o $(MLIB)
313- cp a.out $(INSTDIR)/imagew
314+palloc.o $(MLIB) -o $(DESTDIR)$(INSTDIR)/imagew
315
316-$(EXEC2)/mt160: mt160.o mplot.o plot.o palloc.o
317- $(CC) $(CFLAGS) -o $(EXEC2)/mt160 mt160.o mplot.o plot.o $(common) \
318+$(DESTDIR)$(EXEC2)/mt160: mt160.o mplot.o plot.o palloc.o
319+ $(CC) $(CFLAGS) -o $(DESTDIR)$(EXEC2)/mt160 mt160.o mplot.o plot.o $(common) \
320 palloc.o
321
322-$(INSTDIR)/meta2tga: meta2tga.o rplot.o plot.o palloc.o
323+$(DESTDIR)$(INSTDIR)/meta2tga: meta2tga.o rplot.o plot.o palloc.o
324 $(CC) $(CFLAGS) meta2tga.o rplot.o plot.o $(common) \
325-palloc.o $(MLIB)
326- cp a.out $(INSTDIR)/meta2tga
327+palloc.o $(MLIB) -o $(DESTDIR)$(INSTDIR)/meta2tga
328
329-$(INSTDIR)/mx80: mx80.o mplot.o plot.o palloc.o
330+$(DESTDIR)$(INSTDIR)/mx80: mx80.o mplot.o plot.o palloc.o
331 $(CC) $(CFLAGS) mx80.o mplot.o plot.o $(common) \
332-palloc.o $(MLIB)
333- cp a.out $(INSTDIR)/mx80
334+palloc.o $(MLIB) -o $(DESTDIR)$(INSTDIR)/mx80
335
336-$(INSTDIR)/t4014: plotout.c ../lib/lib4014.a
337+$(DESTDIR)$(INSTDIR)/t4014: plotout.c ../lib/lib4014.a
338 $(CC) -DFORTEK $(CFLAGS) plotout.c $(common) \
339-../lib/lib4014.a $(MLIB)
340- cp a.out $(INSTDIR)/t4014
341+../lib/lib4014.a $(MLIB) -o $(DESTDIR)$(INSTDIR)/t4014
342 rm -f plotout.o
343
344-$(INSTDIR)/impress: impress.o implot.o imPfuncs.o plot.o
345+$(DESTDIR)$(INSTDIR)/impress: impress.o implot.o imPfuncs.o plot.o
346 $(CC) $(CFLAGS) impress.o implot.o imPfuncs.o \
347-plot.o $(common) $(MLIB)
348- cp a.out $(INSTDIR)/impress
349+plot.o $(common) $(MLIB) -o $(DESTDIR)$(INSTDIR)/impress
350
351-$(INSTDIR)/aed5: aed5.o
352- $(CC) $(CFLAGS) aed5.o $(common) $(MLIB)
353- cp a.out $(INSTDIR)/aed5
354-
355-$(INSTDIR)/xmeta: xmeta.o xplot.o plot.o palloc.o
356- $(CC) $(CFLAGS) xmeta.o xplot.o plot.o palloc.o $(common) -lX11 $(MLIB)
357- cp a.out $(INSTDIR)/xmeta
358-
359-$(INSTDIR)/x11meta: xmeta.o x11plot.o plot.o palloc.o
360- $(CC) $(CFLAGS) xmeta.o x11plot.o plot.o palloc.o $(common) -lX11 $(MLIB)
361- cp a.out $(INSTDIR)/x11meta
362-
363-$(INSTDIR)/psmeta: psmeta.o psplot.o
364- $(CC) $(CFLAGS) psmeta.o psplot.o $(common) $(MLIB)
365- cp a.out $(INSTDIR)/psmeta
366-
367-$(INSTDIR)/plotout: plotout.c
368- $(CC) $(CFLAGS) plotout.c $(common) -lplot $(MLIB)
369- cp a.out $(INSTDIR)/plotout
370+$(DESTDIR)$(INSTDIR)/aed5: aed5.o
371+ $(CC) $(CFLAGS) aed5.o $(common) $(MLIB) -o $(DESTDIR)$(INSTDIR)/aed5
372+
373+$(DESTDIR)$(INSTDIR)/xmeta: xmeta.o xplot.o plot.o palloc.o
374+ $(CC) $(CFLAGS) xmeta.o xplot.o plot.o palloc.o $(common) -lX11 $(MLIB) -o $(DESTDIR)$(INSTDIR)/xmeta
375+
376+$(DESTDIR)$(INSTDIR)/x11meta: xmeta.o x11plot.o plot.o palloc.o
377+ $(CC) $(CFLAGS) xmeta.o x11plot.o plot.o palloc.o $(common) -lX11 $(MLIB) -o $(DESTDIR)$(INSTDIR)/x11meta
378+
379+$(DESTDIR)$(INSTDIR)/psmeta: psmeta.o psplot.o
380+ $(CC) $(CFLAGS) psmeta.o psplot.o $(common) $(MLIB) -o $(DESTDIR)$(INSTDIR)/psmeta
381+
382+$(DESTDIR)$(INSTDIR)/plotout: plotout.c
383+ $(CC) $(CFLAGS) plotout.c $(common) -lplot $(MLIB) -o $(DESTDIR)$(INSTDIR)/plotout
384 rm -f plotout.o
385
386-$(INSTDIR)/plotin: plotin.o primout.o
387- $(CC) $(CFLAGS) plotin.o primout.o $(common) $(MLIB)
388- cp a.out $(INSTDIR)/plotin
389+$(DESTDIR)$(INSTDIR)/plotin: plotin.o primout.o
390+ $(CC) $(CFLAGS) plotin.o primout.o $(common) $(MLIB) -o $(DESTDIR)$(INSTDIR)/plotin
391
392-$(INSTDIR)/pexpand: pexpand.o expand.o segment.o palloc.o
393+$(DESTDIR)$(INSTDIR)/pexpand: pexpand.o expand.o segment.o palloc.o
394 $(CC) $(CFLAGS) pexpand.o expand.o segment.o \
395-$(common) palloc.o $(MLIB)
396- cp a.out $(INSTDIR)/pexpand
397+$(common) palloc.o $(MLIB) -o $(DESTDIR)$(INSTDIR)/pexpand
398
399-$(INSTDIR)/psort: psort.o sort.o palloc.o
400- $(CC) $(CFLAGS) psort.o sort.o $(common) palloc.o $(MLIB)
401- cp a.out $(INSTDIR)/psort
402+$(DESTDIR)$(INSTDIR)/psort: psort.o sort.o palloc.o
403+ $(CC) $(CFLAGS) psort.o sort.o $(common) palloc.o $(MLIB) -o $(DESTDIR)$(INSTDIR)/psort
404
405-$(INSTDIR)/cv: cv.o mfio.o cvhfio.o syscalls.o misc.o savestr.o \
406+$(DESTDIR)$(INSTDIR)/cv: cv.o mfio.o cvhfio.o syscalls.o misc.o savestr.o \
407 wputs.o eputs.o quit.o $(COMPAT)
408 $(CC) $(CFLAGS) cv.o mfio.o cvhfio.o syscalls.o misc.o \
409-savestr.o wputs.o eputs.o quit.o $(COMPAT) $(MLIB)
410- cp a.out $(INSTDIR)/cv
411+savestr.o wputs.o eputs.o quit.o $(COMPAT) $(MLIB) -o $(DESTDIR)$(INSTDIR)/cv
412
413-$(INSTDIR)/plot4: plot4.o primout.o
414- $(CC) $(CFLAGS) plot4.o primout.o $(common) $(MLIB)
415- cp a.out $(INSTDIR)/plot4
416+$(DESTDIR)$(INSTDIR)/plot4: plot4.o primout.o
417+ $(CC) $(CFLAGS) plot4.o primout.o $(common) $(MLIB) -o $(DESTDIR)$(INSTDIR)/plot4
418
419-$(INSTDIR)/tcurve: tcurve.o tgraph.o primout.o
420+$(DESTDIR)$(INSTDIR)/tcurve: tcurve.o tgraph.o primout.o
421 $(CC) $(CFLAGS) tcurve.o tgraph.o primout.o \
422-$(common) $(MLIB)
423- cp a.out $(INSTDIR)/tcurve
424+$(common) $(MLIB) -o $(DESTDIR)$(INSTDIR)/tcurve
425
426-$(INSTDIR)/tscat: tscat.o tgraph.o primout.o
427+$(DESTDIR)$(INSTDIR)/tscat: tscat.o tgraph.o primout.o
428 $(CC) $(CFLAGS) tscat.o tgraph.o primout.o \
429-$(common) $(MLIB)
430- cp a.out $(INSTDIR)/tscat
431+$(common) $(MLIB) -o $(DESTDIR)$(INSTDIR)/tscat
432+
433+$(DESTDIR)$(INSTDIR)/tbar: tbar.o tgraph.o primout.o
434+ $(CC) $(CFLAGS) tbar.o tgraph.o primout.o $(common) $(MLIB) -o $(DESTDIR)$(INSTDIR)/tbar
435
436-$(INSTDIR)/tbar: tbar.o tgraph.o primout.o
437- $(CC) $(CFLAGS) tbar.o tgraph.o primout.o $(common) $(MLIB)
438- cp a.out $(INSTDIR)/tbar
439-
440-$(EXEC2)/mtext: mtext.o primout.o
441- $(CC) $(CFLAGS) mtext.o primout.o $(common)
442- cp a.out $(EXEC2)/mtext
443+$(DESTDIR)$(EXEC2)/mtext: mtext.o primout.o
444+ $(CC) $(CFLAGS) mtext.o primout.o $(common) -o $(DESTDIR)$(EXEC2)/mtext
445
446 ../lib/libmeta.a: metacalls.o primout.o progname.o
447 ar rc ../lib/libmeta.a metacalls.o primout.o \
448@@ -154,30 +135,26 @@
449 ../lib/lib4014.a:
450 cd lib4014; make INSTDIR=../../lib install clean
451
452-$(INSTDIR)/bgraph: bgraph.o mgvars.o mgraph.o ../lib/libmeta.a \
453+$(DESTDIR)$(INSTDIR)/bgraph: bgraph.o mgvars.o mgraph.o ../lib/libmeta.a \
454 calexpr.o caldefn.o calfunc.o ealloc.o
455 $(CC) $(CFLAGS) bgraph.o mgvars.o mgraph.o \
456-calexpr.o caldefn.o calfunc.o ealloc.o ../lib/libmeta.a $(MLIB)
457- cp a.out $(INSTDIR)/bgraph
458+calexpr.o caldefn.o calfunc.o ealloc.o ../lib/libmeta.a $(MLIB) -o $(DESTDIR)$(INSTDIR)/bgraph
459
460-$(INSTDIR)/igraph: igraph.o mgvars.o mgraph.o ../lib/libmeta.a \
461+$(DESTDIR)$(INSTDIR)/igraph: igraph.o mgvars.o mgraph.o ../lib/libmeta.a \
462 calexpr.o caldefn.o calfunc.o cgraph.o ealloc.o gcalc.o
463 $(CC) $(CFLAGS) igraph.o mgvars.o mgraph.o \
464 calexpr.o caldefn.o calfunc.o cgraph.o ealloc.o gcalc.o \
465-../lib/libmeta.a $(MLIB)
466- cp a.out $(INSTDIR)/igraph
467+../lib/libmeta.a $(MLIB) -o $(DESTDIR)$(INSTDIR)/igraph
468
469-$(INSTDIR)/dgraph: dgraph.o cgraph.o mgvars.o ealloc.o calfunc.o \
470+$(DESTDIR)$(INSTDIR)/dgraph: dgraph.o cgraph.o mgvars.o ealloc.o calfunc.o \
471 calexpr.o caldefn.o savestr.o wputs.o $(COMPAT)
472 $(CC) $(CFLAGS) dgraph.o cgraph.o mgvars.o \
473-calfunc.o calexpr.o caldefn.o ealloc.o savestr.o wputs.o $(COMPAT) $(MLIB)
474- cp a.out $(INSTDIR)/dgraph
475+calfunc.o calexpr.o caldefn.o ealloc.o savestr.o wputs.o $(COMPAT) $(MLIB) -o $(DESTDIR)$(INSTDIR)/dgraph
476
477-$(INSTDIR)/gcomp: gcomp.o gcalc.o mgvars.o ealloc.o calfunc.o \
478+$(DESTDIR)$(INSTDIR)/gcomp: gcomp.o gcalc.o mgvars.o ealloc.o calfunc.o \
479 calexpr.o caldefn.o wputs.o savestr.o $(COMPAT)
480 $(CC) $(CFLAGS) gcomp.o gcalc.o mgvars.o \
481-calfunc.o calexpr.o caldefn.o ealloc.o wputs.o savestr.o $(COMPAT) $(MLIB)
482- cp a.out $(INSTDIR)/gcomp
483+calfunc.o calexpr.o caldefn.o ealloc.o wputs.o savestr.o $(COMPAT) $(MLIB) -o $(DESTDIR)$(INSTDIR)/gcomp
484
485 calexpr.o: calexpr.c calcomp.h
486 $(CC) $(CFLAGS) -c -DVARIABLE -DFUNCTION -DRCONST calexpr.c
487diff -ur ray.orig/src/meta/igraph.c ray/src/meta/igraph.c
488--- ray.orig/src/meta/igraph.c Thu Aug 29 13:36:42 1991
489+++ ray/src/meta/igraph.c Sun Jun 17 17:30:58 2001
490@@ -14,6 +14,8 @@
491
492 #include "mgvars.h"
493
494+#include "meta.h"
495+
496 typedef struct {
497 char *descrip; /* description */
498 char *value; /* value */
499diff -ur ray.orig/src/meta/meta.h ray/src/meta/meta.h
500--- ray.orig/src/meta/meta.h Fri Dec 4 19:51:46 1992
501+++ ray/src/meta/meta.h Sun Jun 17 17:23:33 2001
502@@ -90,6 +90,7 @@
503 #define YMN 1 /* index in xy array for ymin */
504 #define XMX 2 /* index in xy array for xmax */
505 #define YMX 3 /* index in xy array for ymax */
506+#define pout stdout
507
508
509 /*
510diff -ur ray.orig/src/meta/meta2tga.c ray/src/meta/meta2tga.c
511--- ray.orig/src/meta/meta2tga.c Sat Oct 31 18:35:16 1992
512+++ ray/src/meta/meta2tga.c Sun Jun 17 17:21:55 2001
513@@ -38,7 +38,7 @@
514 static char outname[64];
515 static char *outtack = NULL;
516
517-static FILE *fout = stdout;
518+static FILE *fout;// = stdout;
519
520 static int lineno = 0;
521
522@@ -66,6 +66,8 @@
523 FILE *popen();
524 #endif
525 char comargs[200], command[300];
526+
527+ fout=stdout;
528
529 #ifdef CPM
530 fixargs("meta2tga", &argc, &argv);
531diff -ur ray.orig/src/meta/primout.c ray/src/meta/primout.c
532--- ray.orig/src/meta/primout.c Tue Feb 25 23:19:05 1986
533+++ ray/src/meta/primout.c Sun Jun 17 17:23:05 2001
534@@ -8,7 +8,7 @@
535 #include "meta.h"
536
537
538-FILE *pout = stdout; /* the primitive output stream */
539+// FILE *pout;// = stdout; /* the primitive output stream */
540
541
542 plseg(a0, xstart, ystart, xend, yend) /* plot line segment */
543diff -ur ray.orig/src/ot/Rmakefile ray/src/ot/Rmakefile
544--- ray.orig/src/ot/Rmakefile Tue Apr 4 01:46:49 1995
545+++ ray/src/ot/Rmakefile Sun Jun 17 17:16:16 2001
546@@ -24,14 +24,14 @@
547 o_cone.o o_instance.o bbox.o initotypes.o readfargs.o malloc.o
548 $(CC) $(CFLAGS) -o oconv oconv.o writeoct.o sphere.o o_face.o \
549 o_cone.o o_instance.o bbox.o readfargs.o \
550-initotypes.o malloc.o -lrt $(MLIB)
551+initotypes.o malloc.o -lrayt $(MLIB)
552
553 getbbox: getbbox.o readobj2.o bbox.o init2otypes.o
554 $(CC) $(CFLAGS) -o getbbox getbbox.o readobj2.o \
555-bbox.o init2otypes.o -lrt $(MLIB)
556+bbox.o init2otypes.o -lrayt $(MLIB)
557
558 install: oconv getbbox
559- cp oconv getbbox $(INSTDIR)
560+ cp oconv getbbox $(DESTDIR)$(INSTDIR)
561
562 clean:
563 set nonomatch; rm -f oconv getbbox *.o core
564diff -ur ray.orig/src/px/Rmakefile ray/src/px/Rmakefile
565--- ray.orig/src/px/Rmakefile Wed Apr 16 01:56:32 1997
566+++ ray/src/px/Rmakefile Sun Jun 17 17:16:16 2001
567@@ -5,7 +5,7 @@
568 ARCH = sun
569 OPT = -O
570 MACH = -DBSD
571-SPECIAL = aed tiff
572+# SPECIAL = aed tiff
573 CFLAGS = $(OPT) $(MACH) -I../common -L../lib
574 CC = cc
575 MLIB = -lm
576@@ -40,145 +40,145 @@
577
578 install: $(PROGS) $(SPECIAL) normpat.csh falsecolor.csh \
579 pdfblur.csh pmblur.csh xyzimage.csh
580- cp $(PROGS) $(INSTDIR)
581- cp normpat.csh $(INSTDIR)/normpat
582- cp falsecolor.csh $(INSTDIR)/falsecolor
583- cp pdfblur.csh $(INSTDIR)/pdfblur
584- cp pmblur.csh $(INSTDIR)/pmblur
585- cp xyzimage.csh $(INSTDIR)/xyzimage
586- chmod 755 $(INSTDIR)/normpat $(INSTDIR)/falsecolor \
587-$(INSTDIR)/pdfblur $(INSTDIR)/pmblur $(INSTDIR)/xyzimage
588+ cp $(PROGS) $(DESTDIR)$(INSTDIR)
589+ cp normpat.csh $(DESTDIR)$(INSTDIR)/normpat
590+ cp falsecolor.csh $(DESTDIR)$(INSTDIR)/falsecolor
591+ cp pdfblur.csh $(DESTDIR)$(INSTDIR)/pdfblur
592+ cp pmblur.csh $(DESTDIR)$(INSTDIR)/pmblur
593+ cp xyzimage.csh $(DESTDIR)$(INSTDIR)/xyzimage
594+ chmod 755 $(DESTDIR)$(INSTDIR)/normpat $(DESTDIR)$(INSTDIR)/falsecolor \
595+$(DESTDIR)$(INSTDIR)/pdfblur $(DESTDIR)$(INSTDIR)/pmblur $(DESTDIR)$(INSTDIR)/xyzimage
596
597 clean:
598 set nonomatch; rm -f x10image aedimage glimage ra_tiff \
599 $(PROGS) *.o core
600
601 pfilt: pfilt.o pf2.o pf3.o
602- $(CC) $(CFLAGS) -o pfilt pfilt.o pf2.o pf3.o -lrt $(MLIB)
603+ $(CC) $(CFLAGS) -o pfilt pfilt.o pf2.o pf3.o -lrayt $(MLIB)
604
605 pcond: pcond.o pcond2.o pcond3.o pcond4.o warp3d.o
606 $(CC) $(CFLAGS) -o pcond pcond.o pcond2.o pcond3.o pcond4.o warp3d.o \
607--lrt $(MLIB)
608+-lrayt $(MLIB)
609
610 pcwarp: pcwarp.o warp3d.o
611- $(CC) $(CFLAGS) -o pcwarp pcwarp.o warp3d.o -lrt $(MLIB)
612+ $(CC) $(CFLAGS) -o pcwarp pcwarp.o warp3d.o -lrayt $(MLIB)
613
614 ttyimage: ttyimage.o
615- $(CC) $(CFLAGS) -o ttyimage ttyimage.o -lrt $(MLIB)
616+ $(CC) $(CFLAGS) -o ttyimage ttyimage.o -lrayt $(MLIB)
617
618 t4027: t4027.o
619- $(CC) $(CFLAGS) -o t4027 t4027.o -lrt
620+ $(CC) $(CFLAGS) -o t4027 t4027.o -lrayt
621
622 glimage: glimage.o
623- $(CC) $(CFLAGS) -o glimage glimage.o -lrt -lgl_s $(MLIB)
624+ $(CC) $(CFLAGS) -o glimage glimage.o -lrayt -lgl_s $(MLIB)
625
626 aedimage: aedimage.o ciq.o cut.o closest.o biq.o
627 $(CC) $(CFLAGS) -o aedimage aedimage.o ciq.o cut.o closest.o \
628-biq.o -lrt $(MLIB)
629+biq.o -lrayt $(MLIB)
630
631 oki20c: oki20c.o
632- $(CC) $(CFLAGS) -o oki20c oki20c.o -lrt $(MLIB)
633+ $(CC) $(CFLAGS) -o oki20c oki20c.o -lrayt $(MLIB)
634
635 oki20: oki20.o
636- $(CC) $(CFLAGS) -o oki20 oki20.o -lrt $(MLIB)
637+ $(CC) $(CFLAGS) -o oki20 oki20.o -lrayt $(MLIB)
638
639 paintjet: paintjet.o
640- $(CC) $(CFLAGS) -o paintjet paintjet.o -lrt $(MLIB)
641+ $(CC) $(CFLAGS) -o paintjet paintjet.o -lrayt $(MLIB)
642
643 mt160r: mt160r.o
644- $(CC) $(CFLAGS) -o mt160r mt160r.o -lrt $(MLIB)
645+ $(CC) $(CFLAGS) -o mt160r mt160r.o -lrayt $(MLIB)
646
647 greyscale: greyscale.o
648- $(CC) $(CFLAGS) -o greyscale greyscale.o -lrt $(MLIB)
649+ $(CC) $(CFLAGS) -o greyscale greyscale.o -lrayt $(MLIB)
650
651 colorscale: colorscale.o
652- $(CC) $(CFLAGS) -o colorscale colorscale.o -lrt
653+ $(CC) $(CFLAGS) -o colorscale colorscale.o -lrayt
654
655 pvalue: pvalue.o
656- $(CC) $(CFLAGS) -o pvalue pvalue.o -lrt $(MLIB)
657+ $(CC) $(CFLAGS) -o pvalue pvalue.o -lrayt $(MLIB)
658
659 psum: psum.o
660- $(CC) $(CFLAGS) -o psum psum.o -lrt
661+ $(CC) $(CFLAGS) -o psum psum.o -lrayt
662
663 pcompos: pcompos.o
664- $(CC) $(CFLAGS) -o pcompos pcompos.o -lrt
665+ $(CC) $(CFLAGS) -o pcompos pcompos.o -lrayt
666
667 psign: psign.o
668- $(CC) $(CFLAGS) -o psign psign.o -lrt
669+ $(CC) $(CFLAGS) -o psign psign.o -lrayt
670
671 d48c: d48c.o
672- $(CC) $(CFLAGS) -o d48c d48c.o -lrt
673+ $(CC) $(CFLAGS) -o d48c d48c.o -lrayt
674
675 ra_gif: ra_gif.o clrtab.o neuclrtab.o
676- $(CC) $(CFLAGS) -o ra_gif ra_gif.o clrtab.o neuclrtab.o -lrt $(MLIB)
677+ $(CC) $(CFLAGS) -o ra_gif ra_gif.o clrtab.o neuclrtab.o -lrayt $(MLIB)
678
679 ra_pr: ra_pr.o ciq.o cut.o closest.o biq.o
680 $(CC) $(CFLAGS) -o ra_pr ra_pr.o ciq.o cut.o closest.o \
681-biq.o -lrt $(MLIB)
682+biq.o -lrayt $(MLIB)
683
684 ra_pr24: ra_pr24.o
685- $(CC) $(CFLAGS) -o ra_pr24 ra_pr24.o -lrt $(MLIB)
686+ $(CC) $(CFLAGS) -o ra_pr24 ra_pr24.o -lrayt $(MLIB)
687
688 ra_avs: ra_avs.o
689- $(CC) $(CFLAGS) -o ra_avs ra_avs.o -lrt $(MLIB)
690+ $(CC) $(CFLAGS) -o ra_avs ra_avs.o -lrayt $(MLIB)
691
692 ra_ps: ra_ps.o
693- $(CC) $(CFLAGS) -o ra_ps ra_ps.o -lrt $(MLIB)
694+ $(CC) $(CFLAGS) -o ra_ps ra_ps.o -lrayt $(MLIB)
695
696 ra_ppm: ra_ppm.o
697- $(CC) $(CFLAGS) -o ra_ppm ra_ppm.o -lrt $(MLIB)
698+ $(CC) $(CFLAGS) -o ra_ppm ra_ppm.o -lrayt $(MLIB)
699
700 ra_t8: ra_t8.o clrtab.o neuclrtab.o
701- $(CC) $(CFLAGS) -o ra_t8 ra_t8.o clrtab.o neuclrtab.o -lrt $(MLIB)
702+ $(CC) $(CFLAGS) -o ra_t8 ra_t8.o clrtab.o neuclrtab.o -lrayt $(MLIB)
703
704 ra_t16: ra_t16.o
705- $(CC) $(CFLAGS) -o ra_t16 ra_t16.o -lrt $(MLIB)
706+ $(CC) $(CFLAGS) -o ra_t16 ra_t16.o -lrayt $(MLIB)
707
708 ra_im: ra_im.o
709 $(CC) $(CFLAGS) -o ra_im ra_im.o
710
711 ra_bn: ra_bn.o
712- $(CC) $(CFLAGS) -o ra_bn ra_bn.o -lrt $(MLIB)
713+ $(CC) $(CFLAGS) -o ra_bn ra_bn.o -lrayt $(MLIB)
714
715 ra_rgbe: ra_rgbe.o
716- $(CC) $(CFLAGS) -o ra_rgbe ra_rgbe.o -lrt $(MLIB)
717+ $(CC) $(CFLAGS) -o ra_rgbe ra_rgbe.o -lrayt $(MLIB)
718
719 ra_pict: ra_pict.o
720- $(CC) $(CFLAGS) -o ra_pict ra_pict.o -lrt $(MLIB)
721+ $(CC) $(CFLAGS) -o ra_pict ra_pict.o -lrayt $(MLIB)
722
723
724 x10image: ximage.o ciq.o cut.o closest.o xraster.o biq.o
725 $(CC) $(CFLAGS) -o x10image ximage.o xraster.o \
726-ciq.o cut.o closest.o biq.o -lX -lrt $(MLIB)
727+ciq.o cut.o closest.o biq.o -lX -lrayt $(MLIB)
728
729 ximage: x11image.o x11raster.o clrtab.o
730 $(CC) $(CFLAGS) -o ximage x11image.o x11raster.o \
731-clrtab.o -lX11 -lrt $(MLIB)
732+clrtab.o -lX11 -lrayt $(MLIB)
733
734 protate: protate.o
735- $(CC) $(CFLAGS) -o protate protate.o -lrt
736+ $(CC) $(CFLAGS) -o protate protate.o -lrayt
737
738 pextrem: pextrem.o
739- $(CC) $(CFLAGS) -o pextrem pextrem.o -lrt
740+ $(CC) $(CFLAGS) -o pextrem pextrem.o -lrayt
741
742 pflip: pflip.o
743- $(CC) $(CFLAGS) -o pflip pflip.o -lrt
744+ $(CC) $(CFLAGS) -o pflip pflip.o -lrayt
745
746 panim: panim.o client/libclient.a
747 $(CC) $(CFLAGS) -o panim panim.o \
748--lrt client/libclient.a -lrpcsvc $(MLIB)
749+-lrayt client/libclient.a -lrpcsvc $(MLIB)
750
751 pcomb: pcomb.o
752- $(CC) $(CFLAGS) -o pcomb pcomb.o -lrt $(MLIB)
753+ $(CC) $(CFLAGS) -o pcomb pcomb.o -lrayt $(MLIB)
754
755 pinterp: pinterp.o
756- $(CC) $(CFLAGS) -o pinterp pinterp.o -lrt $(MLIB)
757+ $(CC) $(CFLAGS) -o pinterp pinterp.o -lrayt $(MLIB)
758
759 ra_xyze: ra_xyze.o
760- $(CC) $(CFLAGS) -o ra_xyze ra_xyze.o -lrt $(MLIB)
761+ $(CC) $(CFLAGS) -o ra_xyze ra_xyze.o -lrayt $(MLIB)
762
763 ra_tiff: ra_tiff.o ../lib/libtiff.a
764- $(CC) $(CFLAGS) -o ra_tiff ra_tiff.o -lrt -ltiff $(MLIB)
765+ $(CC) $(CFLAGS) -o ra_tiff ra_tiff.o -lrayt -ltiff $(MLIB)
766
767 ra_tiff.o: ra_tiff.c
768 $(CC) $(CFLAGS) -Ilibtiff -c ra_tiff.c
769@@ -188,7 +188,7 @@
770 mv libtiff.a ../../lib ; make clean
771
772 ra_pixar: ra_pixar.o ra_pixar.c
773- $(CC) $(CFLAGS) $(PIXAR_INCLUDE) -o $@ ra_pixar.o -lrt \
774+ $(CC) $(CFLAGS) $(PIXAR_INCLUDE) -o $@ ra_pixar.o -lrayt \
775 $(PIXAR_LIB)
776
777 ra_pixar.o: ra_pixar.c
778@@ -196,11 +196,11 @@
779
780 xshowtrace: xshowtrace.o x11findwind.o
781 $(CC) $(CFLAGS) -o xshowtrace xshowtrace.o \
782-x11findwind.o -lrt $(MLIB) -lX11
783+x11findwind.o -lrayt $(MLIB) -lX11
784
785 macbethcal: macbethcal.o pmapgen.o mx3.o warp3d.o
786 $(CC) $(CFLAGS) -o macbethcal macbethcal.o pmapgen.o mx3.o warp3d.o \
787--lrt $(MLIB)
788+-lrayt $(MLIB)
789
790
791 macbethcal.o: pmap.h ../common/color.h ../common/resolu.h
792diff -ur ray.orig/src/px/pcwarp.c ray/src/px/pcwarp.c
793--- ray.orig/src/px/pcwarp.c Thu Feb 6 02:29:26 1997
794+++ ray/src/px/pcwarp.c Sun Jun 17 17:25:54 2001
795@@ -14,7 +14,7 @@
796
797 char *progname; /* global argv[0] */
798
799-FILE *infp = stdin; /* input stream */
800+FILE *infp; // = stdin; /* input stream */
801 int xres, yres; /* input picture resolution */
802
803 WARP3D *cwarp; /* our warp map */
804@@ -30,6 +30,7 @@
805 int cwflags = 0;
806 int rval;
807 int i;
808+ infp=stdin;
809
810 progname = argv[0];
811 /* get options */
812diff -ur ray.orig/src/px/x11image.c ray/src/px/x11image.c
813--- ray.orig/src/px/x11image.c Wed Jan 28 01:59:42 1998
814+++ ray/src/px/x11image.c Sun Jun 17 17:25:18 2001
815@@ -94,7 +94,7 @@
816 int xmax, ymax; /* picture dimensions */
817 int width, height; /* window size */
818 char *fname = NULL; /* input file name */
819-FILE *fin = stdin; /* input file */
820+FILE *fin; // = stdin; /* input file */
821 long *scanpos = NULL; /* scan line positions in file */
822 int cury = 0; /* current scan location */
823
824@@ -144,6 +144,7 @@
825 int headline();
826 int i;
827 int pid;
828+ fin=stdin;
829
830 progname = argv[0];
831
832diff -ur ray.orig/src/rt/Rmakefile ray/src/rt/Rmakefile
833--- ray.orig/src/rt/Rmakefile Thu Jul 4 02:19:57 1996
834+++ ray/src/rt/Rmakefile Sun Jun 17 17:16:16 2001
835@@ -5,8 +5,8 @@
836
837 OPT = -O
838 MACH = -DBSD
839-CFLAGS = $(MACH) $(OPT) -I../common -L../lib
840-SPECIAL = aed
841+CFLAGS = $(MACH) $(OPT) -I../common -L../lib -I/usr/include/ncurses
842+# SPECIAL = aed
843 CC = cc
844 MLIB = -lm
845 LINT = lint
846@@ -29,7 +29,7 @@
847 #
848 # Library routines:
849 #
850-LIBS = -lrt $(MLIB)
851+LIBS = -lrayt $(MLIB)
852
853 #
854 # Device drivers for rview (see also devtable.c):
855@@ -92,9 +92,9 @@
856 all: $(PROGS) $(SPECIAL)
857
858 install: $(PROGS) $(SPECIAL) rayinit.cal
859- $(INSTALL) $(PROGS) $(INSTDIR)
860- rm -f $(LIBDIR)/rayinit.cal
861- cp rayinit.cal $(LIBDIR)
862+ $(INSTALL) $(PROGS) $(DESTDIR)$(INSTDIR)
863+ rm -f $(DESTDIR)$(LIBDIR)/rayinit.cal
864+ cp rayinit.cal $(DESTDIR)$(LIBDIR)
865
866 sun: $(DEVDIR)/sun $(DEVDIR)/sun.com
867
868@@ -126,7 +126,7 @@
869 $(CC) $(CFLAGS) -o $(DESTDIR)/rview $(RVOBJS) $(DLIBS) $(LIBS)
870
871 $(DESTDIR)/lookamb: lookamb.o ambio.o
872- $(CC) $(CFLAGS) -o $(DESTDIR)/lookamb lookamb.o ambio.o -lrt
873+ $(CC) $(CFLAGS) -o $(DESTDIR)/lookamb lookamb.o ambio.o -lrayt
874
875 $(DEVDIR)/sun: sundev.o devmain.o colortab.o editline.o
876 $(CC) $(CFLAGS) -s -o $(DEVDIR)/sun devmain.o sundev.o colortab.o \
877diff -ur ray.orig/src/util/Rmakefile ray/src/util/Rmakefile
878--- ray.orig/src/util/Rmakefile Wed Mar 19 00:59:42 1997
879+++ ray/src/util/Rmakefile Sun Jun 17 17:16:16 2001
880@@ -21,19 +21,19 @@
881
882 install: all objview.csh objpict.csh glare.csh dayfact.csh rlux.csh \
883 raddepend.csh trad.wsh objline.csh
884- cp $(PROGS) $(INSTDIR)
885- cp objview.csh $(INSTDIR)/objview
886- cp objline.csh $(INSTDIR)/objline
887- cp objpict.csh $(INSTDIR)/objpict
888- cp glare.csh $(INSTDIR)/glare
889- cp dayfact.csh $(INSTDIR)/dayfact
890- cp debugcal.csh $(INSTDIR)/debugcal
891- cp rlux.csh $(INSTDIR)/rlux
892- cp raddepend.csh $(INSTDIR)/raddepend
893- chmod 755 $(INSTDIR)/objview $(INSTDIR)/objpict \
894- $(INSTDIR)/glare $(INSTDIR)/dayfact $(INSTDIR)/debugcal \
895- $(INSTDIR)/rlux $(INSTDIR)/raddepend $(INSTDIR)/objline
896- csh -f tradinstall.csh $(INSTDIR) $(LIBDIR)/tcl
897+ cp $(PROGS) $(DESTDIR)$(INSTDIR)
898+ cp objview.csh $(DESTDIR)$(INSTDIR)/objview
899+ cp objline.csh $(DESTDIR)$(INSTDIR)/objline
900+ cp objpict.csh $(DESTDIR)$(INSTDIR)/objpict
901+ cp glare.csh $(DESTDIR)$(INSTDIR)/glare
902+ cp dayfact.csh $(DESTDIR)$(INSTDIR)/dayfact
903+ cp debugcal.csh $(DESTDIR)$(INSTDIR)/debugcal
904+ cp rlux.csh $(DESTDIR)$(INSTDIR)/rlux
905+ cp raddepend.csh $(DESTDIR)$(INSTDIR)/raddepend
906+ chmod 755 $(DESTDIR)$(INSTDIR)/objview $(DESTDIR)$(INSTDIR)/objpict \
907+ $(DESTDIR)$(INSTDIR)/glare $(DESTDIR)$(INSTDIR)/dayfact $(DESTDIR)$(INSTDIR)/debugcal \
908+ $(DESTDIR)$(INSTDIR)/rlux $(DESTDIR)$(INSTDIR)/raddepend $(DESTDIR)$(INSTDIR)/objline
909+ csh -f tradinstall.csh $(DESTDIR)$(INSTDIR) $(DESTDIR)$(LIBDIR)/tcl
910
911 clean:
912 set nonomatch; rm -f *.o $(PROGS) core
913@@ -42,33 +42,33 @@
914 $(CC) $(CFLAGS) -o scanner scanner.o -lm
915
916 makedist: makedist.o setscan.o
917- $(CC) $(CFLAGS) -o makedist makedist.o setscan.o -lrt -lm
918+ $(CC) $(CFLAGS) -o makedist makedist.o setscan.o -lrayt -lm
919
920 findglare: findglare.o glareval.o glaresrc.o setscan.o
921 $(CC) $(CFLAGS) -o findglare findglare.o glareval.o glaresrc.o \
922-setscan.o -lrt -lm
923+setscan.o -lrayt -lm
924
925 glarendx: glarendx.o
926- $(CC) $(CFLAGS) -o glarendx glarendx.o -lrt -lm
927+ $(CC) $(CFLAGS) -o glarendx glarendx.o -lrayt -lm
928
929 xglaresrc: xglaresrc.o x11findwind.o
930 $(CC) $(CFLAGS) -o xglaresrc xglaresrc.o \
931-x11findwind.o -lrt -lX11 -lm
932+x11findwind.o -lrayt -lX11 -lm
933
934 rad: rad.o
935- $(CC) $(CFLAGS) -o rad rad.o -lrt -lm
936+ $(CC) $(CFLAGS) -o rad rad.o -lrayt -lm
937
938 ranimate: ranimate.o netproc.o
939- $(CC) $(CFLAGS) -o ranimate ranimate.o netproc.o -lrt -lm
940+ $(CC) $(CFLAGS) -o ranimate ranimate.o netproc.o -lrayt -lm
941
942 rpiece: rpiece.o Version.o
943- $(CC) $(CFLAGS) -o rpiece rpiece.o Version.o -lrt -lm
944+ $(CC) $(CFLAGS) -o rpiece rpiece.o Version.o -lrayt -lm
945
946 vwright: vwright.o
947- $(CC) $(CFLAGS) -o vwright vwright.o -lrt -lm
948+ $(CC) $(CFLAGS) -o vwright vwright.o -lrayt -lm
949
950 getinfo: getinfo.o
951- $(CC) $(CFLAGS) -o getinfo getinfo.o -lrt
952+ $(CC) $(CFLAGS) -o getinfo getinfo.o -lrayt
953
954 contour: contour.o
955 $(CC) $(CFLAGS) -o contour contour.o -lm
Radiance 3D Photo-Realistic Renderer
This page took 0.210152 seconds and 4 git commands to generate.