--- a/components/meta-packages/history/Makefile Mon Sep 05 05:00:46 2016 -0700
+++ b/components/meta-packages/history/Makefile Mon Sep 26 08:04:04 2016 -0700
@@ -41,7 +41,7 @@
MANIFEST_BASE = $(BUILD_DIR)/manifest-$(MACH)
CANONICAL_MANIFESTS = $(wildcard *.p5m)
-HISTORICAL_MANIFESTS = $(shell $(NAWK) -v FUNCTION=name -f $(GENERATE_HISTORY) < $(HISTORY))
+HISTORICAL_MANIFESTS = $(shell $(NAWK) -v FUNCTION=name -v MACH=$(MACH) -f $(GENERATE_HISTORY) < $(HISTORY))
ARCH_MANIFESTS = $(wildcard *.p5m.$(MACH))
GENERATED_ARCH_MANIFESTS = $(ARCH_MANIFESTS:%.p5m.$(MACH)=%.p5m)
CANONICAL_MANIFESTS += $(GENERATED_ARCH_MANIFESTS)
@@ -54,7 +54,7 @@
# Rule to generate historical manifests from the $(HISTORY) file.
define history-manifest-rule
$(MANIFEST_BASE)-$(1): $(HISTORY) $(BUILD_DIR)
- $(NAWK) -v FUNCTION=manifest -v TARGET=$1 -f $(GENERATE_HISTORY) < \
+ $(NAWK) -v FUNCTION=manifest -v MACH=$(MACH) -v TARGET=$1 -f $(GENERATE_HISTORY) < \
$(HISTORY) > $$@
endef
$(foreach mfst,$(HISTORICAL_MANIFESTS),$(eval $(call history-manifest-rule,$(mfst))))