summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMagnus Ahltorp <map@kth.se>2014-11-13 19:25:11 +0100
committerMagnus Ahltorp <map@kth.se>2014-11-19 04:50:33 +0100
commit31c95a0b8f8776011846d4b8744aa80be68d4830 (patch)
tree0c19438584258610296364ee42108eed42188204
parent9eae8602cefaa53dad6f4c7fca1649668ba9efc5 (diff)
Use an escript to call make, since 'erl -make' doesn't return error code
-rw-r--r--Makefile2
-rwxr-xr-xmake.erl18
2 files changed, 19 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index a905c78..1eb9b52 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ build all:
(cd c_src && make all)
mkdir -p priv
cp c_src/fsynchelper priv/
- erl -pa ../lager/ebin -make
+ ./make.erl
clean:
(cd c_src && make clean)
-rm priv/fsynchelper
diff --git a/make.erl b/make.erl
new file mode 100755
index 0000000..4ebdf74
--- /dev/null
+++ b/make.erl
@@ -0,0 +1,18 @@
+#!/usr/bin/env escript
+%% -*- erlang -*-
+
+main(_) ->
+ LagerPath = "../lager/ebin",
+ case code:add_path(LagerPath) of
+ true ->
+ ok;
+ {error, bad_directory} ->
+ io:format("Could not add path ~p~n", [LagerPath]),
+ halt(1)
+ end,
+ case make:all() of
+ up_to_date ->
+ ok;
+ error ->
+ halt(1)
+ end.