Removed the subdirectory paths from the definitions of MAN[1-9]. They

were a workaround for limitations in bsd.man.mk that were fixed about
2 years ago.

14 files changed, 87 insertions, 132 deletions

diff --git a/lib/libc/compat-43/Makefile.inc b/lib/libc/compat-43/Makefile.inc
index 25d7763..ccbc0ab 100644
--- a/lib/libc/compat-43/Makefile.inc
+++ b/lib/libc/compat-43/Makefile.inc
@@ -1,5 +1,5 @@
 #	@(#)Makefile.inc	8.1 (Berkeley) 6/2/93
-#	$Id$
+#	$Id: Makefile.inc,v 1.5 1997/05/03 03:49:51 jb Exp $
 
 # compat-43 sources
 .PATH: ${.CURDIR}/../libc/${MACHINE}/compat-43 ${.CURDIR}/../libc/compat-43
@@ -7,13 +7,10 @@
 SRCS+=	creat.c gethostid.c getwd.c killpg.c sethostid.c setpgrp.c \
 	setrgid.c setruid.c sigcompat.c
 
-# Only build man pages with libc.
 .if ${LIB} == "c"
-MAN2+=	compat-43/creat.2 compat-43/killpg.2 \
-	compat-43/sigblock.2 \
-	compat-43/sigpause.2 compat-43/sigsetmask.2 compat-43/sigvec.2
+MAN2+=	creat.2 killpg.2 sigblock.2 sigpause.2 sigsetmask.2 sigvec.2
 
-MAN3+=  compat-43/gethostid.3 compat-43/setruid.3
+MAN3+=  gethostid.3 setruid.3
 
 MLINKS+=setruid.3 setrgid.3
 MLINKS+=gethostid.3 sethostid.3
diff --git a/lib/libc/gen/Makefile.inc b/lib/libc/gen/Makefile.inc
index 9d89685..d94558f 100644
--- a/lib/libc/gen/Makefile.inc
+++ b/lib/libc/gen/Makefile.inc
@@ -1,5 +1,5 @@
 #	@(#)Makefile.inc	8.6 (Berkeley) 5/4/95
-#	$Id: Makefile.inc,v 1.38 1997/08/31 00:08:35 peter Exp $
+#	$Id: Makefile.inc,v 1.39 1997/10/14 07:43:18 bde Exp $
 
 # machine-independent gen sources
 .PATH: ${.CURDIR}/../libc/${MACHINE}/gen ${.CURDIR}/../libc/gen
@@ -41,30 +41,24 @@ errlst.o errlst.po:
 	rm -f errlst.s
 .endif
 
-# Only build man pages with libc.
 .if ${LIB} == "c"
