removed checked in rebar (buggy and old), fixed makefile to access any rebar installed, modernized rebar.config.script

tonyrog · tonyrog · commit ece5d640fd6f · 2012-10-09T18:59:56.000+02:00
diff --git a/Makefile b/Makefile
@@ -1,10 +1,10 @@
 .PHONY:	doc
 
 all:
-	./rebar compile
+	rebar compile
 
 doc:
-	./rebar doc
+	rebar doc
 
 pkg:	all doc
 	tetrapak pkg:ipkg
diff --git a/rebar b/rebar
diff --git a/rebar.config.script b/rebar.config.script
@@ -1,10 +1,7 @@
 %% -*- erlang -*-
-{ok, Opts} = file:consult(
-	       filename:join(
-		 filename:dirname(SCRIPT), "rebar.config")).
 case os:getenv("REBAR_DEPS") of
     false ->
-	Opts;
+	CONFIG;
     Dir ->
-	lists:keystore(deps_dir, 1, Opts, {deps_dir, Dir})
+	lists:keystore(deps_dir, 1, CONFIG, {deps_dir, Dir})
 end.
