提交 50078cfb 编写于 作者: M Michal Privoznik

wireshark: Install into DESTDIR

Like everything we install, it should be prefixed with DESTDIR.
Signed-off-by: NMichal Privoznik <mprivozn@redhat.com>
上级 6564de5e
...@@ -28,20 +28,20 @@ AC_DEFUN([LIBVIRT_CHECK_WIRESHARK],[ ...@@ -28,20 +28,20 @@ AC_DEFUN([LIBVIRT_CHECK_WIRESHARK],[
dnl Check for system location of wireshark plugins dnl Check for system location of wireshark plugins
if test "x$with_wireshark_dissector" != "xno" ; then if test "x$with_wireshark_dissector" != "xno" ; then
if test "x$with_ws_plugindir" = "xcheck" ; 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 if test "x$ws_plugindir" = "x" ; then
dnl On some systems the plugindir variable may not be stored within pkg config. 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. 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 fi
elif test "x$with_ws_plugindir" = "xno" || test "x$with_ws_plugindir" = "xyes"; then 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]) AC_MSG_ERROR([ws-plugindir must be used only with valid path])
else else
ws_plugindir=$with_ws_plugindir plugindir=$with_ws_plugindir
fi fi
fi fi
AC_SUBST([ws_plugindir]) AC_SUBST([plugindir])
]) ])
AC_DEFUN([LIBVIRT_RESULT_WIRESHARK],[ AC_DEFUN([LIBVIRT_RESULT_WIRESHARK],[
......
...@@ -381,6 +381,7 @@ EXTRA_DIST += \ ...@@ -381,6 +381,7 @@ EXTRA_DIST += \
if WITH_WIRESHARK_DISSECTOR if WITH_WIRESHARK_DISSECTOR
ws_plugindir = $(DESTDIR)$(plugindir)
ws_plugin_LTLIBRARIES = wireshark/src/libvirt.la ws_plugin_LTLIBRARIES = wireshark/src/libvirt.la
wireshark_src_libvirt_la_CPPFLAGS = \ wireshark_src_libvirt_la_CPPFLAGS = \
-I wireshark/src $(WIRESHARK_DISSECTOR_CFLAGS) -I wireshark/src $(WIRESHARK_DISSECTOR_CFLAGS)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册