Stage 3 of dynamic root support. Make all the libraries needed to run

binaries in /bin and /sbin installed in /lib. Only the versioned files
reside in /lib, the .so symlink continues to live /usr/lib so the
toolchain doesn't need to be modified.

gnu/lib/libreadline/readline/Makefile

@@ -4,6 +4,7 @@ SUBDIR= doc
 
 LIB=    readline
 MAN=    doc/readline.3
+SHLIBDIR?=	/lib
 
 TILDESRC= tilde.c
 SRCS=     readline.c vi_mode.c funmap.c keymaps.c parens.c search.c \

lib/libalias/Makefile

@@ -1,6 +1,7 @@
 # $FreeBSD$
 
 LIB=	alias
+SHLIBDIR?=	/lib
 SHLIB_MAJOR=	4
 MAN=	libalias.3
 SRCS=	alias.c alias_cuseeme.c alias_db.c alias_ftp.c alias_irc.c \

lib/libatm/Makefile

@@ -28,6 +28,7 @@
 #
 
 LIB=	atm
+SHLIBDIR?=	/lib
 SRCS=	atm_addr.c cache_key.c ioctl_subr.c ip_addr.c ip_checksum.c timer.c
 INCS=	libatm.h
 

lib/libc/Makefile

@@ -10,6 +10,7 @@
 # system call stubs.
 LIB=c
 SHLIB_MAJOR= 5
+SHLIBDIR?=/lib
 CFLAGS+=-I${.CURDIR}/include -I${.CURDIR}/../../include
 CFLAGS+=-I${.CURDIR}/${MACHINE_ARCH}
 CLEANFILES+=tags

lib/libcam/Makefile

@@ -1,6 +1,7 @@
 # $FreeBSD$
 
 LIB=		cam
+SHLIBDIR?=	/lib
 SRCS=		camlib.c scsi_cmdparse.c scsi_all.c scsi_da.c scsi_sa.c cam.c
 INCS=		camlib.h
 

lib/libcrypt/Makefile

@@ -4,6 +4,7 @@
 
 SHLIB_MAJOR=	2
 LIB=		crypt
+SHLIBDIR?=	/lib
 
 .PATH:		${.CURDIR}/../libmd
 SRCS=		crypt.c misc.c \

lib/libdevstat/Makefile

@@ -1,6 +1,7 @@
 # $FreeBSD$
 
 LIB=	devstat
+SHLIBDIR?=	/lib
 # Bump DEVSTAT_USER_API_VER in devstat.h every time this is incremented.
 SHLIB_MAJOR= 4
 SRCS=	devstat.c

lib/libedit/Makefile

@@ -4,6 +4,7 @@
 
 LIB=	edit
 SHLIB_MAJOR=	4
+SHLIBDIR?=	/lib
 
 OSRCS=	chared.c common.c el.c emacs.c fcns.c help.c hist.c key.c map.c \
 	parse.c prompt.c read.c refresh.c search.c sig.c term.c tty.c vi.c

lib/libexpat/Makefile

@@ -3,6 +3,7 @@
 EXPAT=		${.CURDIR}/../../contrib/expat
 
 LIB=		bsdxml
+SHLIBDIR?=	/lib
 SHLIB_MAJOR=	1
 SRCS=		xmlparse.c xmlrole.c xmltok.c
 INCS=		bsdxml.h

lib/libgeom/Makefile

@@ -1,6 +1,7 @@
 # $FreeBSD$
 
 LIB=	geom
+SHLIBDIR?=	/lib
 SRCS+=	geom_getxml.c
 SRCS+=	geom_stats.c
 SRCS+=	geom_xml2tree.c

lib/libipsec/Makefile

@@ -27,6 +27,7 @@
 # $FreeBSD$
 
 LIB=	ipsec
+SHLIBDIR?=	/lib
 SHLIB_MAJOR= 1
 CFLAGS+=-I. -I${.CURDIR}
 CFLAGS+=-DIPSEC_DEBUG -DIPSEC

lib/libipx/Makefile

@@ -1,6 +1,7 @@
 # $FreeBSD$
 
 LIB=	ipx
+SHLIBDIR?=	/lib
 SRCS=	ipx_addr.c ipx_ntoa.c
 MAN=	ipx.3
 MLINKS+=ipx.3 ipx_addr.3 ipx.3 ipx_ntoa.3

lib/libkvm/Makefile

@@ -2,6 +2,7 @@
 # $FreeBSD$
 
 LIB=	kvm
+SHLIBDIR?=/lib
 CFLAGS+=-DLIBC_SCCS -I${.CURDIR}
 SRCS=	kvm.c kvm_${MACHINE_ARCH}.c kvm_file.c kvm_getloadavg.c \
 	kvm_getswapinfo.c kvm_proc.c

lib/libmd/Makefile

@@ -1,6 +1,7 @@
 # $FreeBSD$
 
 LIB=	md
+SHLIBDIR?=	/lib
 SRCS=	md2c.c md4c.c md5c.c md2hl.c md4hl.c md5hl.c \
 	rmd160c.c rmd160hl.c \
 	sha0c.c sha0hl.c sha1c.c sha1hl.c

lib/libncurses/Makefile

@@ -3,6 +3,7 @@
 NCURSES=${.CURDIR}/../../contrib/ncurses
 
 LIB=	ncurses
+SHLIBDIR?=	/lib
 SHLIB_MAJOR=5
 
 # Should be elsewhere
