--- a/usr/src/pkg/Makefile	Wed Nov 24 14:40:38 2010 -0800
+++ b/usr/src/pkg/Makefile	Wed Nov 24 15:02:13 2010 -0800
@@ -41,7 +41,10 @@
 PKGPUBLISHER_wos = vpanels
 PKGPUBLISHER=$(PKGPUBLISHER_$(TYPE))
 
-PKG_DIR = $(CODEMGR_WS)/packages/$(ISA)
+PKG_DIR_normal = $(CODEMGR_WS)/packages/$(ISA)
+PKG_DIR_wos = $(CODEMGR_WS)/packages_wos/$(ISA)
+PKG_DIR = $(PKG_DIR_$(TYPE))
+
 PKG_REPO_LOCAL = file://$(PKG_DIR)
 PKG_REPO = $(PKG_REPO_LOCAL)
 MFDIR_normal = manifests
@@ -76,7 +79,10 @@
 	$(TRANSFORMS)
 MOG.filter = $(PKGMOGRIFY) -I transforms $(PKGMOG_DEFINES:%=-D %) -O /dev/null publish
 
-SCRATCH = build
+
+SCRATCH_normal = build
+SCRATCH_wos = build_wos
+SCRATCH = $(SCRATCH_$(TYPE))
 
 INCORP = consolidation-vpanels-vpanels-incorporation
 
@@ -106,7 +112,7 @@
 	restart_fmri \
 	publish
 
-CLEAN_FILES += $(SCRATCH)
+CLEAN_FILES += $(SCRATCH_normal) $(SCRATCH_wos)
 
 include $(SRC)/Makefile.targ