Commits

Mathieu Courtois committed 66cf1b5

[BB0006] Install elements catalog into $LIBDIR/aster

This file appears to be architecture-dependent.

  • Participants
  • Parent commits f34956c
  • Branches v11

Comments (0)

Files changed (2)

File catalo/wscript

 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 = self.options.destdir + env.ASTERDATADIR[0],
+    install_path = self.options.destdir + osp.join(env.LIBDIR, 'aster'),
     )
 
 @TaskGen.feature('catalo')

File data/config.txt.tmpl

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