Index: head/lib/libc/Makefile.inc
===================================================================
--- head/lib/libc/Makefile.inc	(revision 107051)
+++ head/lib/libc/Makefile.inc	(nonexistent)
@@ -1,63 +0,0 @@
-# $FreeBSD$
-#
-# This file contains make rules that are shared by libc and libc_r.
-#
-# Define (empty) variables so that make doesn't give substitution
-# errors if the included makefiles don't change these:
-MDSRCS=
-MISRCS=
-MDASM=
-MIASM=
-NOASM=
-
-#
-# If there is a machine dependent makefile, use it:
-#
-.if exists(${.CURDIR}/../libc/${MACHINE_ARCH}/Makefile.inc)
-.include "${.CURDIR}/../libc/${MACHINE_ARCH}/Makefile.inc"
-.endif
-
-.include "${.CURDIR}/../libc/db/Makefile.inc"
-.include "${.CURDIR}/../libc/compat-43/Makefile.inc"
-.include "${.CURDIR}/../libc/gen/Makefile.inc"
-.if ${MACHINE_ARCH} != "powerpc"
-.include "${.CURDIR}/../libc/gmon/Makefile.inc"
-.endif
-.include "${.CURDIR}/../libc/locale/Makefile.inc"
-.include "${.CURDIR}/../libc/net/Makefile.inc"
-.include "${.CURDIR}/../libc/nls/Makefile.inc"
-.include "${.CURDIR}/../libc/posix1e/Makefile.inc"
-.if !defined(NO_QUAD)
-.include "${.CURDIR}/../libc/quad/Makefile.inc"
-.endif
-.include "${.CURDIR}/../libc/regex/Makefile.inc"
-.include "${.CURDIR}/../libc/stdio/Makefile.inc"
-.include "${.CURDIR}/../libc/stdlib/Makefile.inc"
-.include "${.CURDIR}/../libc/stdtime/Makefile.inc"
-.include "${.CURDIR}/../libc/string/Makefile.inc"
-.include "${.CURDIR}/../libc/sys/Makefile.inc"
-.include "${.CURDIR}/../libc/rpc/Makefile.inc"
-.include "${.CURDIR}/../libc/uuid/Makefile.inc"
-.include "${.CURDIR}/../libc/xdr/Makefile.inc"
-.if !defined(NO_YP_LIBC)
-CFLAGS+= -DYP
-.include "${.CURDIR}/../libc/yp/Makefile.inc"
-.endif
-.if !defined(NO_HESIOD_LIBC)
-CFLAGS+= -DHESIOD
-.endif
-
-# If there are no machine dependent sources, append all the
-# machine-independent sources:
-.if empty(MDSRCS)
-SRCS+=	${MISRCS}
-.else
-# Append machine-dependent sources, then append machine-independent sources
-# for which there is no machine-dependent variant.
-SRCS+=	${MDSRCS}
-.for _src in ${MISRCS}
-.if ${MDSRCS:R:M${_src:R}} == ""
-SRCS+=	${_src}
-.endif
-.endfor
-.endif

Property changes on: head/lib/libc/Makefile.inc
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/lib/libc/Makefile
===================================================================
--- head/lib/libc/Makefile	(revision 107051)
+++ head/lib/libc/Makefile	(revision 107052)
@@ -1,40 +1,95 @@
 #	@(#)Makefile	8.2 (Berkeley) 2/3/94
 # $FreeBSD$
 #
 # All library objects contain FreeBSD revision strings by default; they may be
 # excluded as a space-saving measure.  To produce a library that does
 # not contain these strings, add -DSTRIP_FBSDID (see <sys/cdefs.h>) to CFLAGS
 # below.  Note, there are no IDs for syscall stubs whose sources are generated.
 # To included legacy CSRG sccsid strings, add -DLIBC_SCCS and -DSYSLIBC_SCCS
 # (for system call stubs) to CFLAGS below.  -DSYSLIBC_SCCS affects just the
 # system call stubs.
 LIB=c
 SHLIB_MAJOR= 5
 CFLAGS+=-I${.CURDIR}/include -I${.CURDIR}/../../include
 AINC=	-I${.CURDIR}/${MACHINE_ARCH}
 CLEANFILES+=tags
 INSTALL_PIC_ARCHIVE=	yes
 PRECIOUSLIB=	yes
 
+# Define (empty) variables so that make doesn't give substitution
+# errors if the included makefiles don't change these:
+MDSRCS=
+MISRCS=
+MDASM=
+MIASM=
+NOASM=
+
 #
-# Include make rules that are shared with libc_r.
+# If there is a machine dependent makefile, use it:
 #
-.include "${.CURDIR}/Makefile.inc"
+.if exists(${.CURDIR}/${MACHINE_ARCH}/Makefile.inc)
+.include "${.CURDIR}/${MACHINE_ARCH}/Makefile.inc"
+.endif
+
+.include "${.CURDIR}/db/Makefile.inc"
+.include "${.CURDIR}/compat-43/Makefile.inc"
+.include "${.CURDIR}/gen/Makefile.inc"
+.if ${MACHINE_ARCH} != "powerpc"
+.include "${.CURDIR}/gmon/Makefile.inc"
+.endif
+.include "${.CURDIR}/locale/Makefile.inc"
+.include "${.CURDIR}/net/Makefile.inc"
+.include "${.CURDIR}/nls/Makefile.inc"
+.include "${.CURDIR}/posix1e/Makefile.inc"
+.if !defined(NO_QUAD)
+.include "${.CURDIR}/quad/Makefile.inc"
+.endif
+.include "${.CURDIR}/regex/Makefile.inc"
+.include "${.CURDIR}/stdio/Makefile.inc"
+.include "${.CURDIR}/stdlib/Makefile.inc"
+.include "${.CURDIR}/stdtime/Makefile.inc"
+.include "${.CURDIR}/string/Makefile.inc"
+.include "${.CURDIR}/sys/Makefile.inc"
+.include "${.CURDIR}/rpc/Makefile.inc"
+.include "${.CURDIR}/uuid/Makefile.inc"
+.include "${.CURDIR}/xdr/Makefile.inc"
+.if !defined(NO_YP_LIBC)
+CFLAGS+= -DYP
+.include "${.CURDIR}/yp/Makefile.inc"
+.endif
+.if !defined(NO_HESIOD_LIBC)
+CFLAGS+= -DHESIOD
+.endif
+
+# If there are no machine dependent sources, append all the
+# machine-independent sources:
+.if empty(MDSRCS)
+SRCS+=	${MISRCS}
+.else
+# Append machine-dependent sources, then append machine-independent sources
+# for which there is no machine-dependent variant.
+SRCS+=	${MDSRCS}
+.for _src in ${MISRCS}
+.if ${MDSRCS:R:M${_src:R}} == ""
+SRCS+=	${_src}
+.endif
+.endfor
+.endif
 
 KQSRCS=	adddi3.c anddi3.c ashldi3.c ashrdi3.c cmpdi2.c divdi3.c iordi3.c \
 	lshldi3.c lshrdi3.c moddi3.c muldi3.c negdi2.c notdi2.c qdivrem.c \
 	subdi3.c ucmpdi2.c udivdi3.c umoddi3.c xordi3.c
 KSRCS=	bcmp.c ffs.c index.c mcount.c rindex.c strcat.c strcmp.c strcpy.c \
 	strlen.c strncpy.c
 
 libkern: libkern.gen libkern.${MACHINE_ARCH}
 
 libkern.gen: ${KQSRCS} ${KSRCS}
 	cp -p ${.CURDIR}/quad/quad.h ${.ALLSRC} ${DESTDIR}/sys/libkern
 
 libkern.${MACHINE_ARCH}:: ${KMSRCS}
 .if defined(KMSRCS) && !empty(KMSRCS)
 	cp -p ${.ALLSRC} ${DESTDIR}/sys/libkern/${MACHINE_ARCH}
 .endif
 
 .include <bsd.lib.mk>
Index: head/lib/libc/alpha/gen/Makefile.inc
===================================================================
--- head/lib/libc/alpha/gen/Makefile.inc	(revision 107051)
+++ head/lib/libc/alpha/gen/Makefile.inc	(revision 107052)
@@ -1,47 +1,47 @@
 # $FreeBSD$
 
 SRCS+=	_setjmp.S fabs.S frexp.c infinity.c isinf.c ldexp.c modf.c setjmp.S
 SRCS+=	flt_rounds.c fpgetmask.c fpgetround.c fpgetsticky.c fpsetmask.c \
 	fpsetround.c fpsetsticky.c
 
 SRCS+=	sigsetjmp.S
 SRCS+=	__divqu.S __divq.S __divlu.S __divl.S
 SRCS+=	__remqu.S __remq.S __remlu.S __reml.S
 SRCS+=	rfork_thread.S
 SRCS+=	_ctx_start.S makecontext.c
 
 CLEANFILES+=	__divqu.S __divq.S __divlu.S __divl.S
 CLEANFILES+=	__remqu.S __remq.S __remlu.S __reml.S
 
 
-__divqu.S: ${.CURDIR}/../libc/alpha/gen/divrem.m4
+__divqu.S: ${.CURDIR}/alpha/gen/divrem.m4
 	m4 -DNAME=__divqu -DOP=div -DS=false -DWORDSIZE=64 \
 		${.ALLSRC} > ${.TARGET}
 
-__divq.S: ${.CURDIR}/../libc/alpha/gen/divrem.m4
+__divq.S: ${.CURDIR}/alpha/gen/divrem.m4
 	m4 -DNAME=__divq -DOP=div -DS=true -DWORDSIZE=64 \
 		${.ALLSRC} > ${.TARGET}
 
-__divlu.S: ${.CURDIR}/../libc/alpha/gen/divrem.m4
+__divlu.S: ${.CURDIR}/alpha/gen/divrem.m4
 	m4 -DNAME=__divlu -DOP=div -DS=false -DWORDSIZE=32 \
 		${.ALLSRC} > ${.TARGET}
 
-__divl.S: ${.CURDIR}/../libc/alpha/gen/divrem.m4
+__divl.S: ${.CURDIR}/alpha/gen/divrem.m4
 	m4 -DNAME=__divl -DOP=div -DS=true -DWORDSIZE=32 \
 		${.ALLSRC} > ${.TARGET}
 
-__remqu.S: ${.CURDIR}/../libc/alpha/gen/divrem.m4
+__remqu.S: ${.CURDIR}/alpha/gen/divrem.m4
 	m4 -DNAME=__remqu -DOP=rem -DS=false -DWORDSIZE=64 \
 		${.ALLSRC} > ${.TARGET}
 
-__remq.S: ${.CURDIR}/../libc/alpha/gen/divrem.m4
+__remq.S: ${.CURDIR}/alpha/gen/divrem.m4
 	m4 -DNAME=__remq -DOP=rem -DS=true -DWORDSIZE=64 \
 		${.ALLSRC} > ${.TARGET}
 
-__remlu.S: ${.CURDIR}/../libc/alpha/gen/divrem.m4
+__remlu.S: ${.CURDIR}/alpha/gen/divrem.m4
 	m4 -DNAME=__remlu -DOP=rem -DS=false -DWORDSIZE=32 \
 		${.ALLSRC} > ${.TARGET}
 
-__reml.S: ${.CURDIR}/../libc/alpha/gen/divrem.m4
+__reml.S: ${.CURDIR}/alpha/gen/divrem.m4
 	m4 -DNAME=__reml -DOP=rem -DS=true -DWORDSIZE=32 \
 		${.ALLSRC} > ${.TARGET}
Index: head/lib/libc/amd64/sys/Makefile.inc
===================================================================
--- head/lib/libc/amd64/sys/Makefile.inc	(revision 107051)
+++ head/lib/libc/amd64/sys/Makefile.inc	(revision 107052)
@@ -1,24 +1,22 @@
 #	from: Makefile.inc,v 1.1 1993/09/03 19:04:23 jtc Exp
 # $FreeBSD$
 
 SRCS+=	i386_clr_watch.c i386_get_ioperm.c i386_get_ldt.c i386_set_ioperm.c \
 	i386_set_ldt.c i386_set_watch.c i386_vm86.c
 
 MDASM=	Ovfork.S brk.S cerror.S exect.S pipe.S ptrace.S reboot.S sbrk.S \
 	setlogin.S sigreturn.S syscall.S
 
 # Don't generate default code for these syscalls:
 NOASM=	break.o exit.o ftruncate.o getdomainname.o getlogin.o \
 	lseek.o mlockall.o mmap.o munlockall.o openbsd_poll.o pread.o \
 	pwrite.o setdomainname.o sstk.o truncate.o uname.o vfork.o yield.o
 
 PSEUDO=	_getlogin.o _exit.o
 
-.if ${LIB} == "c"
 MAN+=	i386_get_ioperm.2 i386_get_ldt.2 i386_vm86.2
 MAN+=	i386_set_watch.3
 
 MLINKS+=i386_get_ioperm.2 i386_set_ioperm.2
 MLINKS+=i386_get_ldt.2 i386_set_ldt.2
 MLINKS+=i386_set_watch.3 i386_clr_watch.3
-.endif
Index: head/lib/libc/compat-43/Makefile.inc
===================================================================
--- head/lib/libc/compat-43/Makefile.inc	(revision 107051)
+++ head/lib/libc/compat-43/Makefile.inc	(revision 107052)
@@ -1,19 +1,17 @@
 #	@(#)Makefile.inc	8.1 (Berkeley) 6/2/93
 # $FreeBSD$
 
 # compat-43 sources
-.PATH: ${.CURDIR}/../libc/${MACHINE_ARCH}/compat-43 ${.CURDIR}/../libc/compat-43
+.PATH: ${.CURDIR}/${MACHINE_ARCH}/compat-43 ${.CURDIR}/compat-43
 
 SRCS+=	creat.c gethostid.c getwd.c killpg.c sethostid.c setpgrp.c \
 	setrgid.c setruid.c sigcompat.c
 
-.if ${LIB} == "c"
 MAN+=	creat.2 killpg.2 sigpause.2 sigsetmask.2 sigvec.2
 MAN+=	gethostid.3 setruid.3
 
 MLINKS+=gethostid.3 sethostid.3
 MLINKS+=setruid.3 setrgid.3
 
 MLINKS+=sigsetmask.2 sigblock.2
 MLINKS+=sigsetmask.2 sigmask.2
-.endif
Index: head/lib/libc/db/Makefile.inc
===================================================================
--- head/lib/libc/db/Makefile.inc	(revision 107051)
+++ head/lib/libc/db/Makefile.inc	(revision 107052)
@@ -1,11 +1,11 @@
 #	from @(#)Makefile.inc	8.2 (Berkeley) 2/21/94
 # $FreeBSD$
 #
 CFLAGS+=-D__DBINTERFACE_PRIVATE
 
-.include "${.CURDIR}/../libc/db/btree/Makefile.inc"
-.include "${.CURDIR}/../libc/db/db/Makefile.inc"
-.include "${.CURDIR}/../libc/db/hash/Makefile.inc"
-.include "${.CURDIR}/../libc/db/man/Makefile.inc"
-.include "${.CURDIR}/../libc/db/mpool/Makefile.inc"
-.include "${.CURDIR}/../libc/db/recno/Makefile.inc"
+.include "${.CURDIR}/db/btree/Makefile.inc"
+.include "${.CURDIR}/db/db/Makefile.inc"
+.include "${.CURDIR}/db/hash/Makefile.inc"
+.include "${.CURDIR}/db/man/Makefile.inc"
+.include "${.CURDIR}/db/mpool/Makefile.inc"
+.include "${.CURDIR}/db/recno/Makefile.inc"
Index: head/lib/libc/db/btree/Makefile.inc
===================================================================
--- head/lib/libc/db/btree/Makefile.inc	(revision 107051)
+++ head/lib/libc/db/btree/Makefile.inc	(revision 107052)
@@ -1,8 +1,8 @@
 #	from @(#)Makefile.inc	8.2 (Berkeley) 7/14/94
 # $FreeBSD$
 
-.PATH: ${.CURDIR}/../libc/db/btree
+.PATH: ${.CURDIR}/db/btree
 
 SRCS+=	bt_close.c bt_conv.c bt_debug.c bt_delete.c bt_get.c bt_open.c \
 	bt_overflow.c bt_page.c bt_put.c bt_search.c bt_seq.c bt_split.c \
 	bt_utils.c
Index: head/lib/libc/db/db/Makefile.inc
===================================================================
--- head/lib/libc/db/db/Makefile.inc	(revision 107051)
+++ head/lib/libc/db/db/Makefile.inc	(revision 107052)
@@ -1,6 +1,6 @@
 #       from @(#)Makefile.inc	8.1 (Berkeley) 6/4/93
 # $FreeBSD$
 
-.PATH: ${.CURDIR}/../libc/db/db
+.PATH: ${.CURDIR}/db/db
 
 SRCS+=	db.c
Index: head/lib/libc/db/hash/Makefile.inc
===================================================================
--- head/lib/libc/db/hash/Makefile.inc	(revision 107051)
+++ head/lib/libc/db/hash/Makefile.inc	(revision 107052)
@@ -1,7 +1,7 @@
 #       from @(#)Makefile.inc	8.1 (Berkeley) 6/4/93
 # $FreeBSD$
 
-.PATH: ${.CURDIR}/../libc/db/hash
+.PATH: ${.CURDIR}/db/hash
 
 SRCS+=	hash.c hash_bigkey.c hash_buf.c hash_func.c hash_log2.c \
 	hash_page.c ndbm.c
Index: head/lib/libc/db/man/Makefile.inc
===================================================================
--- head/lib/libc/db/man/Makefile.inc	(revision 107051)
+++ head/lib/libc/db/man/Makefile.inc	(revision 107052)
@@ -1,20 +1,18 @@
 #       from @(#)Makefile.inc	8.1 (Berkeley) 6/4/93
 # $FreeBSD$
 
-.PATH: ${.CURDIR}/../libc/db/man
+.PATH: ${.CURDIR}/db/man
 
-.if ${LIB} == "c"
 MAN+=	btree.3 dbm.3 dbopen.3 hash.3 mpool.3 recno.3
 
 MLINKS+= dbm.3 dbm_clearerr.3
 MLINKS+= dbm.3 dbm_close.3
 MLINKS+= dbm.3 dbm_delete.3
 MLINKS+= dbm.3 dbm_dirnfo.3
 MLINKS+= dbm.3 dbm_error.3
 MLINKS+= dbm.3 dbm_fetch.3
 MLINKS+= dbm.3 dbm_firstkey.3
 MLINKS+= dbm.3 dbm_nextkey.3
 MLINKS+= dbm.3 dbm_open.3
 MLINKS+= dbm.3 dbm_store.3
 MLINKS+= dbopen.3 db.3
-.endif
Index: head/lib/libc/db/mpool/Makefile.inc
===================================================================
--- head/lib/libc/db/mpool/Makefile.inc	(revision 107051)
+++ head/lib/libc/db/mpool/Makefile.inc	(revision 107052)
@@ -1,6 +1,6 @@
 #	from @(#)Makefile.inc	8.1 (Berkeley) 6/4/93
 # $FreeBSD$
 
-.PATH: ${.CURDIR}/../libc/db/mpool
+.PATH: ${.CURDIR}/db/mpool
 
 SRCS+=	mpool.c
Index: head/lib/libc/db/recno/Makefile.inc
===================================================================
--- head/lib/libc/db/recno/Makefile.inc	(revision 107051)
+++ head/lib/libc/db/recno/Makefile.inc	(revision 107052)
@@ -1,7 +1,7 @@
 #       from @(#)Makefile.inc	8.1 (Berkeley) 6/4/93
 # $FreeBSD$
 
-.PATH: ${.CURDIR}/../libc/db/recno
+.PATH: ${.CURDIR}/db/recno
 
 SRCS+=	rec_close.c rec_delete.c rec_get.c rec_open.c rec_put.c rec_search.c \
 	rec_seq.c rec_utils.c
Index: head/lib/libc/gen/Makefile.inc
===================================================================
--- head/lib/libc/gen/Makefile.inc	(revision 107051)
+++ head/lib/libc/gen/Makefile.inc	(revision 107052)
@@ -1,135 +1,133 @@
 #	@(#)Makefile.inc	8.6 (Berkeley) 5/4/95
 # $FreeBSD$
 
 # machine-independent gen sources
-.PATH: ${.CURDIR}/../libc/${MACHINE_ARCH}/gen ${.CURDIR}/../libc/gen
+.PATH: ${.CURDIR}/${MACHINE_ARCH}/gen ${.CURDIR}/gen
 
 SRCS+=  __xuname.c _pthread_stubs.c _rand48.c _spinlock_stub.c _thread_init.c \
 	alarm.c arc4random.c assert.c basename.c check_utility_compat.c \
 	clock.c closedir.c confstr.c \
 	crypt.c ctermid.c daemon.c devname.c dirname.c disklabel.c \
 	dlfcn.c dlfunc.c drand48.c erand48.c err.c errlst.c errno.c \
 	exec.c fmtcheck.c fmtmsg.c fnmatch.c fstab.c ftok.c fts.c \
 	getbootfile.c getbsize.c \
 	getcap.c getcwd.c getdomainname.c getgrent.c getgrouplist.c \
 	gethostname.c getloadavg.c getlogin.c getmntinfo.c getnetgrent.c \
 	getobjformat.c getosreldate.c getpagesize.c \
 	getpeereid.c getprogname.c getpwent.c getttyent.c \
 	getusershell.c getvfsbyname.c getvfsent.c glob.c \
 	initgroups.c isatty.c jrand48.c lcong48.c \
 	lockf.c lrand48.c mrand48.c nice.c \
 	nlist.c nrand48.c ntp_gettime.c opendir.c \
 	pause.c popen.c posixshm.c pselect.c psignal.c pw_scan.c pwcache.c \
 	raise.c readdir.c readpassphrase.c rewinddir.c \
 	scandir.c seed48.c seekdir.c semctl.c \
 	setdomainname.c sethostname.c setjmperr.c setmode.c \
 	setproctitle.c setprogname.c \
 	siginterrupt.c siglist.c signal.c \
 	sigsetops.c sleep.c srand48.c statvfs.c stringlist.c strtofflags.c \
 	sysconf.c sysctl.c sysctlbyname.c sysctlnametomib.c \
 	syslog.c telldir.c termios.c time.c times.c timezone.c ttyname.c \
 	ttyslot.c ualarm.c ulimit.c uname.c unvis.c usleep.c utime.c \
 	valloc.c vis.c wait.c wait3.c waitpid.c
 
 # machine-dependent gen sources
