6 files changed, 15 insertions, 12 deletions
diff --git a/usr/src/lib/libeti/form/Makefile b/usr/src/lib/libeti/form/Makefile
index a130b89a17..65b525da03 100644
--- a/usr/src/lib/libeti/form/Makefile
+++ b/usr/src/lib/libeti/form/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.lib
 
@@ -34,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: $(SUBDIRS)
+all clean clobber install: $(SUBDIRS)
 
 # definitions for install_h target
 HDRS=		form.h utility.h
diff --git a/usr/src/lib/libeti/form/Makefile.com b/usr/src/lib/libeti/form/Makefile.com
index c526d231b3..5a9eae2ad9 100644
--- a/usr/src/lib/libeti/form/Makefile.com
+++ b/usr/src/lib/libeti/form/Makefile.com
@@ -65,12 +65,10 @@ OBJECTS=  \
 # include library definitions
 include ../../../Makefile.lib
 
-LIBS =          $(DYNLIB) $(LINTLIB)
+LIBS =          $(DYNLIB)
 
 SRCDIR=		../common
 
-$(LINTLIB) :=	SRCS=$(SRCDIR)/$(LINTSRC)
-
 CPPFLAGS +=	-I../inc
 CFLAGS +=       $(CCVERBOSE)
 LDLIBS +=       -lcurses -lc
@@ -79,11 +77,17 @@ CERRWARN +=	-_gcc=-Wno-parentheses
 CERRWARN +=	$(CNOWARN_UNINIT)
 CERRWARN +=	-_gcc=-Wno-char-subscripts
 
+COMPATLINKS=	usr/ccs/lib/libform.so
+COMPATLINKS64=	usr/ccs/lib/$(MACH64)/libform.so
+
+$(ROOT)/usr/ccs/lib/libform.so := COMPATLINKTARGET= ../../lib/libform.so.1
+$(ROOT)/usr/ccs/lib/$(MACH64)/libform.so := \
+	COMPATLINKTARGET= ../../../lib/$(MACH64)/libform.so.1
+
 .KEEP_STATE:
 
 all: $(LIBS)
 
-lint: lintcheck
 
 # include library targets
 include ../../../Makefile.targ
diff --git a/usr/src/lib/libeti/form/amd64/Makefile b/usr/src/lib/libeti/form/amd64/Makefile
index 4201c0bb20..5757f3b5ec 100644
--- a/usr/src/lib/libeti/form/amd64/Makefile
+++ b/usr/src/lib/libeti/form/amd64/Makefile
@@ -29,4 +29,4 @@ DYNFLAGS += $(DYNFLAGS64)
 
 .KEEP_STATE:
 
-install: all $(ROOTLIBS64) $(ROOTLINKS64)
+install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64)
diff --git a/usr/src/lib/libeti/form/i386/Makefile b/usr/src/lib/libeti/form/i386/Makefile
index af931b5d9a..ee434ebd50 100644
--- a/usr/src/lib/libeti/form/i386/Makefile
+++ b/usr/src/lib/libeti/form/i386/Makefile
@@ -26,4 +26,5 @@ include ../Makefile.com
 
 .KEEP_STATE:
 
-install: all $(ROOTLIBS) $(ROOTLINKS) $(DYNLINKLIB) $(ROOTLINT)
+install: all $(ROOTLIBS) $(ROOTLINKS) $(DYNLINKLIB) \
+	$(ROOTCOMPATLINKS)
diff --git a/usr/src/lib/libeti/form/sparc/Makefile b/usr/src/lib/libeti/form/sparc/Makefile
index af931b5d9a..ee434ebd50 100644
--- a/usr/src/lib/libeti/form/sparc/Makefile
+++ b/usr/src/lib/libeti/form/sparc/Makefile
@@ -26,4 +26,5 @@ include ../Makefile.com
 
 .KEEP_STATE:
 
-install: all $(ROOTLIBS) $(ROOTLINKS) $(DYNLINKLIB) $(ROOTLINT)
+install: all $(ROOTLIBS) $(ROOTLINKS) $(DYNLINKLIB) \
+	$(ROOTCOMPATLINKS)
diff --git a/usr/src/lib/libeti/form/sparcv9/Makefile b/usr/src/lib/libeti/form/sparcv9/Makefile
index 06a8dcb9bb..34a4272b2b 100644
--- a/usr/src/lib/libeti/form/sparcv9/Makefile
+++ b/usr/src/lib/libeti/form/sparcv9/Makefile
@@ -29,4 +29,4 @@ DYNFLAGS += $(DYNFLAGS64)
 
 .KEEP_STATE:
 
-install: all $(ROOTLIBS64) $(ROOTLINKS64)
+install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64)