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
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
|
From: Ole Streicher <debian@liska.ath.cx>
Date: Mon, 17 Dec 2018 16:33:29 +0100
Subject: Don't install and use the convienience copy provided in the
source, but use the one installed by the "libxpa1" package.
---
setup.py | 7 +------
xpa.py | 2 +-
2 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/setup.py b/setup.py
index b7550ed..7548421 100644
--- a/setup.py
+++ b/setup.py
@@ -21,7 +21,7 @@ else:
xpadir = 'xpa'
-def make(which):
+def _disabled_make(which):
curdir = os.getcwd()
srcDir = os.path.join(os.path.dirname(os.path.abspath(__file__)), xpadir)
os.chdir(srcDir)
@@ -86,10 +86,5 @@ setup(name='pyds9',
author_email='saord@cfa.harvard.edu',
url='http://hea-www.harvard.edu/saord/ds9/',
py_modules=['pyds9', 'xpa'],
- data_files=[('', [os.path.join(xpadir, xpalib),
- os.path.join(xpadir, xpans)])],
- cmdclass={'build_py': my_build_py,
- 'install_data': my_install_data,
- 'clean': my_clean},
install_requires=['six']
)
diff --git a/xpa.py b/xpa.py
index 822447f..284cccf 100644
--- a/xpa.py
+++ b/xpa.py
@@ -28,7 +28,7 @@ def _find_shlib(_libbase):
return _fname
return None
-_libpath = _find_shlib('xpa')
+_libpath = 'libxpa.so.1'
if _libpath:
libxpa = ctypes.cdll.LoadLibrary(_libpath)
_ulist = platform.uname()
|
