From f99f79e380326cd1259721e134c074bf271f4269 Mon Sep 17 00:00:00 2001 From: Michal Privoznik Date: Wed, 13 Jan 2016 16:10:15 +0100 Subject: [PATCH] wireshark: Drop DESTDIR from install path In 50078cfbcbf3c8 I've tried to fix distcheck but accidentally broke rpm build. The problem is that rpm build not only sets DESTDIR but also passes plugindir path. This results in double DESTDIR being in the plugin path, Drop one. Signed-off-by: Michal Privoznik --- tools/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/Makefile.am b/tools/Makefile.am index 5bf6a3ea69..0be35672b1 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -381,7 +381,7 @@ EXTRA_DIST += \ if WITH_WIRESHARK_DISSECTOR -ws_plugindir = $(DESTDIR)$(plugindir) +ws_plugindir = $(plugindir) ws_plugin_LTLIBRARIES = wireshark/src/libvirt.la wireshark_src_libvirt_la_CPPFLAGS = \ -I wireshark/src $(WIRESHARK_DISSECTOR_CFLAGS) -- GitLab