From: Denis Laxalde Date: Wed, 12 Mar 2014 15:51:41 +0100 Subject: Handle destdir option properly --- catalo/wscript | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/catalo/wscript b/catalo/wscript index e612818..9fb4fc7 100644 --- a/catalo/wscript +++ b/catalo/wscript @@ -22,7 +22,7 @@ def build(self): name = 'catapy', target = 'elements', env = env, - install_path = env.ASTERDATADIR[0], + install_path = self.options.destdir + env.ASTERDATADIR[0], ) @TaskGen.feature('catalo') @@ -131,9 +131,10 @@ def exec_pyaster(self, pyfile, args, **kwargs): # add to cli as it could contain variable (``$LIBDIR`` for example) cmds.append('LD_LIBRARY_PATH="%s"' % environ['LD_LIBRARY_PATH']) # XXX - python_path = self.get_tgen_by_name('bibpyt').install_path - add_to_env_paths(environ, 'LIBDIR', env['LIBDIR']) - add_to_env_paths(environ, 'BINDIR', env['BINDIR']) + destdir = self.options.destdir + python_path = destdir + self.get_tgen_by_name('bibpyt').install_path + add_to_env_paths(environ, 'LIBDIR', destdir + env['LIBDIR']) + add_to_env_paths(environ, 'BINDIR', destdir + env['BINDIR']) add_to_env_paths(environ, 'PYTHONARCHDIR', env['PYTHONARCHDIR']) add_to_env_paths(environ, 'PYTHONDIR', env['PYTHONDIR']) add_to_env_paths(environ, 'PYTHONPATH', python_path) @@ -168,7 +169,7 @@ def get_ld_paths(self): ld_path.insert(0, self.get_tgen_by_name('asterlib').install_task.dest) except Errors.WafError:# depends on --enbed-* options pass - return ld_path + return [self.options.destdir + p for p in ld_path] def add_to_env_paths(environ, name, path): if not path: