--- a/components/meta-packages/history/Makefile Wed May 27 16:32:47 2015 -0700
+++ b/components/meta-packages/history/Makefile Wed May 27 17:12:47 2015 -0700
@@ -48,14 +48,20 @@
ASLR_MODE = $(ASLR_NOT_APPLICABLE)
-build install system-test:
+PKG_MACROS = CONSOLIDATION=$(CONSOLIDATION)
+PKG_MACROS += BUILD_VERSION=$(BUILD_VERSION)
+PKG_MACROS += OS_VERSION=$(OS_VERSION)
+
+PKG_OPTIONS += $(PKG_MACROS:%=-D %)
+
+build install test system-test:
@echo "nothing to be done for $@"
$(BUILD_DIR):
$(MKDIR) $@
$(MANIFEST_BASE)-%.mogrified: %.p5m $(BUILD_DIR)
- $(PKGMOGRIFY) -D CONSOLIDATION=$(CONSOLIDATION) $< \
+ $(PKGMOGRIFY) $(PKG_OPTIONS) $< \
$(WS_TOP)/transforms/incorporate > $@
$(MANIFEST_BASE)-%.published: $(MANIFEST_BASE)-%.mogrified $(BUILD_DIR)
@@ -82,4 +88,3 @@
clobber clean::
$(RM) -r $(BUILD_DIR) $(GENERATED_ARCH_MANIFESTS)
-