aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSrijan Choudhary <[email protected]>2015-01-09 18:05:09 +0530
committerSrijan Choudhary <[email protected]>2015-01-09 18:07:57 +0530
commit16551762371f3eb67b4be418f7b9b0a1e330f687 (patch)
tree89ef7ddda7c7efdd1b7480b6ba7aa9dcc6669bee
parent7f1f97aef8b6e34f9641705dd4e2e556afb9e78f (diff)
downloaderlang.mk-16551762371f3eb67b4be418f7b9b0a1e330f687.tar.gz
erlang.mk-16551762371f3eb67b4be418f7b9b0a1e330f687.tar.bz2
erlang.mk-16551762371f3eb67b4be418f7b9b0a1e330f687.zip
Don't overwrite elvis config if elvis binary is missing
-rw-r--r--erlang.mk6
-rw-r--r--plugins/elvis.mk6
2 files changed, 8 insertions, 4 deletions
diff --git a/erlang.mk b/erlang.mk
index 73948a7..269b3e9 100644
--- a/erlang.mk
+++ b/erlang.mk
@@ -921,11 +921,13 @@ distclean:: distclean-elvis
# Plugin-specific targets.
$(ELVIS):
- @$(call core_http_get,$(ELVIS_CONFIG),$(ELVIS_CONFIG_URL))
@$(call core_http_get,$(ELVIS),$(ELVIS_URL))
@chmod +x $(ELVIS)
-elvis: $(ELVIS)
+$(ELVIS_CONFIG):
+ @$(call core_http_get,$(ELVIS_CONFIG),$(ELVIS_CONFIG_URL))
+
+elvis: $(ELVIS) $(ELVIS_CONFIG)
@$(ELVIS) rock -c $(ELVIS_CONFIG) $(ELVIS_OPTS)
distclean-elvis:
diff --git a/plugins/elvis.mk b/plugins/elvis.mk
index f3e75a8..341038f 100644
--- a/plugins/elvis.mk
+++ b/plugins/elvis.mk
@@ -30,11 +30,13 @@ distclean:: distclean-elvis
# Plugin-specific targets.
$(ELVIS):
- @$(call core_http_get,$(ELVIS_CONFIG),$(ELVIS_CONFIG_URL))
@$(call core_http_get,$(ELVIS),$(ELVIS_URL))
@chmod +x $(ELVIS)
-elvis: $(ELVIS)
+$(ELVIS_CONFIG):
+ @$(call core_http_get,$(ELVIS_CONFIG),$(ELVIS_CONFIG_URL))
+
+elvis: $(ELVIS) $(ELVIS_CONFIG)
@$(ELVIS) rock -c $(ELVIS_CONFIG) $(ELVIS_OPTS)
distclean-elvis: