--- a/make-rules/ips.mk Mon Feb 07 08:17:09 2011 -0800
+++ b/make-rules/ips.mk Mon Feb 07 17:45:11 2011 -0800
@@ -65,21 +65,15 @@
PKG_MACROS += ARCH=$(MACH)
PKG_MACROS += MACH32=$(MACH32)
PKG_MACROS += MACH64=$(MACH64)
-PKG_MACROS += IPS_PKG_NAME=$(IPS_PKG_NAME)
PKG_MACROS += PUBLISHER=$(PUBLISHER)
PKG_MACROS += CONSOLIDATION=$(CONSOLIDATION)
PKG_MACROS += BUILD_VERSION=$(BUILD_VERSION)
PKG_MACROS += SOLARIS_VERSION=$(SOLARIS_VERSION)
PKG_MACROS += OS_VERSION=$(OS_VERSION)
PKG_MACROS += IPS_COMPONENT_VERSION=$(IPS_COMPONENT_VERSION)
-PKG_MACROS += COMPONENT_PROJECT_URL=$(COMPONENT_PROJECT_URL)
PKG_MACROS += COMPONENT_ARCHIVE_URL=$(COMPONENT_ARCHIVE_URL)
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)
MANIFEST_BASE = $(BUILD_DIR)/manifest-$(MACH)
@@ -96,9 +90,6 @@
ifeq ($(IPS_PKG_NAME),)
IPS_PKG_NAME = $(COMPONENT_NAME)
endif
-ifeq ($(COMPONENT_SUMMARY),)
- COMPONENT_SUMMARY = $(COMPONENT_DESCRIPTION)
-endif
IPS_COMPONENT_VERSION = $(COMPONENT_VERSION)
.DEFAULT: publish