summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore1
-rw-r--r--Makefile6
-rw-r--r--src/elixir.app.src (renamed from lib/elixir/src/elixir.app.src)0
3 files changed, 6 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index c0a1fc30b..bfd6fa50b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@
/.full
/lib/*/ebin/*
/lib/*/test/tmp
+/lib/elixir/src/elixir.app.src
/lib/elixir/src/*_lexer.erl
/lib/elixir/src/*_parser.erl
/lib/elixir/test/ebin
diff --git a/Makefile b/Makefile
index dd17f9324..6594b1372 100644
--- a/Makefile
+++ b/Makefile
@@ -43,7 +43,11 @@ endef
#==> Compilation tasks
KERNEL:=lib/elixir/ebin/__MAIN__-Elixir-Builtin.beam
-compile: erlang elixir
+compile: lib/elixir/src/elixir.app.src erlang elixir
+
+lib/elixir/src/elixir.app.src: src/elixir.app.src
+ @ rm -rf lib/elixir/src/elixir.app.src
+ @ cp src/elixir.app.src lib/elixir/src/elixir.app.src
erlang:
@ cd lib/elixir && $(REBAR) compile
diff --git a/lib/elixir/src/elixir.app.src b/src/elixir.app.src
index 3fad94abe..3fad94abe 100644
--- a/lib/elixir/src/elixir.app.src
+++ b/src/elixir.app.src