6 files changed, 18 insertions, 20 deletions
diff --git a/usr/src/lib/nsswitch/user/Makefile b/usr/src/lib/nsswitch/user/Makefile
index 123b24895e..ed69fbf8dd 100644
--- a/usr/src/lib/nsswitch/user/Makefile
+++ b/usr/src/lib/nsswitch/user/Makefile
@@ -20,12 +20,9 @@
 # CDDL HEADER END
 #
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
 # Copyright (c) 1991 - 1996, by Sun Microsystems, Inc.
 # All rights reserved.
 #
-# lib/nsswitch/user/Makefile
 
 include     ../../../Makefile.master
 
@@ -35,11 +32,10 @@ all:=		TARGET= all
 clean:=		TARGET= clean
 clobber:=	TARGET= clobber
 install:=	TARGET= install
-lint:=		TARGET= lint
 
 .KEEP_STATE:
 
-all clean clobber install lint: $(FILES_SUBDIRS)
+all clean clobber install: $(FILES_SUBDIRS)
 
 $(MACH) $(MACH64): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
diff --git a/usr/src/lib/nsswitch/user/Makefile.com b/usr/src/lib/nsswitch/user/Makefile.com
index befd4172a7..0a1803ff22 100644
--- a/usr/src/lib/nsswitch/user/Makefile.com
+++ b/usr/src/lib/nsswitch/user/Makefile.com
@@ -22,9 +22,6 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
-# lib/nsswitch/user/Makefile.com
 
 LIBRARY =	libnss_user.a
 VERS =		.1
@@ -38,10 +35,15 @@ include		../../Makefile.com
 # install this library in the root filesystem
 include ../../../Makefile.rootfs
 
-CPPFLAGS +=	-I../../../common/inc
-LINTFLAGS +=	-erroff=E_GLOBAL_COULD_BE_STATIC2 -erroff=E_FUNC_SET_NOT_USED
-LINTFLAGS64 +=	-erroff=E_GLOBAL_COULD_BE_STATIC2 -erroff=E_FUNC_SET_NOT_USED
-
 DYNLIB1 =	nss_user.so$(VERS)
 
+COMPATLINKS=	usr/lib/$(DYNLIB1)
+COMPATLINKS64=	usr/lib/$(MACH64)/$(DYNLIB1)
+
+$(ROOT)/usr/lib/$(DYNLIB1) := COMPATLINKTARGET=../../lib/$(DYNLIB1)
+$(ROOT)/usr/lib/$(MACH64)/$(DYNLIB1) := \
+	COMPATLINKTARGET=../../../lib/$(MACH64)/$(DYNLIB1)
+
+CPPFLAGS +=	-I../../../common/inc
+
 all: $(DYNLIB1)
diff --git a/usr/src/lib/nsswitch/user/amd64/Makefile b/usr/src/lib/nsswitch/user/amd64/Makefile
index 1334471b25..2f85b65f33 100644
--- a/usr/src/lib/nsswitch/user/amd64/Makefile
+++ b/usr/src/lib/nsswitch/user/amd64/Makefile
@@ -23,7 +23,7 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 
 include		../Makefile.com
@@ -33,4 +33,4 @@ LIBS =		$(DYNLIB1)
 
 include		../../Makefile.targ
 
-install:	all $(ROOT64DYNLIB)
+install:	all $(ROOT64DYNLIB) $(ROOTCOMPATLINKS64)
diff --git a/usr/src/lib/nsswitch/user/i386/Makefile b/usr/src/lib/nsswitch/user/i386/Makefile
index 173380a346..ffe5bd84ba 100644
--- a/usr/src/lib/nsswitch/user/i386/Makefile
+++ b/usr/src/lib/nsswitch/user/i386/Makefile
@@ -20,7 +20,7 @@
 # CDDL HEADER END
 #
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 # Copyright (c) 1993,2001 by Sun Microsystems, Inc.
 # All rights reserved.
@@ -33,4 +33,4 @@ LIBS =		$(DYNLIB1)
 
 include		../../Makefile.targ
 
-install:	all $(ROOTLIBS)
+install:	all $(ROOTLIBS) $(ROOTCOMPATLINKS)
diff --git a/usr/src/lib/nsswitch/user/sparc/Makefile b/usr/src/lib/nsswitch/user/sparc/Makefile
index 2d974133a9..6de0a45157 100644
--- a/usr/src/lib/nsswitch/user/sparc/Makefile
+++ b/usr/src/lib/nsswitch/user/sparc/Makefile
@@ -20,7 +20,7 @@
 # CDDL HEADER END
 #
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 # Copyright (c) 1993,2001 by Sun Microsystems, Inc.
 # All rights reserved.
@@ -33,4 +33,4 @@ LIBS =		$(DYNLIB1)
 
 include		../../Makefile.targ
 
-install:	all $(ROOTLIBS)
+install:	all $(ROOTLIBS) $(ROOTCOMPATLINKS)
diff --git a/usr/src/lib/nsswitch/user/sparcv9/Makefile b/usr/src/lib/nsswitch/user/sparcv9/Makefile
index 87fbebb765..7f1a6c94bf 100644
--- a/usr/src/lib/nsswitch/user/sparcv9/Makefile
+++ b/usr/src/lib/nsswitch/user/sparcv9/Makefile
@@ -20,7 +20,7 @@
 # CDDL HEADER END
 #
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 # Copyright (c) 1993,2001 by Sun Microsystems, Inc.
 # All rights reserved.
@@ -34,4 +34,4 @@ LIBS =		$(DYNLIB1)
 
 include		../../Makefile.targ
 
-install:	all $(ROOT64DYNLIB)
+install:	all $(ROOT64DYNLIB) $(ROOTCOMPATLINKS64)