From f4e69407d886546e154d57c668cb246abb38abf6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Hoguin?= Date: Tue, 25 Apr 2017 14:12:46 +0200 Subject: Use $(if) instead of ifeq and add a test for RELX_TAR=0 --- plugins/relx.mk | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'plugins/relx.mk') diff --git a/plugins/relx.mk b/plugins/relx.mk index 8931e71..24de0c6 100644 --- a/plugins/relx.mk +++ b/plugins/relx.mk @@ -42,18 +42,10 @@ $(RELX): $(verbose) chmod +x $(RELX) relx-rel: $(RELX) rel-deps app -ifeq ($(RELX_TAR),1) - $(verbose) $(RELX) -c $(RELX_CONFIG) $(RELX_OPTS) release tar -else - $(verbose) $(RELX) -c $(RELX_CONFIG) $(RELX_OPTS) release -endif + $(verbose) $(RELX) -c $(RELX_CONFIG) $(RELX_OPTS) release $(if $(filter 1,$(RELX_TAR)),tar) relx-relup: $(RELX) rel-deps app -ifeq ($(RELX_TAR),1) - $(verbose) $(RELX) -c $(RELX_CONFIG) $(RELX_OPTS) release relup tar -else - $(verbose) $(RELX) -c $(RELX_CONFIG) $(RELX_OPTS) release relup -endif + $(verbose) $(RELX) -c $(RELX_CONFIG) $(RELX_OPTS) release relup $(if $(filter 1,$(RELX_TAR)),tar) distclean-relx-rel: $(gen_verbose) rm -rf $(RELX_OUTPUT_DIR) -- cgit v1.2.3