-MAN3+=  gen/alarm.3 gen/arc4random.3 gen/clock.3 gen/confstr.3 \
-	gen/config_open.3 gen/crypt.3 gen/ctermid.3 \
-	gen/daemon.3 gen/devname.3 gen/directory.3 gen/err.3 gen/exec.3 \
-	gen/fnmatch.3 gen/frexp.3 gen/fts.3 gen/getbsize.3 gen/getbootfile.3 \
-	gen/getcap.3 gen/getcwd.3 gen/getdiskbyname.3 gen/getdomainname.3 \
-	gen/getfsent.3 gen/getgrent.3 gen/getgrouplist.3 gen/gethostname.3 \
-	gen/getloadavg.3 \
-	gen/getmntinfo.3 gen/getnetgrent.3 gen/getpagesize.3 gen/getpass.3 \
-	gen/getpwent.3 gen/getttyent.3 gen/getusershell.3 gen/getvfsbyname.3 \
-	gen/getvfsent.3 gen/glob.3 \
-	gen/initgroups.3 gen/isinf.3 gen/ldexp.3 \
-	gen/msgctl.3 gen/msgget.3 gen/msgrcv.3 gen/msgsnd.3 \
-	gen/modf.3 gen/nice.3 \
-	gen/nlist.3 gen/pause.3 gen/popen.3 gen/psignal.3 gen/pwcache.3 \
-	gen/raise.3 gen/rand48.3 \
-	gen/scandir.3 gen/setjmp.3 gen/setmode.3 \
-	gen/siginterrupt.3 gen/signal.3 gen/sigsetops.3 gen/sleep.3 \
-	gen/stringlist.3 \
-	gen/sysconf.3 gen/sysctl.3 gen/syslog.3 gen/tcgetpgrp.3 \
-	gen/tcsendbreak.3 gen/tcsetattr.3 gen/tcsetpgrp.3 gen/time.3 \
-	gen/times.3 gen/timezone.3 gen/ttyname.3 gen/tzset.3 gen/ualarm.3 \
-	gen/uname.3 gen/unvis.3 gen/usleep.3 gen/utime.3 gen/valloc.3 gen/vis.3
+MAN3+=  alarm.3 arc4random.3 clock.3 confstr.3 \
+	config_open.3 crypt.3 ctermid.3 daemon.3 \
+	devname.3 directory.3 err.3 exec.3 fnmatch.3 frexp.3 fts.3 \
+	getbsize.3 getbootfile.3 getcap.3 getcwd.3 \
+	getdiskbyname.3 getdomainname.3 getfsent.3 \
+	getgrent.3 getgrouplist.3 gethostname.3 getloadavg.3 \
+	getmntinfo.3 getnetgrent.3 getpagesize.3 getpass.3 getpwent.3 \
+	getttyent.3 getusershell.3 getvfsbyname.3 getvfsent.3 \
+	glob.3 initgroups.3 isinf.3 \
+	ldexp.3 msgctl.3 msgget.3 msgrcv.3 msgsnd.3 modf.3 \
+	nice.3 nlist.3 pause.3 popen.3 psignal.3 pwcache.3 \
+	raise.3 rand48.3 scandir.3 setjmp.3 setmode.3 siginterrupt.3 \
+	signal.3 sigsetops.3 sleep.3 stringlist.3 \
+	sysconf.3 sysctl.3 syslog.3 tcgetpgrp.3 \
+	tcsendbreak.3 tcsetattr.3 tcsetpgrp.3 time.3 times.3 timezone.3 \
+	ttyname.3 tzset.3 ualarm.3 uname.3 unvis.3 usleep.3 utime.3 \
+	valloc.3 vis.3
 
 MLINKS+=arc4random.3 arc4random_stir.3 arc4random.3 arc4random_addrandom.3
 MLINKS+=config_open.3 config_next.3 config_open.3 config_close.3 \
diff --git a/lib/libc/gmon/Makefile.inc b/lib/libc/gmon/Makefile.inc
index a264d09..668cb26 100644
--- a/lib/libc/gmon/Makefile.inc
+++ b/lib/libc/gmon/Makefile.inc
@@ -1,14 +1,13 @@
 #	from @(#)Makefile.inc	8.1 (Berkeley) 6/4/93
-#	$Id$
+#	$Id: Makefile.inc,v 1.4 1997/05/03 03:49:55 jb Exp $
 
 # gmon sources
 .PATH: ${.CURDIR}/../libc/gmon
 
 SRCS+=	gmon.c mcount.c
 
-# Only build man pages with libc.
 .if ${LIB} == "c"
-MAN3+=	gmon/moncontrol.3
+MAN3+=	moncontrol.3
 MLINKS+= moncontrol.3 monstartup.3
 .endif
 
diff --git a/lib/libc/locale/Makefile.inc b/lib/libc/locale/Makefile.inc
index 03673e7..8833024 100644
--- a/lib/libc/locale/Makefile.inc
+++ b/lib/libc/locale/Makefile.inc
@@ -1,5 +1,5 @@
 #	from @(#)Makefile.inc	8.1 (Berkeley) 6/4/93
-#	$Id: Makefile.inc,v 1.8 1997/05/03 03:50:00 jb Exp $
+#	$Id: Makefile.inc,v 1.9 1997/09/24 20:38:10 julian Exp $
 
 # locale sources
 .PATH: ${.CURDIR}/../libc/${MACHINE}/locale ${.CURDIR}/../libc/locale
@@ -9,15 +9,12 @@ SRCS+=	ansi.c ctype.c euc.c frune.c isctype.c lconv.c localeconv.c \
 	runetype.c tolower.c toupper.c nomacros.c collate.c setinvalidrune.c \
 	collcmp.c mskanji.c
 
-# Only build man pages with libc.
 .if ${LIB} == "c"
-MAN3+=	locale/ctype.3 locale/isalnum.3 locale/isalpha.3 locale/isascii.3 \
-	locale/isblank.3 locale/iscntrl.3 locale/isdigit.3 locale/isgraph.3 \
-	locale/islower.3 locale/isprint.3 locale/ispunct.3 locale/isspace.3 \
-	locale/isupper.3 locale/isxdigit.3 locale/mbrune.3 locale/multibyte.3 \
-	locale/rune.3 locale/setlocale.3 locale/toascii.3 locale/tolower.3 \
-	locale/toupper.3
-MAN4+=	locale/euc.4 locale/utf2.4
+MAN3+=	ctype.3 isalnum.3 isalpha.3 isascii.3 isblank.3 iscntrl.3 \
+	isdigit.3 isgraph.3 islower.3 isprint.3 ispunct.3 isspace.3 \
+	isupper.3 isxdigit.3 mbrune.3 multibyte.3 rune.3 setlocale.3 \
+	toascii.3 tolower.3 toupper.3
+MAN4+=	euc.4 utf2.4
 MLINKS+= rune.3 setrunelocale.3 rune.3 setinvalidrune.3 rune.3 sgetrune.3 \
 	 rune.3 sputrune.3 rune.3 fgetrune.3 rune.3 fungetrune.3 \
 	 rune.3 fputrune.3 mbrune.3 mbrrune.3 mbrune.3 mbmb.3 \
diff --git a/lib/libc/net/Makefile.inc b/lib/libc/net/Makefile.inc
index d654c02..d5c69e4 100644
--- a/lib/libc/net/Makefile.inc
+++ b/lib/libc/net/Makefile.inc
@@ -1,5 +1,5 @@
 #	from @(#)Makefile.inc	8.2 (Berkeley) 9/5/93
-#	$Id$
+#	$Id: Makefile.inc,v 1.23 1997/05/03 03:50:01 jb Exp $
 
 # machine-independent net sources
 .PATH: ${.CURDIR}/../libc/${MACHINE}/net ${.CURDIR}/../libc/net
@@ -21,14 +21,12 @@ SRCS+=	addr2ascii.c ascii2addr.c base64.c \
 # machine-dependent net sources
 .include "${.CURDIR}/../libc/${MACHINE}/net/Makefile.inc"
 
-# Only build man pages with libc.
 .if ${LIB} == "c"
-MAN3+=	net/addr2ascii.3 \
-	net/byteorder.3 net/ethers.3 net/gethostbyname.3 net/getnetent.3 \
-	net/getprotoent.3 net/getservent.3 net/inet.3 net/linkaddr.3 \
-	net/rcmd.3 resolver.3
+MAN3+=	addr2ascii.3 byteorder.3 ethers.3 gethostbyname.3 \
+	getnetent.3 getprotoent.3 getservent.3 \
+	inet.3 linkaddr.3 rcmd.3 resolver.3
 
-# not installed: net/ns.3 net/iso_addr.3
+# not installed: ns.3 iso_addr.3
 
 MLINKS+=addr2ascii.3 ascii2addr.3
 MLINKS+=byteorder.3 htonl.3 byteorder.3 htons.3 byteorder.3 ntohl.3 \
diff --git a/lib/libc/nls/Makefile.inc b/lib/libc/nls/Makefile.inc
index 6d2acea..8bbca27 100644
--- a/lib/libc/nls/Makefile.inc
+++ b/lib/libc/nls/Makefile.inc
@@ -1,11 +1,10 @@
 #	from $NetBSD: Makefile.inc,v 1.7 1995/02/27 13:06:20 cgd Exp $
-#	$Id$
+#	$Id: Makefile.inc,v 1.3 1997/05/03 03:50:01 jb Exp $
 
 .PATH: ${.CURDIR}/../libc/nls
 
 SRCS+=	catclose.c catgets.c catopen.c msgcat.c
 
-# Only build man pages with libc.
 .if ${LIB} == "c"
-MAN3+=  nls/catclose.3 nls/catgets.3 nls/catopen.3
+MAN3+=  catclose.3 catgets.3 catopen.3
 .endif
diff --git a/lib/libc/regex/Makefile.inc b/lib/libc/regex/Makefile.inc
index d8c6092..12af2a8 100644
--- a/lib/libc/regex/Makefile.inc
+++ b/lib/libc/regex/Makefile.inc
@@ -1,5 +1,5 @@
 #	from @(#)Makefile.inc	8.1 (Berkeley) 6/4/93
-#	$Id$
+#	$Id: Makefile.inc,v 1.3 1997/05/03 03:50:02 jb Exp $
 
 # regex sources
 .PATH: ${.CURDIR}/../libc/regex
@@ -8,10 +8,9 @@ CFLAGS+=-DPOSIX_MISTAKE
 
 SRCS+=	regcomp.c regerror.c regexec.c regfree.c
 
-# Only build man pages with libc.
 .if ${LIB} == "c"
-MAN3+=	regex/regex.3
-MAN7+=	regex/re_format.7
+MAN3+=	regex.3
+MAN7+=	re_format.7
 
 MLINKS+=regex.3 regcomp.3 regex.3 regexec.3 regex.3 regerror.3
 MLINKS+=regexec.3 regfree.3
diff --git a/lib/libc/rpc/Makefile.inc b/lib/libc/rpc/Makefile.inc
index 2731c69..a9b1b3e 100644
--- a/lib/libc/rpc/Makefile.inc
+++ b/lib/libc/rpc/Makefile.inc
@@ -32,7 +32,6 @@ crypt_xdr.c: ${RPCDIR}/crypt.x crypt.h
 crypt.h: ${RPCDIR}/crypt.x
 	${RPCGEN} -h -o ${.TARGET} ${RPCDIR}/crypt.x
 
-# Only build man pages with libc.
 .if ${LIB} == "c"
 #
 # XXX -- rstat.1 and rstat_svc.8 shouldn't really be here
@@ -41,13 +40,13 @@ crypt.h: ${RPCDIR}/crypt.x
 # Paul.
 #
 
-# MAN1+= rpc/rstat.1
-MAN3+= rpc/bindresvport.3 rpc/getrpcent.3 rpc/getrpcport.3 rpc/rpc.3
-MAN5+= rpc/rpc.5
-MAN8+= rpc/rstat_svc.8
+# MAN1+= rstat.1
+MAN3+= bindresvport.3 getrpcent.3 getrpcport.3 rpc.3
+MAN5+= rpc.5
+MAN8+= rstat_svc.8
 
-MAN3+= rpc/rpc_secure.3 rpc/publickey.3 rpc/rtime.3 rpc/des_crypt.3
-MAN5+= rpc/publickey.5
+MAN3+= rpc_secure.3 publickey.3 rtime.3 des_crypt.3
+MAN5+= publickey.5
 
 MLINKS+=	getrpcent.3 getrpcbyname.3 \
 		getrpcent.3 getrpcbynumber.3 \
diff --git a/lib/libc/stdio/Makefile.inc b/lib/libc/stdio/Makefile.inc
index b86404a..b9664b4 100644
--- a/lib/libc/stdio/Makefile.inc
+++ b/lib/libc/stdio/Makefile.inc
@@ -1,5 +1,5 @@
 #	@(#)Makefile.inc	8.3 (Berkeley) 4/17/94
-#	$Id: Makefile.inc,v 1.8 1997/02/22 15:01:45 peter Exp $
+#	$Id: Makefile.inc,v 1.9 1997/05/03 03:50:03 jb Exp $
 
 # stdio sources
 .PATH: ${.CURDIR}/../libc/stdio
@@ -15,13 +15,10 @@ SRCS+=	asprintf.c clrerr.c fclose.c fdopen.c feof.c ferror.c fflush.c \
 	vfprintf.c vfscanf.c vprintf.c vscanf.c vsnprintf.c vsprintf.c \
 	vsscanf.c wbuf.c wsetup.c
 
-# Only build man pages with libc.
 .if ${LIB} == "c"
-MAN3+=	stdio/fclose.3 stdio/ferror.3 stdio/fflush.3 stdio/fgetln.3 \
-	stdio/fgets.3 stdio/fopen.3 stdio/fputs.3 stdio/fread.3 stdio/fseek.3 \
-	stdio/funopen.3 stdio/getc.3 stdio/mktemp.3 stdio/printf.3 \
-	stdio/putc.3 stdio/remove.3 stdio/scanf.3 stdio/setbuf.3 \
-	stdio/stdio.3 stdio/tmpnam.3 stdio/ungetc.3
+MAN3+=	fclose.3 ferror.3 fflush.3 fgetln.3 fgets.3 fopen.3 fputs.3 \
+	fread.3 fseek.3 funopen.3 getc.3 mktemp.3 printf.3 putc.3 remove.3 \
+	scanf.3 setbuf.3 stdio.3 tmpnam.3 ungetc.3
 
 MLINKS+=ferror.3 clearerr.3 ferror.3 feof.3 ferror.3 fileno.3
 MLINKS+=fflush.3 fpurge.3
diff --git a/lib/libc/stdlib/Makefile.inc b/lib/libc/stdlib/Makefile.inc
index 58842bf..120ea21 100644
--- a/lib/libc/stdlib/Makefile.inc
+++ b/lib/libc/stdlib/Makefile.inc
@@ -1,5 +1,5 @@
 #	from @(#)Makefile.inc	8.3 (Berkeley) 2/4/95
-#	$Id: Makefile.inc,v 1.9 1997/06/22 17:54:24 phk Exp $
+#	$Id: Makefile.inc,v 1.10 1997/07/01 18:39:31 phk Exp $
 
 # machine-independent stdlib sources
 .PATH: ${.CURDIR}/../libc/${MACHINE}/stdlib ${.CURDIR}/../libc/stdlib
@@ -13,16 +13,11 @@ SRCS+=	abort.c atexit.c atof.c atoi.c atol.c bsearch.c calloc.c div.c \
 # machine-dependent stdlib sources
 .include "${.CURDIR}/../libc/${MACHINE}/stdlib/Makefile.inc"
 
-# Only build man pages with libc.
 .if ${LIB} == "c"
-MAN3+=	stdlib/abort.3 stdlib/abs.3 stdlib/alloca.3 stdlib/atexit.3 \
-	stdlib/atof.3 stdlib/atoi.3 stdlib/atol.3 stdlib/bsearch.3 \
-	stdlib/div.3 stdlib/exit.3 \
-	stdlib/getenv.3 stdlib/getopt.3 stdlib/getsubopt.3 stdlib/labs.3 \
-	stdlib/ldiv.3 stdlib/malloc.3 stdlib/memory.3 stdlib/qsort.3 \
-	stdlib/radixsort.3 stdlib/rand.3 stdlib/random.3 \
-	stdlib/realpath.3 stdlib/strtod.3 stdlib/strtol.3 stdlib/strtoul.3 \
-	stdlib/system.3
+MAN3+=	abort.3 abs.3 alloca.3 atexit.3 atof.3 atoi.3 atol.3 bsearch.3 \
+	div.3 exit.3 getenv.3 getopt.3 getsubopt.3 labs.3 \
+	ldiv.3 malloc.3 memory.3 qsort.3 radixsort.3 rand.3 random.3 \
+	realpath.3 strtod.3 strtol.3 strtoul.3 system.3
 
 MLINKS+=getenv.3 setenv.3 getenv.3 unsetenv.3 getenv.3 putenv.3
 MLINKS+=qsort.3 heapsort.3 qsort.3 mergesort.3
