]> xenbits.xensource.com Git - libvirt.git/commitdiff
Honour prefix in wireshark install dir
authorDaniel P. Berrange <berrange@redhat.com>
Tue, 21 Jan 2014 16:06:37 +0000 (16:06 +0000)
committerDaniel P. Berrange <berrange@redhat.com>
Tue, 21 Jan 2014 16:19:27 +0000 (16:19 +0000)
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>
configure.ac

index b9375f1edacb6c04e252124528192cf182d2ea45..3a703750100a16a6dac3b6115b4a690e78ce5c96 100644 (file)
@@ -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])