aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorLoïc Hoguin <[email protected]>2014-08-15 14:40:35 +0200
committerLoïc Hoguin <[email protected]>2014-08-15 14:40:35 +0200
commitbe51eb962063def3b5d793458aa813e10f43ae8c (patch)
treed0824617fe5b6b866c93d61c9e48eba5ef462a84 /plugins
parent6d9515fa66e3f2298f50d16614cc90a3930d4e92 (diff)
downloaderlang.mk-be51eb962063def3b5d793458aa813e10f43ae8c.tar.gz
erlang.mk-be51eb962063def3b5d793458aa813e10f43ae8c.tar.bz2
erlang.mk-be51eb962063def3b5d793458aa813e10f43ae8c.zip
Fix relx plugin to have targets defined even if file is missing
Diffstat (limited to 'plugins')
-rw-r--r--plugins/relx.mk18
1 files changed, 9 insertions, 9 deletions
diff --git a/plugins/relx.mk b/plugins/relx.mk
index 3f7fd87..3204321 100644
--- a/plugins/relx.mk
+++ b/plugins/relx.mk
@@ -1,14 +1,12 @@
# Copyright (c) 2013-2014, Loïc Hoguin <[email protected]>
# 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
@@ -22,10 +20,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.
@@ -37,10 +36,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