From: Denis Laxalde <denis.laxalde@logilab.fr>
Date: Wed, 19 Mar 2014 15:38:20 +0100
Subject: Install elements into /usr/lib/aster

This file is architecture-dependent.
---
 catalo/wscript     |    4 ++--
 waftools/legacy.py |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/catalo/wscript b/catalo/wscript
index 9fb4fc7..21f7cdd 100644
--- a/catalo/wscript
+++ b/catalo/wscript
@@ -10,7 +10,7 @@ from waflib import TaskGen, Logs, Utils, Errors, Task
 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:
@@ -22,7 +22,7 @@ def build(self):
             name = 'catapy',
           target = 'elements',
              env = env,
-    install_path = self.options.destdir + env.ASTERDATADIR[0],
+    install_path = self.options.destdir + osp.join(env.LIBDIR, 'aster'),
     )
 
 @TaskGen.feature('catalo')
diff --git a/waftools/legacy.py b/waftools/legacy.py
index 2dfad09..d459c62 100644
--- a/waftools/legacy.py
+++ b/waftools/legacy.py
@@ -117,7 +117,7 @@ PYTHON         | python  | -     | %(PYTHON)s
 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...