1 |
hasufell 13/03/31 22:45:37 |
2 |
|
3 |
Added: julius-4.2.2-install.patch |
4 |
julius-4.2.2-ldflags.patch |
5 |
Log: |
6 |
initial import wrt #245475 |
7 |
|
8 |
(Portage version: 2.2.0_alpha170/cvs/Linux x86_64, signed Manifest commit with key E73C35B3) |
9 |
|
10 |
Revision Changes Path |
11 |
1.1 app-accessibility/julius/files/julius-4.2.2-install.patch |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-accessibility/julius/files/julius-4.2.2-install.patch?rev=1.1&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-accessibility/julius/files/julius-4.2.2-install.patch?rev=1.1&content-type=text/plain |
15 |
|
16 |
Index: julius-4.2.2-install.patch |
17 |
=================================================================== |
18 |
From: Julian Ospald <hasufell@g.o> |
19 |
Date: Sun Mar 31 20:38:49 UTC 2013 |
20 |
Subject: respect DESTDIR |
21 |
|
22 |
--- julius-4.2.2/libsent/Makefile.in |
23 |
+++ julius-4.2.2/libsent/Makefile.in |
24 |
@@ -144,16 +144,16 @@ |
25 |
install: install.lib install.include install.bin |
26 |
|
27 |
install.lib: $(TARGET) |
28 |
- ${INSTALL} -d ${libdir} |
29 |
- ${INSTALL_DATA} $(TARGET) ${libdir} |
30 |
+ ${INSTALL} -d $(DESTDIR)/${libdir} |
31 |
+ ${INSTALL_DATA} $(DESTDIR)/$(TARGET) ${libdir} |
32 |
|
33 |
install.include: |
34 |
- ${INSTALL} -d ${includedir}/sent |
35 |
- ${INSTALL_DATA} include/sent/*.h ${includedir}/sent |
36 |
+ ${INSTALL} -d $(DESTDIR)/${includedir}/sent |
37 |
+ ${INSTALL_DATA} include/sent/*.h $(DESTDIR)/${includedir}/sent |
38 |
|
39 |
install.bin: libsent-config-dist |
40 |
- ${INSTALL} -d ${bindir} |
41 |
- ${INSTALL_PROGRAM} libsent-config-dist ${bindir}/libsent-config |
42 |
+ ${INSTALL} -d $(DESTDIR)/${bindir} |
43 |
+ ${INSTALL_PROGRAM} libsent-config-dist $(DESTDIR)/${bindir}/libsent-config |
44 |
|
45 |
clean: |
46 |
$(RM) *~ src/*/*~ src/*/*.o src/*/*/*.o src/*/*/*/*.o src/*/*/*/*/*.o include/sent/*~ |
47 |
--- julius-4.2.2/libjulius/Makefile.in |
48 |
+++ julius-4.2.2/libjulius/Makefile.in |
49 |
@@ -90,16 +90,16 @@ |
50 |
install: install.lib install.include install.bin |
51 |
|
52 |
install.lib: $(TARGET) |
53 |
- ${INSTALL} -d ${libdir} |
54 |
- ${INSTALL_DATA} $(TARGET) ${libdir} |
55 |
+ ${INSTALL} -d $(DESTDIR)/${libdir} |
56 |
+ ${INSTALL_DATA} $(TARGET) $(DESTDIR)/${libdir} |
57 |
|
58 |
install.include: |
59 |
- ${INSTALL} -d ${includedir}/julius |
60 |
- ${INSTALL_DATA} include/julius/*.h ${includedir}/julius |
61 |
+ ${INSTALL} -d $(DESTDIR)/${includedir}/julius |
62 |
+ ${INSTALL_DATA} include/julius/*.h $(DESTDIR)/${includedir}/julius |
63 |
|
64 |
install.bin: libjulius-config-dist |
65 |
- ${INSTALL} -d ${bindir} |
66 |
- ${INSTALL_PROGRAM} libjulius-config-dist ${bindir}/libjulius-config |
67 |
+ ${INSTALL} -d $(DESTDIR)/${bindir} |
68 |
+ ${INSTALL_PROGRAM} libjulius-config-dist $(DESTDIR)/${bindir}/libjulius-config |
69 |
|
70 |
depend: |
71 |
makedepend -- $(CFLAGS) -- $(OBJSENT) |
72 |
--- julius-4.2.2/julius/Makefile.in |
73 |
+++ julius-4.2.2/julius/Makefile.in |
74 |
@@ -61,8 +61,8 @@ |
75 |
install: install.bin |
76 |
|
77 |
install.bin: $(TARGET) |
78 |
- ${INSTALL} -d @bindir@ |
79 |
- ${INSTALL_PROGRAM} $(TARGET) ${bindir}/${INSTALLTARGET} |
80 |
+ ${INSTALL} -d $(DESTDIR)/@bindir@ |
81 |
+ ${INSTALL_PROGRAM} $(TARGET) $(DESTDIR)/${bindir}/${INSTALLTARGET} |
82 |
|
83 |
depend: |
84 |
makedepend -- $(CFLAGS) -- $(OBJSENT) |
85 |
--- julius-4.2.2/mkbingram/Makefile.in |
86 |
+++ julius-4.2.2/mkbingram/Makefile.in |
87 |
@@ -32,8 +32,8 @@ |
88 |
install: install.bin |
89 |
|
90 |
install.bin: $(TARGET) |
91 |
- ${INSTALL} -d @bindir@ |
92 |
- @INSTALL_PROGRAM@ $(TARGET) @bindir@ |
93 |
+ ${INSTALL} -d $(DESTDIR)/@bindir@ |
94 |
+ @INSTALL_PROGRAM@ $(TARGET) $(DESTDIR)/@bindir@ |
95 |
|
96 |
clean: |
97 |
$(RM) $(OBJ) |
98 |
--- julius-4.2.2/mkbinhmm/Makefile.in |
99 |
+++ julius-4.2.2/mkbinhmm/Makefile.in |
100 |
@@ -32,8 +32,8 @@ |
101 |
install: install.bin |
102 |
|
103 |
install.bin: mkbinhmm@EXEEXT@ mkbinhmmlist@EXEEXT@ |
104 |
- ${INSTALL} -d @bindir@ |
105 |
- @INSTALL_PROGRAM@ mkbinhmm@EXEEXT@ mkbinhmmlist@EXEEXT@ @bindir@ |
106 |
+ ${INSTALL} -d $(DESTDIR)/@bindir@ |
107 |
+ @INSTALL_PROGRAM@ mkbinhmm@EXEEXT@ mkbinhmmlist@EXEEXT@ $(DESTDIR)/@bindir@ |
108 |
|
109 |
clean: |
110 |
$(RM) mkbinhmm.o mkbinhmmlist.o |
111 |
--- julius-4.2.2/adinrec/Makefile.in |
112 |
+++ julius-4.2.2/adinrec/Makefile.in |
113 |
@@ -36,8 +36,8 @@ |
114 |
install: install.bin |
115 |
|
116 |
install.bin: $(TARGET) |
117 |
- ${INSTALL} -d @bindir@ |
118 |
- @INSTALL_PROGRAM@ $(TARGET) @bindir@ |
119 |
+ ${INSTALL} -d $(DESTDIR)/@bindir@ |
120 |
+ @INSTALL_PROGRAM@ $(TARGET) $(DESTDIR)/@bindir@ |
121 |
|
122 |
############################################################ |
123 |
|
124 |
--- julius-4.2.2/adintool/Makefile.in |
125 |
+++ julius-4.2.2/adintool/Makefile.in |
126 |
@@ -36,8 +36,8 @@ |
127 |
install: install.bin |
128 |
|
129 |
install.bin: $(TARGET) |
130 |
- ${INSTALL} -d @bindir@ |
131 |
- @INSTALL_PROGRAM@ $(TARGET) @bindir@ |
132 |
+ ${INSTALL} -d $(DESTDIR)/@bindir@ |
133 |
+ @INSTALL_PROGRAM@ $(TARGET) $(DESTDIR)/@bindir@ |
134 |
|
135 |
############################################################ |
136 |
|
137 |
--- julius-4.2.2/mkgshmm/Makefile.in |
138 |
+++ julius-4.2.2/mkgshmm/Makefile.in |
139 |
@@ -23,8 +23,8 @@ |
140 |
install: install.bin |
141 |
|
142 |
install.bin: $(TARGET) |
143 |
- ${INSTALL} -d @bindir@ |
144 |
- @INSTALL_PROGRAM@ $(TARGET) @bindir@ |
145 |
+ ${INSTALL} -d $(DESTDIR)/@bindir@ |
146 |
+ @INSTALL_PROGRAM@ $(TARGET) $(DESTDIR)/@bindir@ |
147 |
|
148 |
############################################################ |
149 |
|
150 |
--- julius-4.2.2/mkss/Makefile.in |
151 |
+++ julius-4.2.2/mkss/Makefile.in |
152 |
@@ -36,8 +36,8 @@ |
153 |
install: install.bin |
154 |
|
155 |
install.bin: $(TARGET) |
156 |
- ${INSTALL} -d @bindir@ |
157 |
- @INSTALL_PROGRAM@ $(TARGET) @bindir@ |
158 |
+ ${INSTALL} -d $(DESTDIR)/@bindir@ |
159 |
+ @INSTALL_PROGRAM@ $(TARGET) $(DESTDIR)/@bindir@ |
160 |
|
161 |
############################################################ |
162 |
|
163 |
--- julius-4.2.2/jcontrol/Makefile.in |
164 |
+++ julius-4.2.2/jcontrol/Makefile.in |
165 |
@@ -31,19 +31,19 @@ |
166 |
install: install.bin |
167 |
|
168 |
install.bin: $(TARGET) |
169 |
- ${INSTALL} -d @bindir@ |
170 |
- @INSTALL_PROGRAM@ $(TARGET) @bindir@ |
171 |
+ ${INSTALL} -d $(DESTDIR)/@bindir@ |
172 |
+ @INSTALL_PROGRAM@ $(TARGET) $(DESTDIR)/@bindir@/jucontrol |
173 |
|
174 |
clean: |
175 |
$(RM) $(OBJ) |
176 |
$(RM) config.log config.cache |
177 |
$(RM) *~ core |
178 |
- $(RM) $(TARGET) $(TARGET).exe |
179 |
+ $(RM) $(TARGET) $(TARGET).exe jucontrol |
180 |
|
181 |
distclean: |
182 |
$(RM) $(OBJ) |
183 |
$(RM) config.log config.cache |
184 |
$(RM) *~ core |
185 |
- $(RM) $(TARGET) $(TARGET).exe |
186 |
+ $(RM) $(TARGET) $(TARGET).exe jucontrol |
187 |
$(RM) config.status |
188 |
$(RM) Makefile |
189 |
--- julius-4.2.2/gramtools/accept_check/Makefile.in |
190 |
+++ julius-4.2.2/gramtools/accept_check/Makefile.in |
191 |
@@ -36,8 +36,8 @@ |
192 |
install: install.bin |
193 |
|
194 |
install.bin: $(TARGET) |
195 |
- ${INSTALL} -d @bindir@ |
196 |
- @INSTALL_PROGRAM@ $(TARGET) @bindir@ |
197 |
+ ${INSTALL} -d $(DESTDIR)/@bindir@ |
198 |
+ @INSTALL_PROGRAM@ $(TARGET) $(DESTDIR)/@bindir@ |
199 |
|
200 |
############################################################ |
201 |
|
202 |
--- julius-4.2.2/gramtools/dfa_determinize/Makefile.in |
203 |
+++ julius-4.2.2/gramtools/dfa_determinize/Makefile.in |
204 |
@@ -35,8 +35,8 @@ |
205 |
install: install.bin |
206 |
|
207 |
install.bin: $(TARGET) |
208 |
- ${INSTALL} -d @bindir@ |
209 |
- @INSTALL_PROGRAM@ $(TARGET) @bindir@ |
210 |
+ ${INSTALL} -d $(DESTDIR)/@bindir@ |
211 |
+ @INSTALL_PROGRAM@ $(TARGET) $(DESTDIR)/@bindir@ |
212 |
|
213 |
############################################################ |
214 |
|
215 |
--- julius-4.2.2/gramtools/dfa_minimize/Makefile.in |
216 |
+++ julius-4.2.2/gramtools/dfa_minimize/Makefile.in |
217 |
@@ -34,8 +34,8 @@ |
218 |
install: install.bin |
219 |
|
220 |
install.bin: $(TARGET) |
221 |
- ${INSTALL} -d @bindir@ |
222 |
- @INSTALL_PROGRAM@ $(TARGET) @bindir@ |
223 |
+ ${INSTALL} -d $(DESTDIR)/@bindir@ |
224 |
+ @INSTALL_PROGRAM@ $(TARGET) $(DESTDIR)/@bindir@ |
225 |
|
226 |
############################################################ |
227 |
|
228 |
--- julius-4.2.2/gramtools/generate/Makefile.in |
229 |
+++ julius-4.2.2/gramtools/generate/Makefile.in |
230 |
@@ -35,8 +35,8 @@ |
231 |
install: install.bin |
232 |
|
233 |
install.bin: $(TARGET) |
234 |
- ${INSTALL} -d @bindir@ |
235 |
- @INSTALL_PROGRAM@ $(TARGET) @bindir@ |
236 |
+ ${INSTALL} -d $(DESTDIR)/@bindir@ |
237 |
+ @INSTALL_PROGRAM@ $(TARGET) $(DESTDIR)/@bindir@ |
238 |
|
239 |
############################################################ |
240 |
|
241 |
--- julius-4.2.2/gramtools/gram2sapixml/Makefile.in |
242 |
+++ julius-4.2.2/gramtools/gram2sapixml/Makefile.in |
243 |
@@ -17,8 +17,8 @@ |
244 |
install: install.bin |
245 |
|
246 |
install.bin: |
247 |
- ${INSTALL} -d @bindir@ |
248 |
- @INSTALL_PROGRAM@ $(TARGET) @bindir@ |
249 |
+ ${INSTALL} -d $(DESTDIR)/@bindir@ |
250 |
+ @INSTALL_PROGRAM@ $(TARGET) $(DESTDIR)/@bindir@ |
251 |
|
252 |
clean: |
253 |
echo nothing to do |
254 |
--- julius-4.2.2/gramtools/mkdfa/Makefile.in |
255 |
+++ julius-4.2.2/gramtools/mkdfa/Makefile.in |
256 |
@@ -18,13 +18,13 @@ |
257 |
|
258 |
install: |
259 |
(cd $(SUBDIR); $(MAKE) install) |
260 |
- ${INSTALL} -d @bindir@ |
261 |
- @INSTALL_PROGRAM@ $(TARGET) @bindir@ |
262 |
+ ${INSTALL} -d $(DESTDIR)/@bindir@ |
263 |
+ @INSTALL_PROGRAM@ $(TARGET) $(DESTDIR)/@bindir@ |
264 |
|
265 |
install.bin: |
266 |
(cd $(SUBDIR); $(MAKE) install.bin) |
267 |
- ${INSTALL} -d @bindir@ |
268 |
- @INSTALL_PROGRAM@ $(TARGET) @bindir@ |
269 |
+ ${INSTALL} -d $(DESTDIR)/@bindir@ |
270 |
+ @INSTALL_PROGRAM@ $(TARGET) $(DESTDIR)/@bindir@ |
271 |
|
272 |
clean: |
273 |
(cd $(SUBDIR); $(MAKE) clean) |
274 |
--- julius-4.2.2/gramtools/mkdfa/mkfa-1.44-flex/Makefile.in |
275 |
+++ julius-4.2.2/gramtools/mkdfa/mkfa-1.44-flex/Makefile.in |
276 |
@@ -43,8 +43,8 @@ |
277 |
install: install.bin |
278 |
|
279 |
install.bin: |
280 |
- ${INSTALL} -d @bindir@ |
281 |
- @INSTALL_PROGRAM@ $(TARGET) @bindir@ |
282 |
+ ${INSTALL} -d $(DESTDIR)/@bindir@ |
283 |
+ @INSTALL_PROGRAM@ $(TARGET) $(DESTDIR)/@bindir@ |
284 |
|
285 |
clean: |
286 |
$(RM) *.o *~ core |
287 |
--- julius-4.2.2/gramtools/nextword/Makefile.in |
288 |
+++ julius-4.2.2/gramtools/nextword/Makefile.in |
289 |
@@ -36,8 +36,8 @@ |
290 |
install: install.bin |
291 |
|
292 |
install.bin: $(TARGET) |
293 |
- ${INSTALL} -d @bindir@ |
294 |
- @INSTALL_PROGRAM@ $(TARGET) @bindir@ |
295 |
+ ${INSTALL} -d $(DESTDIR)/@bindir@ |
296 |
+ @INSTALL_PROGRAM@ $(TARGET) $(DESTDIR)/@bindir@ |
297 |
|
298 |
############################################################ |
299 |
|
300 |
--- julius-4.2.2/gramtools/yomi2voca/Makefile.in |
301 |
+++ julius-4.2.2/gramtools/yomi2voca/Makefile.in |
302 |
@@ -17,8 +17,8 @@ |
303 |
install: install.bin |
304 |
|
305 |
install.bin: |
306 |
- ${INSTALL} -d @bindir@ |
307 |
- @INSTALL_PROGRAM@ $(TARGET) @bindir@ |
308 |
+ ${INSTALL} -d $(DESTDIR)/@bindir@ |
309 |
+ @INSTALL_PROGRAM@ $(TARGET) $(DESTDIR)/@bindir@ |
310 |
|
311 |
clean: |
312 |
echo nothing to do |
313 |
--- julius-4.2.2/generate-ngram/Makefile.in |
314 |
+++ julius-4.2.2/generate-ngram/Makefile.in |
315 |
@@ -33,8 +33,8 @@ |
316 |
install: install.bin |
317 |
|
318 |
install.bin: $(TARGET) |
319 |
- ${INSTALL} -d @bindir@ |
320 |
- @INSTALL_PROGRAM@ $(TARGET) @bindir@ |
321 |
+ ${INSTALL} -d $(DESTDIR)/@bindir@ |
322 |
+ @INSTALL_PROGRAM@ $(TARGET) $(DESTDIR)/@bindir@ |
323 |
|
324 |
clean: |
325 |
$(RM) $(OBJ) *~ core |
326 |
--- julius-4.2.2/jclient-perl/Makefile.in |
327 |
+++ julius-4.2.2/jclient-perl/Makefile.in |
328 |
@@ -17,8 +17,8 @@ |
329 |
install: install.bin |
330 |
|
331 |
install.bin: |
332 |
- ${INSTALL} -d @bindir@ |
333 |
- @INSTALL_PROGRAM@ $(TARGET) @bindir@ |
334 |
+ ${INSTALL} -d $(DESTDIR)/@bindir@ |
335 |
+ @INSTALL_PROGRAM@ $(TARGET) $(DESTDIR)/@bindir@ |
336 |
|
337 |
clean: |
338 |
echo nothing to do |
339 |
--- julius-4.2.2/man/Makefile.in |
340 |
+++ julius-4.2.2/man/Makefile.in |
341 |
@@ -19,16 +19,16 @@ |
342 |
install: install.man install.man.ja |
343 |
|
344 |
install.man: |
345 |
- ${INSTALL} -d @mandir@/man1 |
346 |
+ ${INSTALL} -d $(DESTDIR)/@mandir@/man1 |
347 |
for f in *.1; do \ |
348 |
- @INSTALL_DATA@ $$f @mandir@/man1/$$f; \ |
349 |
+ @INSTALL_DATA@ $$f $(DESTDIR)/@mandir@/man1/$$f; \ |
350 |
done |
351 |
|
352 |
install.man.ja: |
353 |
- ${INSTALL} -d @mandir@/ja/man1 |
354 |
+ ${INSTALL} -d $(DESTDIR)/@mandir@/ja/man1 |
355 |
cd ja; |
356 |
for f in *.1; do \ |
357 |
- @INSTALL_DATA@ $$f @mandir@/ja/man1/$$f; \ |
358 |
+ @INSTALL_DATA@ $$f $(DESTDIR)/@mandir@/ja/man1/$$f; \ |
359 |
done |
360 |
cd .. |
361 |
|
362 |
|
363 |
|
364 |
|
365 |
1.1 app-accessibility/julius/files/julius-4.2.2-ldflags.patch |
366 |
|
367 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-accessibility/julius/files/julius-4.2.2-ldflags.patch?rev=1.1&view=markup |
368 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-accessibility/julius/files/julius-4.2.2-ldflags.patch?rev=1.1&content-type=text/plain |
369 |
|
370 |
Index: julius-4.2.2-ldflags.patch |
371 |
=================================================================== |
372 |
--- julius-4.2.2/jcontrol/Makefile.in |
373 |
+++ julius-4.2.2/jcontrol/Makefile.in |
374 |
@@ -14,7 +14,7 @@ |
375 |
CC=@CC@ |
376 |
CFLAGS=@CFLAGS@ |
377 |
CPPFLAGS=@CPPFLAGS@ @DEFS@ |
378 |
-LDFLAGS=@LIBS@ @EXTRALIB@ |
379 |
+LDFLAGS += @LIBS@ @EXTRALIB@ |
380 |
RM=@RM@ -f |
381 |
prefix=@prefix@ |
382 |
exec_prefix=@exec_prefix@ |