Commits

Denis Laxalde  committed ce5b321

Handle destdir option properly

  • Participants
  • Parent commits 276e390
  • Branches v11

Comments (0)

Files changed (1)

File catalo/wscript

           target = 'elements',
              env = env,
             vars = ['CATALO_CMD'],
-    install_path = env.ASTERDATADIR[0],
+    install_path = self.options.destdir + env.ASTERDATADIR[0],
     )
 
 @TaskGen.feature('catalo')
         # add to cli as it could contain variable (``$LIBDIR`` for example)
         cmdenv.append('LD_LIBRARY_PATH="%s"' % environ['LD_LIBRARY_PATH'])
 
-    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)
         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: