3915 Add adjuncts support to the build

Reviewed by: Robert Mustacchi <rm@joyent.com>
Reviewed by: Richard Lowe <richlowe@richlowe.net>
Approved by: Dan McDonald <danmcd@nexenta.com>

28 files changed, 52 insertions, 51 deletions

diff --git a/usr/src/lib/efcode/interpreter/Makefile b/usr/src/lib/efcode/interpreter/Makefile
index 82c44bbdc2..d7475b45bb 100644
--- a/usr/src/lib/efcode/interpreter/Makefile
+++ b/usr/src/lib/efcode/interpreter/Makefile
@@ -39,7 +39,8 @@ CERRWARN += -_gcc=-Wno-uninitialized
 LDFLAGS += -R/usr/lib/efcode/$(MACH64) -M mapfile64
 
 LIBS	= fcode.so fcdriver.so
-$(PROG) := LDLIBS += -L/usr/lib/efcode/$(MACH64) $(LIBS:%=$(EFCODEDIR64)/%)
+$(PROG) := LDLIBS += -L$(ADJUNCT_PROTO)/usr/lib/efcode/$(MACH64) \
+	$(LIBS:%=$(EFCODEDIR64)/%)
 
 all: $(PROG)
 
diff --git a/usr/src/lib/fm/libldom/Makefile.com b/usr/src/lib/fm/libldom/Makefile.com
index 931961fe4a..859a177363 100644
--- a/usr/src/lib/fm/libldom/Makefile.com
+++ b/usr/src/lib/fm/libldom/Makefile.com
@@ -38,7 +38,7 @@ SRCDIR = ../sparc
 LIBS = $(DYNLIB) $(LINTLIB)
 
 CPPFLAGS += -I. -I$(SRC)/uts/sun4v -I$(ROOT)/usr/platform/sun4v/include \
-	-I/usr/include/libxml2 -I/usr/sfw/include
+	-I$(ADJUNCT_PROTO)/usr/include/libxml2
 CFLAGS += $(CCVERBOSE) $(C_BIGPICFLAGS)
 CFLAGS64 += $(CCVERBOSE) $(C_BIGPICFLAGS)
 
diff --git a/usr/src/lib/fm/topo/libtopo/Makefile.com b/usr/src/lib/fm/topo/libtopo/Makefile.com
index 0b7dc59c6d..56871dd6d4 100644
--- a/usr/src/lib/fm/topo/libtopo/Makefile.com
+++ b/usr/src/lib/fm/topo/libtopo/Makefile.com
@@ -74,7 +74,7 @@ SRCDIR =	../common
 
 CLEANFILES += $(SRCDIR)/topo_error.c $(SRCDIR)/topo_tables.c
 
-CPPFLAGS += -I../common -I/usr/include/libxml2 -I.
+CPPFLAGS += -I../common -I$(ADJUNCT_PROTO)/usr/include/libxml2 -I.
 CFLAGS += $(CCVERBOSE) $(C_BIGPICFLAGS)
 CFLAGS += -D_POSIX_PTHREAD_SEMANTICS
 CFLAGS64 += $(CCVERBOSE) $(C_BIGPICFLAGS)
diff --git a/usr/src/lib/libbrand/Makefile.com b/usr/src/lib/libbrand/Makefile.com
index cd7d83371a..77443eb600 100644
--- a/usr/src/lib/libbrand/Makefile.com
+++ b/usr/src/lib/libbrand/Makefile.com
@@ -22,7 +22,6 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
 
 LIBRARY=	libbrand.a
 VERS=		.1
@@ -34,7 +33,7 @@ include ../../Makefile.lib
 LIBS=		$(DYNLIB) $(LINTLIB)
 LDLIBS +=	-lc
 $(LINTLIB) := SRCS=	$(SRCDIR)/$(LINTSRC)
-CPPFLAGS +=	-I/usr/include/libxml2 -I$(SRCDIR) -D_REENTRANT
+CPPFLAGS +=	-I$(ADJUNCT_PROTO)/usr/include/libxml2 -I$(SRCDIR) -D_REENTRANT
 $(DYNLIB) :=	LDLIBS += -lxml2
 
 SRCDIR=		../common
diff --git a/usr/src/lib/libkmf/ber_der/Makefile.com b/usr/src/lib/libkmf/ber_der/Makefile.com
index e056b6cfa7..6654e7cfde 100644
--- a/usr/src/lib/libkmf/ber_der/Makefile.com
+++ b/usr/src/lib/libkmf/ber_der/Makefile.com
@@ -43,8 +43,10 @@ $(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC)
 
 CFLAGS		+=	$(CCVERBOSE) -xCC
 CFLAGS64	+=	$(CCVERBOSE) -xCC
-CPPFLAGS	+=	-I/usr/include/libxml2 -I$(INCDIR) -I../../include
-CPPFLAGS64	+=	-I/usr/include/libxml2 -I$(INCDIR) -I../../include
+CPPFLAGS	+=	-I$(ADJUNCT_PROTO)/usr/include/libxml2 \
+			-I$(INCDIR) -I../../include
+CPPFLAGS64	+=	-I$(ADJUNCT_PROTO)/usr/include/libxml2 \
+			-I$(INCDIR) -I../../include
 LDLIBS		+=	-lc
 
 CERRWARN	+=	-_gcc=-Wno-unused-label
diff --git a/usr/src/lib/libkmf/libkmf/Makefile.com b/usr/src/lib/libkmf/libkmf/Makefile.com
index 4091ae09c1..a704d1e5a8 100644
--- a/usr/src/lib/libkmf/libkmf/Makefile.com
+++ b/usr/src/lib/libkmf/libkmf/Makefile.com
@@ -63,7 +63,8 @@ LDLIBS6	+=	$(BERDERLIB64) $(CRYPTOUTILLIB64) -lmd -lpkcs11 -lnsl -lsocket -lc
 $(DYNLIB) :=    LDLIBS += -lxml2
 $(DYNLIB64) :=  LDLIBS64 += -lxml2
 
-CPPFLAGS	+=	-I$(INCDIR) -I/usr/include/libxml2 -I../../ber_der/inc -I$(SRCDIR)
+CPPFLAGS	+=	-I$(INCDIR) -I$(ADJUNCT_PROTO)/usr/include/libxml2 \
+			-I../../ber_der/inc -I$(SRCDIR)
 
 CERRWARN	+=	-_gcc=-Wno-parentheses
 CERRWARN	+=	-_gcc=-Wno-switch
diff --git a/usr/src/lib/libkmf/plugins/kmf_nss/Makefile.com b/usr/src/lib/libkmf/plugins/kmf_nss/Makefile.com
index a3ab702811..3b5f23aa92 100644
--- a/usr/src/lib/libkmf/plugins/kmf_nss/Makefile.com
+++ b/usr/src/lib/libkmf/plugins/kmf_nss/Makefile.com
@@ -34,19 +34,21 @@ include	$(SRC)/lib/Makefile.lib
 
 MPSDIR=		/usr/lib/mps
 KMFINC=		-I../../../include -I../../../ber_der/inc
-NSSINC=		-I/usr/include/mps
+NSSINC=		-I$(ADJUNCT_PROTO)/usr/include/mps
 BERLIB=		-lkmf -lkmfberder
 BERLIB64=	$(BERLIB)
 
-NSSLIBS=	$(BERLIB) -L$(MPSDIR) -R$(MPSDIR) -lnss3 -lnspr4 -lsmime3 -lc
-NSSLIBS64=	$(BERLIB64) -L$(MPSDIR)/$(MACH64) -R$(MPSDIR)/$(MACH64) -lnss3 -lnspr4 -lsmime3 -lc
+NSSLIBS=	$(BERLIB) -L$(ADJUNCT_PROTO)$(MPSDIR) -R$(MPSDIR) \
+		-lnss3 -lnspr4 -lsmime3 -lc
+NSSLIBS64=	$(BERLIB64) -L$(ADJUNCT_PROTO)$(MPSDIR)/$(MACH64) \
+		-R$(MPSDIR)/$(MACH64) -lnss3 -lnspr4 -lsmime3 -lc
 
 SRCDIR=		../common
 INCDIR=		../../include
 
 CFLAGS		+=	$(CCVERBOSE) 
 CPPFLAGS	+=	-D_REENTRANT $(KMFINC) $(NSSINC)  \
