wireshark: Install into DESTDIR

Like everything we install, it should be prefixed with DESTDIR.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>

diff --git a/m4/virt-wireshark.m4 b/m4/virt-wireshark.m4
index 199317eaa312aa2ac9ff0fe58a34b5b1a8e2191d..ac2e44cb91fe5caa031dcf7b02f3d23afc6d9323 100644 (file)
--- a/m4/virt-wireshark.m4
+++ b/m4/virt-wireshark.m4
@@ -28,20 +28,20 @@ AC_DEFUN([LIBVIRT_CHECK_WIRESHARK],[
   dnl Check for system location of wireshark plugins
   if test "x$with_wireshark_dissector" != "xno" ; then
     if test "x$with_ws_plugindir" = "xcheck" ; then
-      ws_plugindir="$($PKG_CONFIG --variable plugindir wireshark)"
+      plugindir="$($PKG_CONFIG --variable plugindir wireshark)"
       if test "x$ws_plugindir" = "x" ; then
         dnl On some systems the plugindir variable may not be stored within pkg config.
         dnl Fall back to older style of constructing the plugin dir path.
-        ws_plugindir="$libdir/wireshark/plugins/$($PKG_CONFIG --modversion wireshark)"
+        plugindir="$libdir/wireshark/plugins/$($PKG_CONFIG --modversion wireshark)"
       fi
     elif test "x$with_ws_plugindir" = "xno" || test "x$with_ws_plugindir" = "xyes"; then
       AC_MSG_ERROR([ws-plugindir must be used only with valid path])
     else
-      ws_plugindir=$with_ws_plugindir
+      plugindir=$with_ws_plugindir
     fi
   fi
 
-  AC_SUBST([ws_plugindir])
+  AC_SUBST([plugindir])
 ])
 
 AC_DEFUN([LIBVIRT_RESULT_WIRESHARK],[

diff --git a/tools/Makefile.am b/tools/Makefile.am
index e5c186c790cfb347b1f52a6e13621f7994439048..d38d3cbff96f0597fdf5ad80c80fdfbdf32315b1 100644 (file)
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -381,6 +381,7 @@ EXTRA_DIST += \
 
 if WITH_WIRESHARK_DISSECTOR
 
+ws_plugindir = $(DESTDIR)$(plugindir)
 ws_plugin_LTLIBRARIES = wireshark/src/libvirt.la
 wireshark_src_libvirt_la_CPPFLAGS = \
        -I wireshark/src $(WIRESHARK_DISSECTOR_CFLAGS)