diff --git a/lib/libc/stdtime/Makefile.inc b/lib/libc/stdtime/Makefile.inc
index 246be28..3a876ed 100644
--- a/lib/libc/stdtime/Makefile.inc
+++ b/lib/libc/stdtime/Makefile.inc
@@ -1,15 +1,14 @@
 #	Makefile.inc,v 1.2 1994/09/13 21:26:01 wollman Exp
-#	$Id: Makefile.inc,v 1.4 1997/05/03 03:50:04 jb Exp $
+#	$Id: Makefile.inc,v 1.5 1997/08/09 15:43:51 joerg Exp $
 
 .PATH:	${.CURDIR}/../libc/stdtime
 
 SRCS+=	asctime.c localtime.c strftime.c difftime.c timelocal.c strptime.c
 
-# Only build man pages with libc.
 .if ${LIB} == "c"
-MAN5+=	stdtime/tzfile.5
-MAN3+=	stdtime/ctime.3 stdtime/strftime.3 stdtime/time2posix.3
-MAN3+=	stdtime/strptime.3
+MAN5+=	tzfile.5
+MAN3+=	ctime.3 strftime.3 time2posix.3
+MAN3+=	strptime.3
 
 MLINKS+=ctime.3 asctime.3 ctime.3 difftime.3 ctime.3 gmtime.3 \
 	ctime.3 localtime.3 ctime.3 mktime.3
diff --git a/lib/libc/string/Makefile.inc b/lib/libc/string/Makefile.inc
index e95d87d..c91b2ea 100644
--- a/lib/libc/string/Makefile.inc
+++ b/lib/libc/string/Makefile.inc
@@ -1,5 +1,5 @@
 #	@(#)Makefile.inc	8.1 (Berkeley) 6/4/93
-#	$Id: Makefile.inc,v 1.9 1997/02/22 15:03:21 peter Exp $
+#	$Id: Makefile.inc,v 1.10 1997/05/03 03:50:05 jb Exp $
 
 .PATH: ${.CURDIR}/../libc/${MACHINE}/string ${.CURDIR}/../libc/string
 
@@ -81,17 +81,12 @@ strrchr.po: rindex.c
 	@mv -f a.out ${.TARGET}
 .endif
 #
-# Only build man pages with libc.
 .if ${LIB} == "c"
-MAN3+=	string/bcmp.3 string/bcopy.3 string/bstring.3 string/bzero.3 \
-	string/ffs.3 string/index.3 string/memccpy.3 string/memchr.3 \
-	string/memcmp.3 string/memcpy.3 string/memmove.3 string/memset.3 \
-	string/rindex.3 string/strcasecmp.3 string/strcat.3 string/strchr.3 \
-	string/strcmp.3 string/strcoll.3 string/strcpy.3 string/strcspn.3 \
-	string/string.3 string/strlen.3 string/strmode.3 \
-	string/strdup.3 string/strerror.3 string/strpbrk.3 string/strrchr.3 \
-	string/strsep.3 string/strspn.3 string/strstr.3 string/strtok.3 \
-	string/strxfrm.3 string/swab.3
+MAN3+=	bcmp.3 bcopy.3 bstring.3 bzero.3 ffs.3 index.3 memccpy.3 memchr.3 \
+	memcmp.3 memcpy.3 memmove.3 memset.3 rindex.3 strcasecmp.3 strcat.3 \
+	strchr.3 strcmp.3 strcoll.3 strcpy.3 strcspn.3 string.3 strlen.3 \
+	strmode.3 strdup.3 strerror.3 strpbrk.3 strrchr.3 strsep.3 strspn.3 \
+	strstr.3 strtok.3 strxfrm.3 swab.3
 #
 MLINKS+=strcasecmp.3 strncasecmp.3
 MLINKS+=strcat.3 strncat.3
