1 --- ./configure~ 2005-09-04 01:26:56.000000000 +0300
2 +++ ./configure 2005-09-04 01:26:58.000000000 +0300
7 +libdir="${prefix}/lib"
13 --prefix=*) prefix=`echo $opt | cut -d '=' -f 2`
15 + --libdir=*) libdir=`echo $opt | cut -d '=' -f 2`
17 --mandir=*) mandir=`echo $opt | cut -d '=' -f 2`
19 --source-path=*) source_path=`echo $opt | cut -d '=' -f 2`
20 @@ -1612,6 +1615,10 @@
21 bindir="${prefix}/bin"
24 +if test x"$libdir" = x""; then
25 +libdir="${prefix}/lib"
28 if test x"$mandir" = x""; then
29 mandir="${prefix}/man"
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
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
44 TARGET = mythsamplerate-$$LIBVERSION
45 CONFIG += thread staticlib warn_off
46 -target.path = $${PREFIX}/lib
47 +target.path = $${LIBDIR}
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
57 CONFIG += plugin thread
58 -target.path = $${PREFIX}/lib/mythtv/filters
59 +target.path = $${LIBDIR}/mythtv/filters
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
69 CONFIG += plugin thread
70 -target.path = $${PREFIX}/lib/mythtv/filters
71 +target.path = $${LIBDIR}/mythtv/filters
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
81 CONFIG += plugin thread
82 -target.path = $${PREFIX}/lib/mythtv/filters
83 +target.path = $${LIBDIR}/mythtv/filters
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
93 CONFIG += plugin thread
94 -target.path = $${PREFIX}/lib/mythtv/filters
95 +target.path = $${LIBDIR}/mythtv/filters
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
105 CONFIG += plugin thread
106 -target.path = $${PREFIX}/lib/mythtv/filters
107 +target.path = $${LIBDIR}/mythtv/filters
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
117 CONFIG += plugin thread
118 -target.path = $${PREFIX}/lib/mythtv/filters
119 +target.path = $${LIBDIR}/mythtv/filters
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
129 CONFIG += plugin thread
130 -target.path = $${PREFIX}/lib/mythtv/filters
131 +target.path = $${LIBDIR}/mythtv/filters
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
141 CONFIG += plugin thread
142 -target.path = $${PREFIX}/lib/mythtv/filters
143 +target.path = $${LIBDIR}/mythtv/filters
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
153 CONFIG += plugin thread
154 -target.path = $${PREFIX}/lib/mythtv/filters
155 +target.path = $${LIBDIR}/mythtv/filters
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
165 CONFIG += plugin thread
166 -target.path = $${PREFIX}/lib/mythtv/filters
167 +target.path = $${LIBDIR}/mythtv/filters
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
177 CONFIG += plugin thread
178 -target.path = $${PREFIX}/lib/mythtv/filters
179 +target.path = $${LIBDIR}/mythtv/filters
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
189 CONFIG += plugin thread
190 -target.path = $${PREFIX}/lib/mythtv/filters
191 +target.path = $${LIBDIR}/mythtv/filters
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
200 TARGET = mythavcodec-$$LIBVERSION
201 CONFIG += thread dll warn_off
202 -target.path = $${PREFIX}/lib
203 +target.path = $${LIBDIR}
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
212 TARGET = mythavformat-$$LIBVERSION
213 CONFIG += thread dll warn_off
214 -target.path = $${PREFIX}/lib
215 +target.path = $${LIBDIR}
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
224 TARGET = myth-$$LIBVERSION
226 -target.path = $${PREFIX}/lib
227 +target.path = $${LIBDIR}
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
236 TARGET = mythmpeg2-$$LIBVERSION
237 CONFIG += thread staticlib warn_off
238 -target.path = $${PREFIX}/lib
239 +target.path = $${LIBDIR}
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
248 TARGET = mythsoundtouch-$$LIBVERSION
249 CONFIG += thread staticlib warn_off
250 -target.path = $${PREFIX}/lib
251 +target.path = $${LIBDIR}
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
260 TARGET = mythtv-$$LIBVERSION
262 -target.path = $${PREFIX}/lib
263 +target.path = $${LIBDIR}
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
272 TARGET = mythui-$$LIBVERSION
273 CONFIG += debug thread dll
274 -target.path = $${PREFIX}/lib
275 +target.path = $${LIBDIR}
277 INCLUDEPATH += ../../libs/libmyth
279 --- ./configure~ 2005-09-05 20:10:30.000000000 +0300
280 +++ ./configure 2005-09-05 20:10:33.000000000 +0300
282 LIBPATHS="$LIBPATHS $LP_APPEND"
285 - LIBPATHS="`echo $LIBPATHS /lib /usr/lib | sed s/'\/ '/' '/g` "
286 + LIBPATHS="`echo $LIBPATHS $libdir /lib /usr/lib | sed s/'\/ '/' '/g` "
289 for LIBPATH in $LIBPATHS ; do
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
293 const QString kPluginLibSuffix = ".so";
297 +#define LIBDIR "lib"
300 MythContext *gContext = NULL;
301 QMutex MythContext::verbose_mutex(true);
305 QString MythContext::GetLibraryDir(void)
307 - return d->m_installprefix + "/lib/mythtv/";
308 + return d->m_installprefix + "/" + LIBDIR "/mythtv/";
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
318 +if test "$_lib" != ""; then
319 + echo "#define LIBDIR \"$_lib\"" >> $TMPH
322 diff $TMPH config.h >/dev/null 2>&1
323 if test $? -ne 0 ; then