6 files changed, 38 insertions, 66 deletions
diff --git a/usr/src/lib/libcurses/Makefile b/usr/src/lib/libcurses/Makefile
index 9e88e23114..594a2c7ba7 100644
--- a/usr/src/lib/libcurses/Makefile
+++ b/usr/src/lib/libcurses/Makefile
@@ -33,7 +33,6 @@ all :=		TARGET= all
 install :=	TARGET= install
 clean :=	TARGET= clean
 clobber :=	TARGET= clobber
-lint :=		TARGET= lint
 test :=		TARGET= test
 
 SCRFILES = screen/keycaps \
@@ -48,7 +47,7 @@ SCRFILES = screen/keycaps \
 	screen/term.h
 
 # definitions for install_h target
-HDRS= 		curses.h term.h unctrl.h
+HDRS=		curses.h term.h unctrl.h
 HDRDIR=		screen
 
 LIBRARY=	libcurses.a
@@ -71,7 +70,7 @@ all: $(SCRFILES) .WAIT $(SUBDIRS)
 
 install: all .WAIT $(SUBDIRS)
 
-clean clobber lint test: $(SUBDIRS)
+clean clobber test: $(SUBDIRS)
 
 install_h: $(ROOTHDRS)
 
diff --git a/usr/src/lib/libcurses/Makefile.com b/usr/src/lib/libcurses/Makefile.com
index 51dce6c5bc..2082f3b634 100644
--- a/usr/src/lib/libcurses/Makefile.com
+++ b/usr/src/lib/libcurses/Makefile.com
@@ -136,16 +136,7 @@ include ../../Makefile.rootfs
 
 SRCDIR =	../screen
 
-LIBS =		$(DYNLIB) $(LINTLIB)
-
-# definitions for lint
-
-$(LINTLIB):= SRCS=../screen/llib-lcurses
-
-LINTOUT=	lint.out
-LINTSRC=	$(LINTLIB:%.ln=%)
-
-CLEANFILES +=	$(LINTOUT) $(LINTLIB)
+LIBS =		$(DYNLIB)
 
 CFLAGS	+=	$(CCVERBOSE)
 
@@ -171,51 +162,37 @@ CLOBBERFILES=	libcurses.so libcurses.so$(VERS)
 
 all: $(LIBS)
 
