summaryrefslogtreecommitdiffstats
path: root/ctdb/wscript
diff options
context:
space:
mode:
authorMartin Schwenke <martin@meltin.net>2014-09-02 16:18:01 +1000
committerAmitay Isaacs <amitay@samba.org>2014-09-10 01:36:14 +0200
commit05f08d5148e4df8c5bed13023824f030efebf26e (patch)
treeb2fd5940c21ee72739e0f7027f1613ef42f8a4a0 /ctdb/wscript
parent4cb92e42f2d4753332d3ddddf2a87fc678afd306 (diff)
ctdb-build: Don't try to set lib64 directory automatically in build
Just install into lib/ and let packagers decide on this policy, since it can vary between distributions. Update our packaging files accordingly. A secondary matter is that things are incorrectly installed into lib64/ when building with 32-bit userspace on a 64-bit kernel. If this is done then it should depend on the architecture of the compiler. Signed-off-by: Martin Schwenke <martin@meltin.net> Reviewed-by: Amitay Isaacs <amitay@gmail.com>
Diffstat (limited to 'ctdb/wscript')
-rwxr-xr-xctdb/wscript4
1 files changed, 0 insertions, 4 deletions
diff --git a/ctdb/wscript b/ctdb/wscript
index 3ced41612f..d185e7135a 100755
--- a/ctdb/wscript
+++ b/ctdb/wscript
@@ -125,10 +125,6 @@ def configure(conf):
conf.env.CTDB_VARDIR = os.path.join(conf.env.LOCALSTATEDIR, 'lib/ctdb')
conf.env.CTDB_RUNDIR = os.path.join(conf.env.LOCALSTATEDIR, 'run/ctdb')
- machine = os.uname()[4]
- if machine in ['x86_64', 'ppc64', 'powerpc64']:
- conf.env.LIBDIR = conf.env.LIBDIR + '64'
-
if Options.options.ctdb_logdir:
conf.env.CTDB_LOGDIR = Options.options.ctdb_logdir
else: