---

yaml
---
r: 126743
b: refs/heads/snap-stage3
c: e34e86d
h: refs/heads/master
i:
  126741: 7912a0c
  126739: cb97f10
  126735: eb5bddc
v: v3

Author: brson

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 7be8f0af0393dcdb077c2f6b1653836fd3fba235
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 04914fddfb772eed2fe83b7638bd04ca23eacc0a
+refs/heads/snap-stage3: e34e86d151341076556635b9bc233338d3d9898e
 refs/heads/try: 502e4c045236682e9728539dc0d2b3d0b237f55c
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/mk/dist.mk

@@ -156,7 +156,7 @@ define DEF_OSX_PKG
 $$(eval $$(call DEF_PREPARE,osx-$(1)))
 
 dist-prepare-osx-$(1): PREPARE_HOST=$(1)
-dist-prepare-osx-$(1): PREPARE_TARGETS=$(1)
+dist-prepare-osx-$(1): PREPARE_TARGETS=$(2)
 dist-prepare-osx-$(1): PREPARE_DEST_DIR=tmp/dist/pkgroot-$(1)
 dist-prepare-osx-$(1): PREPARE_DIR_CMD=$(DEFAULT_PREPARE_DIR_CMD)
 dist-prepare-osx-$(1): PREPARE_BIN_CMD=$(DEFAULT_PREPARE_BIN_CMD)
@@ -187,7 +187,11 @@ tmp/dist/pkgres-$(1)/%: $(S)src/etc/pkg/%
 
 endef
 
-$(foreach host,$(CFG_HOST),$(eval $(call DEF_OSX_PKG,$(host))))
+ifneq ($(CFG_ENABLE_DIST_HOST_ONLY),)
+$(foreach host,$(CFG_HOST),$(eval $(call DEF_OSX_PKG,$(host),$(host))))
+else
+$(foreach host,$(CFG_HOST),$(eval $(call DEF_OSX_PKG,$(host),$(TARGET))))
+endif
 
 dist-osx: $(foreach host,$(CFG_HOST),dist/$(PKG_NAME)-$(host).pkg)
 
@@ -210,7 +214,7 @@ define DEF_INSTALLER
 $$(eval $$(call DEF_PREPARE,dir-$(1)))
 
 dist-install-dir-$(1): PREPARE_HOST=$(1)
-dist-install-dir-$(1): PREPARE_TARGETS=$(1)
+dist-install-dir-$(1): PREPARE_TARGETS=$(2)
 dist-install-dir-$(1): PREPARE_DEST_DIR=tmp/dist/$$(PKG_NAME)-$(1)
 dist-install-dir-$(1): PREPARE_DIR_CMD=$(DEFAULT_PREPARE_DIR_CMD)
 dist-install-dir-$(1): PREPARE_BIN_CMD=$(DEFAULT_PREPARE_BIN_CMD)
@@ -235,8 +239,13 @@ dist/$$(PKG_NAME)-$(1).tar.gz: dist-install-dir-$(1)
 
 endef
 
+ifneq ($(CFG_ENABLE_DIST_HOST_ONLY),)
 $(foreach host,$(CFG_HOST),\
-  $(eval $(call DEF_INSTALLER,$(host))))
+  $(eval $(call DEF_INSTALLER,$(host),$(host))))
+else
+$(foreach host,$(CFG_HOST),\
+  $(eval $(call DEF_INSTALLER,$(host),$(CFG_TARGET))))
+endif
 
 dist-install-dirs: $(foreach host,$(CFG_HOST),dist-install-dir-$(host))