From be51eb962063def3b5d793458aa813e10f43ae8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Hoguin?= Date: Fri, 15 Aug 2014 14:40:35 +0200 Subject: Fix relx plugin to have targets defined even if file is missing --- erlang.mk | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'erlang.mk') diff --git a/erlang.mk b/erlang.mk index 7e8e0f3..944bed9 100644 --- a/erlang.mk +++ b/erlang.mk @@ -685,14 +685,12 @@ distclean-edoc: # Copyright (c) 2013-2014, Loïc Hoguin # This file is part of erlang.mk and subject to the terms of the ISC License. -.PHONY: distclean-rel +.PHONY: relx-rel distclean-relx-rel distclean-relx # Configuration. RELX_CONFIG ?= $(CURDIR)/relx.config -ifneq ($(wildcard $(RELX_CONFIG)),) - RELX ?= $(CURDIR)/relx export RELX @@ -706,10 +704,11 @@ endif # Core targets. -rel:: distclean-rel $(RELX) - @$(RELX) -c $(RELX_CONFIG) $(RELX_OPTS) +ifneq ($(wildcard $(RELX_CONFIG)),) +rel:: distclean-relx-rel relx-rel +endif -distclean:: distclean-rel distclean-relx +distclean:: distclean-relx-rel distclean-relx # Plugin-specific targets. @@ -721,10 +720,11 @@ endef $(RELX): @$(call relx_fetch) -distclean-rel: +relx-rel: $(RELX) + @$(RELX) -c $(RELX_CONFIG) $(RELX_OPTS) + +distclean-relx-rel: $(gen_verbose) rm -rf $(RELX_OUTPUT_DIR) distclean-relx: $(gen_verbose) rm -rf $(RELX) - -endif -- cgit v1.2.3