-		-I$(SFWDIR)/include -I$(INCDIR) -I/usr/include/libxml2
+		-I$(INCDIR) -I$(ADJUNCT_PROTO)/usr/include/libxml2
 
 PICS=	$(OBJECTS:%=pics/%)
 
diff --git a/usr/src/lib/libkmf/plugins/kmf_openssl/Makefile.com b/usr/src/lib/libkmf/plugins/kmf_openssl/Makefile.com
index e44eb0a87c..76ecd38479 100644
--- a/usr/src/lib/libkmf/plugins/kmf_openssl/Makefile.com
+++ b/usr/src/lib/libkmf/plugins/kmf_openssl/Makefile.com
@@ -48,7 +48,7 @@ INCDIR=		../../include
 
 CFLAGS		+=	$(CCVERBOSE) 
 CPPFLAGS	+=	-D_REENTRANT $(KMFINC) \
-			-I$(INCDIR) -I/usr/include/libxml2
+			-I$(INCDIR) -I$(ADJUNCT_PROTO)/usr/include/libxml2
 
 CERRWARN	+=	-_gcc=-Wno-unused-label
 CERRWARN	+=	-_gcc=-Wno-unused-value
diff --git a/usr/src/lib/libkmf/plugins/kmf_pkcs11/Makefile.com b/usr/src/lib/libkmf/plugins/kmf_pkcs11/Makefile.com
index ae97ef8e8f..0b69e23fd6 100644
--- a/usr/src/lib/libkmf/plugins/kmf_pkcs11/Makefile.com
+++ b/usr/src/lib/libkmf/plugins/kmf_pkcs11/Makefile.com
@@ -49,7 +49,8 @@ SRCS =  \
 
 
 CFLAGS		+=	$(CCVERBOSE)
-CPPFLAGS	+=	-D_REENTRANT $(KMFINC) -I$(INCDIR)  -I/usr/include/libxml2 -I$(BIGNUMDIR)
+CPPFLAGS	+=	-D_REENTRANT $(KMFINC) -I$(INCDIR) \
+			-I$(ADJUNCT_PROTO)/usr/include/libxml2 -I$(BIGNUMDIR)
 LINTFLAGS64	+=	-errchk=longptr64
 
 CERRWARN	+=	-_gcc=-Wno-unused-label
diff --git a/usr/src/lib/libldap5/Makefile.com b/usr/src/lib/libldap5/Makefile.com
index 9c28fae337..ee48739eea 100644
--- a/usr/src/lib/libldap5/Makefile.com
+++ b/usr/src/lib/libldap5/Makefile.com
@@ -57,7 +57,7 @@ OBJECTS=	$(BEROBJS) $(LDAPOBJS) $(SSLDAPOBJS) $(PRLDAPOBJS) \
 include ../../Makefile.lib
 
 NSS_LIBS=	-lnspr4 -lplc4 -lnss3 -lssl3
-NSS_HDRS=	/usr/include/mps
+NSS_HDRS=	$(ADJUNCT_PROTO)/usr/include/mps
 NSS_LDPATH=	/usr/lib/mps
 NSS_LDPATH64=	$(NSS_LDPATH)/64	
 
diff --git a/usr/src/lib/libldap5/amd64/Makefile b/usr/src/lib/libldap5/amd64/Makefile
index 680f2fb7c6..82a354b822 100644
--- a/usr/src/lib/libldap5/amd64/Makefile
+++ b/usr/src/lib/libldap5/amd64/Makefile
@@ -2,15 +2,13 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 PR_MDUSOBJS = os_SunOS_x86.o
 
 include ../Makefile.com
 include ../../Makefile.lib.64
 
-LDLIBS +=	-L$(NSS_LDPATH64) $(NSS_LIBS)
+LDLIBS +=	-L$(ADJUNCT_PROTO)$(NSS_LDPATH64) $(NSS_LIBS)
 DYNFLAGS +=	-R$(NSS_LDPATH64)
 
 all: $(LIBS)
diff --git a/usr/src/lib/libldap5/i386/Makefile b/usr/src/lib/libldap5/i386/Makefile
index d0eba36ca2..500155684a 100644
--- a/usr/src/lib/libldap5/i386/Makefile
+++ b/usr/src/lib/libldap5/i386/Makefile
@@ -2,8 +2,6 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 # lib/libldap5/i386/Makefile
 #
 
