--- a/components/Makefile	Wed Dec 18 04:50:56 2013 -0800
+++ b/components/Makefile	Wed Dec 18 10:04:53 2013 -0800
@@ -106,7 +106,7 @@
 DUMMYPKG += "set org.opensolaris.consolidation=userland\n"
 DUMMYPKG += "set info.classification=org.opensolaris.category.2008:System/Core"
 
-$(WS_LINT_CACHE):	$(WS_LOGS)
+$(WS_LINT_CACHE):	$(WS_LOGS) tools
 ifdef CANONICAL_REPO
 	@echo "Generating pkglint(1) cache from $(CANONICAL_REPO)..."
 	@(echo $(DUMMYPKG) | $(PKGLINT) \
@@ -131,7 +131,7 @@
 	 $(BASS_O_MATIC) $(TEMPLATE_ZONE:%=--template-zone %) \
 			 $(@:%=--component %) --make $(TARGET) $(LOG)
 
-publish:
+incorporation:
 	$(PKGREPO) refresh -s $(PKG_REPO)
 	$(WS_TOOLS)/userland-incorporator --repository $(PKG_REPO) \
 	  -p pkg:/consolidation/$(CONSOLIDATION)/$(CONSOLIDATION)[email protected]$(OS_VERSION),$(BUILD_VERSION) \
@@ -140,7 +140,9 @@
 	  -c $(CONSOLIDATION) >$(WS_LOGS)/$(CONSOLIDATION)-incorporation.p5m
 	$(PKGSEND) -s $(PKG_REPO) publish --fmri-in-manifest \
 	  $(WS_LOGS)/$(CONSOLIDATION)-incorporation.p5m
-	$(PKGREPO) refresh -s $(PKG_REPO)
+
+publish:
+	$(MAKE) incorporation
 # pkglint all of the published manifests in one batch.
 ifdef CANONICAL_REPO
 	@echo 'pkglinting all package manifests...'