Merge pull request #22 from uwiger/uw-otp24

Fix compilation under OTP 24, delete rebar2
uwiger · May 17, 2021 · 4504acc · 4504acc
2 parents dd3d082 + a081fba
commit 4504acc
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,7 @@
 .project
 .settings/
 .eunit/
+_build/
 ebin/
 *~
 */*~

diff --git a/Makefile b/Makefile
@@ -1,12 +1,14 @@
+REBAR3=$(shell which rebar3 || echo ./rebar3)
+
 .PHONY: all compile clean doc
 
 all: compile
 
 compile:
-	./rebar compile
+	$(REBAR3) compile
 
 clean:
-	./rebar clean
+	$(REBAR3) clean
 
 doc: compile
 	./make_doc
diff --git a/rebar b/rebar
diff --git a/rebar.lock b/rebar.lock
@@ -0,0 +1 @@
+[].
diff --git a/rebar3 b/rebar3
diff --git a/src/edoc_compat.hrl b/src/edoc_compat.hrl
@@ -4,6 +4,9 @@
 -ifndef(NO_APP).
 %% OTP 24+ EDoc
 -define(NO_APP, no_app).
+-endif.
+
+-if(?OTP_RELEASE >= 24).
 -define(context, doclet_context).
 -else.
 %% Pre OTP 24 EDoc