-lint: lintcheck
-
-#
-# Install rules for libtermlib.so links.
-# Augments the rule in Makefile.targ
-#
-$(ROOTLIBDIR)/$(LIBLINKS) := INS.liblink= \
-	$(RM) $@; $(SYMLINK) $(LIBLINKPATH)$(LIBLINKS)$(VERS) $@; \
-	cd $(ROOTLIBDIR); \
-		$(RM) libtermlib.so libtermlib.so$(VERS); \
-		$(SYMLINK) libcurses.so$(VERS) libtermlib.so$(VERS); \
-		$(SYMLINK) libtermlib.so$(VERS) libtermlib.so;
-
-$(ROOTLIBDIR64)/$(LIBLINKS) := INS.liblink64= \
-	$(RM) $@; $(SYMLINK) $(LIBLINKPATH)$(LIBLINKS)$(VERS) $@; \
-	cd $(ROOTLIBDIR64); \
-		$(RM) libtermlib.so libtermlib.so$(VERS);\
-		$(SYMLINK) libcurses.so$(VERS) libtermlib.so$(VERS); \
-		$(SYMLINK) libtermlib.so$(VERS) libtermlib.so;
-
-#
-# Install rules for libtermlib.ln links.
-# Augments a pattern rule in Makefile.targ
-#
-$(ROOTLIBDIR)/$(LINTLIB) := INS.file= \
-	-$(RM) $@; $(INS) -s -m $(FILEMODE) -f $(@D) $(LINTLIB); \
-	cd $(ROOTLIBDIR); \
-		$(RM) llib-ltermlib.ln ; \
-		$(SYMLINK) ./llib-lcurses.ln llib-ltermlib.ln;
-
-$(ROOTLIBDIR64)/$(LINTLIB) := INS.file= \
-	-$(RM) $@; $(INS) -s -m $(FILEMODE) -f $(@D) $(LINTLIB); \
-	cd $(ROOTLIBDIR64); \
-		$(RM) llib-ltermlib.ln ; \
-		$(SYMLINK) ./llib-lcurses.ln llib-ltermlib.ln;
-
-#
-# Install rule for the lint source, which is installed only in
-# the default library dir, not MACH64 etc.
-#
-$(ROOTLINTDIR)/%: ../screen/%
-	$(INS.file)
-	cd $(ROOTLINTDIR); \
-		$(RM) llib-ltermlib ; \
-		$(SYMLINK) ./llib-lcurses llib-ltermlib;
+COMPATLINKS +=	usr/ccs/lib/libcurses.so \
+		usr/ccs/lib/libtermlib.so \
+		usr/lib/libtermlib.so \
+		usr/lib/libtermlib.so.1 \
+		lib/libtermlib.so \
+		lib/libtermlib.so.1
+
+COMPATLINKS64 +=	usr/ccs/lib/$(MACH64)/libcurses.so \
+			usr/ccs/lib/$(MACH64)/libtermlib.so \
+			usr/lib/$(MACH64)/libtermlib.so \
+			usr/lib/$(MACH64)/libtermlib.so.1 \
+			lib/$(MACH64)/libtermlib.so \
+			lib/$(MACH64)/libtermlib.so.1
+
+$(ROOT)/usr/ccs/lib/libcurses.so := COMPATLINKTARGET=../../../lib/libcurses.so.1
+$(ROOT)/usr/ccs/lib/libtermlib.so := \
+	COMPATLINKTARGET=../../../lib/libcurses.so.1
+$(ROOT)/usr/ccs/lib/$(MACH64)/libcurses.so := \
+	COMPATLINKTARGET=../../../../lib/$(MACH64)/libcurses.so.1
+$(ROOT)/usr/ccs/lib/$(MACH64)/libtermlib.so := \
+	COMPATLINKTARGET=../../../../lib/$(MACH64)/libcurses.so.1
+$(ROOT)/usr/lib/libtermlib.so.1 := COMPATLINKTARGET= ../../lib/libcurses.so.1
+$(ROOT)/usr/lib/libtermlib.so := COMPATLINKTARGET= ../../lib/libcurses.so.1
+$(ROOT)/usr/lib/$(MACH64)/libtermlib.so.1 := \
+	COMPATLINKTARGET= ../../../lib/$(MACH64)/libcurses.so.1
+$(ROOT)/usr/lib/$(MACH64)/libtermlib.so := \
+	COMPATLINKTARGET= ../../../lib/$(MACH64)/libcurses.so.1
+$(ROOT)/lib/libtermlib.so.1 := COMPATLINKTARGET= libcurses.so.1
+$(ROOT)/lib/libtermlib.so := COMPATLINKTARGET= libtermlib.so.1
+$(ROOT)/lib/$(MACH64)/libtermlib.so.1 := COMPATLINKTARGET= libcurses.so.1
+$(ROOT)/lib/$(MACH64)/libtermlib.so := COMPATLINKTARGET= libtermlib.so.1
 
 #
 # Include library targets
diff --git a/usr/src/lib/libcurses/amd64/Makefile b/usr/src/lib/libcurses/amd64/Makefile
index 57138967e0..81d2c84ed7 100644
--- a/usr/src/lib/libcurses/amd64/Makefile
+++ b/usr/src/lib/libcurses/amd64/Makefile
@@ -31,4 +31,4 @@ include ../../Makefile.lib.64
 
 all: $(LIBS)
 
-install: all $(ROOTLIBS64) $(ROOTLINKS64)
+install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64)
diff --git a/usr/src/lib/libcurses/i386/Makefile b/usr/src/lib/libcurses/i386/Makefile
index 2a944b0b43..8537c30eda 100644
--- a/usr/src/lib/libcurses/i386/Makefile
+++ b/usr/src/lib/libcurses/i386/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.com
 
@@ -31,4 +29,4 @@ include ../Makefile.com
 
 all: $(LIBS)
 
-install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS)
diff --git a/usr/src/lib/libcurses/sparc/Makefile b/usr/src/lib/libcurses/sparc/Makefile
index 2a944b0b43..8537c30eda 100644
--- a/usr/src/lib/libcurses/sparc/Makefile
+++ b/usr/src/lib/libcurses/sparc/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.com
 
@@ -31,4 +29,4 @@ include ../Makefile.com
 
 all: $(LIBS)
 
-install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS)
diff --git a/usr/src/lib/libcurses/sparcv9/Makefile b/usr/src/lib/libcurses/sparcv9/Makefile
index 57138967e0..81d2c84ed7 100644
--- a/usr/src/lib/libcurses/sparcv9/Makefile
+++ b/usr/src/lib/libcurses/sparcv9/Makefile
@@ -31,4 +31,4 @@ include ../../Makefile.lib.64
 
 all: $(LIBS)
 
-install: all $(ROOTLIBS64) $(ROOTLINKS64)
+install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64)