@@ -11,7 +9,7 @@ PR_MDUSOBJS = os_SunOS_x86.o
 
 include ../Makefile.com
 
-LDLIBS +=	-L$(NSS_LDPATH) $(NSS_LIBS)
+LDLIBS +=	-L$(ADJUNCT_PROTO)$(NSS_LDPATH) $(NSS_LIBS)
 DYNFLAGS +=	-R$(NSS_LDPATH)
 
 all: $(LIBS)
diff --git a/usr/src/lib/libldap5/sparc/Makefile b/usr/src/lib/libldap5/sparc/Makefile
index e5e0562484..b650c81920 100644
--- a/usr/src/lib/libldap5/sparc/Makefile
+++ b/usr/src/lib/libldap5/sparc/Makefile
@@ -2,8 +2,6 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 # lib/libldap5/sparc/Makefile
 #
 
@@ -11,7 +9,7 @@ PR_MDUSOBJS = os_SunOS.o
 
 include ../Makefile.com
 
-LDLIBS +=	-L$(NSS_LDPATH) $(NSS_LIBS)
+LDLIBS +=	-L$(ADJUNCT_PROTO)$(NSS_LDPATH) $(NSS_LIBS)
 DYNFLAGS +=	-R$(NSS_LDPATH)
 
 
diff --git a/usr/src/lib/libldap5/sparcv9/Makefile b/usr/src/lib/libldap5/sparcv9/Makefile
index e1ac900b72..a36300f4ba 100644
--- a/usr/src/lib/libldap5/sparcv9/Makefile
+++ b/usr/src/lib/libldap5/sparcv9/Makefile
@@ -2,8 +2,6 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 # lib/libldap5/sparcv9/Makefile
 #
 
@@ -12,7 +10,7 @@ PR_MDUSOBJS = os_SunOS.o
 include ../Makefile.com
 include ../../Makefile.lib.64
 
-LDLIBS +=	-L$(NSS_LDPATH64) $(NSS_LIBS)
+LDLIBS +=	-L$(ADJUNCT_PROTO)$(NSS_LDPATH64) $(NSS_LIBS)
 DYNFLAGS +=	-R$(NSS_LDPATH64)
 
 all: $(LIBS)
diff --git a/usr/src/lib/libpool/Makefile.com b/usr/src/lib/libpool/Makefile.com
index 493e442d0d..13b8a05cc1 100644
--- a/usr/src/lib/libpool/Makefile.com
+++ b/usr/src/lib/libpool/Makefile.com
@@ -48,7 +48,8 @@ SRCDIR =	../common
 $(LINTLIB) :=	SRCS = $(SRCDIR)/$(LINTSRC)
 
 CFLAGS +=	$(CCVERBOSE)
-CPPFLAGS +=	-D_REENTRANT -D_FILE_OFFSET_BITS=64 -I/usr/include/libxml2
+CPPFLAGS +=	-D_REENTRANT -D_FILE_OFFSET_BITS=64 \
+		-I$(ADJUNCT_PROTO)/usr/include/libxml2
 
 CERRWARN +=	-_gcc=-Wno-parentheses
 CERRWARN +=	-_gcc=-Wno-switch
diff --git a/usr/src/lib/libshare/Makefile.com b/usr/src/lib/libshare/Makefile.com
index 7e3c902a5e..328ffb353a 100644
--- a/usr/src/lib/libshare/Makefile.com
+++ b/usr/src/lib/libshare/Makefile.com
@@ -45,7 +45,8 @@ CFLAGS +=	$(CCVERBOSE)
 CERRWARN +=	-_gcc=-Wno-parentheses
 CERRWARN +=	-_gcc=-Wno-uninitialized
 CERRWARN +=	-_gcc=-Wno-switch
-CPPFLAGS +=	-D_REENTRANT -I$(NFSLIB_DIR) -I/usr/include/libxml2
+CPPFLAGS +=	-D_REENTRANT -I$(NFSLIB_DIR) \
+		-I$(ADJUNCT_PROTO)/usr/include/libxml2
 
 .KEEP_STATE:
 