@@ -233,11 +234,11 @@ SYMLINKS+=libncurses.a ${LIBDIR}/libmytinfo.a
 SYMLINKS+=libncurses.a ${LIBDIR}/libtinfo.a
 .if !defined(NOPIC)
 # no need for major at all, it's an ld-time redirection only
-SYMLINKS+=libncurses.so ${SHLIBDIR}/libcurses.so
-SYMLINKS+=libncurses.so ${SHLIBDIR}/libtermcap.so
-SYMLINKS+=libncurses.so ${SHLIBDIR}/libtermlib.so
-SYMLINKS+=libncurses.so ${SHLIBDIR}/libmytinfo.so
-SYMLINKS+=libncurses.so ${SHLIBDIR}/libtinfo.so
+SYMLINKS+=libncurses.so ${LIBDIR}/libcurses.so
+SYMLINKS+=libncurses.so ${LIBDIR}/libtermcap.so
+SYMLINKS+=libncurses.so ${LIBDIR}/libtermlib.so
+SYMLINKS+=libncurses.so ${LIBDIR}/libmytinfo.so
+SYMLINKS+=libncurses.so ${LIBDIR}/libtinfo.so
 .endif
 .if !defined(NOPROFILE)
 SYMLINKS+=libncurses_p.a ${LIBDIR}/libcurses_p.a

lib/libsbuf/Makefile

@@ -1,6 +1,7 @@
 # $FreeBSD$
 
 LIB=	sbuf
+SHLIBDIR?=	/lib
 SRCS=	subr_sbuf.c 
 WARNS?= 2
 

lib/libufs/Makefile

@@ -1,6 +1,7 @@
 # $FreeBSD$
 
 LIB=	ufs
+SHLIBDIR?=	/lib
 SRCS=	block.c cgroup.c inode.c sblock.c type.c
 INCS=	libufs.h
 MAN=	bread.3 cgread.3 libufs.3 sbread.3 ufs_disk_close.3

lib/libutil/Makefile

@@ -3,6 +3,7 @@
 
 LIB=	util
 SHLIB_MAJOR= 3
+SHLIBDIR?=/lib
 CFLAGS+=-Wall -DLIBC_SCCS -I${.CURDIR} -I${.CURDIR}/../libc/gen/
 CFLAGS+=-DINET6
 SRCS=	_secure_path.c auth.c fparseln.c login.c login_auth.c \

lib/libz/Makefile

@@ -5,6 +5,7 @@
 MAINTAINER=peter@FreeBSD.org
 
 LIB=		z
+SHLIBDIR?=	/lib
 MAN=		zlib.3
 
 #CFLAGS+=	-DMAX_WBITS=14 -DMAX_MEM_LEVEL=7

lib/msun/Makefile

@@ -66,6 +66,7 @@ ARCH_SRCS = e_acos.S e_asin.S e_atan2.S e_exp.S e_fmod.S e_log.S e_log10.S \
 CFLAGS+= -D_IEEE_LIBM
 
 LIB=	m
+SHLIBDIR?= /lib
 COMMON_SRCS= b_exp.c b_log.c b_tgamma.c \
 	e_acos.c e_acosf.c e_acosh.c e_acoshf.c e_asin.c e_asinf.c \
 	e_atan2.c e_atan2f.c e_atanh.c e_atanhf.c e_cosh.c e_coshf.c e_exp.c \

lib/ncurses/ncurses/Makefile

@@ -3,6 +3,7 @@
 NCURSES=${.CURDIR}/../../contrib/ncurses
 
 LIB=	ncurses
+SHLIBDIR?=	/lib
 SHLIB_MAJOR=5
 
 # Should be elsewhere
@@ -233,11 +234,11 @@ SYMLINKS+=libncurses.a ${LIBDIR}/libmytinfo.a
 SYMLINKS+=libncurses.a ${LIBDIR}/libtinfo.a
 .if !defined(NOPIC)
 # no need for major at all, it's an ld-time redirection only
-SYMLINKS+=libncurses.so ${SHLIBDIR}/libcurses.so
-SYMLINKS+=libncurses.so ${SHLIBDIR}/libtermcap.so
-SYMLINKS+=libncurses.so ${SHLIBDIR}/libtermlib.so
-SYMLINKS+=libncurses.so ${SHLIBDIR}/libmytinfo.so
-SYMLINKS+=libncurses.so ${SHLIBDIR}/libtinfo.so
+SYMLINKS+=libncurses.so ${LIBDIR}/libcurses.so
+SYMLINKS+=libncurses.so ${LIBDIR}/libtermcap.so
+SYMLINKS+=libncurses.so ${LIBDIR}/libtermlib.so
+SYMLINKS+=libncurses.so ${LIBDIR}/libmytinfo.so
+SYMLINKS+=libncurses.so ${LIBDIR}/libtinfo.so
 .endif
 .if !defined(NOPROFILE)
 SYMLINKS+=libncurses_p.a ${LIBDIR}/libcurses_p.a

secure/lib/libcrypto/Makefile

@@ -1,6 +1,7 @@
 # $FreeBSD$
 
 LIB=		crypto
+SHLIBDIR?=	/lib
 SHLIB_MAJOR=	3
 
 NOLINT=		true

sys/netinet/libalias/Makefile

@@ -1,6 +1,7 @@
 # $FreeBSD$
 
 LIB=	alias
+SHLIBDIR?=	/lib
 SHLIB_MAJOR=	4
 MAN=	libalias.3
 SRCS=	alias.c alias_cuseeme.c alias_db.c alias_ftp.c alias_irc.c \