From: Daniel P. Berrange <berrange@redhat.com>
Date: Wed, 19 Jan 2011 12:24:26 +0000 (+0000)
Subject: Fix setup of lib directory with autogen.sh --system
X-Git-Tag: v0.8.8~139
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3493f1bcec5d6b8e0276b9daf48c458cc756187d;p=thirdparty%2Flibvirt.git

Fix setup of lib directory with autogen.sh --system

On x86_64 hosts, /usr/lib64 must be used instead of /usr/lib
Rather than attempt to whitelist architectures, just check
for existance of /usr/lib64

* autogen.sh: Fix to use /usr/lib64 if it exists
---

diff --git a/autogen.sh b/autogen.sh
index 323710be8a..ff13fd1486 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -21,7 +21,14 @@ if test "x$1" = "x--no-git"; then
 fi
 if test "x$1" = "x--system"; then
     shift
-    EXTRA_ARGS="--prefix=/usr --sysconfdir=/etc --localstatedir=/var"
+    prefix=/usr
+    libdir=$prefix/lib
+    sysconfdir=/etc
+    localstatedir=/var
+    if [ -d /usr/lib64 ]; then
+      libdir=$prefix/lib64
+    fi
+    EXTRA_ARGS="--prefix=$prefix --sysconfdir=$sysconfdir --localstatedir=$localstatedir --libdir=$libdir"
     echo "Running ./configure with $EXTRA_ARGS $@"
 else
     if test -z "$*" && test ! -f "$THEDIR/config.status"; then