-.if exists(${.CURDIR}/../libc/${MACHINE_ARCH}/gen/Makefile.inc)
-.include "${.CURDIR}/../libc/${MACHINE_ARCH}/gen/Makefile.inc"
+.if exists(${.CURDIR}/${MACHINE_ARCH}/gen/Makefile.inc)
+.include "${.CURDIR}/${MACHINE_ARCH}/gen/Makefile.inc"
 .endif
 
-.if ${LIB} == "c"
 MAN+=	alarm.3 arc4random.3 \
 	basename.3 check_utility_compat.3 clock.3 \
 	confstr.3 ctermid.3 daemon.3 \
 	devname.3 directory.3 dirname.3 dladdr.3 dllockinit.3 dlopen.3 \
 	err.3 exec.3 fmtcheck.3 fmtmsg.3 fnmatch.3 frexp.3 ftok.3 fts.3 \
 	getbootfile.3 getbsize.3 getcap.3 getcontext.3 getcwd.3 \
 	getdiskbyname.3 getdomainname.3 getfsent.3 \
 	getgrent.3 getgrouplist.3 gethostname.3 getloadavg.3 \
 	getmntinfo.3 getnetgrent.3 getobjformat.3 \
 	getpagesize.3 getpass.3 getpeereid.3 getprogname.3 getpwent.3 \
 	getttyent.3 getusershell.3 getvfsbyname.3 getvfsent.3 \
 	glob.3 initgroups.3 isinf.3 ldexp.3 lockf.3 makecontext.3 \
 	modf.3 msgctl.3 msgget.3 msgrcv.3 msgsnd.3 \
 	nice.3 nlist.3 pause.3 popen.3 pselect.3 psignal.3 pwcache.3 \
 	raise.3 rand48.3 readpassphrase.3 rfork_thread.3 \
 	scandir.3 setjmp.3 setmode.3 setproctitle.3 shm_open.3 \
 	siginterrupt.3 signal.3 sigsetops.3 sleep.3 statvfs.3 stringlist.3 \
 	strtofflags.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 ucontext.3 ulimit.3 uname.3 \
 	unvis.3 usleep.3 utime.3 valloc.3 vis.3
 
 MLINKS+=arc4random.3 arc4random_addrandom.3 arc4random.3 arc4random_stir.3
 MLINKS+=ctermid.3 ctermid_r.3
 MLINKS+=directory.3 closedir.3 directory.3 dirfd.3 directory.3 opendir.3 \
 	directory.3 readdir.3 directory.3 readdir_r.3 directory.3 rewinddir.3 \
 	directory.3 seekdir.3 directory.3 telldir.3
 MLINKS+=dlopen.3 dlclose.3 dlopen.3 dlerror.3 dlopen.3 dlfunc.3 \
 	dlopen.3 dlsym.3
 MLINKS+=err.3 err_set_exit.3 err.3 err_set_file.3 err.3 errc.3 err.3 errx.3 \
 	err.3 verr.3 err.3 verrc.3 err.3 verrx.3 err.3 vwarn.3 err.3 vwarnc.3 \
 	err.3 vwarnx.3 err.3 warnc.3 err.3 warn.3 err.3 warnx.3
 MLINKS+=exec.3 execl.3 exec.3 execle.3 exec.3 execlp.3 exec.3 exect.3 \
 	exec.3 execv.3 exec.3 execvp.3
 MLINKS+=fts.3 fts_children.3 fts.3 fts_close.3 fts.3 fts_open.3 \
 	fts.3 fts_read.3 fts.3 fts_set.3
 MLINKS+=getcap.3 cgetcap.3 getcap.3 cgetclose.3 getcap.3 cgetent.3 \
 	getcap.3 cgetfirst.3 getcap.3 cgetmatch.3 getcap.3 cgetnext.3 \
 	getcap.3 cgetnum.3 getcap.3 cgetset.3 getcap.3 cgetstr.3 \
 	getcap.3 cgetustr.3
 MLINKS+=getcwd.3 getwd.3
 MLINKS+=getcontext.3 setcontext.3
 MLINKS+=getdomainname.3 setdomainname.3
 MLINKS+=getfsent.3 endfsent.3 getfsent.3 getfsfile.3 getfsent.3 getfsspec.3 \
 	getfsent.3 getfstype.3 getfsent.3 setfsent.3
 MLINKS+=getgrent.3 endgrent.3 getgrent.3 getgrgid.3 getgrent.3 getgrnam.3 \
 	getgrent.3 setgrent.3 getgrent.3 setgroupent.3
 MLINKS+=gethostname.3 sethostname.3
 MLINKS+=getnetgrent.3 endnetgrent.3 getnetgrent.3 innetgr.3 \
 	getnetgrent.3 setnetgrent.3
 MLINKS+=getprogname.3 setprogname.3
 MLINKS+=getpwent.3 endpwent.3 getpwent.3 getpwnam.3 getpwent.3 getpwuid.3 \
 	getpwent.3 setpassent.3 getpwent.3 setpwent.3 getpwent.3 setpwfile.3
 MLINKS+=getttyent.3 endttyent.3 getttyent.3 getttynam.3 \
 	getttyent.3 isdialuptty.3 getttyent.3 isnettty.3 \
 	getttyent.3 setttyent.3
 MLINKS+=getusershell.3 endusershell.3 getusershell.3 setusershell.3
 MLINKS+=getvfsent.3 endvfsent.3 getvfsent.3 getvfsbytype.3 \
 	getvfsent.3 setvfsent.3 getvfsent.3 vfsisloadable.3 \
 	getvfsent.3 vfsload.3
 MLINKS+=glob.3 globfree.3
 MLINKS+=isinf.3 isnan.3 isinf.3 isnanf.3
 MLINKS+=makecontext.3 swapcontext.3
 MLINKS+=popen.3 pclose.3
 MLINKS+=psignal.3 strsignal.3 psignal.3 sys_siglist.3 psignal.3 sys_signame.3
 MLINKS+=pwcache.3 group_from_gid.3 pwcache.3 user_from_uid.3
 MLINKS+=rand48.3 _rand48.3 rand48.3 drand48.3 rand48.3 erand48.3 \
 	rand48.3 jrand48.3 rand48.3 lcong48.3 rand48.3 lrand48.3 \
 	rand48.3 mrand48.3 rand48.3 nrand48.3 rand48.3 seed48.3 \
 	rand48.3 srand48.3
 MLINKS+=scandir.3 alphasort.3
 MLINKS+=setjmp.3 _longjmp.3 setjmp.3 _setjmp.3 setjmp.3 longjmp.3 \
 	setjmp.3 longjmperr.3 setjmp.3 longjmperror.3 \
 	setjmp.3 siglongjmp.3 setjmp.3 sigsetjmp.3
 MLINKS+=setmode.3 getmode.3
 MLINKS+=shm_open.3 shm_unlink.3
 MLINKS+=sigsetops.3 sigaddset.3 sigsetops.3 sigdelset.3 \
 	sigsetops.3 sigemptyset.3 sigsetops.3 sigfillset.3 \
 	sigsetops.3 sigismember.3
 MLINKS+=statvfs.3 fstatvfs.3
 MLINKS+=stringlist.3 sl_add.3 stringlist.3 sl_find.3 \
 	stringlist.3 sl_free.3 stringlist.3 sl_init.3
 MLINKS+=strtofflags.3 fflagstostr.3
 MLINKS+=sysctl.3 sysctlbyname.3 sysctl.3 sysctlnametomib.3
 MLINKS+=syslog.3 closelog.3 syslog.3 openlog.3 syslog.3 setlogmask.3 \
 	syslog.3 vsyslog.3
 MLINKS+=tcsendbreak.3 tcdrain.3 tcsendbreak.3 tcflow.3 tcsendbreak.3 tcflush.3
 MLINKS+=tcsetattr.3 cfgetispeed.3 tcsetattr.3 cfgetospeed.3 \
 	tcsetattr.3 cfmakeraw.3 tcsetattr.3 cfsetispeed.3 \
 	tcsetattr.3 cfsetospeed.3 tcsetattr.3 cfsetspeed.3 \
 	tcsetattr.3 tcgetattr.3
 MLINKS+=ttyname.3 isatty.3 ttyname.3 ttyslot.3
 MLINKS+=tzset.3 tzsetwall.3
 MLINKS+=unvis.3 strunvis.3 unvis.3 strunvisx.3
 MLINKS+=vis.3 strvis.3 vis.3 strvisx.3
-.endif
Index: head/lib/libc/gmon/Makefile.inc
===================================================================
--- head/lib/libc/gmon/Makefile.inc	(revision 107051)
+++ head/lib/libc/gmon/Makefile.inc	(revision 107052)
@@ -1,17 +1,15 @@
 #	from @(#)Makefile.inc	8.1 (Berkeley) 6/4/93
 # $FreeBSD$
 
 # gmon sources
-.PATH: ${.CURDIR}/../libc/gmon
+.PATH: ${.CURDIR}/gmon
 
 SRCS+=	gmon.c mcount.c
 
-.if ${LIB} == "c"
 MAN+=	moncontrol.3
 
 MLINKS+=moncontrol.3 monstartup.3
-.endif
 
 # mcount cannot be compiled with profiling
 mcount.po: mcount.o
 	cp mcount.o mcount.po
Index: head/lib/libc/i386/sys/Makefile.inc
===================================================================
--- head/lib/libc/i386/sys/Makefile.inc	(revision 107051)
+++ head/lib/libc/i386/sys/Makefile.inc	(revision 107052)
@@ -1,24 +1,22 @@
 #	from: Makefile.inc,v 1.1 1993/09/03 19:04:23 jtc Exp
 # $FreeBSD$
 
 SRCS+=	i386_clr_watch.c i386_get_ioperm.c i386_get_ldt.c i386_set_ioperm.c \
 	i386_set_ldt.c i386_set_watch.c i386_vm86.c
 
 MDASM=	Ovfork.S brk.S cerror.S exect.S pipe.S ptrace.S reboot.S sbrk.S \
 	setlogin.S sigreturn.S syscall.S
 
 # Don't generate default code for these syscalls:
 NOASM=	break.o exit.o ftruncate.o getdomainname.o getlogin.o \
 	lseek.o mlockall.o mmap.o munlockall.o openbsd_poll.o pread.o \
 	pwrite.o setdomainname.o sstk.o truncate.o uname.o vfork.o yield.o
 
 PSEUDO=	_getlogin.o _exit.o
 
-.if ${LIB} == "c"
 MAN+=	i386_get_ioperm.2 i386_get_ldt.2 i386_vm86.2
 MAN+=	i386_set_watch.3
 
 MLINKS+=i386_get_ioperm.2 i386_set_ioperm.2
 MLINKS+=i386_get_ldt.2 i386_set_ldt.2
 MLINKS+=i386_set_watch.3 i386_clr_watch.3
-.endif
Index: head/lib/libc/locale/Makefile.inc
===================================================================
--- head/lib/libc/locale/Makefile.inc	(revision 107051)
+++ head/lib/libc/locale/Makefile.inc	(revision 107052)
@@ -1,58 +1,56 @@
 #	from @(#)Makefile.inc	8.1 (Berkeley) 6/4/93
 # $FreeBSD$
 
 # locale sources
