Skip to content

Commit

Permalink
[SCons] Fix installation location for Debian Python packages
Browse files Browse the repository at this point in the history
  • Loading branch information
speth committed Jan 13, 2017
1 parent 6546c08 commit 4b97421
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
4 changes: 2 additions & 2 deletions SConstruct
Original file line number Diff line number Diff line change
Expand Up @@ -1355,8 +1355,8 @@ if env['layout'] == 'debian':
env['libdirname'], 'cantera', 'matlab', 'toolbox')

env['inst_python_bindir'] = pjoin(base, 'cantera-python', 'usr', 'bin')
env['python_prefix'] = pjoin(base, 'cantera-python', 'usr')
env['python3_prefix'] = pjoin(base, 'cantera-python3', 'usr')
env['python_prefix'] = pjoin(base, 'cantera-python')
env['python3_prefix'] = pjoin(base, 'cantera-python3')
else:
env['inst_libdir'] = pjoin(instRoot, env['libdirname'])
env['inst_bindir'] = pjoin(instRoot, 'bin')
Expand Down
1 change: 1 addition & 0 deletions interfaces/cython/SConscript
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@ def install_module(prefix, python_version):
env['install_python2_action'] = mod_inst

elif localenv['PYTHON_INSTALLER'] == 'debian':
extra = localenv.subst(' --root=${python%s_prefix}' % ver)
install(localenv.Command, dummy, mod,
build_cmd + ' install --install-layout=deb --no-compile %s' % extra)
env['python%s_module_loc' % ver] = '<unspecified>'
Expand Down

0 comments on commit 4b97421

Please sign in to comment.