[illumos-gate merge]

commit 3052595ab8ddcc51231d239415b5eba5d913d45b
    11807 "private use area" characters should be marked as "printable"
commit cd61ae21816e53b94bc1673f3f1aa651fc3115e8
    12447 should install library compat symlinks from library makefiles, not Targetdirs
commit 241c90a06e8d1708235651863df515a2d522a03a
    12454 remove lint library machinery
commit 282d4a2d330d797757f16d55e1df9569f3e52d10
    12666 libproc manpage bugs
commit d906f494f9407f1ae043a922478ce3609959caf5
    12670 Unaligned output of snoop's usage() function
commit 18c4eaf123da22eddbe6e9a4ba7b8115ba748075
    12669 Add omitted word in vmstat man page
commit b68ab351091d2aea3f72a011f64de12fb05fc833
    12028 zfs test mdb_001_pos can fail

	Conflicts:
	usr/src/lib/nsswitch/dns/Makefile.com
	usr/src/lib/libsff/Makefile
	usr/src/lib/brand/Makefile
	usr/src/lib/Makefile.lib
	usr/src/lib/Makefile.targ

6 files changed, 8 insertions, 20 deletions

diff --git a/usr/src/lib/libnsl/Makefile b/usr/src/lib/libnsl/Makefile
index 923f8dad40..52ea34b8fb 100644
--- a/usr/src/lib/libnsl/Makefile
+++ b/usr/src/lib/libnsl/Makefile
@@ -73,7 +73,6 @@ clean :=	TARGET= clean
 clobber :=	TARGET= clobber
 delete :=	TARGET= delete
 install :=	TARGET= install
-lint :=		TARGET= lint
 _msg :=		TARGET= _msg
 package :=	TARGET= package
 
@@ -92,7 +91,7 @@ install_h:	$(ROOTHDRS)
 # nss.h isn't delivered; no reason to check
 check:
 
-clean clobber delete lint package:	$(SUBDIRS)
+clean clobber delete package:	$(SUBDIRS)
 
 $(PROTOCOL_DIR):
 	$(INS.dir)
@@ -118,7 +117,7 @@ $(PROTOCOL_DIR)/%.x:	$(PROTOCOL_UTS_SRCDIR)/%.x
 #
 # Derived header files
 #
-nis/gen/nis_clnt.h: $(PROTOCOL_DIR)/nis.x $(PROTOCOL_DIR)/nis_object.x 
+nis/gen/nis_clnt.h: $(PROTOCOL_DIR)/nis.x $(PROTOCOL_DIR)/nis_object.x
 	$(RPCGEN) -C -h $(PROTOCOL_DIR)/nis.x > nis_clnt-gen.h
 	$(SED) -n -e '/EDIT_START/,$$ p' < nis_clnt-gen.h |\
 	$(SED) -e 's/_3_svc/_svc/' |\
diff --git a/usr/src/lib/libnsl/Makefile.com b/usr/src/lib/libnsl/Makefile.com
index e3ba39ddc9..12b5904994 100644
--- a/usr/src/lib/libnsl/Makefile.com
+++ b/usr/src/lib/libnsl/Makefile.com
@@ -164,7 +164,7 @@ include ../../Makefile.lib
 # install this library in the root filesystem
 include ../../Makefile.rootfs
 
-LIBS =		$(DYNLIB) $(LINTLIB)
+LIBS =		$(DYNLIB)
 
 SRCDIR=		../common
 
@@ -208,19 +208,14 @@ CERRWARN +=	-_gcc=-Wno-clobbered
 SMATCH=off
 
 LIBMP =		-lmp
-lint :=		LIBMP =
 LDLIBS +=	$(LIBMP) -lmd -lc
 DYNFLAGS +=	$(ZNODELETE)
 
-$(LINTLIB):=	SRCS=$(SRCDIR)/$(LINTSRC)
-LINTFLAGS +=	-m -DPORTMAP
-LINTFLAGS64 +=	-m -DPORTMAP
 
 .KEEP_STATE:
 
 all: $(LIBS)
 
-# Don't lint WRAPPERS as they are explicitly unclean
 SRCS=	$(DES:%.o=../des/%.c)			\
 	$(DIAL:%.o=../dial/%.c)			\
 	$(IPSEC:%.o=../ipsec/%.c)		\
@@ -234,8 +229,6 @@ SRCS=	$(DES:%.o=../des/%.c)			\
 	$(NIS_GEN:%.o=../nis/gen/%.c)		\
 	$(COMMON:%.o=../common/%.c)
 
-lint:
-	@$(LINT.c) $(SRCS) $(LDLIBS)
 
 # include library targets
 include ../../Makefile.targ
diff --git a/usr/src/lib/libnsl/amd64/Makefile b/usr/src/lib/libnsl/amd64/Makefile
index ed0a7167be..88032f0441 100644
--- a/usr/src/lib/libnsl/amd64/Makefile
+++ b/usr/src/lib/libnsl/amd64/Makefile
@@ -23,7 +23,7 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 
 include ../Makefile.com
@@ -35,4 +35,4 @@ include ../../Makefile.lib.64
 
 amd64_C_PICFLAGS = $(amd64_C_BIGPICFLAGS)
 
-install: all $(ROOTLIBS64) $(ROOTLINKS64)
+install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64)
diff --git a/usr/src/lib/libnsl/i386/Makefile b/usr/src/lib/libnsl/i386/Makefile
index 5591ea9a22..655acde2a7 100644
--- a/usr/src/lib/libnsl/i386/Makefile
+++ b/usr/src/lib/libnsl/i386/Makefile
@@ -23,9 +23,7 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 include ../Makefile.com
 
-install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS)
diff --git a/usr/src/lib/libnsl/sparc/Makefile b/usr/src/lib/libnsl/sparc/Makefile
index 5591ea9a22..655acde2a7 100644
--- a/usr/src/lib/libnsl/sparc/Makefile
+++ b/usr/src/lib/libnsl/sparc/Makefile
@@ -23,9 +23,7 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 include ../Makefile.com
 
-install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS)
diff --git a/usr/src/lib/libnsl/sparcv9/Makefile b/usr/src/lib/libnsl/sparcv9/Makefile
index 249857bc50..d26d0a9514 100644
--- a/usr/src/lib/libnsl/sparcv9/Makefile
+++ b/usr/src/lib/libnsl/sparcv9/Makefile
@@ -33,4 +33,4 @@ include ../../Makefile.lib.64
 
 sparcv9_C_PICFLAGS = $(sparcv9_C_BIGPICFLAGS)
 
-install: all $(ROOTLIBS64) $(ROOTLINKS64)
+install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64)