diff --git a/usr/src/lib/libshare/autofs/Makefile.com b/usr/src/lib/libshare/autofs/Makefile.com
index 41c7dfd334..d110bf634a 100644
--- a/usr/src/lib/libshare/autofs/Makefile.com
+++ b/usr/src/lib/libshare/autofs/Makefile.com
@@ -49,8 +49,9 @@ CFLAGS +=	$(CCVERBOSE)
 CERRWARN +=	-_gcc=-Wno-switch
 CERRWARN +=	-_gcc=-Wno-unused-variable
 CERRWARN +=	-_gcc=-Wno-uninitialized
-CPPFLAGS +=	-D_REENTRANT -I$(AUTOFSSMFLIB_DIR) -I/usr/include/libxml2 \
-			-I$(SRCDIR)../common
+CPPFLAGS +=	-D_REENTRANT -I$(AUTOFSSMFLIB_DIR) \
+			-I$(ADJUNCT_PROTO)/usr/include/libxml2 \
+  			-I$(SRCDIR)../common
 
 .KEEP_STATE:
 
diff --git a/usr/src/lib/libshare/nfs/Makefile.com b/usr/src/lib/libshare/nfs/Makefile.com
index d393c5f8ba..ed89b6d960 100644
--- a/usr/src/lib/libshare/nfs/Makefile.com
+++ b/usr/src/lib/libshare/nfs/Makefile.com
@@ -50,8 +50,8 @@ CERRWARN +=	-_gcc=-Wno-parentheses
 CERRWARN +=	-_gcc=-Wno-switch
 CERRWARN +=	-_gcc=-Wno-unused-variable
 CERRWARN +=	-_gcc=-Wno-uninitialized
-CPPFLAGS +=	-D_REENTRANT -I$(NFSLIB_DIR) -I/usr/include/libxml2 \
-			-I$(SRCDIR)/../common
+CPPFLAGS +=	-D_REENTRANT -I$(NFSLIB_DIR) \
+		-I$(ADJUNCT_PROTO)/usr/include/libxml2 -I$(SRCDIR)/../common
 
 .KEEP_STATE:
 
diff --git a/usr/src/lib/libshare/smb/Makefile.com b/usr/src/lib/libshare/smb/Makefile.com
index 6b3d821684..0fc5f66142 100644
--- a/usr/src/lib/libshare/smb/Makefile.com
+++ b/usr/src/lib/libshare/smb/Makefile.com
@@ -51,8 +51,8 @@ all install := LDLIBS += -lxml2
 CFLAGS +=	$(CCVERBOSE)
 CERRWARN +=	-_gcc=-Wno-char-subscripts
 CERRWARN +=	-_gcc=-Wno-switch
-CPPFLAGS +=	-D_REENTRANT -I/usr/include/libxml2 \
-		-I$(SRCDIR)/../common
+CPPFLAGS +=	-D_REENTRANT -I$(ADJUNCT_PROTO)/usr/include/libxml2 \
+  		-I$(SRCDIR)/../common
 $(ENABLE_SMB_PRINTING) CPPFLAGS += -DHAVE_CUPS
 
 .KEEP_STATE:
diff --git a/usr/src/lib/libshare/smbfs/Makefile.com b/usr/src/lib/libshare/smbfs/Makefile.com
index c4b7b48117..36b4875560 100644
--- a/usr/src/lib/libshare/smbfs/Makefile.com
+++ b/usr/src/lib/libshare/smbfs/Makefile.com
@@ -43,8 +43,8 @@ LDLIBS +=	-lshare -lscf -lumem -luuid -lc -lxml2 -lsmbfs
 CFLAGS +=	$(CCVERBOSE)
 CERRWARN +=	-_gcc=-Wno-switch
 CERRWARN +=	-_gcc=-Wno-uninitialized
-CPPFLAGS +=	-D_REENTRANT -I/usr/include/libxml2 -I$(SRCDIR)/../common \
-		-I$(SRC)/lib/libsmbfs -I$(SRC)/uts/common
+CPPFLAGS +=	-D_REENTRANT -I$(ADJUNCT_PROTO)/usr/include/libxml2 \
+		-I$(SRCDIR)/../common -I$(SRC)/lib/libsmbfs -I$(SRC)/uts/common
 
 .KEEP_STATE:
 
