]> git.pld-linux.org Git - packages/diffuse.git/blame - diffuse-Makefiles.patch
projects / packages / diffuse.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
- tabs in preamble
[packages/diffuse.git] / diffuse-Makefiles.patch
CommitLineData
d413c85d
RW		 1diff -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
4@@ -15,7 +15,9 @@
5
6 # Where to install the binary and help file and a backup location
7
8-BINDIR = /usr/local/bin
9+prefix = /usr
10+BINDIR = $(prefix)/bin
11+DATADIR = $(prefix)/share
12 BACKDIR = $(HOME)/linux/backup/
13
14 # Your compiler name and install program
15@@ -150,22 +152,25 @@
16 install: discus appl_dis.hlp lib_f77.hlp color.map
17 rm -f discus.hlp
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/; \
27- fi
28- if [ ! -d "$(BINDIR)/mac/discus" ] ; then \
29- mkdir -m $(BMOD) $(BINDIR)/mac/discus; \
30- chmod $(BMOD) $(BINDIR)/mac/discus;\
31- fi
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/; \
43+# fi
44+# if [ ! -d "$(BINDIR)/mac/discus" ] ; then \
45+# mkdir -m $(BMOD) $(BINDIR)/mac/discus; \
46+# chmod $(BMOD) $(BINDIR)/mac/discus;\
47+# fi
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;)
53 done
54
55 backup: *.f sys_*cc.c read*.c *.inc *.cmm *.hlp *.map *ake* CHANGES.*
56diff -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
59@@ -33,16 +33,13 @@
60 call getenv('HOME',home_dir)
61 home_dir_l = len_str(home_dir)
62 c
63- appl_dir = ' '
64- call getenv(pname_cap,appl_dir)
65- if(appl_dir.eq.' ') then
66- appl_dir = '.'
67- endif
68- appl_dir_l = len_str(appl_dir)
69-c
70 deffile = '.'//pname
71 deffile_l = len_str(deffile)
72 c
73+ appl_dir = ' '
74+ appl_dir_l = len_str('/usr/share/diffuse/')
75+ appl_dir(1:appl_dir_l) = '/usr/share/diffuse/'
76+c
77 mac_dir = ' '
78 mac_dir(1:appl_dir_l) = appl_dir
79 mac_dir(appl_dir_l+1:appl_dir_l+len_str(pname)+6) =
80@@ -64,6 +61,13 @@
81 colorfile(appl_dir_l+1:appl_dir_l+10) = '/color.map'
82 colorfile_l = len_str(colorfile)
83 c
84+ appl_dir = ' '
85+ call getenv(pname_cap,appl_dir)
86+ if(appl_dir.eq.' ') then
87+ appl_dir = '.'
88+ endif
89+ appl_dir_l = len_str(appl_dir)
90+c
91 write(*,1000) umac_dir(1:umac_dir_l)
92 write(*,1100) mac_dir(1:mac_dir_l)
93 c
94diff -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
97@@ -15,7 +15,9 @@
98
99 # Where to install the binary and help file and a backup location
100
101-BINDIR = /usr/local/bin
102+prefix=/usr
103+BINDIR = $(prefix)/bin
104+DATADIR = $(prefix)/share
105 BACKDIR = $(HOME)/linux/backup
106
107 # Your compiler names and install program
108@@ -48,7 +50,7 @@
109
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
115
116 # ================================================================
117@@ -126,22 +128,25 @@
118 rm -f kuplot $(OBJ)
119
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
124 rm -f kuplot.hlp
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/; \
132- fi
133- if [ ! -d "$(BINDIR)/mac/kuplot" ] ; then \
134- mkdir -m $(BMOD) $(BINDIR)/mac/kuplot; \
135- chmod $(BMOD) $(BINDIR)/mac/kuplot;\
136- fi
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/; \
143+# fi
144+# if [ ! -d "$(BINDIR)/mac/kuplot" ] ; then \
145+# mkdir -m $(BMOD) $(BINDIR)/mac/kuplot; \
146+# chmod $(BMOD) $(BINDIR)/mac/kuplot;\
147+# fi
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;)
153 done
154
155 backup:
156diff -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
159@@ -33,16 +33,13 @@
160 call getenv('HOME',home_dir)
161 home_dir_l = len_str(home_dir)
162 c
163- appl_dir = ' '
164- call getenv(pname_cap,appl_dir)
165- if(appl_dir.eq.' ') then
166- appl_dir = '.'
167- endif
168- appl_dir_l = len_str(appl_dir)
169-c
170 deffile = '.'//pname
171 deffile_l = len_str(deffile)
172 c
173+ appl_dir = ' '
174+ appl_dir_l = len_str('/usr/share/diffuse/')
175+ appl_dir(1:appl_dir_l) = '/usr/share/diffuse/'
176+c
177 mac_dir = ' '
178 mac_dir(1:appl_dir_l) = appl_dir
179 mac_dir(appl_dir_l+1:appl_dir_l+len_str(pname)+6) =
180@@ -64,6 +61,13 @@
181 colorfile(appl_dir_l+1:appl_dir_l+10) = '/color.map'
182 colorfile_l = len_str(colorfile)
183 c
184+ appl_dir = ' '
185+ call getenv(pname_cap,appl_dir)
186+ if(appl_dir.eq.' ') then
187+ appl_dir = '.'
188+ endif
189+ appl_dir_l = len_str(appl_dir)
190+c
191 write(*,1000) umac_dir(1:umac_dir_l)
192 write(*,1100) mac_dir(1:mac_dir_l)
193 c
194diff -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
197@@ -33,16 +33,13 @@
198 call getenv('HOME',home_dir)
199 home_dir_l = len_str(home_dir)
200 c
201- appl_dir = ' '
202- call getenv(pname_cap,appl_dir)
203- if(appl_dir.eq.' ') then
204- appl_dir = '.'
205- endif
206- appl_dir_l = len_str(appl_dir)
207-c
208 deffile = '.'//pname
209 deffile_l = len_str(deffile)
210 c
211+ appl_dir = ' '
212+ appl_dir_l = len_str('/usr/share/diffuse/')
213+ appl_dir(1:appl_dir_l) = '/usr/share/diffuse/'
214+c
215 mac_dir = ' '
216 mac_dir(1:appl_dir_l) = appl_dir
217 mac_dir(appl_dir_l+1:appl_dir_l+len_str(pname)+6) =
218@@ -64,6 +61,13 @@
219 colorfile(appl_dir_l+1:appl_dir_l+10) = '/color.map'
220 colorfile_l = len_str(colorfile)
221 c
222+ appl_dir = ' '
223+ call getenv(pname_cap,appl_dir)
224+ if(appl_dir.eq.' ') then
225+ appl_dir = '.'
226+ endif
227+ appl_dir_l = len_str(appl_dir)
228+c
229 write(*,1000) umac_dir(1:umac_dir_l)
230 write(*,1100) mac_dir(1:mac_dir_l)
231 c
232diff -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
235@@ -14,7 +14,9 @@
236
237 # Where to install the binary and help file and a backup location
238
239-BINDIR = /usr/local/bin
240+prefix=/usr
241+BINDIR = $(prefix)/bin
242+DATADIR = $(prefix)/share
243 BACKDIR = $(HOME)/linux/backup
244
245 # Your compiler names
246@@ -146,20 +148,23 @@
247 install: pdffit appl_pdf.hlp lib_f77.hlp
248 rm -f pdffit.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/; \
256- fi
257- if [ ! -d "$(BINDIR)/mac/pdffit" ] ; then \
258- mkdir -m $(BMOD) $(BINDIR)/mac/pdffit; \
259- chmod $(BMOD) $(BINDIR)/mac/pdffit;\
260- fi
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/; \
270+# fi
271+# if [ ! -d "$(BINDIR)/mac/pdffit" ] ; then \
272+# mkdir -m $(BMOD) $(BINDIR)/mac/pdffit; \
273+# chmod $(BMOD) $(BINDIR)/mac/pdffit;\
274+# fi
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;)
280 done
281
282
283diff -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
286@@ -33,16 +33,13 @@
287 call getenv('HOME',home_dir)
288 home_dir_l = len_str(home_dir)
289 c
290- appl_dir = ' '
291- call getenv(pname_cap,appl_dir)
292- if(appl_dir.eq.' ') then
293- appl_dir = '.'
294- endif
295- appl_dir_l = len_str(appl_dir)
296-c
297 deffile = '.'//pname
298 deffile_l = len_str(deffile)
299 c
300+ appl_dir = ' '
301+ appl_dir_l = len_str('/usr/share/diffuse/')
302+ appl_dir(1:appl_dir_l) = '/usr/share/diffuse/'
303+c
304 mac_dir = ' '
305 mac_dir(1:appl_dir_l) = appl_dir
306 mac_dir(appl_dir_l+1:appl_dir_l+len_str(pname)+6) =
307@@ -64,6 +61,13 @@
308 colorfile(appl_dir_l+1:appl_dir_l+10) = '/color.map'
309 colorfile_l = len_str(colorfile)
310 c
311+ appl_dir = ' '
312+ call getenv(pname_cap,appl_dir)
313+ if(appl_dir.eq.' ') then
314+ appl_dir = '.'
315+ endif
316+ appl_dir_l = len_str(appl_dir)
317+c
318 write(*,1000) umac_dir(1:umac_dir_l)
319 write(*,1100) mac_dir(1:mac_dir_l)
320 c
'Diffuse program' collection
This page took 0.086224 seconds and 4 git commands to generate.