mergegcc9

6 files changed, 14 insertions, 15 deletions

diff --git a/usr/src/lib/libmp/Makefile b/usr/src/lib/libmp/Makefile
index f4e1d98996..0f651e4eda 100644
--- a/usr/src/lib/libmp/Makefile
+++ b/usr/src/lib/libmp/Makefile
@@ -22,8 +22,6 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 include ../../Makefile.master
 include	../Makefile.lib
@@ -36,12 +34,11 @@ all :=		TARGET= all
 clean :=	TARGET= clean
 clobber :=	TARGET= clobber
 install :=	TARGET= install
-lint :=		TARGET= lint
 test :=		TARGET= test
 
 .KEEP_STATE:
 
-all clean clobber install lint test: $(SUBDIRS)
+all clean clobber install test: $(SUBDIRS)
 
 $(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
diff --git a/usr/src/lib/libmp/Makefile.com b/usr/src/lib/libmp/Makefile.com
index e2123569a9..3c71277267 100644
--- a/usr/src/lib/libmp/Makefile.com
+++ b/usr/src/lib/libmp/Makefile.com
@@ -22,8 +22,6 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 LIBRARY=	libmp.a
 VERS=		.2
@@ -36,6 +34,9 @@ include ../../Makefile.lib
 # install this library in the root filesystem
 include ../../Makefile.rootfs
 
+COMPATLINKS += usr/lib/libmp.so.1
+$(ROOT)/usr/lib/libmp.so.1 := COMPATLINKTARGET=../../lib/libmp.so.1
+
 SRCDIR =	../common
 
 OMAPFILE =	../common/mapfile_1-vers
@@ -47,7 +48,6 @@ LDLIBS +=	-lc
 
 .KEEP_STATE:
 
-lint: lintcheck
 
 #
 # Include library targets
diff --git a/usr/src/lib/libmp/amd64/Makefile b/usr/src/lib/libmp/amd64/Makefile
index fc9ec9e40a..40902c4fa9 100644
--- a/usr/src/lib/libmp/amd64/Makefile
+++ b/usr/src/lib/libmp/amd64/Makefile
@@ -22,7 +22,7 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 
 include ../Makefile.com
@@ -34,4 +34,4 @@ LIBS = $(DYNLIB)
 
 all: $(LIBS)
 
-install: all $(ROOTLIBS64) $(ROOTLINKS64)
+install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64)
diff --git a/usr/src/lib/libmp/i386/Makefile b/usr/src/lib/libmp/i386/Makefile
index 3c4312b6da..9df3e6be40 100644
--- a/usr/src/lib/libmp/i386/Makefile
+++ b/usr/src/lib/libmp/i386/Makefile
@@ -22,7 +22,7 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 
 OLIBRARY =	libmp.so.1
@@ -51,4 +51,5 @@ pics/pics_mp.o:
 
 all: $(LIBS) $(OLIBRARY)
 
-install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLIBDIR)/$(OLIBRARY)
+install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLIBDIR)/$(OLIBRARY) \
+	$(ROOTCOMPATLINKS)
diff --git a/usr/src/lib/libmp/sparc/Makefile b/usr/src/lib/libmp/sparc/Makefile
index 9c62a2b7ac..8bb9a77528 100644
--- a/usr/src/lib/libmp/sparc/Makefile
+++ b/usr/src/lib/libmp/sparc/Makefile
@@ -22,7 +22,7 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 
 OLIBRARY =	libmp.so.1
@@ -51,4 +51,5 @@ pics/pics_mp.o:
 
 all: $(LIBS) $(OLIBRARY)
 
-install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLIBDIR)/$(OLIBRARY)
+install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLIBDIR)/$(OLIBRARY) \
+	$(ROOTCOMPATLINKS)
diff --git a/usr/src/lib/libmp/sparcv9/Makefile b/usr/src/lib/libmp/sparcv9/Makefile
index fc9ec9e40a..40902c4fa9 100644
--- a/usr/src/lib/libmp/sparcv9/Makefile
+++ b/usr/src/lib/libmp/sparcv9/Makefile
@@ -22,7 +22,7 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 
 include ../Makefile.com
@@ -34,4 +34,4 @@ LIBS = $(DYNLIB)
 
 all: $(LIBS)
 
-install: all $(ROOTLIBS64) $(ROOTLINKS64)
+install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64)