Fix man page locations on Solaris

There are two problems:
a) usermod and ethers man pages lie in nonstandard path
b) Solaris 12 has the man pages sections reordered completely

diff --git a/configure b/configure
index e7d5590813b458333441ee6e91ca028a43f5d6cb..625fe20dfceceef485140b17aab99efe565fdc47 100755 (executable)
--- a/configure
+++ b/configure
@@ -634,6 +634,8 @@ NETFILTER_SRC
 PCAP_SUPPORT_NETFILTER
 USB_SRC
 PCAP_SUPPORT_USB
 PCAP_SUPPORT_NETFILTER
 USB_SRC
 PCAP_SUPPORT_USB

+MAN_ETHERS_SECTION
+MAN_USERMOD_SECTION

 MAN_MISC_INFO
 MAN_FILE_FORMATS
 DYEXT
 MAN_MISC_INFO
 MAN_FILE_FORMATS
 DYEXT


@@ -7249,6 +7251,8 @@ fi
 DYEXT="none"
 MAN_FILE_FORMATS=5
 MAN_MISC_INFO=7
 DYEXT="none"
 MAN_FILE_FORMATS=5
 MAN_MISC_INFO=7

+MAN_USERMOD_SECTION=1M
+MAN_ETHERS_SECTION=3N

 case "$host_os" in
 
 aix*)
 case "$host_os" in
 
 aix*)


@@ -7507,12 +7511,25 @@ solaris*)
 $as_echo "#define HAVE_SOLARIS 1" >>confdefs.h
 
 
 $as_echo "#define HAVE_SOLARIS 1" >>confdefs.h
 
 

+       case "`uname -r`" in
+           5.12)
+               MAN_USERMOD_SECTION=8
+               MAN_ETHERS_SECTION=5
+               MAN_FILE_FORMATS=5
+               MAN_MISC_INFO=7
+               ;;
+           *)
+               #
+               # Use System V conventions for man pages.
+               #
+
+               MAN_USERMOD_SECTION=1m
+               MAN_ETHERS_SECTION=4
+               MAN_FILE_FORMATS=4
+               MAN_MISC_INFO=5
+       esac
+

        DYEXT="so"
        DYEXT="so"

-       #
-       # Use System V conventions for man pages.
-       #
-       MAN_FILE_FORMATS=4
-       MAN_MISC_INFO=5

        ;;
 esac
 
        ;;
 esac
 


@@ -8406,6 +8423,8 @@ ln -s ${srcdir}/bpf/net net
 
 
 
 
 
 

+
+

 
 # Check whether --enable-usb was given.
 if test "${enable_usb+set}" = set; then :
 
 # Check whether --enable-usb was given.
 if test "${enable_usb+set}" = set; then :

diff --git a/configure.ac b/configure.ac
index a4d3a74e5eba0d38c600ad2ab567880ac563e299..cb908f778e69f4d3a99cadf6d77b6be44cfbf20e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1195,6 +1195,8 @@ fi
 DYEXT="none"
 MAN_FILE_FORMATS=5
 MAN_MISC_INFO=7
 DYEXT="none"
 MAN_FILE_FORMATS=5
 MAN_MISC_INFO=7

+MAN_USERMOD_SECTION=1M
+MAN_ETHERS_SECTION=3N

 case "$host_os" in
 
 aix*)
 case "$host_os" in
 
 aix*)


@@ -1427,12 +1429,25 @@ sinix*)
 solaris*)
        AC_DEFINE(HAVE_SOLARIS,1,[On solaris])
 
 solaris*)
        AC_DEFINE(HAVE_SOLARIS,1,[On solaris])
 