-.PATH: ${.CURDIR}/../libc/${MACHINE_ARCH}/locale ${.CURDIR}/../libc/locale
+.PATH: ${.CURDIR}/${MACHINE_ARCH}/locale ${.CURDIR}/locale
 
 SRCS+=	big5.c btowc.c collate.c collcmp.c euc.c fix_grouping.c frune.c \
 	isctype.c iswctype.c \
 	ldpart.c lmessages.c lmonetary.c lnumeric.c localeconv.c mblen.c \
 	mbrlen.c \
 	mbrtowc.c mbrune.c mbsinit.c mbsrtowcs.c mbtowc.c mbstowcs.c \
 	mskanji.c nl_langinfo.c nomacros.c none.c rune.c \
 	runetype.c setinvalidrune.c setlocale.c setrunelocale.c table.c \
 	tolower.c toupper.c utf2.c utf8.c wcrtomb.c wcsrtombs.c wcsftime.c \
 	wcstod.c \
 	wcstoimax.c wcstol.c wcstoll.c \
 	wcstombs.c \
 	wcstoul.c wcstoull.c wcstoumax.c wctob.c wctomb.c wctrans.c wctype.c \
 	wcwidth.c
 
-.if ${LIB} == "c"
 MAN+=	btowc.3 \
 	ctype.3 digittoint.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 iswalnum.3 isxdigit.3 mbrlen.3 mbrtowc.3 mbrune.3 mbsinit.3 \
 	mbsrtowcs.3 multibyte.3 \
 	nl_langinfo.3 \
 	rune.3 \
 	setlocale.3 toascii.3 tolower.3 toupper.3 towlower.3 towupper.3 \
 	wcsftime.3 \
 	wcrtomb.3 \
 	wcsrtombs.3 wcstod.3 wcstol.3 \
 	wctrans.3 wctype.3 wcwidth.3
 MAN+=	euc.4 utf2.4
 MAN+=	utf8.5
 
 MLINKS+=btowc.3 wctob.3
 MLINKS+=isdigit.3 isnumber.3
 MLINKS+=iswalnum.3 iswalpha.3 iswalnum.3 iswascii.3 iswalnum.3 iswblank.3 \
 	iswalnum.3 iswcntrl.3 iswalnum.3 iswdigit.3 iswalnum.3 iswgraph.3 \
 	iswalnum.3 iswhexnumber.3 iswalnum.3 iswhexnumber.3 \
 	iswalnum.3 iswideogram.3 iswalnum.3 iswlower.3 iswalnum.3 iswnumber.3 \
 	iswalnum.3 iswphonogram.3 iswalnum.3 iswprint.3 iswalnum.3 iswpunct.3 \
 	iswalnum.3 iswrune.3 iswalnum.3 iswspace.3 iswalnum.3 iswspecial.3 \
 	iswalnum.3 iswupper.3 iswalnum.3 iswxdigit.3
 MLINKS+=isxdigit.3 ishexnumber.3
 MLINKS+=mbrune.3 mbmb.3 mbrune.3 mbrrune.3
 MLINKS+=multibyte.3 mblen.3 multibyte.3 mbstowcs.3 multibyte.3 mbtowc.3 \
 	multibyte.3 wcstombs.3 multibyte.3 wctomb.3
 MLINKS+=rune.3 fgetrune.3 rune.3 fputrune.3 rune.3 fungetrune.3 \
 	rune.3 setinvalidrune.3 rune.3 setrunelocale.3 rune.3 sgetrune.3 \
 	rune.3 sputrune.3
 MLINKS+=setlocale.3 localeconv.3
 MLINKS+=wcstol.3 wcstoul.3 wcstol.3 wcstoll.3 wcstol.3 wcstoull.3 \
 	wcstol.3 wcstoimax.3 wcstol.3 wcstoumax.3
 MLINKS+=wctrans.3 towctrans.3
 MLINKS+=wctype.3 iswctype.3
-.endif
Index: head/lib/libc/net/Makefile.inc
===================================================================
--- head/lib/libc/net/Makefile.inc	(revision 107051)
+++ head/lib/libc/net/Makefile.inc	(revision 107052)
@@ -1,103 +1,101 @@
 #	from @(#)Makefile.inc	8.2 (Berkeley) 9/5/93
 # $FreeBSD$
 
 # machine-independent net sources
-.PATH: ${.CURDIR}/../libc/${MACHINE_ARCH}/net ${.CURDIR}/../libc/net
+.PATH: ${.CURDIR}/${MACHINE_ARCH}/net ${.CURDIR}/net
 
 SRCS+=	addr2ascii.c ascii2addr.c base64.c ether_addr.c getaddrinfo.c \
 	gethostbydns.c gethostbyht.c gethostbynis.c gethostnamadr.c \
 	getifaddrs.c getnameinfo.c \
 	getnetbydns.c getnetbyht.c getnetbynis.c getnetnamadr.c \
 	getproto.c getprotoent.c getprotoname.c getservbyname.c \
 	getservbyport.c getservent.c herror.c hesiod.c inet_addr.c \
 	if_indextoname.c if_nameindex.c if_nametoindex.c inet_lnaof.c \
 	inet_makeaddr.c inet_net_ntop.c inet_net_pton.c inet_neta.c \
 	inet_netof.c inet_network.c inet_ntoa.c inet_ntop.c \
 	inet_pton.c ip6opt.c linkaddr.c map_v4v6.c name6.c ns_addr.c \
 	ns_name.c ns_netint.c \
 	ns_ntoa.c ns_parse.c ns_print.c ns_ttl.c \
 	nsdispatch.c nslexer.c nsparser.c \
 	nsap_addr.c rcmd.c rcmdsh.c recv.c res_comp.c res_data.c res_debug.c \
 	res_init.c res_mkquery.c res_mkupdate.c res_query.c res_send.c \
 	res_update.c rthdr.c send.c vars.c
 # not supported: iso_addr.c 
 
 CFLAGS+=-DINET6 -I${.OBJDIR}
 
 YFLAGS+=-p_nsyy
 LFLAGS+=-P_nsyy
 
 CLEANFILES+=nsparser.c nslexer.c nsparser.h
 
 nsparser.h: nsparser.c
 	mv y.tab.h ${.TARGET}
 
 nslexer.c: nslexer.l nsparser.h
 	${LEX} ${LFLAGS} -o/dev/stdout ${.IMPSRC} | \
 		sed -e '/YY_BUF_SIZE/s/16384/1024/' >${.TARGET}
 
 # machine-dependent net sources
-.if exists(${.CURDIR}/../libc/${MACHINE_ARCH}/net/Makefile.inc)
-.include "${.CURDIR}/../libc/${MACHINE_ARCH}/net/Makefile.inc"
+.if exists(${.CURDIR}/${MACHINE_ARCH}/net/Makefile.inc)
+.include "${.CURDIR}/${MACHINE_ARCH}/net/Makefile.inc"
 .endif
 
-.if ${LIB} == "c"
 MAN+=	addr2ascii.3 byteorder.3 ethers.3 getaddrinfo.3 gethostbyname.3 \
 	getifaddrs.3 getipnodebyname.3 \
 	getnameinfo.3 getnetent.3 getprotoent.3 getservent.3 hesiod.3 \
 	if_indextoname.3 \
 	inet.3 inet_net.3 \
 	inet6_option_space.3 inet6_rthdr_space.3 linkaddr.3 \
 	nsdispatch.3 rcmd.3 rcmdsh.3 resolver.3
 # not installed: iso_addr.3 ns.3
 
 MLINKS+=addr2ascii.3 ascii2addr.3
 MLINKS+=byteorder.3 htonl.3 byteorder.3 htons.3 byteorder.3 ntohl.3 \
 	byteorder.3 ntohs.3
 MLINKS+=ethers.3 ether_aton.3 ethers.3 ether_hostton.3 ethers.3 ether_line.3 \
 	ethers.3 ether_ntoa.3 ethers.3 ether_ntohost.3
 MLINKS+=getaddrinfo.3 freeaddrinfo.3 getaddrinfo.3 gai_strerror.3
 MLINKS+=gethostbyname.3 endhostent.3 gethostbyname.3 gethostbyaddr.3 \
 	gethostbyname.3 gethostbyname2.3 gethostbyname.3 gethostent.3 \
 	gethostbyname.3 herror.3 gethostbyname.3 hstrerror.3 \
 	gethostbyname.3 sethostent.3
 MLINKS+=getifaddrs.3 freeifaddrs.3
 MLINKS+=getipnodebyname.3 getipnodebyaddr.3 getipnodebyname.3 freehostent.3
 MLINKS+=getnetent.3 endnetent.3 getnetent.3 getnetbyaddr.3 \
 	getnetent.3 getnetbyname.3 getnetent.3 setnetent.3
 MLINKS+=getprotoent.3 endprotoent.3 getprotoent.3 getprotobyname.3 \
 	getprotoent.3 getprotobynumber.3 getprotoent.3 setprotoent.3
 MLINKS+=getservent.3 endservent.3 getservent.3 getservbyname.3 \
 	getservent.3 getservbyport.3 getservent.3 setservent.3
 MLINKS+=if_indextoname.3 if_nametoindex.3 if_indextoname.3 if_nameindex.3 \
 	if_indextoname.3 if_freenameindex.3
 MLINKS+=inet.3 addr.3 inet.3 inet_addr.3 inet.3 inet_aton.3 \
 	inet.3 inet_lnaof.3 inet.3 inet_makeaddr.3 inet.3 inet_netof.3 \
 	inet.3 inet_network.3 inet.3 inet_ntoa.3 \
 	inet.3 inet_ntop.3 inet.3 inet_pton.3 \
 	inet.3 network.3 inet.3 ntoa.3 
 MLINKS+=inet_net.3 inet_net_ntop.3 inet_net.3 inet_net_pton.3
 MLINKS+=inet6_option_space.3 inet6_option_alloc.3 \
 	inet6_option_space.3 inet6_option_append.3 \
 	inet6_option_space.3 inet6_option_find.3 \
 	inet6_option_space.3 inet6_option_init.3 \
 	inet6_option_space.3 inet6_option_next.3 \
 	inet6_rthdr_space.3 inet6_rthdr_add.3 \
 	inet6_rthdr_space.3 inet6_rthdr_getaddr.3 \
 	inet6_rthdr_space.3 inet6_rthdr_getflags.3 \
 	inet6_rthdr_space.3 inet6_rthdr_init.3 \
 	inet6_rthdr_space.3 inet6_rthdr_lasthop.3 \
 	inet6_rthdr_space.3 inet6_rthdr_reverse.3 \
 	inet6_rthdr_space.3 inet6_rthdr_segments.3
 MLINKS+=linkaddr.3 link_addr.3 linkaddr.3 link_ntoa.3 
 #MLINKS+=ns.3 ns_addr.3 ns.3 ns_ntoa.3
 MLINKS+=rcmd.3 iruserok.3 rcmd.3 iruserok_sa.3 \
 	rcmd.3 rcmd_af.3 \
 	rcmd.3 rresvport.3 rcmd.3 rresvport_af.3 \
 	rcmd.3 ruserok.3
 MLINKS+=resolver.3 dn_comp.3 resolver.3 dn_expand.3 resolver.3 res_init.3 \
 	resolver.3 res_mkquery.3 resolver.3 res_query.3 \
 	resolver.3 res_search.3 resolver.3 res_send.3 resolver.3 dn_skipname.3 \
 	resolver.3 ns_get16.3 resolver.3 ns_get32.3 \
 	resolver.3 ns_put16.3 resolver.3 ns_put32.3
