From: Daniel P. Berrange <berrange@redhat.com>
Date: Tue, 21 Jan 2014 16:06:37 +0000 (+0000)
Subject: Honour prefix in wireshark install dir
X-Git-Tag: v1.2.2-rc1~246
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9d6f26e57c4195c306c2fecff8ff4dba1dcd7e34;p=thirdparty%2Flibvirt.git

Honour prefix in wireshark install dir

Trying to run

  $ ./configure --prefix=$HOME/usr/libvirt-git
  $ make install

results in libvirt trying to install in /usr/lib/wireshark/plugins/....
with predictable amounts of fail. The configure script should not be
hardcoding /usr/lib by default but rather honour $libdir

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
---

diff --git a/configure.ac b/configure.ac
index b9375f1eda..3a70375010 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2566,7 +2566,7 @@ AC_ARG_WITH([ws-plugindir],
 
 if test "$with_wireshark_dissector" != "no" && test -z "$ws_plugindir"; then
     ws_version=`$WIRESHARK -v | head -1 | cut -f 2 -d' '`
-    ws_plugindir=`dirname $WIRESHARK`/../lib/wireshark/plugins/$ws_version
+    ws_plugindir="$libdir/wireshark/plugins/$ws_version"
 fi
 AC_SUBST([ws_plugindir])