Commits

Denis Laxalde committed 8140158

Install elements catalog into $LIBDIR/aster

This file appears to be architecture-dependent.

Comments (0)

Files changed (2)

 def build(self):
     env = self.all_envs[self.variant]
     if self.cmd.startswith('uninstall'):
-        elem = osp.join(env.ASTERDATADIR[0], 'elements')
+        elem = osp.join(env.LIBDIR, 'aster', 'elements')
         try:
             os.remove(elem)
         except OSError:
           target = 'elements',
              env = env,
             vars = ['CATALO_CMD'],
-    install_path = env.ASTERDATADIR[0],
+    install_path = osp.join(env.LIBDIR, 'aster'),
     )
 
 @TaskGen.feature('catalo')

waftools/legacy.py

 BIN_NODBG      | bin     | -     | %(PREFIX)s/bin/aster
 BIN_DBG        | bin     | -     | %(PREFIX)s/bin/asterd
 BINCMDE        | bin     | -     | %(LIBDIR)s/aster/Cata
-BINELE         | bin     | -     | $ASTER_VERSION_DIR/elements
+BINELE         | bin     | -     | %(LIBDIR)s/aster/elements
 BINPICKLED     | bin     | -     | %(SRC)s/build/release/catalo/cata_ele.pickled
 #
 # for as_run --make_shared...