setting REBAR to the rebar in the current directory works

erlware · Mar 7, 2014 · 1c5bcba · 1c5bcba
1 parent 9694936
commit 1c5bcba
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/Makefile b/Makefile
@@ -31,13 +31,13 @@ endif
 
 REBAR=$(shell which rebar)
 
-ifeq ($(REBAR),)
+# If building on travis, use the rebar in the current directory
+ifeq ($(TRAVIS),true)
 REBAR=$(CURDIR)/rebar
 endif
 
-# Unset rebar when building on Travis
-ifeq ($(TRAVIS),true)
-REBAR=""
+ifeq ($(REBAR),)
+REBAR=$(CURDIR)/rebar
 endif
 
 # =============================================================================