--- a/usr/src/lib/openssl/openssl-0.9.8/fips/Makefile.sfw	Sun May 15 10:12:12 2011 -0700
+++ b/usr/src/lib/openssl/openssl-0.9.8/fips/Makefile.sfw	Sun May 15 10:24:42 2011 -0700
@@ -22,7 +22,7 @@
 #
 # Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
 #
-# ident	"@(#)Makefile.sfw	1.1	11/04/07 SMI"
+# ident	"@(#)Makefile.sfw	1.2	11/04/29 SMI"
 #
 
 include $(SRC)/lib/Makefile.lib
@@ -58,6 +58,14 @@
 
 CONFIG_STATUS = config.status
 
+# We need to create lint libraries from relevant header files. However, part of
+# the install script is to install both the headers files and the built lint
+# libraries. So, we cannot use the proto area to build the lint libraries since
+# no headers are there yet. We use the original headers from the source code
+# directory. See usr/src/Makefile.master for original definition of $(LINT.c).
+MYLINT = $(LINT) $(LINTFLAGS) -I ./include $(CPPFLAGS)
+MYLINT64 = $(LINT) $(LINTFLAGS64) -I ./include $(CPPFLAGS)
+
 all := TARGET = all
 all32 := TARGET = all32
 all64 := TARGET = all64
@@ -97,13 +105,13 @@
 
 lint32: $(VER)/$(CONFIG_STATUS)
 	cd $(VER); \
-		$(LINT.c) -o crypto ../llib-lcrypto; \
-		$(LINT.c) -o ssl ../llib-lssl
+		$(MYLINT) -o crypto ../llib-lcrypto; \
+		$(MYLINT) -o ssl ../llib-lssl
 
 lint64: $(VER64)/$(CONFIG_STATUS)
 	cd $(VER64); \
-		$(LINT64.c) -o crypto ../llib-lcrypto; \
-		$(LINT64.c) -o ssl ../llib-lssl
+		$(MYLINT64) -o crypto ../llib-lcrypto; \
+		$(MYLINT64) -o ssl ../llib-lssl
 
 install: all install32 install64