backout 6449514/6686002/6686004/6700122: needs more work

10 files changed, 30 insertions, 30 deletions

diff --git a/usr/src/lib/libcryptoutil/Makefile.com b/usr/src/lib/libcryptoutil/Makefile.com
index d5668d367f..7f8c7a0a43 100644
--- a/usr/src/lib/libcryptoutil/Makefile.com
+++ b/usr/src/lib/libcryptoutil/Makefile.com
@@ -42,7 +42,6 @@ OBJECTS= \
 	util.o
 
 include $(SRC)/lib/Makefile.lib
-include $(SRC)/lib/Makefile.rootfs
 
 SRCDIR=	../common
 
diff --git a/usr/src/lib/libelfsign/Makefile.com b/usr/src/lib/libelfsign/Makefile.com
index 0e9a2a48ca..c5faa4ea7e 100644
--- a/usr/src/lib/libelfsign/Makefile.com
+++ b/usr/src/lib/libelfsign/Makefile.com
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -34,7 +34,6 @@ OBJECTS = \
 	elfsignlib.o
 
 include $(SRC)/lib/Makefile.lib
-include $(SRC)/lib/Makefile.rootfs
 
 SRCDIR =	../common
 
diff --git a/usr/src/lib/libkmf/ber_der/Makefile.com b/usr/src/lib/libkmf/ber_der/Makefile.com
index ad376dea5f..9c8c5657de 100644
--- a/usr/src/lib/libkmf/ber_der/Makefile.com
+++ b/usr/src/lib/libkmf/ber_der/Makefile.com
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -34,7 +34,6 @@ OBJECTS=\
 	clasn1.o
 
 include $(SRC)/lib/Makefile.lib
-include $(SRC)/lib/Makefile.rootfs
 
 SRCDIR=	../common
 INCDIR=	../inc
