From 1c5bcba490b1af53e28f0a831a273fece5f770a5 Mon Sep 17 00:00:00 2001
From: nuex <nx@nu-ex.com>
Date: Fri, 7 Mar 2014 04:43:53 -0500
Subject: setting REBAR to the rebar in the current directory works

---
 Makefile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 28a35d5..b7ee1e5 100644
--- 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
 
 # =============================================================================
-- 
cgit v1.2.3