1 | Index: libs/libmyth/mythcontext.cpp
|
---|
2 | ===================================================================
|
---|
3 | --- libs/libmyth/mythcontext.cpp (revision 16468)
|
---|
4 | +++ libs/libmyth/mythcontext.cpp (working copy)
|
---|
5 | @@ -341,9 +341,6 @@
|
---|
6 | display_res(NULL), |
---|
7 | useSettingsCache(false) |
---|
8 | { |
---|
9 | - char *tmp_installprefix = getenv("MYTHTVDIR"); |
---|
10 | - if (tmp_installprefix) |
---|
11 | - m_installprefix = tmp_installprefix; |
---|
12 | |
---|
13 | #if QT_VERSION >= 0x030200 |
---|
14 | QDir prefixDir = qApp->applicationDirPath(); |
---|
15 | @@ -352,6 +349,30 @@
|
---|
16 | QDir prefixDir(appPath.left(appPath.findRev("/"))); |
---|
17 | #endif |
---|
18 | |
---|
19 | + char *tmp_installprefix = getenv("MYTHTVDIR"); |
---|
20 | + if (tmp_installprefix) |
---|
21 | + m_installprefix = tmp_installprefix; |
---|
22 | +#ifdef _WIN32 |
---|
23 | + else { |
---|
24 | + m_installprefix = prefixDir.canonicalPath(); |
---|
25 | + _putenv(QString("MYTHTVDIR=%1").arg(m_installprefix)); |
---|
26 | + |
---|
27 | + } |
---|
28 | + // LIBDIR might not be defined |
---|
29 | + // some libraries will fail without it |
---|
30 | + |
---|
31 | + char *tmp_libdir = getenv("MYTHLIBDIR"); |
---|
32 | + if (!tmp_libdir) { |
---|
33 | + m_installlibdir = prefixDir.canonicalPath()+ QString("/lib"); ; |
---|
34 | + _putenv(QString("MYTHLIBDIR=%1").arg(m_installlibdir)); |
---|
35 | + } else |
---|
36 | + m_installlibdir = tmp_libdir; |
---|
37 | + |
---|
38 | + VERBOSE(VB_IMPORTANT, QString("Using runtime prefix = %1, libdir = %2 Prefixdir= %3") |
---|
39 | + .arg(m_installprefix).arg(m_installlibdir).arg(prefixDir.canonicalPath())); |
---|
40 | + |
---|
41 | +#endif |
---|
42 | + |
---|
43 | if (QDir(m_installprefix).isRelative()) |
---|
44 | { |
---|
45 | // If the PREFIX is relative, evaluate it relative to our |
---|
46 | |
---|
47 | |
---|
48 | @@ -1540,6 +1595,13 @@
|
---|
49 | |
---|
50 | _putenv(QString("HOME=%1").arg(home)); |
---|
51 | } |
---|
52 | + char *mythconfdir = getenv("MYTHCONFDIR"); |
---|
53 | + if (!mythconfdir) |
---|
54 | + { |
---|
55 | + _putenv(QString("MYTHCONFDIR=%1/mythtv").arg(home)); |
---|
56 | + |
---|
57 | + } |
---|
58 | + |
---|
59 | #endif |
---|
60 | |
---|
61 | if (QDir::homeDirPath() == "/" && ! getenv("MYTHCONFDIR")) |
---|