-.endif
Index: head/lib/libc/nls/Makefile.inc
===================================================================
--- head/lib/libc/nls/Makefile.inc	(revision 107051)
+++ head/lib/libc/nls/Makefile.inc	(revision 107052)
@@ -1,10 +1,8 @@
 #	from $NetBSD: Makefile.inc,v 1.7 1995/02/27 13:06:20 cgd Exp $
 # $FreeBSD$
 
-.PATH: ${.CURDIR}/../libc/nls
+.PATH: ${.CURDIR}/nls
 
 SRCS+=	msgcat.c
 
-.if ${LIB} == "c"
 MAN+=	catclose.3 catgets.3 catopen.3
-.endif
Index: head/lib/libc/posix1e/Makefile.inc
===================================================================
--- head/lib/libc/posix1e/Makefile.inc	(revision 107051)
+++ head/lib/libc/posix1e/Makefile.inc	(revision 107052)
@@ -1,85 +1,81 @@
 # $FreeBSD$
 
 MAINTAINER=	rwatson@FreeBSD.org
 
-.PATH: ${.CURDIR}/../libc/posix1e
+.PATH: ${.CURDIR}/posix1e
 
 SRCS+=	acl_calc_mask.c			\
 	acl_copy.c			\
 	acl_delete.c			\
 	acl_delete_entry.c		\
 	acl_entry.c			\
 	acl_free.c			\
 	acl_from_text.c			\
 	acl_get.c			\
 	acl_init.c			\
 	acl_perm.c			\
 	acl_set.c			\
 	acl_support.c			\
 	acl_to_text.c			\
 	acl_valid.c			\
 	extattr.c			\
 	mac.c				\
 	mac_exec.c			\
 	mac_get.c			\
 	mac_set.c
 
-.if ${LIB} == "c"
-
 MAN+=	acl.3				\
 	acl_add_perm.3			\
 	acl_calc_mask.3			\
 	acl_clear_perms.3		\
 	acl_copy_entry.3		\
 	acl_create_entry.3		\
 	acl_delete.3			\
 	acl_delete_entry.3		\
 	acl_delete_perm.3		\
 	acl_dup.3			\
 	acl_free.3			\
 	acl_from_text.3			\
 	acl_get.3			\
 	acl_get_entry.3			\
 	acl_get_permset.3		\
 	acl_get_perm_np.3		\
 	acl_get_qualifier.3		\
 	acl_get_tag_type.3		\
 	acl_init.3			\
 	acl_set.3			\
 	acl_set_permset.3		\
 	acl_set_qualifier.3		\
 	acl_set_tag_type.3		\
 	acl_to_text.3			\
 	acl_valid.3			\
 	extattr.3			\
 	mac.3				\
 	mac_free.3			\
 	mac_is_present_np.3		\
 	mac_get.3			\
 	mac_set.3			\
 	mac_text.3			\
 	posix1e.3
 
 MLINKS+=acl_delete.3 acl_delete_def_file.3	\
 	acl_delete.3 acl_delete_file_np.3	\
 	acl_delete.3 acl_delete_fd_np.3		\
 	acl_get.3 acl_get_file.3		\
 	acl_get.3 acl_get_fd.3			\
 	acl_get.3 acl_get_fd_np.3		\
 	acl_set.3 acl_set_file.3		\
 	acl_set.3 acl_set_fd.3			\
 	acl_set.3 acl_set_fd_np.3		\
 	acl_valid.3 acl_valid_file_np.3		\
 	acl_valid.3 acl_valid_fd_np.3		\
 	extattr.3 extattr_namespace_to_string.3	\
 	extattr.3 extattr_string_to_namespace.3 \
 	mac_get.3 mac_get_fd.3			\
 	mac_get.3 mac_get_file.3		\
 	mac_get.3 mac_get_proc.3		\
 	mac_set.3 mac_set_fd.3			\
 	mac_set.3 mac_set_file.3		\
 	mac_set.3 mac_set_proc.3		\
 	mac_text.3 mac_from_text.3		\
 	mac_text.3 mac_to_text.3
-
-.endif
Index: head/lib/libc/quad/Makefile.inc
===================================================================
--- head/lib/libc/quad/Makefile.inc	(revision 107051)
+++ head/lib/libc/quad/Makefile.inc	(revision 107052)
@@ -1,19 +1,19 @@
 #	from @(#)Makefile.inc	8.1 (Berkeley) 6/4/93
 # $FreeBSD$
 
 # Quad support, if needed
-.PATH: ${.CURDIR}/../libc/${MACHINE_ARCH}/quad ${.CURDIR}/../libc/quad
+.PATH: ${.CURDIR}/${MACHINE_ARCH}/quad ${.CURDIR}/quad
 
 .if ${MACHINE_ARCH} == "i386"
 
 SRCS+=	cmpdi2.c divdi3.c moddi3.c qdivrem.c ucmpdi2.c udivdi3.c umoddi3.c
 
 .else
 
 SRCS+=	adddi3.c anddi3.c ashldi3.c ashrdi3.c cmpdi2.c divdi3.c fixdfdi.c \
 	fixsfdi.c fixunsdfdi.c fixunssfdi.c floatdidf.c floatdisf.c \
 	floatunsdidf.c iordi3.c lshldi3.c lshrdi3.c moddi3.c muldi3.c \
 	negdi2.c notdi2.c qdivrem.c subdi3.c ucmpdi2.c udivdi3.c umoddi3.c \
 	xordi3.c
 
 .endif
Index: head/lib/libc/regex/Makefile.inc
===================================================================
--- head/lib/libc/regex/Makefile.inc	(revision 107051)
+++ head/lib/libc/regex/Makefile.inc	(revision 107052)
@@ -1,17 +1,15 @@
 #	from @(#)Makefile.inc	8.1 (Berkeley) 6/4/93
 # $FreeBSD$
 
 # regex sources
-.PATH: ${.CURDIR}/../libc/regex
+.PATH: ${.CURDIR}/regex
 
 CFLAGS+=-DPOSIX_MISTAKE
 
 SRCS+=	regcomp.c regerror.c regexec.c regfree.c
 
-.if ${LIB} == "c"
 MAN+=	regex.3
 MAN+=	re_format.7
 
 MLINKS+=regex.3 regcomp.3 regex.3 regexec.3 regex.3 regerror.3
 MLINKS+=regexec.3 regfree.3
-.endif
Index: head/lib/libc/rpc/Makefile.inc
===================================================================
--- head/lib/libc/rpc/Makefile.inc	(revision 107051)
+++ head/lib/libc/rpc/Makefile.inc	(revision 107052)
@@ -1,162 +1,162 @@
 #	@(#)Makefile    5.11 (Berkeley) 9/6/90
 # $FreeBSD$
 
