1 diff -urN Diffuse-4.1b/discus/prog/Makefile Diffuse-4.1b.patch/discus/prog/Makefile
2 --- Diffuse-4.1b/discus/prog/Makefile Tue Mar 13 23:31:27 2001
3 +++ Diffuse-4.1b.patch/discus/prog/Makefile Wed Dec 18 17:12:25 2002
6 # Where to install the binary and help file and a backup location
8 -BINDIR = /usr/local/bin
10 +BINDIR = $(prefix)/bin
11 +DATADIR = $(prefix)/share
12 BACKDIR = $(HOME)/linux/backup/
14 # Your compiler name and install program
16 install: discus appl_dis.hlp lib_f77.hlp color.map
18 cat appl_dis.hlp lib_f77.hlp > discus.hlp
19 - cp discus $(BINDIR)/
20 - cp discus.hlp $(BINDIR)/
21 - cp color.map $(BINDIR)/
22 - chmod $(BMOD) $(BINDIR)/discus
23 - chmod $(FMOD) $(BINDIR)/discus.hlp
24 - chmod $(FMOD) $(BINDIR)/color.map
25 - if [ ! -d "$(BINDIR)/mac/" ] ; then \
26 - mkdir $(BINDIR)/mac/; chmod $(BMOD) $(BINDIR)/mac/; \
28 - if [ ! -d "$(BINDIR)/mac/discus" ] ; then \
29 - mkdir -m $(BMOD) $(BINDIR)/mac/discus; \
30 - chmod $(BMOD) $(BINDIR)/mac/discus;\
32 + install -d $(DESTDIR)$(BINDIR)
33 + install -d $(DESTDIR)$(DATADIR)/diffuse
34 + install -d $(DESTDIR)$(DATADIR)/diffuse/mac/discus
35 + cp discus $(DESTDIR)$(BINDIR)/
36 + cp discus.hlp $(DESTDIR)$(DATADIR)/diffuse
37 + cp color.map $(DESTDIR)$(DATADIR)/diffuse
38 +# chmod $(BMOD) $(BINDIR)/discus
39 +# chmod $(FMOD) $(BINDIR)/discus.hlp
40 +# chmod $(FMOD) $(BINDIR)/color.map
41 +# if [ ! -d "$(BINDIR)/mac/" ] ; then \
42 +# mkdir $(BINDIR)/mac/; chmod $(BMOD) $(BINDIR)/mac/; \
44 +# if [ ! -d "$(BINDIR)/mac/discus" ] ; then \
45 +# mkdir -m $(BMOD) $(BINDIR)/mac/discus; \
46 +# chmod $(BMOD) $(BINDIR)/mac/discus;\
48 cd sysmac; for i in *.mac ; do \
49 - (cp $$i $(BINDIR)/mac/discus/; \
50 - chmod $(FMOD) $(BINDIR)/mac/discus/$$i;) \
51 + cp $$i $(DESTDIR)$(DATADIR)/diffuse/mac/discus/; \
52 +# chmod $(FMOD) $(BINDIR)/mac/discus/$$i;)
55 backup: *.f sys_*cc.c read*.c *.inc *.cmm *.hlp *.map *ake* CHANGES.*
56 diff -urN Diffuse-4.1b/discus/prog/appl_unix.f Diffuse-4.1b.patch/discus/prog/appl_unix.f
57 --- Diffuse-4.1b/discus/prog/appl_unix.f Tue Mar 13 23:31:33 2001
58 +++ Diffuse-4.1b.patch/discus/prog/appl_unix.f Wed Dec 18 16:51:53 2002
60 call getenv('HOME',home_dir)
61 home_dir_l = len_str(home_dir)
64 - call getenv(pname_cap,appl_dir)
65 - if(appl_dir.eq.' ') then
68 - appl_dir_l = len_str(appl_dir)
71 deffile_l = len_str(deffile)
74 + appl_dir_l = len_str('/usr/share/diffuse/')
75 + appl_dir(1:appl_dir_l) = '/usr/share/diffuse/'
78 mac_dir(1:appl_dir_l) = appl_dir
79 mac_dir(appl_dir_l+1:appl_dir_l+len_str(pname)+6) =
81 colorfile(appl_dir_l+1:appl_dir_l+10) = '/color.map'
82 colorfile_l = len_str(colorfile)
85 + call getenv(pname_cap,appl_dir)
86 + if(appl_dir.eq.' ') then
89 + appl_dir_l = len_str(appl_dir)
91 write(*,1000) umac_dir(1:umac_dir_l)
92 write(*,1100) mac_dir(1:mac_dir_l)
94 diff -urN Diffuse-4.1b/kuplot/prog/Makefile Diffuse-4.1b.patch/kuplot/prog/Makefile
95 --- Diffuse-4.1b/kuplot/prog/Makefile Sat Mar 31 07:34:31 2001
96 +++ Diffuse-4.1b.patch/kuplot/prog/Makefile Wed Dec 18 17:16:08 2002
99 # Where to install the binary and help file and a backup location
101 -BINDIR = /usr/local/bin
103 +BINDIR = $(prefix)/bin
104 +DATADIR = $(prefix)/share
105 BACKDIR = $(HOME)/linux/backup
107 # Your compiler names and install program
110 CFLAGS = -DREADLINE -w
111 FFLAGS = -O -malign-double
112 -LDFLAGS = -L$(PGLIB) -L/usr/X11R6/lib -lpgplot -lX11 -lm
113 +LDFLAGS = -L/usr/X11R6/lib -lpgplot -lX11 -lm
114 SYSOBJ = appl_unix.o sys_g77.o
116 # ================================================================
117 @@ -126,22 +128,25 @@
120 install: kuplot appl_kup.hlp lib_f77.hlp
121 + install -d $(DESTDIR)$(BINDIR)
122 + install -d $(DESTDIR)$(DATADIR)/diffuse
123 + install -d $(DESTDIR)$(DATADIR)/mac/kuplot
125 cat appl_kup.hlp lib_f77.hlp > kuplot.hlp
126 - cp kuplot $(BINDIR)/
127 - cp kuplot.hlp $(BINDIR)/
128 - chmod $(BMOD) $(BINDIR)/kuplot
129 - chmod $(FMOD) $(BINDIR)/kuplot.hlp
130 - if [ ! -d "$(BINDIR)/mac/" ] ; then \
131 - mkdir $(BINDIR)/mac/; chmod $(BMOD) $(BINDIR)/mac/; \
133 - if [ ! -d "$(BINDIR)/mac/kuplot" ] ; then \
134 - mkdir -m $(BMOD) $(BINDIR)/mac/kuplot; \
135 - chmod $(BMOD) $(BINDIR)/mac/kuplot;\
137 + cp kuplot $(DESTDIR)$(BINDIR)/
138 + cp kuplot.hlp $(DESTDIR)$(DATADIR)/diffuse
139 +# chmod $(BMOD) $(BINDIR)/kuplot
140 +# chmod $(FMOD) $(BINDIR)/kuplot.hlp
141 +# if [ ! -d "$(BINDIR)/mac/" ] ; then \
142 +# mkdir $(BINDIR)/mac/; chmod $(BMOD) $(BINDIR)/mac/; \
144 +# if [ ! -d "$(BINDIR)/mac/kuplot" ] ; then \
145 +# mkdir -m $(BMOD) $(BINDIR)/mac/kuplot; \
146 +# chmod $(BMOD) $(BINDIR)/mac/kuplot;\
148 cd sysmac; for i in *.mac ; do \
149 - (cp $$i $(BINDIR)/mac/kuplot/; \
150 - chmod $(FMOD) $(BINDIR)/mac/kuplot/$$i;) \
151 + cp $$i $(DESTDIR)$(DATADIR)/mac/kuplot/; \
152 +# chmod $(FMOD) $(BINDIR)/mac/kuplot/$$i;)
156 diff -urN Diffuse-4.1b/kuplot/prog/appl_unix.f Diffuse-4.1b.patch/kuplot/prog/appl_unix.f
157 --- Diffuse-4.1b/kuplot/prog/appl_unix.f Tue Mar 13 23:31:33 2001
158 +++ Diffuse-4.1b.patch/kuplot/prog/appl_unix.f Wed Dec 18 16:51:53 2002
160 call getenv('HOME',home_dir)
161 home_dir_l = len_str(home_dir)
164 - call getenv(pname_cap,appl_dir)
165 - if(appl_dir.eq.' ') then
168 - appl_dir_l = len_str(appl_dir)
171 deffile_l = len_str(deffile)
174 + appl_dir_l = len_str('/usr/share/diffuse/')
175 + appl_dir(1:appl_dir_l) = '/usr/share/diffuse/'
178 mac_dir(1:appl_dir_l) = appl_dir
179 mac_dir(appl_dir_l+1:appl_dir_l+len_str(pname)+6) =
181 colorfile(appl_dir_l+1:appl_dir_l+10) = '/color.map'
182 colorfile_l = len_str(colorfile)
185 + call getenv(pname_cap,appl_dir)
186 + if(appl_dir.eq.' ') then
189 + appl_dir_l = len_str(appl_dir)
191 write(*,1000) umac_dir(1:umac_dir_l)
192 write(*,1100) mac_dir(1:mac_dir_l)
194 diff -urN Diffuse-4.1b/lib_f77/appl_unix.f Diffuse-4.1b.patch/lib_f77/appl_unix.f
195 --- Diffuse-4.1b/lib_f77/appl_unix.f Tue Mar 13 23:31:33 2001
196 +++ Diffuse-4.1b.patch/lib_f77/appl_unix.f Wed Dec 18 16:51:53 2002
198 call getenv('HOME',home_dir)
199 home_dir_l = len_str(home_dir)
202 - call getenv(pname_cap,appl_dir)
203 - if(appl_dir.eq.' ') then
206 - appl_dir_l = len_str(appl_dir)
209 deffile_l = len_str(deffile)
212 + appl_dir_l = len_str('/usr/share/diffuse/')
213 + appl_dir(1:appl_dir_l) = '/usr/share/diffuse/'
216 mac_dir(1:appl_dir_l) = appl_dir
217 mac_dir(appl_dir_l+1:appl_dir_l+len_str(pname)+6) =
219 colorfile(appl_dir_l+1:appl_dir_l+10) = '/color.map'
220 colorfile_l = len_str(colorfile)
223 + call getenv(pname_cap,appl_dir)
224 + if(appl_dir.eq.' ') then
227 + appl_dir_l = len_str(appl_dir)
229 write(*,1000) umac_dir(1:umac_dir_l)
230 write(*,1100) mac_dir(1:mac_dir_l)
232 diff -urN Diffuse-4.1b/pdffit/prog/Makefile Diffuse-4.1b.patch/pdffit/prog/Makefile
233 --- Diffuse-4.1b/pdffit/prog/Makefile Tue Mar 13 23:31:35 2001
234 +++ Diffuse-4.1b.patch/pdffit/prog/Makefile Wed Dec 18 17:15:15 2002
237 # Where to install the binary and help file and a backup location
239 -BINDIR = /usr/local/bin
241 +BINDIR = $(prefix)/bin
242 +DATADIR = $(prefix)/share
243 BACKDIR = $(HOME)/linux/backup
245 # Your compiler names
246 @@ -146,20 +148,23 @@
247 install: pdffit appl_pdf.hlp lib_f77.hlp
249 cat appl_pdf.hlp lib_f77.hlp > pdffit.hlp
250 - cp pdffit $(BINDIR)/
251 - cp pdffit.hlp $(BINDIR)/
252 - chmod $(BMOD) $(BINDIR)/pdffit
253 - chmod $(FMOD) $(BINDIR)/pdffit.hlp
254 - if [ ! -d "$(BINDIR)/mac/" ] ; then \
255 - mkdir $(BINDIR)/mac/; chmod $(BMOD) $(BINDIR)/mac/; \
257 - if [ ! -d "$(BINDIR)/mac/pdffit" ] ; then \
258 - mkdir -m $(BMOD) $(BINDIR)/mac/pdffit; \
259 - chmod $(BMOD) $(BINDIR)/mac/pdffit;\
261 + install -d $(DESTDIR)$(BINDIR)
262 + install -d $(DESTDIR)$(DATADIR)/diffuse
263 + install -d $(DESTDIR)$(DATADIR)/diffuse/mac/pdffit/
264 + cp pdffit $(DESTDIR)$(BINDIR)/
265 + cp pdffit.hlp $(DESTDIR)$(DATADIR)/diffuse
266 +# chmod $(BMOD) $(DESTDIR)$(BINDIR)/pdffit
267 +# chmod $(FMOD) $(DESTDIR)$(BINDIR)/pdffit.hlp
268 +# if [ ! -d "$(BINDIR)/mac/" ] ; then \
269 +# mkdir $(BINDIR)/mac/; chmod $(BMOD) $(BINDIR)/mac/; \
271 +# if [ ! -d "$(BINDIR)/mac/pdffit" ] ; then \
272 +# mkdir -m $(BMOD) $(BINDIR)/mac/pdffit; \
273 +# chmod $(BMOD) $(BINDIR)/mac/pdffit;\
275 cd sysmac; for i in *.mac ; do \
276 - (cp $$i $(BINDIR)/mac/pdffit/; \
277 - chmod $(FMOD) $(BINDIR)/mac/pdffit/$$i;) \
278 + (cp $$i $(DESTDIR)$(DATADIR)/diffuse/mac/pdffit/; \
279 +# chmod $(FMOD) $(BINDIR)/mac/pdffit/$$i;)
283 diff -urN Diffuse-4.1b/pdffit/prog/appl_unix.f Diffuse-4.1b.patch/pdffit/prog/appl_unix.f
284 --- Diffuse-4.1b/pdffit/prog/appl_unix.f Tue Mar 13 23:31:33 2001
285 +++ Diffuse-4.1b.patch/pdffit/prog/appl_unix.f Wed Dec 18 16:51:53 2002
287 call getenv('HOME',home_dir)
288 home_dir_l = len_str(home_dir)
291 - call getenv(pname_cap,appl_dir)
292 - if(appl_dir.eq.' ') then
295 - appl_dir_l = len_str(appl_dir)
298 deffile_l = len_str(deffile)
301 + appl_dir_l = len_str('/usr/share/diffuse/')
302 + appl_dir(1:appl_dir_l) = '/usr/share/diffuse/'
305 mac_dir(1:appl_dir_l) = appl_dir
306 mac_dir(appl_dir_l+1:appl_dir_l+len_str(pname)+6) =
308 colorfile(appl_dir_l+1:appl_dir_l+10) = '/color.map'
309 colorfile_l = len_str(colorfile)
312 + call getenv(pname_cap,appl_dir)
313 + if(appl_dir.eq.' ') then
316 + appl_dir_l = len_str(appl_dir)
318 write(*,1000) umac_dir(1:umac_dir_l)
319 write(*,1100) mac_dir(1:mac_dir_l)