diff --git a/usr/src/lib/libsldap/Makefile.com b/usr/src/lib/libsldap/Makefile.com
index d03823deb8..0d35b1f794 100644
--- a/usr/src/lib/libsldap/Makefile.com
+++ b/usr/src/lib/libsldap/Makefile.com
@@ -47,7 +47,7 @@ SRCDIR =	../common
 CFLAGS +=	$(CCVERBOSE)
 LOCFLAGS +=	-D_REENTRANT -DSUNW_OPTIONS
 CPPFLAGS +=	-I../common -I$(SRC)/lib/libldap5/include/ldap \
-		-I/usr/include/mps $(LOCFLAGS)
+		-I$(ADJUNCT_PROTO)/usr/include/mps $(LOCFLAGS)
 LINTFLAGS +=	-erroff=E_BAD_PTR_CAST_ALIGN
 LINTFLAGS64 +=	-erroff=E_BAD_PTR_CAST_ALIGN
 
diff --git a/usr/src/lib/libzonecfg/Makefile.com b/usr/src/lib/libzonecfg/Makefile.com
index 4c94fe6dd6..0bee2fc908 100644
--- a/usr/src/lib/libzonecfg/Makefile.com
+++ b/usr/src/lib/libzonecfg/Makefile.com
@@ -35,7 +35,7 @@ LDLIBS +=	-lc -lsocket -lnsl -luuid -lnvpair -lsysevent -lsec -lbrand \
 $(DYNLIB) :=	LDLIBS += -lxml2
 
 SRCDIR =	../common
-CPPFLAGS +=	-I/usr/include/libxml2 -I$(SRCDIR) -D_REENTRANT
+CPPFLAGS +=	-I$(ADJUNCT_PROTO)/usr/include/libxml2 -I$(SRCDIR) -D_REENTRANT
 CERRWARN +=	-_gcc=-Wno-uninitialized
 CERRWARN +=	-_gcc=-Wno-parentheses
 $(LINTLIB) := SRCS=	$(SRCDIR)/$(LINTSRC)
diff --git a/usr/src/lib/lvm/libsvm/Makefile.com b/usr/src/lib/lvm/libsvm/Makefile.com
index 7df4a4b39f..dbcd2a7295 100644
--- a/usr/src/lib/lvm/libsvm/Makefile.com
+++ b/usr/src/lib/lvm/libsvm/Makefile.com
@@ -22,8 +22,6 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 LIBRARY=      	libsvm.a 
 VERS=          	.1 
@@ -46,7 +44,7 @@ LDLIBS +=	-lmeta -ldevid -lc
 # XXX There isn't a lint library for libspmicommon.  For now, we work
 # around this by only using the library when we build (as opposed to lint).
 #
-all debug install := LDLIBS += -L/usr/snadm/lib -lspmicommon
+all debug install := LDLIBS += -L$(ADJUNCT_PROTO)/usr/snadm/lib -lspmicommon
 
 DYNFLAGS +=	-R/usr/snadm/lib
 CPPFLAGS +=	-D_FILE_OFFSET_BITS=64
diff --git a/usr/src/lib/pkcs11/pkcs11_tpm/Makefile.com b/usr/src/lib/pkcs11/pkcs11_tpm/Makefile.com
index 22082a1fb8..323f311dec 100644
--- a/usr/src/lib/pkcs11/pkcs11_tpm/Makefile.com
+++ b/usr/src/lib/pkcs11/pkcs11_tpm/Makefile.com
@@ -66,14 +66,14 @@ ROOTLIBDIR64=$(ROOT)/usr/lib/security/$(MACH64)
 
 LIBS=$(DYNLIB) $(DYNLIB64)
 
-TSSROOT=
+TSSROOT=$(ADJUNCT_PROTO)
 TSPILIBDIR=$(TSSROOT)/usr/lib
 TSPIINCDIR=$(TSSROOT)/usr/include
 TSSLIB=-L$(TSPILIBDIR)
 TSSLIB64=-L$(TSPILIBDIR)/$(MACH64)
 TSSINC=-I$(TSPIINCDIR)
 
