blob: 140abbbbbc0b1edbde3c9bec37fd460342f5949a (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
|
--- xpra-0.14.0/xpra/platform/paths.py
+++ xpra-0.14.0/xpra/platform/paths.py
@@ -22,9 +22,9 @@
def get_system_conf_dir():
#the system wide configuration directory
- if sys.prefix == '/usr':
+ if sys.prefix[-4:] == '/usr':
#default posix config location:
- default_conf_dir = '/etc/xpra'
+ default_conf_dir = sys.prefix[:-4] + '/etc/xpra'
else:
#hope the prefix is something like "/usr/local":
default_conf_dir = sys.prefix + '/etc/xpra/'
--- xpra-0.14.0/setup.py
+++ xpra-0.14.0/setup.py
@@ -1470,8 +1470,8 @@
#prepare default [/usr/local]/etc configuration files:
if '--user' in sys.argv:
etc_prefix = 'etc/xpra'
- elif sys.prefix == '/usr':
- etc_prefix = '/etc/xpra'
+ elif sys.prefix[-4:] == '/usr':
+ etc_prefix = sys.prefix[:-4] + '/etc/xpra'
else:
etc_prefix = sys.prefix + '/etc/xpra'
|
GitWeb
