From 6d91b44ed64bc972f8a8b321b3c52f0d2ace4cfa Mon Sep 17 00:00:00 2001 From: Ray Speth Date: Fri, 1 Apr 2016 16:18:08 -0400 Subject: [PATCH] [SCons] Fix setting of prefix when building Debian packages 'prefix' shouldn't be changed after it's used, but should be set by the debian/rules script --- SConstruct | 2 -- 1 file changed, 2 deletions(-) diff --git a/SConstruct b/SConstruct index 3701146a9..645b70393 100644 --- a/SConstruct +++ b/SConstruct @@ -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')