-.PATH: ${.CURDIR}/../libc/rpc ${.CURDIR}/.
+.PATH: ${.CURDIR}/rpc ${.CURDIR}/.
 SRCS+=	auth_none.c auth_unix.c authunix_prot.c bindresvport.c clnt_bcast.c \
 	clnt_dg.c clnt_generic.c clnt_perror.c clnt_raw.c clnt_simple.c \
 	clnt_vc.c rpc_dtablesize.c getnetconfig.c getnetpath.c getrpcent.c \
 	getrpcport.c mt_misc.c pmap_clnt.c pmap_getmaps.c pmap_getport.c \
 	pmap_prot.c pmap_prot2.c pmap_rmt.c rpc_prot.c rpc_commondata.c \
 	rpc_callmsg.c rpc_generic.c rpc_soc.c rpcb_clnt.c rpcb_prot.c \
 	rpcb_st_xdr.c svc.c svc_auth.c svc_dg.c svc_auth_unix.c svc_generic.c \
 	svc_raw.c svc_run.c svc_simple.c svc_vc.c
 
 # XDR
 SRCS+=	xdr.c xdr_array.c xdr_float.c xdr_mem.c xdr_rec.c xdr_reference.c \
 	xdr_stdio.c
 
 # Secure-RPC
 SRCS+=  auth_time.c auth_des.c authdes_prot.c des_crypt.c des_soft.c \
 	crypt_client.c key_call.c key_prot_xdr.c getpublickey.c \
 	svc_auth_des.c
 
 # Resolver stuff
 SRCS+=	netname.c netnamer.c rpcdname.c
 
 # Misc Source
 SRCS+=	rtime.c
 
 # generated sources
 SRCS+=  crypt_clnt.c crypt_xdr.c crypt.h
 
 CFLAGS+= -DBROKEN_DES -DPORTMAP -DDES_BUILTIN
 
 CLEANFILES+= crypt_clnt.c crypt_xdr.c crypt.h
 
 RPCDIR= ${DESTDIR}/usr/include/rpcsvc
 RPCGEN= rpcgen -C
 
 crypt_clnt.c: ${RPCDIR}/crypt.x crypt.h
 	${RPCGEN} -l -o ${.TARGET} ${RPCDIR}/crypt.x
 
 crypt_xdr.c: ${RPCDIR}/crypt.x crypt.h
 	${RPCGEN} -c -o ${.TARGET} ${RPCDIR}/crypt.x
 
 crypt.h: ${RPCDIR}/crypt.x
 	${RPCGEN} -h -o ${.TARGET} ${RPCDIR}/crypt.x
 MAN+=	bindresvport.3 des_crypt.3 getnetconfig.3 getnetpath.3 getrpcent.3 \
 	getrpcport.3 rpc.3 rpc_soc.3 rpc_clnt_auth.3 rpc_clnt_calls.3 \
 	rpc_clnt_create.3 rpc_svc_calls.3 rpc_svc_create.3 rpc_svc_err.3 \
 	rpc_svc_reg.3 rpc_xdr.3 rpcbind.3 publickey.3 rpc_secure.3 \
 	rtime.3
 MAN+=	publickey.5 rpc.5 netconfig.5
 MLINKS+=	bindresvport.3 bindresvport_sa.3 \
 		getnetconfig.3 setnetconfig.3 \
 		getnetconfig.3 getnetconfigent.3 \
 		getnetconfig.3 endnetconfig.3 \
 		getnetconfig.3 nc_perror.3 \
 		getnetconfig.3 nc_sperror.3 \
 		getnetpath.3 setnetpath.3 \
 		getnetpath.3 endnetpath.3 \
 		getrpcent.3 getrpcbyname.3 \
 		getrpcent.3 getrpcbynumber.3 \
 		getrpcent.3 endrpcent.3 \
 		getrpcent.3 setrpcent.3 \
 		rpc_clnt_auth.3 auth_destroy.3 \
 		rpc_clnt_auth.3 authnone_create.3 \
 		rpc_clnt_auth.3 authsys_create.3 \
 		rpc_clnt_auth.3 authsys_create_default.3 \
 		rpc_clnt_calls.3 clnt_call.3 \
 		rpc_clnt_calls.3 clnt_perrno.3 \
 		rpc_clnt_calls.3 clnt_perror.3 \
 		rpc_clnt_calls.3 clnt_sperrno.3 \
 		rpc_clnt_calls.3 clnt_sperror.3 \
 		rpc_clnt_calls.3 rpc_call.3 \
 		rpc_clnt_calls.3 rpc_broadcast.3 \
 		rpc_clnt_calls.3 rpc_broadcast_exp.3 \
 		rpc_clnt_calls.3 clnt_freeres.3 \
 		rpc_clnt_calls.3 clnt_geterr.3 \
 		rpc_clnt_create.3 clnt_control.3 \
 		rpc_clnt_create.3 clnt_create.3 \
 		rpc_clnt_create.3 clnt_create_timed.3 \
 		rpc_clnt_create.3 clnt_create_vers.3 \
 		rpc_clnt_create.3 clnt_create_vers_timed.3 \
 		rpc_clnt_create.3 clnt_destroy.3 \
 		rpc_clnt_create.3 clnt_pcreateerror.3 \
 		rpc_clnt_create.3 clnt_spcreateerror.3 \
 		rpc_clnt_create.3 clnt_dg_create.3 \
 		rpc_clnt_create.3 clnt_raw_create.3 \
 		rpc_clnt_create.3 clnt_tli_create.3 \
 		rpc_clnt_create.3 clnt_tp_create.3 \
 		rpc_clnt_create.3 clnt_tp_create_timed.3 \
 		rpc_clnt_create.3 clnt_vc_create.3 \
 		rpc_svc_calls.3 svc_dg_enablecache.3 \
 		rpc_svc_calls.3 svc_exit.3 \
 		rpc_svc_calls.3 svc_freeargs.3 \
 		rpc_svc_calls.3 svc_getargs.3 \
 		rpc_svc_calls.3 svc_getreq_common.3 \
 		rpc_svc_calls.3 svc_getreq_poll.3 \
 		rpc_svc_calls.3 svc_getreqset.3 \
 		rpc_svc_calls.3 svc_getrpccaller.3 \
 		rpc_svc_calls.3 __svc_getcallercreds.3 \
 		rpc_svc_calls.3 svc_pollset.3 \
 		rpc_svc_calls.3 svc_run.3 \
 		rpc_svc_calls.3 svc_sendreply.3 \
 		rpc_svc_create.3 svc_control.3 \
 		rpc_svc_create.3 svc_create.3 \
 		rpc_svc_create.3 svc_dg_create.3 \
 		rpc_svc_create.3 svc_destroy.3 \
 		rpc_svc_create.3 svc_fd_create.3 \
 		rpc_svc_create.3 svc_raw_create.3 \
 		rpc_svc_create.3 svc_tli_create.3 \
 		rpc_svc_create.3 svc_tp_create.3 \
 		rpc_svc_create.3 svc_vc_create.3 \
 		rpc_svc_err.3 svcerr_auth.3 \
 		rpc_svc_err.3 svcerr_decode.3 \
 		rpc_svc_err.3 svcerr_noproc.3 \
 		rpc_svc_err.3 svcerr_noprog.3 \
 		rpc_svc_err.3 svcerr_progvers.3 \
 		rpc_svc_err.3 svcerr_systemerr.3 \
 		rpc_svc_err.3 svcerr_weakauth.3 \
 		rpc_svc_reg.3 rpc_reg.3 \
 		rpc_svc_reg.3 svc_reg.3 \
 		rpc_svc_reg.3 svc_unreg.3 \
 		rpc_svc_reg.3 svc_auth_reg.3 \
 		rpc_svc_reg.3 xprt_register.3 \
 		rpc_svc_reg.3 xprt_unregister.3 \
 		rpcbind.3 rpcb_getmaps.3 \
 		rpcbind.3 rpcb_getaddr.3 \
 		rpcbind.3 rpcb_gettime.3 \
 		rpcbind.3 rpcb_rmtcall.3 \
 		rpcbind.3 rpcb_set.3 \
 		rpcbind.3 rpcb_unset.3 \
 		rpc_soc.3 authunix_create.3 \
 		rpc_soc.3 authunix_create_default.3 \
 		rpc_soc.3 callrpc.3 \
 		rpc_soc.3 clnt_broadcast.3 \
 		rpc_soc.3 clntraw_create.3 \
 		rpc_soc.3 clnttcp_create.3 \
 		rpc_soc.3 clntunix_create.3 \
 		rpc_soc.3 clntudp_bufcreate.3 \
 		rpc_soc.3 clntudp_create.3 \
 		rpc_soc.3 get_myaddress.3 \
 		rpc_soc.3 pmap_getmaps.3 \
 		rpc_soc.3 pmap_getport.3 \
 		rpc_soc.3 pmap_rmtcall.3 \
 		rpc_soc.3 pmap_set.3 \
 		rpc_soc.3 pmap_unset.3 \
 		rpc_soc.3 registerrpc.3 \
 		rpc_soc.3 rpc_createerr.3 \
 		rpc_soc.3 svc_fds.3 \
 		rpc_soc.3 svc_fdset.3 \
 		rpc_soc.3 svc_getcaller.3 \
 		rpc_soc.3 svc_register.3 \
 		rpc_soc.3 svc_unregister.3 \
 		rpc_soc.3 svcfd_create.3 \
 		rpc_soc.3 svcunixfd_create.3 \
 		rpc_soc.3 svcraw_create.3 \
 		rpc_soc.3 svctcp_create.3 \
 		rpc_soc.3 svcudp_bufcreate.3 \
 		rpc_soc.3 svcunix_create.3 \
 		rpc_soc.3 xdr_pmap.3 \
 		rpc_soc.3 xdr_pmaplist.3
Index: head/lib/libc/sparc64/fpu/Makefile.inc
===================================================================
--- head/lib/libc/sparc64/fpu/Makefile.inc	(revision 107051)
+++ head/lib/libc/sparc64/fpu/Makefile.inc	(revision 107052)
@@ -1,8 +1,8 @@
 # $FreeBSD$
 
-.PATH: ${.CURDIR}/../libc/sparc64/fpu
+.PATH: ${.CURDIR}/sparc64/fpu
 
 CFLAGS+= -I${.CURDIR}/sparc64/sys
 
 SRCS+=	fpu.c fpu_add.c fpu_compare.c fpu_div.c fpu_explode.c fpu_implode.c \
 	fpu_mul.c fpu_qp.c fpu_reg.S fpu_sqrt.c fpu_subr.c
Index: head/lib/libc/stdio/Makefile.inc
===================================================================
--- head/lib/libc/stdio/Makefile.inc	(revision 107051)
+++ head/lib/libc/stdio/Makefile.inc	(revision 107052)
@@ -1,57 +1,55 @@
 #	@(#)Makefile.inc	8.3 (Berkeley) 4/17/94
 # $FreeBSD$
 
 # stdio sources
-.PATH: ${.CURDIR}/../libc/stdio
+.PATH: ${.CURDIR}/stdio
 
 SRCS+=	_flock_stub.c asprintf.c clrerr.c fclose.c fdopen.c feof.c ferror.c \
 	fflush.c fgetc.c fgetln.c fgetpos.c fgets.c fgetwc.c fgetws.c \
 	fileno.c findfp.c flags.c fopen.c fprintf.c fpurge.c fputc.c fputs.c \
 	fputwc.c fputws.c fread.c freopen.c fscanf.c fseek.c fsetpos.c \
 	ftell.c funopen.c fvwrite.c fwalk.c fwide.c fwprintf.c fwscanf.c \
 	fwrite.c getc.c \
 	getchar.c gets.c getw.c getwc.c getwchar.c makebuf.c mktemp.c \
 	perror.c printf.c putc.c putchar.c puts.c putw.c putwc.c putwchar.c \
 	refill.c remove.c rewind.c rget.c scanf.c setbuf.c setbuffer.c \
 	setvbuf.c snprintf.c sprintf.c sscanf.c stdio.c swprintf.c swscanf.c \
 	tempnam.c tmpfile.c \
 	tmpnam.c ungetc.c ungetwc.c vasprintf.c vfprintf.c vfscanf.c \
 	vfwprintf.c vfwscanf.c vprintf.c vscanf.c vsnprintf.c vsprintf.c \
 	vsscanf.c \
 	vswprintf.c vswscanf.c vwprintf.c vwscanf.c wbuf.c wprintf.c wscanf.c \
 	wsetup.c
 
-.if ${LIB} == "c"
 MAN+=	fclose.3 ferror.3 fflush.3 fgetln.3 fgets.3 fgetws.3 fopen.3 fputs.3 \
 	fputws.3 fread.3 fseek.3 funopen.3 fwide.3 getc.3 getwc.3 mktemp.3 \
 	printf.3 putc.3 putwc.3 remove.3 scanf.3 setbuf.3 stdio.3 tmpnam.3 \
 	ungetc.3 ungetwc.3 wprintf.3 wscanf.3
 
 MLINKS+=ferror.3 clearerr.3 ferror.3 feof.3 ferror.3 fileno.3
 MLINKS+=fflush.3 fpurge.3
 MLINKS+=fgets.3 gets.3
 MLINKS+=fopen.3 fdopen.3 fopen.3 freopen.3
 MLINKS+=fputs.3 puts.3
 MLINKS+=fread.3 fwrite.3
 MLINKS+=fseek.3 fgetpos.3 fseek.3 fseeko.3 fseek.3 fsetpos.3 fseek.3 ftell.3 \
 	fseek.3 ftello.3 fseek.3 rewind.3
 MLINKS+=funopen.3 fropen.3 funopen.3 fwopen.3
 MLINKS+=getc.3 fgetc.3 getc.3 getchar.3 getc.3 getw.3
 MLINKS+=getwc.3 fgetwc.3 getwc.3 getwchar.3
 MLINKS+=mktemp.3 mkdtemp.3 mktemp.3 mkstemp.3 mktemp.3 mkstemps.3
 MLINKS+=printf.3 asprintf.3 printf.3 fprintf.3 \
 	printf.3 snprintf.3 printf.3 sprintf.3 \
 	printf.3 vasprintf.3 \
 	printf.3 vfprintf.3 printf.3 vprintf.3 printf.3 vsnprintf.3 \
 	printf.3 vsprintf.3
 MLINKS+=putc.3 fputc.3 putc.3 putchar.3 putc.3 putw.3
 MLINKS+=putwc.3 fputwc.3 putwc.3 putwchar.3
 MLINKS+=scanf.3 fscanf.3 scanf.3 sscanf.3 scanf.3 vfscanf.3 scanf.3 vscanf.3 \
 	scanf.3 vsscanf.3
 MLINKS+=setbuf.3 setbuffer.3 setbuf.3 setlinebuf.3 setbuf.3 setvbuf.3
 MLINKS+=tmpnam.3 tempnam.3 tmpnam.3 tmpfile.3
 MLINKS+=wprintf.3 fwprintf.3 wprintf.3 swprintf.3 \
 	wprintf.3 vwprintf.3 wprintf.3 vfwprintf.3 wprintf.3 vswprintf.3
 MLINKS+=wscanf.3 fwscanf.3 wscanf.3 swscanf.3 wscanf.3 vwscanf.3 \
 	wscanf.3 vswscanf.3 wscanf.3 vfwscanf.3
