diff options
| author | Denis Ovsienko <denis@ovsienko.info> | 2020-09-10 12:54:41 +0100 |
|---|---|---|
| committer | Denis Ovsienko <denis@ovsienko.info> | 2020-09-10 12:59:25 +0100 |
| commit | 95096be4f0c7c3efd459e3ff3bcfb526164ed446 (patch) | |
| tree | 2d32662206520f2b26a8e307a8fb086bc306536d | |
| parent | 4b4867c792e0217b31f1cdcc0c1a8e0f0523153e (diff) | |
| download | tcpdump-95096be4f0c7c3efd459e3ff3bcfb526164ed446.tar.gz | |
Install into bindir, not sbindir. [skip ci]
As discussed on GitHub and on the mailing list, install tcpdump into
bindir because it can be useful to non-root users too, in ways that do
not involve doing live packet captures. Original idea by Guy Harris.
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Makefile.in | 12 |
2 files changed, 7 insertions, 7 deletions
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) |