diff --git a/lib/libalias/Makefile b/lib/libalias/Makefile
index 0fff9a7aae14..bf26f05268f0 100644
--- a/lib/libalias/Makefile
+++ b/lib/libalias/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 LIB=	alias
-SHLIBDIR?=	/lib
+SHLIBDIR?= /lib
 SHLIB_MAJOR=	4
 MAN=	libalias.3
 SRCS=	alias.c alias_cuseeme.c alias_db.c alias_ftp.c alias_irc.c \
diff --git a/lib/libatm/Makefile b/lib/libatm/Makefile
index b2058fa30973..7ce059f6bc38 100644
--- a/lib/libatm/Makefile
+++ b/lib/libatm/Makefile
@@ -1,10 +1,7 @@
-#
-#
 # ===================================
 # HARP  |  Host ATM Research Platform
 # ===================================
 #
-#
 # This Host ATM Research Platform ("HARP") file (the "Software") is
 # made available by Network Computing Services, Inc. ("NetworkCS")
 # "AS IS".  NetworkCS does not provide maintenance, improvements or
@@ -23,12 +20,11 @@
 # Copies of this Software may be made, however, the above copyright
 # notice must be reproduced on all copies.
 #
-#	@(#) $FreeBSD$
-#
-#
+#	@(#) $Id: Makefile,v 1.5 1998/07/10 16:01:58 jpt Exp $
+# $FreeBSD$
 
 LIB=	atm
-SHLIBDIR?=	/lib
+SHLIBDIR?= /lib
 SRCS=	atm_addr.c cache_key.c ioctl_subr.c ip_addr.c ip_checksum.c timer.c
 INCS=	libatm.h
 
diff --git a/lib/libc/Makefile b/lib/libc/Makefile
index 926ca029b66c..79ad35d96cd1 100644
--- a/lib/libc/Makefile
+++ b/lib/libc/Makefile
@@ -10,7 +10,7 @@
 # system call stubs.
 LIB=c
 SHLIB_MAJOR= 5
-SHLIBDIR?=/lib
+SHLIBDIR?= /lib
 CFLAGS+=-I${.CURDIR}/include -I${.CURDIR}/../../include
 CFLAGS+=-I${.CURDIR}/${MACHINE_ARCH}
 CLEANFILES+=tags
diff --git a/lib/libdevstat/Makefile b/lib/libdevstat/Makefile
index f29eb2c52626..cf3ac5e1f841 100644
--- a/lib/libdevstat/Makefile
+++ b/lib/libdevstat/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 LIB=	devstat
-SHLIBDIR?=	/lib
+SHLIBDIR?= /lib
 # Bump DEVSTAT_USER_API_VER in devstat.h every time this is incremented.
 SHLIB_MAJOR= 4
 SRCS=	devstat.c
diff --git a/lib/libedit/Makefile b/lib/libedit/Makefile
index 98d9487ed377..49d58fdd9850 100644
--- a/lib/libedit/Makefile
+++ b/lib/libedit/Makefile
@@ -4,7 +4,7 @@
 
 LIB=	edit
 SHLIB_MAJOR=	4
-SHLIBDIR?=	/lib
+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
diff --git a/lib/libgeom/Makefile b/lib/libgeom/Makefile
index b70ba3c1880a..3a4dad5db580 100644
--- a/lib/libgeom/Makefile
+++ b/lib/libgeom/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 LIB=	geom
-SHLIBDIR?=	/lib
+SHLIBDIR?= /lib
 SRCS+=	geom_getxml.c
 SRCS+=	geom_stats.c
 SRCS+=	geom_xml2tree.c
diff --git a/lib/libipsec/Makefile b/lib/libipsec/Makefile
index fc885114647b..e09ef7feff89 100644
--- a/lib/libipsec/Makefile
+++ b/lib/libipsec/Makefile
@@ -27,7 +27,7 @@
 # $FreeBSD$
 
 LIB=	ipsec
