github: use `if` instead of `and`

This commit is contained in:
Tony Theodore 2017-03-19 11:29:05 +11:00
parent 3127d8e134
commit 4ed90733c9
2 changed files with 2 additions and 2 deletions

View File

@ -473,7 +473,7 @@ $(foreach TARGET,$(MXE_TARGETS),$(call TARGET_RULE,$(TARGET)))
define PKG_RULE
# configure GitHub metadata if GH_CONF is set
$(and $($(PKG)_GH_CONF),$(eval $(MXE_SETUP_GITHUB)))
$(if $($(PKG)_GH_CONF),$(eval $(MXE_SETUP_GITHUB)))
.PHONY: download-$(1)
download-$(1): $(addprefix download-,$($(1)_DEPS)) download-only-$(1)

View File

@ -106,7 +106,7 @@ endef
# called with owner/repo, tag prefix, tag suffix, filter, version sep
define MXE_GET_GH_TAG
$(MXE_GET_GH_TAGS) \
| $(and $(4),grep -v '$(strip $(4))') \
| $(if $(4),grep -v '$(strip $(4))') \
| $(SED) 's,^$(strip $(2)),,g' \
| $(SED) 's,$(strip $(3))$$,,g' \
| tr '$(strip $(5))' '.' \