blob: 1e8e759abaca7c19ab916f6d263cb40d25ca2ac3 (
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
28
29
30
|
Index: xpra-0.10.1/setup.py
===================================================================
--- xpra-0.10.1.orig/setup.py
+++ xpra-0.10.1/setup.py
@@ -896,8 +896,8 @@ else:
return {}
if "install" in sys.argv:
#prepare default [/usr/local]/etc configuration files:
- if sys.prefix == '/usr':
- etc_prefix = '/etc/xpra'
+ if sys.prefix[-4:] == '/usr':
+ etc_prefix = sys.prefix[:-4] + '/etc/xpra'
else:
etc_prefix = sys.prefix + '/etc/xpra'
Index: xpra-0.10.1/xpra/scripts/config.py
===================================================================
--- xpra-0.10.1.orig/xpra/scripts/config.py
+++ xpra-0.10.1/xpra/scripts/config.py
@@ -344,8 +344,8 @@ def read_xpra_defaults():
#first, read the global defaults:
if sys.platform.startswith("win"):
conf_dir = os.path.dirname(os.path.abspath(sys.executable))
- elif sys.prefix == '/usr':
- conf_dir = '/etc/xpra'
+ elif sys.prefix[-4:] == '/usr':
+ conf_dir = sys.prefix[:-4] + '/etc/xpra'
else:
conf_dir = sys.prefix + '/etc/xpra/'
defaults = read_xpra_conf(conf_dir)
|
GitWeb
