moving tcpdump from sbindir to bindir

[Denis Ovsienko via tcpdump-workers <tcpdump-workers () lists tcpdump org>]

> --- Begin Message ---
>
>
> From: Denis Ovsienko <denis () ovsienko info>
>
> Date: Thu, 27 Aug 2020 12:58:10 +0100
>
> Hello list.
>
> tcpslice master branch now installs the binary into bindir instead of
> sbindir, see [1]. Guy had suggested to make the same change in tcpdump.
>
> I have asked tcpdump package maintainers of Debian, Fedora, Gentoo and
> SUSE, they all have confirmed they would be OK with the change. So I
> propose to make the change below in two weeks time if nobody produces
> valid reasons to stop.
>
> Cheers.
>
> 1: https://github.com/the-tcpdump-group/tcpslice/issues/8
>
> ---------------------------------------------------------------------
> diff --git a/CMakeLists.txt b/CMakeLists.txt
> index b2894b1f..4ef7db96 100644
> --- a/CMakeLists.txt
> +++ b/CMakeLists.txt
> @@ -1174,7 +1174,7 @@ set(MAN1_EXPAND tcpdump.1.in)
>  if(WIN32)
>      # XXX TODO where to install on Windows?
>  else(WIN32)
> -    install(TARGETS tcpdump DESTINATION sbin)
> +    install(TARGETS tcpdump DESTINATION bin)
>  endif(WIN32)
>  
>  # On UN*X, and on Windows when not using MSVC, process man pages and
> diff --git a/Makefile.in b/Makefile.in
> index 5f4854c0..469f6b46 100644
> --- a/Makefile.in
> +++ b/Makefile.in
> @@ -26,7 +26,7 @@ prefix = @prefix@
>  exec_prefix = @exec_prefix@
>  datarootdir = @datarootdir@
>  # Pathname of directory to install the binary
> -sbindir = @sbindir@
> +bindir = @bindir@
>  # Pathname of directory to install the man page
>  mandir = @mandir@
>  
> @@ -422,16 +422,16 @@ pcap_dump_ftell.o: $(srcdir)/missing/pcap_dump_ftell.c
>         $(CC) $(FULL_CFLAGS) -o $@ -c $(srcdir)/missing/pcap_dump_ftell.c
>  
>  install: all
> -       [ -d $(DESTDIR)$(sbindir) ] || \
> -           (mkdir -p $(DESTDIR)$(sbindir); chmod 755 $(DESTDIR)$(sbindir))
> -       $(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(sbindir)/$(PROG)
> -       $(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(sbindir)/$(PROG).`cat ${srcdir}/VERSION`
> +       [ -d $(DESTDIR)$(bindir) ] || \
> +           (mkdir -p $(DESTDIR)$(bindir); chmod 755 $(DESTDIR)$(bindir))
> +       $(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(bindir)/$(PROG)
> +       $(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(bindir)/$(PROG).`cat ${srcdir}/VERSION`
>         [ -d $(DESTDIR)$(mandir)/man1 ] || \
>             (mkdir -p $(DESTDIR)$(mandir)/man1; chmod 755 $(DESTDIR)$(mandir)/man1)
>         $(INSTALL_DATA) $(PROG).1 $(DESTDIR)$(mandir)/man1/$(PROG).1
>  
>  uninstall:
> -       rm -f $(DESTDIR)$(sbindir)/$(PROG)
> +       rm -f $(DESTDIR)$(bindir)/$(PROG)
>         rm -f $(DESTDIR)$(mandir)/man1/$(PROG).1
>  
>  lint: $(GENSRC)
>
>
> -- 
>     Denis Ovsienko
>
> --- End Message ---
_______________________________________________
tcpdump-workers mailing list
tcpdump-workers () lists tcpdump org
https://lists.sandelman.ca/mailman/listinfo/tcpdump-workers