From f0cd2bb93188c953c43a8bb313636d267f74169f Mon Sep 17 00:00:00 2001 From: Aleksander Nitecki Date: Fri, 12 Feb 2016 12:18:41 +0100 Subject: [PATCH 1/2] setup.py: Use relative paths for data_files: This allows pip install --user to install headers in ~/.local/include, instead of trying to install them in /usr/include and fail with "permission denied" error. --- setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 04bd97b..73e100e 100644 --- a/setup.py +++ b/setup.py @@ -131,10 +131,10 @@ def remove_if_exist(filename): if platform.system() == 'Windows': # On Windows: C:\Python27\include\pysfml\*_api.h - files = [(sys.exec_prefix +'\\include\\pysfml', c_api_headers)] + files = [('include\\pysfml', c_api_headers)] else: # On Unix: /usr/local/include/pysfml/*_api.h - files = [(sys.exec_prefix + '/include/pysfml', c_api_headers)] + files = [('include/pysfml', c_api_headers)] if platform.system() == 'Windows': dlls = [("Lib\\site-packages\\sfml", glob('extlibs/sfml/bin/' + arch + '/*.dll'))] From b854128a7c70408c55bfbfd8f1ab5fd8ae6f1330 Mon Sep 17 00:00:00 2001 From: Aleksander Nitecki Date: Fri, 12 Feb 2016 12:20:44 +0100 Subject: [PATCH 2/2] setup.py: Simplify redundant path operations. --- setup.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/setup.py b/setup.py index 73e100e..8848cb1 100644 --- a/setup.py +++ b/setup.py @@ -129,12 +129,9 @@ def remove_if_exist(filename): c_api_headers.append(os.path.join(include_path, 'graphics_api.h')) c_api_headers.append(os.path.join(include_path, 'audio_api.h')) -if platform.system() == 'Windows': - # On Windows: C:\Python27\include\pysfml\*_api.h - files = [('include\\pysfml', c_api_headers)] -else: - # On Unix: /usr/local/include/pysfml/*_api.h - files = [('include/pysfml', c_api_headers)] +# On Windows: C:\Python27\include\pysfml\*_api.h +# On Unix: /usr/local/include/pysfml/*_api.h +files = [(os.path.join('include', 'pysfml'), c_api_headers)] if platform.system() == 'Windows': dlls = [("Lib\\site-packages\\sfml", glob('extlibs/sfml/bin/' + arch + '/*.dll'))]