Skip to content

Commit 9684f2d

Browse files
Fix combined build and install of dynd-python and libdynd.
1 parent b85deb8 commit 9684f2d

File tree

1 file changed

+6
-9
lines changed

1 file changed

+6
-9
lines changed

setup.py

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -102,17 +102,14 @@ def run(self):
102102

103103
import glob, shutil
104104

105-
if sys.platform != 'win32':
106-
if install_lib_option.split('=')[1] == 'OFF':
107-
name, = glob.glob('libraries/libdynd/libdynd.*')
105+
if install_lib_option.split('=')[1] == 'OFF':
106+
if sys.platform != 'win32':
107+
names = glob.glob('libraries/libdynd/libdy*.*')
108+
else:
109+
names = glob.glob('libraries/libdynd/%s/libdy*.*' % build_type)
110+
for name in names:
108111
short_name = split(name)[1]
109112
shutil.move(name, os.path.join(build_lib, 'dynd', short_name))
110-
else:
111-
if install_lib_option.split('=')[1] == 'OFF':
112-
names = glob.glob('libraries/libdynd/%s/libdynd.*' % build_type)
113-
for name in names:
114-
short_name = split(name)[1]
115-
shutil.move(name, os.path.join(build_lib, 'dynd', short_name))
116113

117114
# Move the built C-extension to the place expected by the Python build
118115
self._found_names = []

0 commit comments

Comments
 (0)