]>
Commit | Line | Data |
---|---|---|
c8972cd1 ER |
1 | --- ./configure~ 2005-09-04 01:26:56.000000000 +0300 |
2 | +++ ./configure 2005-09-04 01:26:58.000000000 +0300 | |
3 | @@ -13,6 +13,7 @@ | |
4 | # default parameters | |
5 | compile_type="release" | |
6 | prefix="/usr/local" | |
7 | +libdir="${prefix}/lib" | |
8 | mandir="" | |
9 | bindir="" | |
10 | cross_prefix="" | |
11 | @@ -496,6 +497,8 @@ | |
12 | ;; | |
13 | --prefix=*) prefix=`echo $opt | cut -d '=' -f 2` | |
14 | ;; | |
15 | + --libdir=*) libdir=`echo $opt | cut -d '=' -f 2` | |
16 | + ;; | |
17 | --mandir=*) mandir=`echo $opt | cut -d '=' -f 2` | |
18 | ;; | |
19 | --source-path=*) source_path=`echo $opt | cut -d '=' -f 2` | |
20 | @@ -1612,6 +1615,10 @@ | |
21 | bindir="${prefix}/bin" | |
22 | fi | |
23 | ||
24 | +if test x"$libdir" = x""; then | |
25 | +libdir="${prefix}/lib" | |
26 | +fi | |
27 | + | |
28 | if test x"$mandir" = x""; then | |
29 | mandir="${prefix}/man" | |
30 | fi | |
31 | @@ -1840,6 +1847,7 @@ | |
32 | ||
33 | echo "PREFIX=$prefix" >> config.mak | |
34 | #echo "bindir=$bindir" >> config.mak | |
35 | +echo "LIBDIR=$libdir" >> config.mak | |
36 | #echo "mandir=$mandir" >> config.mak | |
37 | #echo "MAKE=$make" >> config.mak | |
38 | echo "QMAKE_CC=$cc" >> config.mak | |
39 | ||
6f608227 ER |
40 | --- ./libs/libmythsamplerate/libmythsamplerate.pro~ 2005-05-06 23:19:54.000000000 +0300 |
41 | +++ ./libs/libmythsamplerate/libmythsamplerate.pro 2005-09-04 00:10:56.000000000 +0300 | |
42 | @@ -4,7 +4,7 @@ | |
43 | TEMPLATE = lib | |
44 | TARGET = mythsamplerate-$$LIBVERSION | |
45 | CONFIG += thread staticlib warn_off | |
46 | -target.path = $${PREFIX}/lib | |
47 | +target.path = $${LIBDIR} | |
48 | INSTALLS = target | |
49 | ||
50 | VERSION = 0.18.1 | |
51 | diff -ur mythtv-0.18.1/filters/adjust/adjust.pro mythtv-0.18.1.fixed/filters/adjust/adjust.pro | |
52 | --- mythtv-0.18.1/filters/adjust/adjust.pro 2005-01-29 07:21:36.000000000 +0200 | |
53 | +++ mythtv-0.18.1.fixed/filters/adjust/adjust.pro 2005-09-04 00:25:07.000000000 +0300 | |
54 | @@ -4,7 +4,7 @@ | |
55 | TEMPLATE = lib | |
56 | CONFIG -= moc qt | |
57 | CONFIG += plugin thread | |
58 | -target.path = $${PREFIX}/lib/mythtv/filters | |
59 | +target.path = $${LIBDIR}/mythtv/filters | |
60 | INSTALLS = target | |
61 | ||
62 | INCLUDEPATH += ../../libs/libmythtv | |
63 | diff -ur mythtv-0.18.1/filters/bobdeint/bobdeint.pro mythtv-0.18.1.fixed/filters/bobdeint/bobdeint.pro | |
64 | --- mythtv-0.18.1/filters/bobdeint/bobdeint.pro 2005-01-29 07:21:36.000000000 +0200 | |
65 | +++ mythtv-0.18.1.fixed/filters/bobdeint/bobdeint.pro 2005-09-04 00:25:16.000000000 +0300 | |
66 | @@ -4,7 +4,7 @@ | |
67 | TEMPLATE = lib | |
68 | CONFIG -= moc qt | |
69 | CONFIG += plugin thread | |
70 | -target.path = $${PREFIX}/lib/mythtv/filters | |
71 | +target.path = $${LIBDIR}/mythtv/filters | |
72 | INSTALLS = target | |
73 | ||
74 | INCLUDEPATH += ../../libs/libmythtv | |
75 | diff -ur mythtv-0.18.1/filters/convert/convert.pro mythtv-0.18.1.fixed/filters/convert/convert.pro | |
76 | --- mythtv-0.18.1/filters/convert/convert.pro 2005-01-29 07:21:36.000000000 +0200 | |
77 | +++ mythtv-0.18.1.fixed/filters/convert/convert.pro 2005-09-04 00:24:55.000000000 +0300 | |
78 | @@ -4,7 +4,7 @@ | |
79 | TEMPLATE = lib | |
80 | CONFIG -= moc qt | |
81 | CONFIG += plugin thread | |
82 | -target.path = $${PREFIX}/lib/mythtv/filters | |
83 | +target.path = $${LIBDIR}/mythtv/filters | |
84 | INSTALLS = target | |
85 | ||
86 | INCLUDEPATH += ../../libs/libmythtv | |
87 | diff -ur mythtv-0.18.1/filters/crop/crop.pro mythtv-0.18.1.fixed/filters/crop/crop.pro | |
88 | --- mythtv-0.18.1/filters/crop/crop.pro 2005-01-29 07:21:36.000000000 +0200 | |
89 | +++ mythtv-0.18.1.fixed/filters/crop/crop.pro 2005-09-04 00:24:52.000000000 +0300 | |
90 | @@ -4,7 +4,7 @@ | |
91 | TEMPLATE = lib | |
92 | CONFIG -= moc qt | |
93 | CONFIG += plugin thread | |
94 | -target.path = $${PREFIX}/lib/mythtv/filters | |
95 | +target.path = $${LIBDIR}/mythtv/filters | |
96 | INSTALLS = target | |
97 | ||
98 | INCLUDEPATH += ../../libs/libmythtv | |
99 | diff -ur mythtv-0.18.1/filters/denoise3d/denoise3d.pro mythtv-0.18.1.fixed/filters/denoise3d/denoise3d.pro | |
100 | --- mythtv-0.18.1/filters/denoise3d/denoise3d.pro 2005-01-29 07:21:36.000000000 +0200 | |
101 | +++ mythtv-0.18.1.fixed/filters/denoise3d/denoise3d.pro 2005-09-04 00:25:21.000000000 +0300 | |
102 | @@ -4,7 +4,7 @@ | |
103 | TEMPLATE = lib | |
104 | CONFIG -= moc qt | |
105 | CONFIG += plugin thread | |
106 | -target.path = $${PREFIX}/lib/mythtv/filters | |
107 | +target.path = $${LIBDIR}/mythtv/filters | |
108 | INSTALLS = target | |
109 | ||
110 | INCLUDEPATH += ../../libs/libmythtv | |
111 | diff -ur mythtv-0.18.1/filters/force/force.pro mythtv-0.18.1.fixed/filters/force/force.pro | |
112 | --- mythtv-0.18.1/filters/force/force.pro 2005-01-29 07:21:36.000000000 +0200 | |
113 | +++ mythtv-0.18.1.fixed/filters/force/force.pro 2005-09-04 00:24:57.000000000 +0300 | |
114 | @@ -4,7 +4,7 @@ | |
115 | TEMPLATE = lib | |
116 | CONFIG -= moc qt | |
117 | CONFIG += plugin thread | |
118 | -target.path = $${PREFIX}/lib/mythtv/filters | |
119 | +target.path = $${LIBDIR}/mythtv/filters | |
120 | INSTALLS = target | |
121 | ||
122 | INCLUDEPATH += ../../libs/libmythtv | |
123 | diff -ur mythtv-0.18.1/filters/invert/invert.pro mythtv-0.18.1.fixed/filters/invert/invert.pro | |
124 | --- mythtv-0.18.1/filters/invert/invert.pro 2005-01-29 07:21:36.000000000 +0200 | |
125 | +++ mythtv-0.18.1.fixed/filters/invert/invert.pro 2005-09-04 00:25:09.000000000 +0300 | |
126 | @@ -4,7 +4,7 @@ | |
127 | TEMPLATE = lib | |
128 | CONFIG -= moc qt | |
129 | CONFIG += plugin thread | |
130 | -target.path = $${PREFIX}/lib/mythtv/filters | |
131 | +target.path = $${LIBDIR}/mythtv/filters | |
132 | INSTALLS = target | |
133 | ||
134 | INCLUDEPATH += ../../libs/libmythtv | |
135 | diff -ur mythtv-0.18.1/filters/kerneldeint/kerneldeint.pro mythtv-0.18.1.fixed/filters/kerneldeint/kerneldeint.pro | |
136 | --- mythtv-0.18.1/filters/kerneldeint/kerneldeint.pro 2005-01-29 07:21:36.000000000 +0200 | |
137 | +++ mythtv-0.18.1.fixed/filters/kerneldeint/kerneldeint.pro 2005-09-04 00:25:14.000000000 +0300 | |
138 | @@ -4,7 +4,7 @@ | |
139 | TEMPLATE = lib | |
140 | CONFIG -= moc qt | |
141 | CONFIG += plugin thread | |
142 | -target.path = $${PREFIX}/lib/mythtv/filters | |
143 | +target.path = $${LIBDIR}/mythtv/filters | |
144 | INSTALLS = target | |
145 | ||
146 | INCLUDEPATH += ../../libs/libmythtv | |
147 | diff -ur mythtv-0.18.1/filters/linearblend/linearblend.pro mythtv-0.18.1.fixed/filters/linearblend/linearblend.pro | |
148 | --- mythtv-0.18.1/filters/linearblend/linearblend.pro 2005-01-29 07:21:36.000000000 +0200 | |
149 | +++ mythtv-0.18.1.fixed/filters/linearblend/linearblend.pro 2005-09-04 00:24:59.000000000 +0300 | |
150 | @@ -4,7 +4,7 @@ | |
151 | TEMPLATE = lib | |
152 | CONFIG -= moc qt | |
153 | CONFIG += plugin thread | |
154 | -target.path = $${PREFIX}/lib/mythtv/filters | |
155 | +target.path = $${LIBDIR}/mythtv/filters | |
156 | INSTALLS = target | |
157 | ||
158 | INCLUDEPATH += ../../libs/libmythtv | |
159 | diff -ur mythtv-0.18.1/filters/onefield/onefield.pro mythtv-0.18.1.fixed/filters/onefield/onefield.pro | |
160 | --- mythtv-0.18.1/filters/onefield/onefield.pro 2005-01-29 07:21:36.000000000 +0200 | |
161 | +++ mythtv-0.18.1.fixed/filters/onefield/onefield.pro 2005-09-04 00:25:02.000000000 +0300 | |
162 | @@ -4,7 +4,7 @@ | |
163 | TEMPLATE = lib | |
164 | CONFIG -= moc qt | |
165 | CONFIG += plugin thread | |
166 | -target.path = $${PREFIX}/lib/mythtv/filters | |
167 | +target.path = $${LIBDIR}/mythtv/filters | |
168 | INSTALLS = target | |
169 | ||
170 | INCLUDEPATH += ../../libs/libmythtv | |
171 | diff -ur mythtv-0.18.1/filters/postprocess/postprocess.pro mythtv-0.18.1.fixed/filters/postprocess/postprocess.pro | |
172 | --- mythtv-0.18.1/filters/postprocess/postprocess.pro 2005-01-29 07:21:36.000000000 +0200 | |
173 | +++ mythtv-0.18.1.fixed/filters/postprocess/postprocess.pro 2005-09-04 00:25:12.000000000 +0300 | |
174 | @@ -4,7 +4,7 @@ | |
175 | TEMPLATE = lib | |
176 | CONFIG -= moc qt | |
177 | CONFIG += plugin thread | |
178 | -target.path = $${PREFIX}/lib/mythtv/filters | |
179 | +target.path = $${LIBDIR}/mythtv/filters | |
180 | INSTALLS = target | |
181 | ||
182 | INCLUDEPATH += ../../libs/libmythtv ../../libs/libavcodec | |
183 | diff -ur mythtv-0.18.1/filters/quickdnr/quickdnr.pro mythtv-0.18.1.fixed/filters/quickdnr/quickdnr.pro | |
184 | --- mythtv-0.18.1/filters/quickdnr/quickdnr.pro 2005-01-29 07:21:36.000000000 +0200 | |
185 | +++ mythtv-0.18.1.fixed/filters/quickdnr/quickdnr.pro 2005-09-04 00:25:18.000000000 +0300 | |
186 | @@ -4,7 +4,7 @@ | |
187 | TEMPLATE = lib | |
188 | CONFIG -= moc qt | |
189 | CONFIG += plugin thread | |
190 | -target.path = $${PREFIX}/lib/mythtv/filters | |
191 | +target.path = $${LIBDIR}/mythtv/filters | |
192 | INSTALLS = target | |
193 | ||
194 | INCLUDEPATH += ../../libs/libmythtv | |
195 | diff -ur mythtv-0.18.1/libs/libavcodec/libavcodec.pro mythtv-0.18.1.fixed/libs/libavcodec/libavcodec.pro | |
196 | --- mythtv-0.18.1/libs/libavcodec/libavcodec.pro 2005-05-06 23:19:54.000000000 +0300 | |
197 | +++ mythtv-0.18.1.fixed/libs/libavcodec/libavcodec.pro 2005-09-04 00:24:44.000000000 +0300 | |
198 | @@ -4,7 +4,7 @@ | |
199 | TEMPLATE = lib | |
200 | TARGET = mythavcodec-$$LIBVERSION | |
201 | CONFIG += thread dll warn_off | |
202 | -target.path = $${PREFIX}/lib | |
203 | +target.path = $${LIBDIR} | |
204 | INSTALLS = target | |
205 | ||
206 | VERSION = 0.18.1 | |
207 | diff -ur mythtv-0.18.1/libs/libavformat/libavformat.pro mythtv-0.18.1.fixed/libs/libavformat/libavformat.pro | |
208 | --- mythtv-0.18.1/libs/libavformat/libavformat.pro 2005-05-06 23:19:54.000000000 +0300 | |
209 | +++ mythtv-0.18.1.fixed/libs/libavformat/libavformat.pro 2005-09-04 00:24:47.000000000 +0300 | |
210 | @@ -4,7 +4,7 @@ | |
211 | TEMPLATE = lib | |
212 | TARGET = mythavformat-$$LIBVERSION | |
213 | CONFIG += thread dll warn_off | |
214 | -target.path = $${PREFIX}/lib | |
215 | +target.path = $${LIBDIR} | |
216 | INSTALLS = target | |
217 | ||
218 | VERSION = 0.18.1 | |
219 | diff -ur mythtv-0.18.1/libs/libmyth/libmyth.pro mythtv-0.18.1.fixed/libs/libmyth/libmyth.pro | |
220 | --- mythtv-0.18.1/libs/libmyth/libmyth.pro 2005-05-06 23:19:54.000000000 +0300 | |
221 | +++ mythtv-0.18.1.fixed/libs/libmyth/libmyth.pro 2005-09-04 00:24:37.000000000 +0300 | |
222 | @@ -4,7 +4,7 @@ | |
223 | TEMPLATE = lib | |
224 | TARGET = myth-$$LIBVERSION | |
225 | CONFIG += thread dll | |
226 | -target.path = $${PREFIX}/lib | |
227 | +target.path = $${LIBDIR} | |
228 | INSTALLS = target | |
229 | ||
230 | VERSION = 0.18.1 | |
231 | diff -ur mythtv-0.18.1/libs/libmythmpeg2/libmythmpeg2.pro mythtv-0.18.1.fixed/libs/libmythmpeg2/libmythmpeg2.pro | |
232 | --- mythtv-0.18.1/libs/libmythmpeg2/libmythmpeg2.pro 2005-05-06 23:19:54.000000000 +0300 | |
233 | +++ mythtv-0.18.1.fixed/libs/libmythmpeg2/libmythmpeg2.pro 2005-09-04 00:24:41.000000000 +0300 | |
234 | @@ -4,7 +4,7 @@ | |
235 | TEMPLATE = lib | |
236 | TARGET = mythmpeg2-$$LIBVERSION | |
237 | CONFIG += thread staticlib warn_off | |
238 | -target.path = $${PREFIX}/lib | |
239 | +target.path = $${LIBDIR} | |
240 | INSTALLS = target | |
241 | ||
242 | VERSION = 0.18.1 | |
243 | diff -ur mythtv-0.18.1/libs/libmythsoundtouch/libmythsoundtouch.pro mythtv-0.18.1.fixed/libs/libmythsoundtouch/libmythsoundtouch.pro | |
244 | --- mythtv-0.18.1/libs/libmythsoundtouch/libmythsoundtouch.pro 2005-05-06 23:19:54.000000000 +0300 | |
245 | +++ mythtv-0.18.1.fixed/libs/libmythsoundtouch/libmythsoundtouch.pro 2005-09-04 00:24:50.000000000 +0300 | |
246 | @@ -4,7 +4,7 @@ | |
247 | TEMPLATE = lib | |
248 | TARGET = mythsoundtouch-$$LIBVERSION | |
249 | CONFIG += thread staticlib warn_off | |
250 | -target.path = $${PREFIX}/lib | |
251 | +target.path = $${LIBDIR} | |
252 | INSTALLS = target | |
253 | ||
254 | VERSION = 0.18.1 | |
255 | diff -ur mythtv-0.18.1/libs/libmythtv/libmythtv.pro mythtv-0.18.1.fixed/libs/libmythtv/libmythtv.pro | |
256 | --- mythtv-0.18.1/libs/libmythtv/libmythtv.pro 2005-05-06 23:19:54.000000000 +0300 | |
257 | +++ mythtv-0.18.1.fixed/libs/libmythtv/libmythtv.pro 2005-09-04 00:24:34.000000000 +0300 | |
258 | @@ -4,7 +4,7 @@ | |
259 | TEMPLATE = lib | |
260 | TARGET = mythtv-$$LIBVERSION | |
261 | CONFIG += thread dll | |
262 | -target.path = $${PREFIX}/lib | |
263 | +target.path = $${LIBDIR} | |
264 | INSTALLS = target | |
265 | ||
266 | VERSION = 0.18.1 | |
267 | diff -ur mythtv-0.18.1/libs/libmythui/libmythui.pro mythtv-0.18.1.fixed/libs/libmythui/libmythui.pro | |
268 | --- mythtv-0.18.1/libs/libmythui/libmythui.pro 2005-05-06 23:19:54.000000000 +0300 | |
269 | +++ mythtv-0.18.1.fixed/libs/libmythui/libmythui.pro 2005-09-04 00:24:32.000000000 +0300 | |
270 | @@ -4,7 +4,7 @@ | |
271 | TEMPLATE = lib | |
272 | TARGET = mythui-$$LIBVERSION | |
273 | CONFIG += debug thread dll | |
274 | -target.path = $${PREFIX}/lib | |
275 | +target.path = $${LIBDIR} | |
276 | INSTALLS = target | |
277 | INCLUDEPATH += ../../libs/libmyth | |
278 | INCLUDEPATH += ../.. | |
57dcc2c8 ER |
279 | --- ./configure~ 2005-09-05 20:10:30.000000000 +0300 |
280 | +++ ./configure 2005-09-05 20:10:33.000000000 +0300 | |
281 | @@ -703,7 +703,7 @@ | |
282 | LIBPATHS="$LIBPATHS $LP_APPEND" | |
283 | done | |
284 | ||
285 | - LIBPATHS="`echo $LIBPATHS /lib /usr/lib | sed s/'\/ '/' '/g` " | |
286 | + LIBPATHS="`echo $LIBPATHS $libdir /lib /usr/lib | sed s/'\/ '/' '/g` " | |
287 | ||
288 | HAS_IT="no" | |
289 | for LIBPATH in $LIBPATHS ; do | |
ef7a8ebd ER |
290 | --- ./libs/libmyth/mythcontext.cpp~ 2005-04-11 21:59:29.000000000 +0300 |
291 | +++ ./libs/libmyth/mythcontext.cpp 2005-09-05 20:20:24.000000000 +0300 | |
292 | @@ -41,6 +41,10 @@ | |
293 | const QString kPluginLibSuffix = ".so"; | |
294 | #endif | |
295 | ||
296 | +#ifndef LIBDIR | |
297 | +#define LIBDIR "lib" | |
298 | +#endif | |
299 | + | |
300 | MythContext *gContext = NULL; | |
301 | QMutex MythContext::verbose_mutex(true); | |
302 | ||
303 | @@ -874,7 +878,7 @@ | |
304 | ||
305 | QString MythContext::GetLibraryDir(void) | |
306 | { | |
307 | - return d->m_installprefix + "/lib/mythtv/"; | |
308 | + return d->m_installprefix + "/" + LIBDIR "/mythtv/"; | |
309 | } | |
310 | ||
311 | QString MythContext::GetThemesParentDir(void) | |
312 | --- ./configure~ 2005-09-05 20:25:05.000000000 +0300 | |
313 | +++ ./configure 2005-09-05 20:25:08.000000000 +0300 | |
314 | @@ -2394,6 +2394,10 @@ | |
315 | echo "CONFIG_INCLUDEPATH=$CONFIG_INCLUDEPATH" >> config.mak | |
316 | fi | |
317 | ||
318 | +if test "$_lib" != ""; then | |
319 | + echo "#define LIBDIR \"$_lib\"" >> $TMPH | |
320 | +fi | |
321 | + | |
322 | diff $TMPH config.h >/dev/null 2>&1 | |
323 | if test $? -ne 0 ; then | |
324 | mv -f $TMPH config.h |