+       case "`uname -r`" in
+           5.12)
+               MAN_USERMOD_SECTION=8
+               MAN_ETHERS_SECTION=5
+               MAN_FILE_FORMATS=5
+               MAN_MISC_INFO=7
+               ;;
+           *)
+               #
+               # Use System V conventions for man pages.
+               #
+
+               MAN_USERMOD_SECTION=1m
+               MAN_ETHERS_SECTION=4
+               MAN_FILE_FORMATS=4
+               MAN_MISC_INFO=5
+       esac
+

        DYEXT="so"
        DYEXT="so"

-       #
-       # Use System V conventions for man pages.
-       #
-       MAN_FILE_FORMATS=4
-       MAN_MISC_INFO=5

        ;;
 esac
 
        ;;
 esac
 


@@ -1476,6 +1491,8 @@ AC_SUBST(SSRC)
 AC_SUBST(DYEXT)
 AC_SUBST(MAN_FILE_FORMATS)
 AC_SUBST(MAN_MISC_INFO)
 AC_SUBST(DYEXT)
 AC_SUBST(MAN_FILE_FORMATS)
 AC_SUBST(MAN_MISC_INFO)

+AC_SUBST(MAN_USERMOD_SECTION)
+AC_SUBST(MAN_ETHERS_SECTION)

 
 AC_ARG_ENABLE([usb],
 [AC_HELP_STRING([--enable-usb],[enable nusb support @<:@default=yes, if support available@:>@])],
 
 AC_ARG_ENABLE([usb],
 [AC_HELP_STRING([--enable-usb],[enable nusb support @<:@default=yes, if support available@:>@])],

diff --git a/pcap-filter.manmisc.in b/pcap-filter.manmisc.in
index 9d3f34bfee19fbff61e62690f4208627a9307cb1..f10560ea821280b6d066b3a6038240d0c659f56c 100644 (file)
--- a/pcap-filter.manmisc.in
+++ b/pcap-filter.manmisc.in
@@ -182,7 +182,7 @@ be checked for a match.
 True if the Ethernet destination address is \fIehost\fP.
 \fIEhost\fP
 may be either a name from /etc/ethers or a number (see
 True if the Ethernet destination address is \fIehost\fP.
 \fIEhost\fP
 may be either a name from /etc/ethers or a number (see

-.IR ethers (3N)
+.IR ethers (@MAN_ETHERS_SECTION@)

 for numeric format).
 .IP "\fBether src \fIehost\fP"
 True if the Ethernet source address is \fIehost\fP.
 for numeric format).
 .IP "\fBether src \fIehost\fP"
 True if the Ethernet source address is \fIehost\fP.

diff --git a/pcap.3pcap.in b/pcap.3pcap.in
index 93478f1cd30f7983de45417c32feddb8cbcad680..dd577983fc5d496988a7470de3251a4973358360 100644 (file)
--- a/pcap.3pcap.in
+++ b/pcap.3pcap.in
@@ -244,7 +244,7 @@ that device.  A user can be given that privilege by, for example, adding
 that privilege to the user's
 .B defaultpriv
 key with the
 that privilege to the user's
 .B defaultpriv
 key with the

-.B usermod (1M)
+.B usermod (@MAN_USERMOD_SECTION@)

 command.
 .TP
 .B Under HP-UX with DLPI:
 command.
 .TP
 .B Under HP-UX with DLPI:


@@ -915,7 +915,7 @@ script or some other configuration script to check whether the libpcap
 1.0 APIs are available and use them only if they are.
 .SH SEE ALSO
 autoconf(1), tcpdump(1), tcpslice(1), pcap-filter(@MAN_MISC_INFO@), pfconfig(8),
 1.0 APIs are available and use them only if they are.
 .SH SEE ALSO
 autoconf(1), tcpdump(1), tcpslice(1), pcap-filter(@MAN_MISC_INFO@), pfconfig(8),

-usermod(1M)
+usermod(@MAN_USERMOD_SECTION@)

 .SH AUTHORS
 The original authors of libpcap are:
 .LP
 .SH AUTHORS
 The original authors of libpcap are:
 .LP