research/cantera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[SCons] Fix setting of prefix when building Debian packages

Browse source 
'prefix' shouldn't be changed after it's used, but should be set by the
debian/rules script
This commit is contained in:
Ray Speth 2016-04-01 16:18:08 -04:00
parent 31c66378c6
commit 6d91b44ed6
1 changed files with 0 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
SConstruct
View file

@ -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'
@ -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')