External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-23 03:42:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

virt-wireshark.m4: Defer $(prefix) substitution

Browse Source 
The autoconf manual says we shouldn't be using this variable (and
some others) outside of Makefiles as it prevents users providing
their own prefix at the installation phase.

https://www.gnu.org/software/autoconf/manual/autoconf-2.69/html_node/Installation-Directory-Variables.html

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Michal Privoznik 2016-10-20 10:25:13 +08:00
parent dc40dd6058
commit 35e45760ee
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
m4/virt-wireshark.m4
View File

@ -38,7 +38,7 @@ AC_DEFUN([LIBVIRT_CHECK_WIRESHARK],[
if test "x$ws_prefix" = "x" ; then if test "x$ws_prefix" = "x" ; then
ws_prefix="/usr"; ws_prefix="/usr";
fi fi
plugindir="${prefix}${plugindir#$ws_prefix}" plugindir="${plugindir#$ws_prefix}"
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])

2
tools/Makefile.am
View File

@ -398,7 +398,7 @@ EXTRA_DIST += \
if WITH_WIRESHARK_DISSECTOR if WITH_WIRESHARK_DISSECTOR
ws_plugindir = $(plugindir) ws_plugindir = $(prefix)$(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)