diff --git a/usr/src/lib/libkmf/include/kmfapiP.h b/usr/src/lib/libkmf/include/kmfapiP.h
index e360f50250..95f8faa8c2 100644
--- a/usr/src/lib/libkmf/include/kmfapiP.h
+++ b/usr/src/lib/libkmf/include/kmfapiP.h
@@ -207,13 +207,13 @@ typedef struct _kmf_handle {
 
 #ifndef KMF_PLUGIN_PATH
 #if defined(__sparcv9)
-#define	KMF_PLUGIN_PATH "/lib/crypto/sparcv9/"
+#define	KMF_PLUGIN_PATH "/usr/lib/security/sparcv9/"
 #elif defined(__sparc)
-#define	KMF_PLUGIN_PATH "/lib/crypto/"
+#define	KMF_PLUGIN_PATH "/usr/lib/security/"
 #elif defined(__i386)
-#define	KMF_PLUGIN_PATH "/lib/crypto/"
+#define	KMF_PLUGIN_PATH "/usr/lib/security/"
 #elif defined(__amd64)
-#define	KMF_PLUGIN_PATH "/lib/crypto/amd64/"
+#define	KMF_PLUGIN_PATH "/usr/lib/security/amd64/"
 #endif
 #endif /* !KMF_PLUGIN_PATH */
 
diff --git a/usr/src/lib/libkmf/libkmf/Makefile.com b/usr/src/lib/libkmf/libkmf/Makefile.com
index d0f7e95483..4d8653fdaa 100644
--- a/usr/src/lib/libkmf/libkmf/Makefile.com
+++ b/usr/src/lib/libkmf/libkmf/Makefile.com
@@ -50,7 +50,6 @@ CRYPTOUTILLIB=	 -lcryptoutil
 CRYPTOUTILLIB64= -lcryptoutil
 
 include $(SRC)/lib/Makefile.lib
-include $(SRC)/lib/Makefile.rootfs
 
 SRCDIR=	../common
 INCDIR=	../../include
diff --git a/usr/src/lib/libkmf/plugins/kmf_nss/Makefile.com b/usr/src/lib/libkmf/plugins/kmf_nss/Makefile.com
index eecfdb9025..2625fec183 100644
--- a/usr/src/lib/libkmf/plugins/kmf_nss/Makefile.com
+++ b/usr/src/lib/libkmf/plugins/kmf_nss/Makefile.com
@@ -19,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -62,8 +62,9 @@ LDLIBS32	+=	$(NSSLIBS)
 
 LIBS	=	$(DYNLIB)
 
-ROOTLIBDIR=	$(ROOTFS_LIBDIR)/crypto
-ROOTLIBDIR64=	$(ROOTFS_LIBDIR)/crypto/$(MACH64)
+ROOTLIBDIR=	$(ROOT)/usr/lib/security
+ROOTLIBDIR64=	$(ROOT)/usr/lib/security/$(MACH64)
+
 
 .KEEP_STATE:
 
diff --git a/usr/src/lib/libkmf/plugins/kmf_openssl/Makefile.com b/usr/src/lib/libkmf/plugins/kmf_openssl/Makefile.com
index dc0782e1d9..acb4c3229a 100644
--- a/usr/src/lib/libkmf/plugins/kmf_openssl/Makefile.com
+++ b/usr/src/lib/libkmf/plugins/kmf_openssl/Makefile.com
@@ -61,8 +61,8 @@ lint:=	OPENSSLLIBS64=	$(LINTSSLLIBS64)
 
 LDLIBS32 	+=	$(OPENSSLLIBS)
 
-ROOTLIBDIR=	$(ROOTFS_LIBDIR)/crypto
-ROOTLIBDIR64=	$(ROOTFS_LIBDIR)/crypto/$(MACH64)
+ROOTLIBDIR=	$(ROOT)/usr/lib/security
+ROOTLIBDIR64=	$(ROOT)/usr/lib/security/$(MACH64)
 
 .KEEP_STATE:
 
diff --git a/usr/src/lib/libkmf/plugins/kmf_pkcs11/Makefile.com b/usr/src/lib/libkmf/plugins/kmf_pkcs11/Makefile.com
index a538027cf3..700daba21b 100644
--- a/usr/src/lib/libkmf/plugins/kmf_pkcs11/Makefile.com
+++ b/usr/src/lib/libkmf/plugins/kmf_pkcs11/Makefile.com
@@ -19,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -60,8 +60,8 @@ SONAME=	$(PLUGIN)
 
 LDLIBS	+=	$(PKCS11LIBS)
 
-ROOTLIBDIR=	$(ROOTFS_LIBDIR)/crypto
-ROOTLIBDIR64=	$(ROOTFS_LIBDIR)/crypto/$(MACH64)
+ROOTLIBDIR=	$(ROOT)/usr/lib/security
+ROOTLIBDIR64=	$(ROOT)/usr/lib/security/$(MACH64)
 
 .KEEP_STATE:
 
diff --git a/usr/src/lib/openssl/Makefile.com b/usr/src/lib/openssl/Makefile.com
index 0d0016c98a..e27cf36b74 100644
--- a/usr/src/lib/openssl/Makefile.com
+++ b/usr/src/lib/openssl/Makefile.com
@@ -19,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -29,13 +29,15 @@ VERS= .0.9.8
 
 include $(SRC)/lib/Makefile.lib
 include $(SRC)/lib/openssl/Makefile.openssl
-include $(SRC)/lib/Makefile.rootfs
 
 CPPFLAGS =	$(OPENSSL_BUILD_CPPFLAGS) $(CPPFLAGS.master)
 
 COPTFLAG =   -xO5
 sparcv9_COPTFLAG =	-xO5
 
+ROOTLIBDIR =     $(ROOTSFWLIB)
+ROOTLIBDIR64 =   $(ROOTSFWLIB64)
+
 #
 # Ensure `all' is the default target.
 #
@@ -57,9 +59,9 @@ LIBPCDIR64 =/usr/lib/$(MACH64)/pkgconfig
 LIBPCSRC = openssl.pc
 
 $(LIBPCSRC): ../../$(LIBPCSRC).tmpl
-	$(SED)	-e s@__VERSION__@$(VERS:.%=%)@ \
-		-e s@__PREFIX__@$(SFW_ROOT)@ \
-		-e s@__LIBDIR__@$(OPENSSL_LIBDIR)@ \
+	$(SED)	-e "s@__VERSION__@$(VERS:.%=%)@" \
+		-e "s@__PREFIX__@$(SFW_ROOT)@" \
+		-e "s@__LIBDIR__@$(SFWLIBDIR)@" \
 		 < ../../$(LIBPCSRC).tmpl > $(LIBPCSRC)
 
 ROOTLIBPCDIR = $(ROOT)/$(LIBPCDIR)
diff --git a/usr/src/lib/openssl/Makefile.openssl b/usr/src/lib/openssl/Makefile.openssl
index 86c72ea683..6867c968c2 100644
--- a/usr/src/lib/openssl/Makefile.openssl
+++ b/usr/src/lib/openssl/Makefile.openssl
@@ -19,14 +19,14 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
 # OpenSSL source is common between lib and stand (for wanboot).
-# For userland consumers it is in /usr so we define some macros in case
-# it moves else where later (it has moved thrice already!).
+# For userland consumers it is in /usr/sfw so we define some macros in case
+# it moves else where later (it has moved twice already!).
 #
 # OPENSSL_CPPFLAGS and OPENSSL_LDLIBS OPENSSL_DYNFLAGS should be used 
 # by all the consumers of the OpenSSL libraries.
@@ -37,7 +37,7 @@
 #
 OPENSSL_SRC =		$(SRC)/common/openssl
 
-OPENSSL_ETCDIR =	/etc/openssl
+OPENSSL_ETCDIR =	/etc/sfw/openssl
 
 
 # The OPENSSL_NO_XXX variable is use to list the algorithms which Solaris
@@ -82,8 +82,9 @@ OPENSSL_BUILD_CPPFLAGS = \
 OPENSSL_CPPFLAGS =	-I$(ROOTSFWINCLUDE)
 OPENSSL_CPPFLAGS +=	-I$(PARENT_ROOT)$(SFWINCDIR)
 
-OPENSSL_LIBDIR =	$(SFWLIBDIR:$(SFW_ROOT)%=%)
-OPENSSL_LDFLAGS =	-L$(ROOT)$(OPENSSL_LIBDIR)
-OPENSSL_LDFLAGS +=	-L$(PARENT_ROOT)$(OPENSSL_LIBDIR)
+OPENSSL_LDFLAGS =	-L$(ROOT)$(SFWLIBDIR)
+OPENSSL_LDFLAGS +=	-L$(PARENT_ROOT)$(SFWLIBDIR)
+OPENSSL_LDFLAGS +=	-L$(SFWLIBDIR)
 
+OPENSSL_DYNFLAGS =	-R $(SFWLIBDIR)
 CFLAGS +=		-_gcc=-fasm