Skip to content

Commit

Permalink
[SCons] Fix setting of prefix when building Debian packages
Browse files Browse the repository at this point in the history
'prefix' shouldn't be changed after it's used, but should be set by the
debian/rules script
  • Loading branch information
speth committed Apr 1, 2016
1 parent 31c6637 commit 6d91b44
Showing 1 changed file with 0 additions and 2 deletions.
2 changes: 0 additions & 2 deletions SConstruct
Original file line number Diff line number Diff line change
Expand Up @@ -1122,7 +1122,6 @@ elif env['layout'] == 'debian':
COMMAND_LINE_TARGETS.append('install')
env['stage_dir'] = 'stage/cantera'
env['PYTHON_INSTALLER'] = 'debian'
env['prefix'] = '/usr/share/cantera'
env['INSTALL_MANPAGES'] = False
else:
env['PYTHON_INSTALLER'] = 'direct'
Expand Down Expand Up @@ -1164,7 +1163,6 @@ if env['layout'] == 'debian':
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['ct_datadir'] = '/usr/share/cantera/data'
else:
env['inst_libdir'] = pjoin(instRoot, 'lib')
env['inst_bindir'] = pjoin(instRoot, 'bin')
Expand Down

0 comments on commit 6d91b44

Please sign in to comment.