Re: [PATCH] wireshark: Drop DESTDIR from install path

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On 01/13/2016 08:25 AM, Michal Privoznik wrote:
> 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 <mprivozn@xxxxxxxxxx>
> ---
>  tools/Makefile.am | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

ACK.

> 
> diff --git a/tools/Makefile.am b/tools/Makefile.am
> index d38d3cb..1a6afd3 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)
> 

-- 
Eric Blake   eblake redhat com    +1-919-301-3266
Libvirt virtualization library http://libvirt.org

Attachment: signature.asc
Description: OpenPGP digital signature

--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list

[Index of Archives]     [Virt Tools]     [Libvirt Users]     [Lib OS Info]     [Fedora Users]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [KDE Users]     [Fedora Tools]