-.endif
Index: head/lib/libc/stdlib/Makefile.inc
===================================================================
--- head/lib/libc/stdlib/Makefile.inc	(revision 107051)
+++ head/lib/libc/stdlib/Makefile.inc	(revision 107052)
@@ -1,42 +1,40 @@
 #	from @(#)Makefile.inc	8.3 (Berkeley) 2/4/95
 # $FreeBSD$
 
 # machine-independent stdlib sources
-.PATH: ${.CURDIR}/../libc/${MACHINE_ARCH}/stdlib ${.CURDIR}/../libc/stdlib
+.PATH: ${.CURDIR}/${MACHINE_ARCH}/stdlib ${.CURDIR}/stdlib
 
 MISRCS+=_Exit.c abort.c abs.c atexit.c atof.c atoi.c atol.c atoll.c \
 	bsearch.c calloc.c div.c exit.c getenv.c getopt.c getopt_long.c \
 	getsubopt.c hcreate.c heapsort.c imaxabs.c imaxdiv.c insque.c \
 	labs.c ldiv.c llabs.c lldiv.c lsearch.c malloc.c merge.c putenv.c \
 	qsort.c qsort_r.c radixsort.c rand.c random.c reallocf.c realpath.c \
 	remque.c setenv.c strfmon.c strhash.c strtod.c strtoimax.c strtol.c \
 	strtoll.c strtoq.c strtoul.c strtoull.c strtoumax.c strtouq.c \
 	system.c tdelete.c tfind.c tsearch.c twalk.c
 
 # machine-dependent stdlib sources
-.if exists(${.CURDIR}/../libc/${MACHINE_ARCH}/stdlib/Makefile.inc)
-.include "${.CURDIR}/../libc/${MACHINE_ARCH}/stdlib/Makefile.inc"
+.if exists(${.CURDIR}/${MACHINE_ARCH}/stdlib/Makefile.inc)
+.include "${.CURDIR}/${MACHINE_ARCH}/stdlib/Makefile.inc"
 .endif
 
-.if ${LIB} == "c"
 MAN+=	abort.3 abs.3 alloca.3 atexit.3 atof.3 atoi.3 atol.3 bsearch.3 \
 	div.3 exit.3 getenv.3 getopt.3 getopt_long.3 getsubopt.3 hcreate.3 \
 	imaxabs.3 imaxdiv.3 insque.3 labs.3 ldiv.3 llabs.3 lldiv.3 \
 	lsearch.3 malloc.3 memory.3 qsort.3 radixsort.3 rand.3 random.3 \
 	realpath.3 strfmon.3 strtod.3 strtol.3 strtoul.3 system.3 tsearch.3
 
 MLINKS+=atol.3 atoll.3
 MLINKS+=exit.3 _Exit.3
 MLINKS+=getenv.3 putenv.3 getenv.3 setenv.3 getenv.3 unsetenv.3
 MLINKS+=hcreate.3 hdestroy.3 hcreate.3 hsearch.3
 MLINKS+=insque.3 remque.3
 MLINKS+=lsearch.3 lfind.3
 MLINKS+=qsort.3 heapsort.3 qsort.3 mergesort.3 qsort.3 qsort_r.3
 MLINKS+=rand.3 rand_r.3 rand.3 srand.3 rand.3 sranddev.3
 MLINKS+=random.3 initstate.3 random.3 setstate.3 random.3 srandom.3 \
 	random.3 srandomdev.3
 MLINKS+=strtol.3 strtoll.3 strtol.3 strtoq.3 strtol.3 strtoimax.3
 MLINKS+=strtoul.3 strtoull.3 strtoul.3 strtouq.3 strtoul.3 strtoumax.3
 MLINKS+=malloc.3 calloc.3 malloc.3 free.3 malloc.3 realloc.3 malloc.3 reallocf.3
 MLINKS+=tsearch.3 tdelete.3 tsearch.3 tfind.3 tsearch.3 twalk.3
-.endif
Index: head/lib/libc/stdtime/Makefile.inc
===================================================================
--- head/lib/libc/stdtime/Makefile.inc	(revision 107051)
+++ head/lib/libc/stdtime/Makefile.inc	(revision 107052)
@@ -1,18 +1,16 @@
 #	Makefile.inc,v 1.2 1994/09/13 21:26:01 wollman Exp
 # $FreeBSD$
 
-.PATH:	${.CURDIR}/../libc/stdtime ${.CURDIR}/../locale
+.PATH:	${.CURDIR}/stdtime ${.CURDIR}/../locale
 
 SRCS+=	asctime.c difftime.c localtime.c strftime.c strptime.c timelocal.c \
 	time32.c
 
-.if ${LIB} == "c"
 MAN+=	ctime.3 strftime.3 strptime.3 time2posix.3
 MAN+=	tzfile.5
 
 MLINKS+=ctime.3 asctime.3 ctime.3 difftime.3 ctime.3 gmtime.3 \
 	ctime.3 localtime.3 ctime.3 mktime.3 ctime.3 timegm.3 \
 	ctime.3 ctime_r.3 ctime.3 localtime_r.3 ctime.3 gmtime_r.3 \
 	ctime.3 asctime_r.3
 MLINKS+=time2posix.3 posix2time.3
-.endif
Index: head/lib/libc/string/Makefile.inc
===================================================================
--- head/lib/libc/string/Makefile.inc	(revision 107051)
+++ head/lib/libc/string/Makefile.inc	(revision 107052)
@@ -1,57 +1,55 @@
 #	@(#)Makefile.inc	8.1 (Berkeley) 6/4/93
 # $FreeBSD$
 
-.PATH: ${.CURDIR}/../libc/${MACHINE_ARCH}/string ${.CURDIR}/../libc/string
+.PATH: ${.CURDIR}/${MACHINE_ARCH}/string ${.CURDIR}/string
 
-CFLAGS+= -I${.CURDIR}/../libc/locale
+CFLAGS+= -I${.CURDIR}/locale
 
 # machine-independent string sources
 MISRCS+=bcmp.c bcopy.c bzero.c ffs.c index.c memccpy.c memchr.c memcmp.c \
 	memcpy.c memmove.c memset.c rindex.c stpcpy.c strcasecmp.c strcat.c \
 	strchr.c strcmp.c strcoll.c strcpy.c strcspn.c strdup.c strerror.c \
 	strlcat.c strlcpy.c strlen.c strmode.c strncat.c strncmp.c strncpy.c \
 	strcasestr.c strnstr.c \
 	strpbrk.c strrchr.c strsep.c strsignal.c strspn.c strstr.c strtok.c \
 	strxfrm.c swab.c wcscat.c wcschr.c wcscmp.c wcscoll.c wcscpy.c \
 	wcscspn.c \
 	wcslcat.c wcslcpy.c wcslen.c wcsncat.c wcsncmp.c wcsncpy.c wcspbrk.c \
 	wcsrchr.c wcsspn.c wcsstr.c wcstok.c wcswidth.c wcsxfrm.c wmemchr.c \
 	wmemcmp.c \
 	wmemcpy.c wmemmove.c wmemset.c
 
 
 # machine-dependent string sources
-.if exists(${.CURDIR}/../libc/${MACHINE_ARCH}/string/Makefile.inc)
-.include "${.CURDIR}/../libc/${MACHINE_ARCH}/string/Makefile.inc"
+.if exists(${.CURDIR}/${MACHINE_ARCH}/string/Makefile.inc)
+.include "${.CURDIR}/${MACHINE_ARCH}/string/Makefile.inc"
 .endif
 
-.if ${LIB} == "c"
 MAN+=	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 strdup.3 strerror.3 \
 	string.3 strlcpy.3 strlen.3 strmode.3 strpbrk.3 strrchr.3 strsep.3 \
 	strspn.3 strstr.3 strtok.3 strxfrm.3 swab.3 wcscoll.3 wcstok.3 \
 	wcswidth.3 wcsxfrm.3 wmemchr.3
 
 MLINKS+=strcasecmp.3 strncasecmp.3
 MLINKS+=strcat.3 strncat.3
 MLINKS+=strcmp.3 strncmp.3
 MLINKS+=strcpy.3 stpcpy.3
 MLINKS+=strcpy.3 strncpy.3
 MLINKS+=strerror.3 perror.3 strerror.3 sys_errlist.3 strerror.3 sys_nerr.3
 MLINKS+=strerror.3 strerror_r.3
 MLINKS+=strlcpy.3 strlcat.3
 MLINKS+=strtok.3 strtok_r.3
 MLINKS+=strstr.3 strcasestr.3
 MLINKS+=strstr.3 strnstr.3
 MLINKS+=wmemchr.3 wmemcmp.3 wmemchr.3 wmemcpy.3 \
 	wmemchr.3 wmemmove.3 wmemchr.3 wmemset.3 \
 	wmemchr.3 wcscat.3 wmemchr.3 wcschr.3 \
 	wmemchr.3 wcscmp.3 wmemchr.3 wcscpy.3 \
 	wmemchr.3 wcscspn.3 wmemchr.3 wcslcat.3 \
 	wmemchr.3 wcslcpy.3 wmemchr.3 wcslen.3 \
 	wmemchr.3 wcsncat.3 wmemchr.3 wcsncmp.3 \
 	wmemchr.3 wcsncpy.3 wmemchr.3 wcspbrk.3 \
 	wmemchr.3 wcsrchr.3 wmemchr.3 wcsspn.3 \
 	wmemchr.3 wcsstr.3
-.endif
Index: head/lib/libc/sys/Makefile.inc
===================================================================
--- head/lib/libc/sys/Makefile.inc	(revision 107051)
+++ head/lib/libc/sys/Makefile.inc	(revision 107052)
@@ -1,145 +1,143 @@
 #	@(#)Makefile.inc	8.3 (Berkeley) 10/24/94
 # $FreeBSD$
 
 # sys sources
-.PATH: ${.CURDIR}/../libc/${MACHINE_ARCH}/sys ${.CURDIR}/../libc/sys
+.PATH: ${.CURDIR}/${MACHINE_ARCH}/sys ${.CURDIR}/sys
 
 # Include the generated makefile containing the *complete* list
 # of syscall names in MIASM.
 .include "${.CURDIR}/../../sys/sys/syscall.mk"
 
 # Include machine dependent definitions.
 #
 # MDASM names override the default syscall names in MIASM.
 # NOASM will prevent the default syscall code from being generated.
 #
-.if exists(${.CURDIR}/../libc/${MACHINE_ARCH}/sys/Makefile.inc)
-.include "${.CURDIR}/../libc/${MACHINE_ARCH}/sys/Makefile.inc"
+.if exists(${.CURDIR}/${MACHINE_ARCH}/sys/Makefile.inc)
+.include "${.CURDIR}/${MACHINE_ARCH}/sys/Makefile.inc"
 .endif
 
 # Sources common to both syscall interfaces:
 SRCS+=	ftruncate.c lseek.c mmap.c pread.c pwrite.c sem.c truncate.c __error.c
 
 # Add machine dependent asm sources:
 SRCS+=${MDASM}
 
 # Look though the complete list of syscalls (MIASM) for names that are
 # not defined with machine dependent implementations (MDASM) and are
 # not declared for no generation of default code (NOASM).  Add each
 # syscall that satisfies these conditions to the ASM list.
 .for _asm in ${MIASM}
 .if (${MDASM:R:M${_asm:R}} == "")
 .if (${NOASM:R:M${_asm:R}} == "")
 ASM+=$(_asm)
 .endif
 .endif
 .endfor
 
 OBJS+=	${ASM} ${PSEUDO}
 
 SASM=	${ASM:S/.o/.S/}
 
 SPSEUDO= ${PSEUDO:S/.o/.S/}
 
 SRCS+=	${SASM} ${SPSEUDO}
 
 # Generated files
 CLEANFILES+=	${SASM} ${SPSEUDO}
 
 ${SASM}:
 	printf '#include "SYS.h"\nRSYSCALL(${.PREFIX})\n' > ${.TARGET}
 
 ${SPSEUDO}:
 	printf '#include "SYS.h"\nPSEUDO(${.PREFIX:S/_//})\n' \
 	    > ${.TARGET}
 
