--- a/Makefile	Fri Sep 24 17:44:45 2010 +0200
+++ b/Makefile	Fri Sep 24 17:44:46 2010 +0200
@@ -139,7 +139,7 @@
 # ==== Public targets ====
 # ************************
 
-.PHONY: all install doc clean
+.PHONY: all install ips pkgsend doc clean
 
 all: build/pkgs.d build/cldr.d locale_objects
 
@@ -147,6 +147,8 @@
 
 ips: install_ips
 
+pkgsend: pkgsend_ips
+
 doc: build/report_diff.html
 
 clean: 
@@ -326,6 +328,7 @@
 
 install_svr4: build/pkgs.d $(PKGS:%=build/%/.installed_svr4)
 install_ips: build/pkgs.d $(PKGS:%=build/%/.installed_ips)
+pkgsend_ips: build/pkgs.d $(PKGS:%=build/%/.pkgsend)
 
 
 $(LOCALES:%=build/%/.installed): build/%/.installed: build/%/.installed_locale_object_32 build/%/.installed_locale_object_64 build/%/.installed_locale_description build/%/.installed_locale_map
@@ -357,10 +360,15 @@
 	$(Q)cp $< pkgmaps/locale/prototype.$(subst SUNW,,$*)
 	$(Q)touch $@
 
-$(PKGS:%=build/%/.installed_ips): build/%/.installed_ips: build/%/manifest build/%/.installed $(FILEROOT)/copyright.cddl+unicode
+$(PKGS:%=build/%/.installed_ips): build/%/.installed_ips: build/%/manifest build/%/.installed $(FILEROOT)/copyright.cddl+unicode pkgmaps/locale/.dir
+	$(M)INSTALL $*/manifest
+	$(Q)cp $< pkgmaps/locale/manifest.$(subst SUNW,,$*)
+	$(Q)touch $@
+
+$(PKGS:%=build/%/.pkgsend): build/%/.pkgsend: build/%/.installed_ips
 	$(M)PKGSEND $*
-	$(Q)eval `pkgsend -s $(PKG_REPO) open $*@0.5.11,5.11-0.111`; \
-		pkgsend -s $(PKG_REPO) include -d $(FILEROOT) $<; \
+	$(Q)(eval `pkgsend -s $(PKG_REPO) open $*@0.5.11,5.11-0.111` && \
+		pkgsend -s $(PKG_REPO) include -d $(FILEROOT) build/$*/manifest; \
 		pkgsend -s $(PKG_REPO) close) $(if $(Q), >/dev/null)
 	$(Q)touch $@