[libvirt] [PATCH 3/3] wireshark: Use ${exec_prefix} for $ws_plugindir

Andrea Bolognani abologna at redhat.com
Wed Oct 26 16:08:16 UTC 2016


${exec_prefix} and ${prefix} point to the same directory in
most setups, but when that's not the case the former should
be used for architecture-dependent data such as shared objects,
which makes it the best fit for our Wireshark dissector.

While at it, change from $(var) to ${var}: they are absolutely
identicaly as far as make's concerned, but autoconf itself
seems to prefer the latter form so we might as well follow suit.
---
 m4/virt-wireshark.m4 | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/m4/virt-wireshark.m4 b/m4/virt-wireshark.m4
index 75786de..7a817f6 100644
--- a/m4/virt-wireshark.m4
+++ b/m4/virt-wireshark.m4
@@ -52,10 +52,10 @@ AC_DEFUN([LIBVIRT_CHECK_WIRESHARK],[
         ws_prefix="/usr"
       fi
       dnl Replace the wireshark prefix with our own.
-      dnl Note that $(prefix) is kept verbatim at this point in time, and will
-      dnl only be expanded later, when make is called: this makes it possible
-      dnl to override the prefix at compilation or installation time
-      ws_plugindir='$(prefix)'"${ws_plugindir#$ws_prefix}"
+      dnl Note that ${exec_prefix} is kept verbatim at this point in time, and
+      dnl will only be expanded later, when make is called: this makes it
+      dnl possible to override such prefix at compilation or installation time
+      ws_plugindir='${exec_prefix}'"${ws_plugindir#$ws_prefix}"
     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
-- 
2.7.4




More information about the libvir-list mailing list