[libvirt] [PATCH] wireshark: Install into DESTDIR

Like everything we install, it should be prefixed with DESTDIR. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- m4/virt-wireshark.m4 | 8 ++++---- tools/Makefile.am | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/m4/virt-wireshark.m4 b/m4/virt-wireshark.m4 index 199317e..ac2e44c 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 e5c186c..d38d3cb 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) -- 2.4.10

On 01/12/2016 12:25 PM, Michal Privoznik wrote:
Like everything we install, it should be prefixed with DESTDIR.
Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- m4/virt-wireshark.m4 | 8 ++++---- tools/Makefile.am | 1 + 2 files changed, 5 insertions(+), 4 deletions(-)
This breaks Fedora RPM builds for srcdir for me: + mv '/home/crobinso/src/libvirt/libvirt-1.3.1-1.fc23.x86_64/usr/lib64/wireshark/plugins/*/libvirt.so' /home/crobinso/src/libvirt/libvirt-1.3.1-1.fc23.x86_64/usr/lib64/wireshark/plugins/libvirt.so mv: cannot stat '/home/crobinso/src/libvirt/libvirt-1.3.1-1.fc23.x86_64/usr/lib64/wireshark/plugins/*/libvirt.so': No such file or directory error: Bad exit status from /var/tmp/rpm-tmp.MXSjxe (%install) The files end up doubly nested in /home/crobinso/src/libvirt/libvirt-1.3.1-1.fc23.x86_64/libvirt-1.3.1-1.fc23.x86_64/home/crobinso/src/libvirt/libvirt-1.3.1-1.fc23.x86_64/usr/lib64/wireshark/plugins/* - Cole

On 12.01.2016 23:08, Cole Robinson wrote:
On 01/12/2016 12:25 PM, Michal Privoznik wrote:
Like everything we install, it should be prefixed with DESTDIR.
Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- m4/virt-wireshark.m4 | 8 ++++---- tools/Makefile.am | 1 + 2 files changed, 5 insertions(+), 4 deletions(-)
This breaks Fedora RPM builds for srcdir for me:
+ mv '/home/crobinso/src/libvirt/libvirt-1.3.1-1.fc23.x86_64/usr/lib64/wireshark/plugins/*/libvirt.so' /home/crobinso/src/libvirt/libvirt-1.3.1-1.fc23.x86_64/usr/lib64/wireshark/plugins/libvirt.so mv: cannot stat '/home/crobinso/src/libvirt/libvirt-1.3.1-1.fc23.x86_64/usr/lib64/wireshark/plugins/*/libvirt.so': No such file or directory error: Bad exit status from /var/tmp/rpm-tmp.MXSjxe (%install)
The files end up doubly nested in /home/crobinso/src/libvirt/libvirt-1.3.1-1.fc23.x86_64/libvirt-1.3.1-1.fc23.x86_64/home/crobinso/src/libvirt/libvirt-1.3.1-1.fc23.x86_64/usr/lib64/wireshark/plugins/*
Aaaagrh. Let me fix that. I'm testing a patch currently. Michal
participants (3)
-
Cole Robinson
-
Martin Kletzander
-
Michal Privoznik