--- a/make-rules/ips.mk Fri Jul 16 00:58:56 2010 -0500
+++ b/make-rules/ips.mk Mon Jul 19 10:23:15 2010 -0500
@@ -76,9 +76,9 @@
PKG_OPTIONS += $(PKG_MACROS:%=-D %)
# multi-word macros get broken up, so we handle them "specially"
-PKG_OPTIONS += -D COMPONENT_SUMMARY=\"$(COMPONENT_SUMMARY)\"
-PKG_OPTIONS += -D COMPONENT_DESCRIPTION=\"$(COMPONENT_DESCRIPTION)\"
-PKG_OPTIONS += -D COMPONENT_CLASSIFICATION=\"$(COMPONENT_CLASSIFICATION)\"
+PKG_OPTIONS += -D COMPONENT_SUMMARY=$(COMPONENT_SUMMARY)
+PKG_OPTIONS += -D COMPONENT_DESCRIPTION=$(COMPONENT_DESCRIPTION)
+PKG_OPTIONS += -D COMPONENT_CLASSIFICATION=$(COMPONENT_CLASSIFICATION)
MANIFEST_BASE = $(COMPONENT_SRC)/manifest-$(MACH)
@@ -92,7 +92,9 @@
PUBLISHED=$(MOGRIFIED:%.resolved=%.published)
COPYRIGHT_FILE = $(COMPONENT_NAME)-$(COMPONENT_VERSION).copyright
-IPS_PKG_NAME = $(COMPONENT_NAME)
+ifeq ($(IPS_PKG_NAME),)
+ IPS_PKG_NAME = $(COMPONENT_NAME)
+endif
IPS_COMPONENT_VERSION = $(COMPONENT_VERSION)
.DEFAULT: publish