--- a/make-rules/ips.mk	Thu Dec 04 08:52:34 2014 -0800
+++ b/make-rules/ips.mk	Mon Dec 08 13:21:00 2014 -0800
@@ -91,6 +91,12 @@
 PKG_MACROS +=		COMPONENT_HG_REV=$(COMPONENT_HG_REV)
 PKG_MACROS +=		COMPONENT_NAME=$(COMPONENT_NAME)
 PKG_MACROS +=		TPNO=$(TPNO)
+
+# Add any TPNO_* Makefile macros to the pkgmogrify arguments.
+$(foreach macro, $(filter TPNO_%, $(.VARIABLES)), \
+    $(eval PKG_MACROS += $(macro)=$$($(macro))) \
+)
+
 PKG_MACROS +=		PYTHON_2.6_ONLY=\#
 PKG_MACROS +=		PYTHON_2.7_ONLY=\#