-.if ${LIB} == "c"
 MAN+=	_exit.2 accept.2 access.2 acct.2 adjtime.2 \
 	aio_cancel.2 aio_error.2 aio_read.2 aio_return.2 \
 	aio_suspend.2 aio_waitcomplete.2 aio_write.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 extattr_get_file.2 \
 	fcntl.2 fhopen.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 jail.2 kenv.2 kill.2 \
 	kldfind.2 kldfirstmod.2 kldload.2 kldnext.2 kldstat.2 kldsym.2 \
 	kldunload.2 kqueue.2 kse.2 ktrace.2 link.2 listen.2 lseek.2 \
 	madvise.2 mincore.2 minherit.2 mkdir.2 mkfifo.2 mknod.2 mlock.2 mmap.2 \
 	modfind.2 modnext.2 modstat.2 \
 	mount.2 mprotect.2 msync.2 munmap.2 nanosleep.2 \
 	nfssvc.2 open.2 pathconf.2 pipe.2 poll.2 profil.2 ptrace.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 sendfile.2 \
 	setgroups.2 setpgid.2 setregid.2 setresuid.2 setreuid.2 setsid.2 \
 	setuid.2 shmat.2 shmctl.2 shmget.2 shutdown.2 \
 	sigaction.2 sigaltstack.2 sigpending.2 sigprocmask.2 sigreturn.2 \
 	sigstack.2 sigsuspend.2 socket.2 socketpair.2 stat.2 statfs.2 \
 	swapon.2 symlink.2 sync.2 sysarch.2 syscall.2 \
 	truncate.2 umask.2 undelete.2 \
 	unlink.2 utimes.2 uuidgen.2 vfork.2 wait.2 write.2
 .if !defined(NO_P1003_1B)
 MAN+=	sched_get_priority_max.2 sched_setparam.2 \
 	sched_setscheduler.2 sched_yield.2
 .endif
 
 MLINKS+=access.2 eaccess.2
 MLINKS+=brk.2 sbrk.2
 MLINKS+=chdir.2 fchdir.2
 MLINKS+=chflags.2 fchflags.2 chflags.2 lchflags.2
 MLINKS+=chmod.2 fchmod.2 chmod.2 lchmod.2
 MLINKS+=chown.2 fchown.2 chown.2 lchown.2
 MLINKS+=clock_gettime.2 clock_getres.2 clock_gettime.2 clock_settime.2
 MLINKS+=dup.2 dup2.2
 MLINKS+=extattr_get_file.2 extattr_set_file.2 \
 	extattr_get_file.2 extattr_delete_file.2 \
 	extattr_get_file.2 extattr_get_fd.2 \
 	extattr_get_file.2 extattr_set_fd.2 \
 	extattr_get_file.2 extattr_delete_fd.2 \
 	extattr_get_file.2 extattr.2
 MLINKS+=fhopen.2 fhstat.2 fhopen.2 fhstatfs.2
 MLINKS+=getdirentries.2 getdents.2
 MLINKS+=getgid.2 getegid.2
 MLINKS+=getitimer.2 setitimer.2
 MLINKS+=getlogin.2 getlogin_r.3
 MLINKS+=getlogin.2 setlogin.2
 MLINKS+=getpgrp.2 getpgid.2
 MLINKS+=getpid.2 getppid.2
 MLINKS+=getpriority.2 setpriority.2
 MLINKS+=getrlimit.2 setrlimit.2
 MLINKS+=getsockopt.2 setsockopt.2
 MLINKS+=gettimeofday.2 settimeofday.2
 MLINKS+=getuid.2 geteuid.2
 MLINKS+=intro.2 errno.2
 MLINKS+=kqueue.2 kevent.2
 MLINKS+=kse.2 kse_create.2 kse.2 kse_exit.2 kse.2 kse_release.2 \
 	kse.2 kse_wakeup.2 kse.2 kse_thr_interrupt.2
 MLINKS+=mlock.2 munlock.2
 MLINKS+=modnext.2 modfnext.2
 MLINKS+=mount.2 unmount.2
 MLINKS+=pathconf.2 fpathconf.2
 MLINKS+=read.2 pread.2 read.2 readv.2
 MLINKS+=recv.2 recvfrom.2 recv.2 recvmsg.2
 MLINKS+=send.2 sendmsg.2 send.2 sendto.2
 MLINKS+=setpgid.2 setpgrp.2
 MLINKS+=setresuid.2 setresgid.2 setresuid.2 getresuid.2 setresuid.2 getresgid.2
 MLINKS+=setuid.2 setegid.2 setuid.2 seteuid.2 setuid.2 setgid.2
 MLINKS+=shmat.2 shmdt.2
 MLINKS+=stat.2 fstat.2 stat.2 lstat.2
 MLINKS+=statfs.2 fstatfs.2
 MLINKS+=syscall.2 __syscall.2
 MLINKS+=truncate.2 ftruncate.2
 MLINKS+=utimes.2 futimes.2 utimes.2 lutimes.2
 MLINKS+=wait.2 wait3.2 wait.2 wait4.2 wait.2 waitpid.2
 MLINKS+=write.2 pwrite.2 write.2 writev.2
 .if !defined(NO_P1003_1B)
 MLINKS+=sched_get_priority_max.2 sched_get_priority_min.2 \
 	sched_get_priority_max.2 sched_rr_get_interval.2
 MLINKS+=sched_setparam.2 sched_getparam.2
 MLINKS+=sched_setscheduler.2 sched_getscheduler.2
-.endif
 .endif
Index: head/lib/libc/uuid/Makefile.inc
===================================================================
--- head/lib/libc/uuid/Makefile.inc	(revision 107051)
+++ head/lib/libc/uuid/Makefile.inc	(revision 107052)
@@ -1,20 +1,18 @@
 # $FreeBSD$
 
 # DCE 1.1 UUID implementation sources
 
-.PATH: ${.CURDIR}/../libc/uuid
+.PATH: ${.CURDIR}/uuid
 
 SRCS+=	uuid_compare.c uuid_create.c uuid_create_nil.c uuid_equal.c \
 	uuid_from_string.c uuid_hash.c uuid_is_nil.c uuid_to_string.c
 
-.if ${LIB} == "c"
 MAN+=	uuid.3
 MLINKS+=uuid.3 uuid_compare.3
 MLINKS+=uuid.3 uuid_create.3
 MLINKS+=uuid.3 uuid_create_nil.3
 MLINKS+=uuid.3 uuid_equal.3
 MLINKS+=uuid.3 uuid_from_string.3
 MLINKS+=uuid.3 uuid_hash.3
 MLINKS+=uuid.3 uuid_is_nil.3
 MLINKS+=uuid.3 uuid_to_string.3
-.endif
Index: head/lib/libc/xdr/Makefile.inc
===================================================================
--- head/lib/libc/xdr/Makefile.inc	(revision 107051)
+++ head/lib/libc/xdr/Makefile.inc	(revision 107052)
@@ -1,50 +1,48 @@
 #	@(#)Makefile	5.11 (Berkeley) 9/6/90
 # $FreeBSD$
 
-.PATH: ${.CURDIR}/../libc/xdr ${.CURDIR}/.
+.PATH: ${.CURDIR}/xdr ${.CURDIR}/.
 SRCS+=	xdr.c xdr_array.c xdr_float.c xdr_mem.c \
 	xdr_rec.c xdr_reference.c xdr_stdio.c
 
-.if ${LIB} == "c"
 MAN+=	xdr.3
 
 MLINKS+=	rpc_xdr.3 xdr_accepted_reply.3 \
 		rpc_xdr.3 xdr_authsys_parms.3 \
 		rpc_xdr.3 xdr_callhdr.3 \
 		rpc_xdr.3 xdr_callmsg.3 \
 		rpc_xdr.3 xdr_opaque_auth.3 \
 		rpc_xdr.3 xdr_rejected_reply.3 \
 		rpc_xdr.3 xdr_replymsg.3 \
 		xdr.3 xdr_array.3 \
 		xdr.3 xdr_bool.3 \
 		xdr.3 xdr_bytes.3 \
 		xdr.3 xdr_char.3 \
 		xdr.3 xdr_destroy.3 \
 		xdr.3 xdr_double.3 \
 		xdr.3 xdr_enum.3 \
 		xdr.3 xdr_float.3 \
 		xdr.3 xdr_free.3 \
 		xdr.3 xdr_getpos.3 \
 		xdr.3 xdr_inline.3 \
 		xdr.3 xdr_int.3 \
 		xdr.3 xdr_long.3 \
 		xdr.3 xdrmem_create.3 \
 		xdr.3 xdr_opaque.3 \
 		xdr.3 xdr_pointer.3 \
 		xdr.3 xdrrec_create.3 \
 		xdr.3 xdrrec_endofrecord.3 \
 		xdr.3 xdrrec_eof.3 \
 		xdr.3 xdrrec_skiprecord.3 \
 		xdr.3 xdr_reference.3 \
 		xdr.3 xdr_setpos.3 \
 		xdr.3 xdr_short.3 \
 		xdr.3 xdrstdio_create.3 \
 		xdr.3 xdr_string.3 \
 		xdr.3 xdr_u_char.3 \
 		xdr.3 xdr_u_long.3 \
 		xdr.3 xdr_u_short.3 \
 		xdr.3 xdr_union.3 \
 		xdr.3 xdr_vector.3 \
 		xdr.3 xdr_void.3 \
                 xdr.3 xdr_wrapstring.3
-.endif
Index: head/lib/libc/yp/Makefile.inc
===================================================================
--- head/lib/libc/yp/Makefile.inc	(revision 107051)
+++ head/lib/libc/yp/Makefile.inc	(revision 107052)
@@ -1,17 +1,17 @@
 #	from: @(#)Makefile.inc	5.3 (Berkeley) 2/20/91
 # $FreeBSD$
 
 # yp sources
-.PATH: ${.CURDIR}/../libc/yp
+.PATH: ${.CURDIR}/yp
 
 SRCS+=	xdryp.c yp.h yp_xdr.c yplib.c
 CLEANFILES+=	yp.h yp_xdr.c
 
 RPCSRC=	${DESTDIR}/usr/include/rpcsvc/yp.x
 RPCGEN=	rpcgen -C
 
 yp_xdr.c: ${RPCSRC}
 	${RPCGEN} -c -o ${.TARGET} ${RPCSRC}
 
 yp.h: ${RPCSRC}
 	${RPCGEN} -h -o ${.TARGET} ${RPCSRC}