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>

ctdb/configure.rpm

@@ -1,9 +1,17 @@
+#!/bin/sh
+
+if gcc -dM -E - </dev/null | grep -Eq '__(x86_64|powerpc64)__' ; then
+	_libdir=/usr/lib64
+else
+	_libdir=/usr/lib
+fi
 
 CFLAGS="-Wall -g -D_GNU_SOURCE" ./configure \
 	--builtin-libraries=replace,popt \
 	--bundled-libraries=!talloc,!tevent,!tdb \
 	--minimum-library-version=talloc:2.0.8,tdb:1.2.11,tevent:0.9.16 \
 	--prefix=/usr \
+	--libdir=${_libdir} \
 	--sysconfdir=/etc \
 	--mandir=/usr/man \
 	--localstatedir=/var \

ctdb/packaging/RPM/ctdb.spec.in

@@ -95,6 +95,7 @@ CFLAGS="$RPM_OPT_FLAGS $EXTRA -D_GNU_SOURCE" ./buildtools/bin/waf configure \
 	--enable-pmda \
 %endif
 	--prefix=%{_prefix} \
+	--libdir=%{_libdir} \
 	--sysconfdir=%{_sysconfdir} \
 	--mandir=%{_mandir} \
 	--localstatedir="/var"

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: