From: Hans-Christoph Steiner <hans@guardianproject.info>
Date: Mon, 3 Apr 2017 14:45:45 +0000 (+0000)
Subject: Merge branch 'local-install' into 'master'
X-Git-Tag: 0.8~87
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=159ca824b743a0473e1525d04f391f76aae24cc1;hp=d8ad1c78c254aec6a10b53df3bba54853a62a397;p=fdroidserver.git

Merge branch 'local-install' into 'master'

Fix installs with pip --user

See merge request !244
---

diff --git a/setup.py b/setup.py
index a0917810..ab74c946 100644
--- a/setup.py
+++ b/setup.py
@@ -1,13 +1,14 @@
 #!/usr/bin/env python3
 
 from setuptools import setup
+import os
 import sys
 
-# workaround issue on OSX, where sys.prefix is not an installable location
-if sys.platform == 'darwin' and sys.prefix.startswith('/System'):
-    data_prefix = '.'
-else:
+# workaround issue on OSX or --user installs, where sys.prefix is not an installable location
+if os.access(sys.prefix, os.W_OK | os.X_OK):
     data_prefix = sys.prefix
+else:
+    data_prefix = '.'
 
 setup(name='fdroidserver',
       version='0.7.0',