1168 want a libtermcap that does not force libcurses

Reviewed by: Garrett D'Amore <garrett@nexenta.com>
Reviewed by: Albert Lee <trisk@nexenta.com>
Reviewed by: Igor Kozhukhov <igor.kozhukhov@nexenta.com>
Approved by: Garrett D'Amore <garrett@nexenta.com>

3 files changed, 43 insertions, 69 deletions

diff --git a/usr/src/lib/libcurses/Makefile.com b/usr/src/lib/libcurses/Makefile.com
index 6db4b1cc4e..19a25fc2ab 100644
--- a/usr/src/lib/libcurses/Makefile.com
+++ b/usr/src/lib/libcurses/Makefile.com
@@ -19,11 +19,10 @@
 # CDDL HEADER END
 #
 #
+# Copyright 2011 Nexenta Systems, Inc.  All rights reserved.
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 LIBRARY=	libcurses.a
 VERS=	.1
@@ -145,12 +144,6 @@ $(LINTLIB):= SRCS=../screen/llib-lcurses
 LINTOUT=	lint.out
 LINTSRC=	$(LINTLIB:%.ln=%)
 
-ROOTLINTDIR=	$(ROOTLIBDIR)
-ROOTLINT=	$(LINTSRC:%=$(ROOTLINTDIR)/%)
-ROOTLINTDIR64=	$(ROOTLIBDIR64)
-ROOTLINT64=	$(LINTSRC:%=$(ROOTLINTDIR64)/%)
-ROOTLINKS64=	$(ROOTLIBDIR64)/$(LIBLINKS)
-
 CLEANFILES +=	$(LINTOUT) $(LINTLIB)
 
 CFLAGS	+=	$(CCVERBOSE)
@@ -168,54 +161,55 @@ RM = rm -f
 #
 CLOBBERFILES=	libcurses.so libcurses.so$(VERS)
 
-.KEEP_STATE:
-
 all: $(LIBS)
 
 lint: lintcheck
 
-# install rule for 32-bit libcurses.a
-$(ROOTLIBDIR)/%.a: %.a
-	$(INS.file)
-		cd $(ROOTLIBDIR); \
-		$(RM) libtermlib.a libtermcap.a; \
-		ln libcurses.a libtermlib.a; \
-		ln libcurses.a libtermcap.a;
+#
+# 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;
 
-# install rules for 32-bit libcurses.so in /usr/lib
-$(ROOTLINKS) := INS.liblink= \
+$(ROOTLIBDIR64)/$(LIBLINKS) := INS.liblink64= \
 	$(RM) $@; $(SYMLINK) $(LIBLINKPATH)$(LIBLINKS)$(VERS) $@; \
-		cd $(ROOTLIBDIR); \
-		$(RM) libtermlib.so$(VERS) libtermcap.so$(VERS); \
-		$(RM) libtermlib.so libtermcap.so; \
+	cd $(ROOTLIBDIR64); \
+		$(RM) libtermlib.so libtermlib.so$(VERS);\
 		$(SYMLINK) libcurses.so$(VERS) libtermlib.so$(VERS); \
-		$(SYMLINK) libcurses.so$(VERS) libtermcap.so$(VERS); \
-		$(SYMLINK) libtermlib.so$(VERS) libtermlib.so; \
-		$(SYMLINK) libtermcap.so$(VERS) libtermcap.so;
+		$(SYMLINK) libtermlib.so$(VERS) libtermlib.so;
 
-# install rule for lint library target
-$(ROOTLINTDIR)/%: ../screen/%
-	$(INS.file)
-	cd $(ROOTLINTDIR); \
-		$(RM) llib-ltermcap llib-ltermlib ; \
-		$(SYMLINK) ./llib-lcurses llib-ltermcap; \
-		$(SYMLINK) ./llib-lcurses llib-ltermlib; \
-		$(RM) llib-ltermcap.ln llib-ltermlib.ln ; \
-		$(SYMLINK) ./llib-lcurses.ln llib-ltermcap.ln; \
+#
+# 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;
 
-# install rule for 64 bit lint library target
-$(ROOTLINTDIR64)/%: ../screen/%
-	$(INS.file)
-	cd $(ROOTLINTDIR64); \
-		$(RM) llib-ltermcap llib-ltermlib ; \
-		$(SYMLINK) ./llib-lcurses llib-ltermcap; \
-		$(SYMLINK) ./llib-lcurses llib-ltermlib; \
-		$(RM) llib-ltermcap.ln llib-ltermlib.ln ; \
-		$(SYMLINK) ./llib-lcurses.ln llib-ltermcap.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;
+
+#
 # Include library targets
 #
 include ../../Makefile.targ
diff --git a/usr/src/lib/libcurses/amd64/Makefile b/usr/src/lib/libcurses/amd64/Makefile
index 5e8087fc09..57138967e0 100644
--- a/usr/src/lib/libcurses/amd64/Makefile
+++ b/usr/src/lib/libcurses/amd64/Makefile
@@ -19,26 +19,16 @@
 # CDDL HEADER END
 #
 #
+# Copyright 2011 Nexenta Systems, Inc.  All rights reserved.
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 include ../Makefile.com
 include ../../Makefile.lib.64
 
 .KEEP_STATE:
 
-$(ROOTLIBDIR64)/$(LIBLINKS) := INS.liblink64 = \
-	-$(RM) $@; \
-	cd $(ROOTLIBDIR64); \
-	$(RM) libtermlib.so$(VERS) libtermcap.so$(VERS);\
-	$(RM) libtermlib.so libtermcap.so; \
-	$(SYMLINK) $(LIBLINKS)$(VERS) $(LIBLINKS); \
-	$(SYMLINK) libcurses.so$(VERS) libtermlib.so$(VERS); \
-	$(SYMLINK) libcurses.so$(VERS) libtermcap.so$(VERS); \
-	$(SYMLINK) libtermcap.so$(VERS) libtermcap.so; \
-	$(SYMLINK) libtermlib.so$(VERS) libtermlib.so
+all: $(LIBS)
 
-install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64)
+install: all $(ROOTLIBS64) $(ROOTLINKS64)
diff --git a/usr/src/lib/libcurses/sparcv9/Makefile b/usr/src/lib/libcurses/sparcv9/Makefile
index 5e8087fc09..57138967e0 100644
--- a/usr/src/lib/libcurses/sparcv9/Makefile
+++ b/usr/src/lib/libcurses/sparcv9/Makefile
@@ -19,26 +19,16 @@
 # CDDL HEADER END
 #
 #
+# Copyright 2011 Nexenta Systems, Inc.  All rights reserved.
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 include ../Makefile.com
 include ../../Makefile.lib.64
 
 .KEEP_STATE:
 
-$(ROOTLIBDIR64)/$(LIBLINKS) := INS.liblink64 = \
-	-$(RM) $@; \
-	cd $(ROOTLIBDIR64); \
-	$(RM) libtermlib.so$(VERS) libtermcap.so$(VERS);\
-	$(RM) libtermlib.so libtermcap.so; \
-	$(SYMLINK) $(LIBLINKS)$(VERS) $(LIBLINKS); \
-	$(SYMLINK) libcurses.so$(VERS) libtermlib.so$(VERS); \
-	$(SYMLINK) libcurses.so$(VERS) libtermcap.so$(VERS); \
-	$(SYMLINK) libtermcap.so$(VERS) libtermcap.so; \
-	$(SYMLINK) libtermlib.so$(VERS) libtermlib.so
+all: $(LIBS)
 
-install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64)
+install: all $(ROOTLIBS64) $(ROOTLINKS64)