x11-wm/xpra/files/xpra-0.15.0-prefix.patch


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.15.0/setup.py
+++ xpra-0.15.0/setup.py
@@ -1612,8 +1612,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'
 
--- xpra-0.15.0/xpra/platform/paths.py
+++ xpra-0.15.0/xpra/platform/paths.py
@@ -30,9 +30,9 @@
         return env_conf_dir
     prefix = get_install_prefix()
     #the system wide configuration directory
-    if prefix == '/usr':
+    if sys.prefix[-4:] == '/usr':
         #default posix config location:
-        return '/etc/xpra'
+        return sys.prefix[:-4] + '/etc/xpra'
     #hope the prefix is something like "/usr/local" or "$HOME/.local":
     return prefix + '/etc/xpra/'