diff --git a/lib/libc/sys/Makefile.inc b/lib/libc/sys/Makefile.inc
index 24d7395..fcdef38 100644
--- a/lib/libc/sys/Makefile.inc
+++ b/lib/libc/sys/Makefile.inc
@@ -1,5 +1,5 @@
 #	@(#)Makefile.inc	8.3 (Berkeley) 10/24/94
-#	$Id: Makefile.inc,v 1.40 1997/09/14 16:57:27 phk Exp $
+#	$Id: Makefile.inc,v 1.41 1997/10/10 05:48:16 dyson Exp $
 
 # sys sources
 .PATH: ${.CURDIR}/../libc/${MACHINE}/sys ${.CURDIR}/../libc/sys
@@ -88,39 +88,27 @@ ${SPSEUDOR}:
 	printf '#include "SYS.h"\nPPSEUDO(${.PREFIX},${.PREFIX:S/_//})\n' \
 	    > ${.TARGET}
 
-# Only build man pages with libc.
 .if ${LIB} == "c"
-MAN2+=	sys/accept.2 sys/access.2 sys/acct.2 sys/adjtime.2 sys/bind.2 \
-	sys/brk.2 sys/chdir.2 sys/chflags.2 sys/chmod.2 sys/chown.2 \
-	sys/chroot.2 sys/clock_gettime.2 sys/close.2 sys/connect.2 sys/dup.2 \
-	sys/execve.2 \
-	sys/_exit.2 sys/fcntl.2 sys/flock.2 sys/fork.2 sys/fsync.2 \
-	sys/getdirentries.2 sys/getdtablesize.2 sys/getfh.2 sys/getfsstat.2 \
-	sys/getgid.2 sys/getgroups.2 sys/getitimer.2 sys/getlogin.2 \
-	sys/getpeername.2 sys/getpgrp.2 sys/getpid.2 sys/getpriority.2 \
-	sys/getrlimit.2 sys/getrusage.2 sys/getsid.2 \
-	sys/getsockname.2 sys/getsockopt.2 \
-	sys/gettimeofday.2 sys/getuid.2 sys/intro.2 sys/ioctl.2 \
-	sys/issetugid.2 sys/kill.2 \
-	sys/ktrace.2 sys/link.2 sys/listen.2 sys/lseek.2 sys/mkdir.2 \
-	sys/mkfifo.2 sys/mknod.2 sys/madvise.2 sys/mincore.2 sys/minherit.2 \
-	sys/mlock.2 \
-	sys/mmap.2 sys/mount.2 sys/mprotect.2 sys/msync.2 sys/munmap.2 \
-	sys/nanosleep.2 \
-	sys/ptrace.2 sys/nfssvc.2 sys/open.2 sys/pathconf.2 sys/pipe.2 poll.2 \
-	sys/profil.2 sys/quotactl.2 sys/read.2 sys/readlink.2 sys/reboot.2 \
-	sys/recv.2 sys/rename.2 sys/revoke.2 sys/rfork.2 sys/rmdir.2 \
-	sys/rtprio.2 sys/select.2 \
-	sys/semctl.2 sys/semget.2 sys/semop.2 \
-	sys/send.2 sys/setgroups.2 \
-	sys/setpgid.2 sys/setregid.2 sys/setreuid.2 \
-	sys/setsid.2 sys/setuid.2 sys/shmat.2 sys/shmctl.2 sys/shmget.2 \
-	sys/shutdown.2 \
-	sys/sigaction.2 sys/sigpending.2 sys/sigprocmask.2 sys/sigreturn.2 \
-	sys/sigaltstack.2 sys/sigstack.2 sys/sigsuspend.2 sys/socket.2 \
-	sys/socketpair.2 sys/stat.2 sys/statfs.2 sys/swapon.2 sys/symlink.2 \
-	sys/sync.2 sys/syscall.2 sys/truncate.2 sys/umask.2 sys/unlink.2 \
-	sys/undelete.2 sys/utimes.2 sys/vfork.2 sys/wait.2 sys/write.2
+MAN2+=	accept.2 access.2 acct.2 adjtime.2 bind.2 brk.2 chdir.2 chflags.2 \
+	chmod.2 chown.2 chroot.2 clock_gettime.2 close.2 \
+	connect.2 dup.2 execve.2 _exit.2 \
+	fcntl.2 flock.2 fork.2 fsync.2 getdirentries.2 getdtablesize.2 \
+	getfh.2 getfsstat.2 getgid.2 getgroups.2 getitimer.2 getlogin.2 \
+	getpeername.2 getpgrp.2 getpid.2 getpriority.2 getrlimit.2 \
+	getrusage.2 getsid.2 getsockname.2 \
+	getsockopt.2 gettimeofday.2 getuid.2 \
+	intro.2 ioctl.2 issetugid.2 kill.2 ktrace.2 link.2 listen.2 lseek.2 \
+	mkdir.2 mkfifo.2 mknod.2 madvise.2 mincore.2 minherit.2 mlock.2 mmap.2 \
+	mount.2 mprotect.2 msync.2 munmap.2 nanosleep.2 \
+	ptrace.2 nfssvc.2 open.2 pathconf.2 pipe.2 poll.2 profil.2 quotactl.2 \
+	read.2 readlink.2 reboot.2 recv.2 rename.2 revoke.2 rfork.2 rmdir.2 \
+	rtprio.2 select.2 semctl.2 semget.2 semop.2 send.2 \
+	setgroups.2 setpgid.2 setregid.2 setreuid.2 setsid.2 setuid.2 \
+	shmat.2 shmctl.2 shmget.2 shutdown.2 \
+	sigaction.2 sigpending.2 sigprocmask.2 sigreturn.2 sigaltstack.2 \
+	sigstack.2 sigsuspend.2 socket.2 socketpair.2 stat.2 statfs.2 \
+	swapon.2 symlink.2 sync.2 syscall.2 truncate.2 umask.2 unlink.2 \
+	undelete.2 utimes.2 vfork.2 wait.2 write.2
 
 MLINKS+=brk.2 sbrk.2
 MLINKS+=dup.2 dup2.2
diff --git a/lib/libc/xdr/Makefile.inc b/lib/libc/xdr/Makefile.inc
index a60acf4..848d4a5 100644
--- a/lib/libc/xdr/Makefile.inc
+++ b/lib/libc/xdr/Makefile.inc
@@ -1,13 +1,12 @@
 #	@(#)Makefile	5.11 (Berkeley) 9/6/90
-#	$Id$
+#	$Id: Makefile.inc,v 1.8 1997/05/28 16:29:12 wpaul Exp $
 
 .PATH: ${.CURDIR}/../libc/xdr ${.CURDIR}/.
 SRCS+=	xdr.c xdr_array.c xdr_float.c xdr_mem.c \
 	xdr_rec.c xdr_reference.c xdr_stdio.c xdr_sizeof.c
 
-# Only build man pages with libc.
 .if ${LIB} == "c"
-MAN3+=	xdr/xdr.3
+MAN3+=	xdr.3
 
 MLINKS+=	xdr.3 xdr_array.3 \
 		xdr.3 xdr_bool.3 \