diff options
| author | Tony Theodore <tonyt@logyst.com> | 2018-11-16 00:53:56 (GMT) |
|---|---|---|
| committer | Tony Theodore <tonyt@logyst.com> | 2018-11-16 00:53:56 (GMT) |
| commit | 4c0ba6ad6214d944b1dd1d9d6130ae4da3d43754 (patch) | |
| tree | e0cc3451fd5dff6a0121a134883696ef7c669434 /mxe.github.mk | |
| parent | b698bf38e19767838b200717da7006eba99c3b15 (diff) | |
| download | mxe-4c0ba6ad6214d944b1dd1d9d6130ae4da3d43754.zip mxe-4c0ba6ad6214d944b1dd1d9d6130ae4da3d43754.tar.gz mxe-4c0ba6ad6214d944b1dd1d9d6130ae4da3d43754.tar.bz2 | |
github macros: minor improvements
Diffstat (limited to 'mxe.github.mk')
| -rw-r--r-- | mxe.github.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mxe.github.mk b/mxe.github.mk index 654381b..91c9d2e 100644 --- a/mxe.github.mk +++ b/mxe.github.mk @@ -104,11 +104,11 @@ define MXE_SETUP_GITHUB $(error $(newline) $(PKG) specifies both branch and tag variables $(newline))) $(if $(filter-out $(GH_APIS),$(GH_API))$(filter x,x$(GH_API)),\ $(error $(newline) $(PKG) has unknown API in GH_CONF := $($(PKG)_GH_CONF) $(newline)\ - must be branches|tags|releases)) - $(if $(GH_BRANCH),$(value MXE_SETUP_GITHUB_BRANCH),$(value MXE_SETUP_GITHUB_$(call uc,$(GH_API)))) + must be $(call merge,|,$(GH_APIS)))) + $(value MXE_SETUP_GITHUB_$(call uc,$(GH_API))) endef -define MXE_SETUP_GITHUB_BRANCH +define MXE_SETUP_GITHUB_BRANCHES $(PKG)_SUBDIR := $(or $($(PKG)_SUBDIR),$($(PKG)_GH_OWNER)-$($(PKG)_GH_REPO)-$($(PKG)_VERSION)) $(PKG)_URL := $(or $($(PKG)_URL),https://github.com/$($(PKG)_GH_OWNER)/$($(PKG)_GH_REPO)/tarball/$($(PKG)_VERSION)/$($(PKG)_FILE)) $(PKG)_UPDATE := $(or $($(PKG)_UPDATE),$(call MXE_GET_GH_SHA,$($(PKG)_GH_OWNER)/$($(PKG)_GH_REPO),$($(PKG)_BRANCH))) |