Skip to content
Browse files

Always use self-contained Erlang (R15B01 at the moment)

  • Loading branch information...
1 parent 5257bf0 commit fbe826197ecb7dccb9427c90129b28faa77e18e4 Yurii Rashkovskii committed
Showing with 4 additions and 9 deletions.
  1. +4 −9 Makefile
View
13 Makefile
@@ -1,13 +1,8 @@
HERE=$(shell pwd)
KERL_CONFIG_OPTS=""
-ifeq ($(shell which erl),)
- ERL=erlang/bin/erl
- REBAR=". $(HERE)/erlang/activate && $(HERE)/rebar"
-else
- ERL=$(shell which erl)
- REBAR="./rebar"
-endif
+ERL=erlang/bin/erl
+REBAR=". $(HERE)/erlang/activate && $(HERE)/rebar"
all: release
@@ -22,6 +17,6 @@ deps: $(ERL)
@$(REBAR) get-deps
$(ERL):
- @KERL_CONFIGURE_OPTIONS=$(KERL_CONFIG_OPTS) KERL_INSTALL_AGNERIZED_REBAR=n HOME=$(HERE) ./kerl build R15B r15b
- @KERL_CONFIGURE_OPTIONS=$(KERL_CONFIG_OPTS) KERL_INSTALL_AGNERIZED_REBAR=n HOME=$(HERE) ./kerl install r15b erlang
+ @KERL_CONFIGURE_OPTIONS=$(KERL_CONFIG_OPTS) KERL_INSTALL_AGNERIZED_REBAR=n HOME=$(HERE) ./kerl build R15B01 r15b01
+ @KERL_CONFIGURE_OPTIONS=$(KERL_CONFIG_OPTS) KERL_INSTALL_AGNERIZED_REBAR=n HOME=$(HERE) ./kerl install r15b01 erlang

0 comments on commit fbe8261

Please sign in to comment.
Something went wrong with that request. Please try again.