diff options
| author | Michal Privoznik <mprivozn@redhat.com> | 2016-01-12 17:20:08 +0100 |
|---|---|---|
| committer | Michal Privoznik <mprivozn@redhat.com> | 2016-01-12 18:51:38 +0100 |
| commit | 50078cfbcbf3c802e9c93f219cc42e5e3818e537 (patch) | |
| tree | 7f298e08fcadb7a2ca6c6fb9b1c1982539b6ddd3 | |
| parent | 6564de5e952959080631c1b80173fe8679cd072c (diff) | |
| download | libvirt-50078cfbcbf3c802e9c93f219cc42e5e3818e537.tar.gz | |
wireshark: Install into DESTDIR
Like everything we install, it should be prefixed with DESTDIR.
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
| -rw-r--r-- | m4/virt-wireshark.m4 | 8 | ||||
| -rw-r--r-- | tools/Makefile.am | 1 |
2 files changed, 5 insertions, 4 deletions
diff --git a/m4/virt-wireshark.m4 b/m4/virt-wireshark.m4 index 199317eaa3..ac2e44cb91 100644 --- 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 e5c186c790..d38d3cbff9 100644 --- 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) |