-LDLIBS += $(TSSLIB) -L/lib -lc -luuid -lmd -ltspi -lcrypto
+LDLIBS += $(TSSLIB) -L$(ADJUNCT_PROTO)/lib -lc -luuid -lmd -ltspi -lcrypto
 CPPFLAGS += -xCC -D_POSIX_PTHREAD_SEMANTICS $(TSSINC)
 CPPFLAGS64 += $(CPPFLAGS)
 C99MODE=        $(C99_ENABLE)
diff --git a/usr/src/lib/policykit/Makefile.policykit b/usr/src/lib/policykit/Makefile.policykit
index 8b8cff0fe1..e7f2d8a2da 100644
--- a/usr/src/lib/policykit/Makefile.policykit
+++ b/usr/src/lib/policykit/Makefile.policykit
@@ -22,15 +22,16 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 # Definitions common for PolicyKit
 #
 
 POLICYKIT_VERSION = 0.2
 
-POLICYKIT_DBUS_CPPFLAGS =	-DDBUS_API_SUBJECT_TO_CHANGE -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include
-POLICYKIT_GLIB_CPPFLAGS = 	-I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include
+POLICYKIT_DBUS_CPPFLAGS =	-DDBUS_API_SUBJECT_TO_CHANGE \
+				-I$(ADJUNCT_PROTO)/usr/include/dbus-1.0 \
+				-I$(ADJUNCT_PROTO)/usr/lib/dbus-1.0/include
+POLICYKIT_GLIB_CPPFLAGS = 	-I$(ADJUNCT_PROTO)/usr/include/glib-2.0 \
+				-I$(ADJUNCT_PROTO)/usr/lib/glib-2.0/include
 
 POLICYKIT_DBUS_LDLIBS =	-ldbus-1
 POLICYKIT_GLIB_LDLIBS =	-lglib-2.0
diff --git a/usr/src/lib/pylibbe/Makefile.com b/usr/src/lib/pylibbe/Makefile.com
index aa26dec043..9f964ce417 100644
--- a/usr/src/lib/pylibbe/Makefile.com
+++ b/usr/src/lib/pylibbe/Makefile.com
@@ -44,7 +44,8 @@ C99MODE=        $(C99_ENABLE)
 LIBS =		$(DYNLIB)
 LDLIBS +=	-lbe -lnvpair -lc
 CFLAGS +=	$(CCVERBOSE)
-CPPFLAGS +=	-I/usr/include/python2.6 -D_FILE_OFFSET_BITS=64 -I../../libbe/common
+CPPFLAGS +=	-I$(ADJUNCT_PROTO)/usr/include/python2.6 \
+		-D_FILE_OFFSET_BITS=64 -I../../libbe/common
 
 .KEEP_STATE:
 
diff --git a/usr/src/lib/pysolaris/Makefile.com b/usr/src/lib/pysolaris/Makefile.com
index a27492771a..28d68704f9 100644
--- a/usr/src/lib/pysolaris/Makefile.com
+++ b/usr/src/lib/pysolaris/Makefile.com
@@ -45,7 +45,7 @@ LIBS =		$(DYNLIB)
 LDLIBS +=	-lc -lsec -lidmap -lpython2.6
 CFLAGS +=	$(CCVERBOSE)
 CERRWARN +=	-_gcc=-Wno-unused-variable
-CPPFLAGS +=	-I/usr/include/python2.6
+CPPFLAGS +=	-I$(ADJUNCT_PROTO)/usr/include/python2.6
 
 .KEEP_STATE:
 
diff --git a/usr/src/lib/pyzfs/Makefile.com b/usr/src/lib/pyzfs/Makefile.com
index 29d0407cae..0c996d0711 100644
--- a/usr/src/lib/pyzfs/Makefile.com
+++ b/usr/src/lib/pyzfs/Makefile.com
@@ -48,7 +48,7 @@ LIBS =		$(DYNLIB)
 LDLIBS +=	-lc -lnvpair -lpython2.6 -lzfs
 CFLAGS +=	$(CCVERBOSE)
 CERRWARN +=	-_gcc=-Wno-unused-variable
-CPPFLAGS +=	-I/usr/include/python2.6
+CPPFLAGS +=	-I$(ADJUNCT_PROTO)/usr/include/python2.6
 CPPFLAGS +=	-I../../../uts/common/fs/zfs
 CPPFLAGS +=	-I../../../common/zfs