[gentoo-commits] gentoo-x86 commit in x11-wm/xpra/files: xpra-0.12.0-prefix.patch

[Michael Weber (xmw)]

xmw         14/03/27 00:16:54

  Added:                xpra-0.12.0-prefix.patch
  Log:
  Version bump
  
  (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 62EEF090)

Revision  Changes    Path
1.1                  x11-wm/xpra/files/xpra-0.12.0-prefix.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/xpra/files/xpra-0.12.0-prefix.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/xpra/files/xpra-0.12.0-prefix.patch?rev=1.1&content-type=text/plain

Index: xpra-0.12.0-prefix.patch
===================================================================
--- xpra-0.12.0/xpra/scripts/config.py
+++ xpra-0.12.0/xpra/scripts/config.py
@@ -188,9 +188,9 @@
         #OSX and win32 use binary installers,
         #we must look for the default config in the bundled resource location:
         conf_dir = get_resources_dir()
-    elif sys.prefix == '/usr':
+    elif sys.prefix[-4:] == '/usr':
         #default posix config location:
-        conf_dir = '/etc/xpra'
+        conf_dir = sys.prefix[:-4] + '/etc/xpra'
     else:
         #hope the prefix is something like "/usr/local":
         conf_dir = sys.prefix + '/etc/xpra/'
--- xpra-0.12.0/setup.py
+++ xpra-0.12.0/setup.py
@@ -990,8 +990,8 @@
             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'