--- a/make-rules/ips.mk	Thu Mar 24 15:37:52 2011 -0700
+++ b/make-rules/ips.mk	Fri Mar 25 11:26:56 2011 -0700
@@ -52,6 +52,7 @@
 COMPARISON_TRANSFORMS +=	$(PKGMOGRIFY_TRANSFORMS)
 
 # order is important
+PUBLISH_TRANSFORMS +=	$(WS_TOP)/transforms/variant-cleanup
 PUBLISH_TRANSFORMS +=	$(WS_TOP)/transforms/defaults
 PUBLISH_TRANSFORMS +=	$(WS_TOP)/transforms/actuators
 PUBLISH_TRANSFORMS +=	$(WS_TOP)/transforms/devel
@@ -61,7 +62,6 @@
 PUBLISH_TRANSFORMS +=	$(WS_TOP)/transforms/publish-cleanup
 
 PKG_MACROS +=		MACH=$(MACH)
-PKG_MACROS +=		ARCH=$(MACH)
 PKG_MACROS +=		MACH32=$(MACH32)
 PKG_MACROS +=		MACH64=$(MACH64)
 PKG_MACROS +=		PUBLISHER=$(PUBLISHER)
@@ -75,7 +75,7 @@
 
 PKG_OPTIONS +=		$(PKG_MACROS:%=-D %)
 
-PKG_PROTO_DIRS += $(PROTO_DIR) $(@D) $(COMPONENT_DIR)
+PKG_PROTO_DIRS += $(PROTO_DIR) $(@D) $(COMPONENT_DIR) $(COMPONENT_SRC)
 
 MANIFEST_BASE =		$(BUILD_DIR)/manifest-$(MACH)