-SHLIBDIR?=	/lib
+SHLIBDIR?= /lib
 SHLIB_MAJOR= 1
 CFLAGS+=-I. -I${.CURDIR}
 CFLAGS+=-DIPSEC_DEBUG -DIPSEC
diff --git a/lib/libipx/Makefile b/lib/libipx/Makefile
index 39e5770ac7d2..66f566a4bd04 100644
--- a/lib/libipx/Makefile
+++ b/lib/libipx/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 LIB=	ipx
-SHLIBDIR?=	/lib
+SHLIBDIR?= /lib
 SRCS=	ipx_addr.c ipx_ntoa.c
 MAN=	ipx.3
 MLINKS+=ipx.3 ipx_addr.3 ipx.3 ipx_ntoa.3
diff --git a/lib/libkvm/Makefile b/lib/libkvm/Makefile
index 8b72802bc0db..33081c4226e9 100644
--- a/lib/libkvm/Makefile
+++ b/lib/libkvm/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 LIB=	kvm
-SHLIBDIR?=/lib
+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
diff --git a/lib/libmd/Makefile b/lib/libmd/Makefile
index d39276af0753..e1566fc84ee8 100644
--- a/lib/libmd/Makefile
+++ b/lib/libmd/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 LIB=	md
-SHLIBDIR?=	/lib
+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
diff --git a/lib/libncurses/Makefile b/lib/libncurses/Makefile
index 01b55d189bfc..612a388495d2 100644
--- a/lib/libncurses/Makefile
+++ b/lib/libncurses/Makefile
@@ -3,7 +3,7 @@
 NCURSES=${.CURDIR}/../../contrib/ncurses
 
 LIB=	ncurses
-SHLIBDIR?=	/lib
+SHLIBDIR?= /lib
 SHLIB_MAJOR=5
 
 # Should be elsewhere
diff --git a/lib/libsbuf/Makefile b/lib/libsbuf/Makefile
index 5adfcd82fb78..b166befc287e 100644
--- a/lib/libsbuf/Makefile
+++ b/lib/libsbuf/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 LIB=	sbuf
-SHLIBDIR?=	/lib
+SHLIBDIR?= /lib
 SRCS=	subr_sbuf.c 
 WARNS?= 2
 
diff --git a/lib/libufs/Makefile b/lib/libufs/Makefile
index 12b3dfe0b7d8..fc72c0c7db22 100644
--- a/lib/libufs/Makefile
+++ b/lib/libufs/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 LIB=	ufs
-SHLIBDIR?=	/lib
+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
diff --git a/lib/libutil/Makefile b/lib/libutil/Makefile
index 3ebf300e23f0..c9052ba4c4cd 100644
--- a/lib/libutil/Makefile
+++ b/lib/libutil/Makefile
@@ -3,7 +3,7 @@
 
 LIB=	util
 SHLIB_MAJOR= 3
-SHLIBDIR?=/lib
+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 \
diff --git a/lib/ncurses/ncurses/Makefile b/lib/ncurses/ncurses/Makefile
index 01b55d189bfc..612a388495d2 100644
--- a/lib/ncurses/ncurses/Makefile
+++ b/lib/ncurses/ncurses/Makefile
@@ -3,7 +3,7 @@
 NCURSES=${.CURDIR}/../../contrib/ncurses
 
 LIB=	ncurses
-SHLIBDIR?=	/lib
+SHLIBDIR?= /lib
 SHLIB_MAJOR=5
 
 # Should be elsewhere
diff --git a/sys/netinet/libalias/Makefile b/sys/netinet/libalias/Makefile
index 0fff9a7aae14..bf26f05268f0 100644
--- a/sys/netinet/libalias/Makefile
+++ b/sys/netinet/libalias/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 LIB=	alias
-SHLIBDIR?=	/lib
+SHLIBDIR?= /lib
 SHLIB_MAJOR=	4
 MAN=	libalias.3
 SRCS=	alias.c alias_cuseeme.c alias_db.c alias_ftp.c alias_irc.c \