aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornuex <[email protected]>2014-03-07 04:43:53 -0500
committernuex <[email protected]>2014-03-07 04:43:53 -0500
commit1c5bcba490b1af53e28f0a831a273fece5f770a5 (patch)
tree2ea2885eac4d470c9d78198175a0212cc9c634ff
parent96949363d301df5b120c717b539e73b7020edc68 (diff)
downloadrelx-1c5bcba490b1af53e28f0a831a273fece5f770a5.tar.gz
relx-1c5bcba490b1af53e28f0a831a273fece5f770a5.tar.bz2
relx-1c5bcba490b1af53e28f0a831a273fece5f770a5.zip
setting REBAR to the rebar in the current directory works
-rw-r--r--Makefile8
1 files changed, 4 insertions, 4 deletions
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
# =============================================================================