--- a/make-rules/ips.mk Thu Jun 10 15:22:50 2010 -0500
+++ b/make-rules/ips.mk Thu Jun 10 15:28:20 2010 -0500
@@ -52,6 +52,7 @@
publish: $(COMPONENT_SRC)/.published
COPYRIGHT_FILE = $(COMPONENT_NAME)-$(COMPONENT_VERSION).copyright
+IPS_COMPONENT_VERSION = $(COMPONENT_VERSION)
$(PROTO_DIR)/$(COPYRIGHT_FILE): $(COMPONENT_COPYRIGHT)
$(CP) $< $@
@@ -60,7 +61,7 @@
pkgsend generate $(PROTO_DIR) >$@
$(COMPONENT_SRC)/$(MANIFEST).mog: $(COMPONENT_SRC)/$(MANIFEST) $(PROTO_DIR)/$(COPYRIGHT_FILE)
- echo "set name=pkg.fmri value=pkg:/$(PUBLISHER)/$(COMPONENT_NAME)@$(COMPONENT_VERSION),$(BUILD_VERSION)" >$@
+ echo "set name=pkg.fmri value=pkg:/$(PUBLISHER)/$(COMPONENT_NAME)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)" >$@
echo "set name=pkg.description value=\"$(COMPONENT_DESCRIPTION)\"" >>$@
echo "set name=pkg.name value=\"$(COMPONENT_DESCRIPTION)\"" >>$@
echo "set name=org.opensolaris.consolidation value=$(CONSOLIDATION)" >>$@