mirror of
https://github.com/the-tcpdump-group/tcpdump.git
synced 2024-11-23 18:14:29 +08:00
Run the tcpdump man page through config, so that it refers to the right
man page sections. Have it refer to the new pcap-savefile man page for a description of the savefile format.
This commit is contained in:
guy
parent
2fa88fe1a3
commit
3565ec111d
@ -17,7 +17,7 @@
|
||||
# WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
|
||||
# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
|
||||
#
|
||||
# @(#) $Header: /tcpdump/master/tcpdump/Makefile.in,v 1.323 2008-08-16 11:36:20 hannes Exp $ (LBL)
|
||||
# @(#) $Header: /tcpdump/master/tcpdump/Makefile.in,v 1.324 2008-10-27 21:12:48 guy Exp $ (LBL)
|
||||
|
||||
#
|
||||
# Various configurable paths (remember to edit Makefile.in, not Makefile)
|
||||
@ -258,7 +258,7 @@ EXTRA_DIST = \
|
||||
smbutil.c \
|
||||
stime.awk \
|
||||
strcasecmp.c \
|
||||
tcpdump.1 \
|
||||
tcpdump.1.in \
|
||||
vfprintf.c \
|
||||
win32/Include/Arpa/tftp.h \
|
||||
win32/Include/errno.h \
|
||||
@ -344,7 +344,7 @@ clean:
|
||||
|
||||
distclean:
|
||||
rm -f $(CLEANFILES) Makefile config.cache config.log config.status \
|
||||
config.h gnuc.h os-proto.h stamp-h stamp-h.in
|
||||
config.h gnuc.h os-proto.h stamp-h stamp-h.in $(PROG).1
|
||||
|
||||
check:
|
||||
(cd tests && ./TESTrun.sh)
|
||||
|
||||
40
configure.in
40
configure.in
@ -1,4 +1,4 @@
|
||||
dnl @(#) $Header: /tcpdump/master/tcpdump/configure.in,v 1.202 2008-09-25 21:45:50 guy Exp $ (LBL)
|
||||
dnl @(#) $Header: /tcpdump/master/tcpdump/configure.in,v 1.203 2008-10-27 21:12:49 guy Exp $ (LBL)
|
||||
dnl
|
||||
dnl Copyright (c) 1994, 1995, 1996, 1997
|
||||
dnl The Regents of the University of California. All rights reserved.
|
||||
@ -6,7 +6,7 @@ dnl
|
||||
dnl Process this file with autoconf to produce a configure script.
|
||||
dnl
|
||||
|
||||
AC_REVISION($Revision: 1.202 $)
|
||||
AC_REVISION($Revision: 1.203 $)
|
||||
AC_PREREQ(2.50)
|
||||
AC_INIT(tcpdump.c)
|
||||
|
||||
@ -779,6 +779,12 @@ V_GROUP=0
|
||||
if test -f /etc/group -a ! -z "`grep '^wheel:' /etc/group`" ; then
|
||||
V_GROUP=wheel
|
||||
fi
|
||||
#
|
||||
# Assume V7/BSD convention for man pages (file formats in section 5,
|
||||
# miscellaneous info in section 7).
|
||||
#
|
||||
MAN_FILE_FORMATS=5
|
||||
MAN_MISC_INFO=7
|
||||
case "$host_os" in
|
||||
|
||||
aix*)
|
||||
@ -786,16 +792,42 @@ aix*)
|
||||
AC_DEFINE(_SUN)
|
||||
;;
|
||||
|
||||
hpux*)
|
||||
#
|
||||
# Use System V conventions for man pages.
|
||||
#
|
||||
MAN_FILE_FORMATS=4
|
||||
MAN_MISC_INFO=5
|
||||
;;
|
||||
|
||||
irix*)
|
||||
V_GROUP=sys
|
||||
|
||||
#
|
||||
# Use System V conventions for man pages.
|
||||
#
|
||||
MAN_FILE_FORMATS=4
|
||||
MAN_MISC_INFO=5
|
||||
;;
|
||||
|
||||
osf*)
|
||||
V_GROUP=system
|
||||
|
||||
#
|
||||
# Use System V conventions for man pages.
|
||||
#
|
||||
MAN_FILE_FORMATS=4
|
||||
MAN_MISC_INFO=5
|
||||
;;
|
||||
|
||||
solaris*)
|
||||
V_GROUP=sys
|
||||
|
||||
#
|
||||
# Use System V conventions for man pages.
|
||||
#
|
||||
MAN_FILE_FORMATS=4
|
||||
MAN_MISC_INFO=5
|
||||
;;
|
||||
esac
|
||||
|
||||
@ -1024,6 +1056,8 @@ AC_SUBST(V_GROUP)
|
||||
AC_SUBST(V_INCLS)
|
||||
AC_SUBST(V_PCAPDEP)
|
||||
AC_SUBST(LOCALSRC)
|
||||
AC_SUBST(MAN_FILE_FORMATS)
|
||||
AC_SUBST(MAN_MISC_INFO)
|
||||
|
||||
AC_PROG_INSTALL
|
||||
|
||||
@ -1034,5 +1068,5 @@ AC_OUTPUT_COMMANDS([if test -f .devel; then
|
||||
cat Makefile-devel-adds >> Makefile
|
||||
make depend
|
||||
fi])
|
||||
AC_OUTPUT(Makefile)
|
||||
AC_OUTPUT(Makefile tcpdump.1)
|
||||
exit 0
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
.\" @(#) $Header: /tcpdump/master/tcpdump/Attic/tcpdump.1,v 1.192 2008-08-16 11:36:20 hannes Exp $ (LBL)
|
||||
.\" @(#) $Header: /tcpdump/master/tcpdump/tcpdump.1.in,v 1.1 2008-10-27 21:12:49 guy Exp $ (LBL)
|
||||
.\"
|
||||
.\" $NetBSD: tcpdump.8,v 1.9 2003/03/31 00:18:17 perry Exp $
|
||||
.\"
|
||||
@ -514,6 +514,9 @@ Write the raw packets to \fIfile\fR rather than parsing and printing
|
||||
them out.
|
||||
They can later be printed with the \-r option.
|
||||
Standard output is used if \fIfile\fR is ``-''.
|
||||
See
|
||||
.BR pcap-savefile (@MAN_FILE_FORMATS@)
|
||||
for a description of the file format.
|
||||
.TP
|
||||
.B \-W
|
||||
Used in conjunction with the
|
||||
@ -607,7 +610,7 @@ Otherwise,
|
||||
only packets for which \fIexpression\fP is `true' will be dumped.
|
||||
.LP
|
||||
For the \fIexpression\fP syntax, see
|
||||
.BR pcap-filter (4).
|
||||
.BR pcap-filter (@MAN_MISC_INFO@).
|
||||
.LP
|
||||
Expression arguments can be passed to \fItcpdump\fP as either a single
|
||||
argument or as multiple arguments, whichever is more convenient.
|
||||
@ -1611,7 +1614,8 @@ is made to account for the time lag between when the
|
||||
Ethernet interface removed the packet from the wire and when the kernel
|
||||
serviced the `new packet' interrupt.
|
||||
.SH "SEE ALSO"
|
||||
stty(1), pcap(3PCAP), pcap-filter(4), bpf(4), nit(4P)
|
||||
stty(1), pcap(3PCAP), bpf(4), nit(4P), pcap-savefile(@MAN_FILE_FORMATS@),
|
||||
pcap-filter(@MAN_MISC_INFO@)
|
||||
.SH AUTHORS
|
||||
The original authors are:
|
||||
.LP
|
||||
Loading…
Reference in New Issue
Block a user