--- a/src/util/distro-import/Makefile	Tue Apr 22 16:09:02 2008 -0700
+++ b/src/util/distro-import/Makefile	Wed Apr 23 22:53:54 2008 -0700
@@ -132,6 +132,9 @@
 	Studio.import		\
 	Webstackui.import
 
+UNBUNDLED_CLUSTERS=		\
+	Clusters.import
+
 BUILDS= 75a\
 	79b\
 	86
@@ -318,19 +321,29 @@
 entire: $(BUILDID)/entire.incorporation
 	PKG_REPO=$(REPO) ./import_manifest_file [email protected],5.11-0.$(BUILDID) $(BUILDID)/entire.incorporation
 
-$(UNBUNDLED_TARGETS:%=$(BUILDS)/%):
+$(UNBUNDLED_TARGETS:%=$(BUILDS)/%) $(UNBUNDLED_CLUSTERS:%=$(BUILDS)/%):
 	$(MAKE) BUILDID=$(@D) $(@F)
 
 $(UNBUNDLED_TARGETS): unbundleds/$$(@:%.import=%)
 	rm -f redist_cluster; ln -s $(BUILDID)/redist_cluster redist_cluster
 	$(SOLARIS.PY) -s $(REPO) $(ALL_PKGS:%=-w %) $(ELIDED_FILES:%=-D %) `./package_names.py unbundleds/$(@:%.import=%)`  unbundleds/$(@:%.import=%) redist_cluster
 
+$(UNBUNDLED_CLUSTERS): unbundleds/$$(@:%.import=%)
+	rm -f redist_cluster; ln -s $(BUILDID)/redist_cluster redist_cluster
+	$(SOLARIS.PY) -s $(REPO) $(ALL_PKGS:%=-w %) $(ELIDED_FILES:%=-D %) `./package_names.py unbundleds/$(@:%.import=%)`  unbundleds/$(@:%.import=%) $(UNBUNDLED_TARGETS:%.import=unbundleds/%) redist_cluster
+
+%/all_unbundleds:
+	$(MAKE) BUILDID=$(@D) $(@F)
+
+all_unbundleds:	$(UNBUNDLED_TARGETS:%=$(BUILDID)/%)
+	$(MAKE) $(BUILDID)/$(UNBUNDLED_CLUSTERS)
+
 
 %/SUNWipkg:
 	$(MAKE) BUILDID=$(@D) $(@F)
 
 SUNWipkg:
-	PKG_REPO=$(REPO) ./publish_ips pkg:/[email protected],5.11-0.`echo $(BUILDID) | tr '[a-z]' ' '`
+	PKG_REPO=$(REPO) ./publish_ips pkg:/[email protected],5.11-0.`echo $(BUILDID) | tr '[a-z]' ' '` ../../../packages/i386/SUNWipkg
 
 clean:
 	rm -f $(OBJS)