diff options
| author | Eric Merritt <[email protected]> | 2013-09-20 15:29:30 -0700 |
|---|---|---|
| committer | Eric Merritt <[email protected]> | 2013-09-20 15:29:30 -0700 |
| commit | 8da020ccdccc9da37d8accaabe9fab0ab1e825dd (patch) | |
| tree | f01a4e30515c87cd7e6a8e38c010b83806cda105 /Makefile | |
| parent | a23fc9028f1914f7dc680a443e35cf47d347365d (diff) | |
| parent | 6df9d493655775677400ca0348de747d90305256 (diff) | |
| download | relx-8da020ccdccc9da37d8accaabe9fab0ab1e825dd.tar.gz relx-8da020ccdccc9da37d8accaabe9fab0ab1e825dd.tar.bz2 relx-8da020ccdccc9da37d8accaabe9fab0ab1e825dd.zip | |
Merge pull request #44 from tsloughter/master
allow template for sys.config and vm.args add lib_dirs config option
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -45,12 +45,12 @@ endif # problem that travis times out. The code below lets us not run # dialyzer on R14 OTP_VSN=$(shell erl -noshell -eval 'io:format("~p", [erlang:system_info(otp_release)]), erlang:halt(0).' | perl -lne 'print for /R(\d+).*/g') -TRAVIS_SLOW=$(shell expr $(OTP_VSN) \<= 14 ) +TRAVIS_SLOW=$(shell expr $(OTP_VSN) \<= 15 ) ifeq ($(TRAVIS_SLOW), 0) DIALYZER=$(shell which dialyzer) else -DIALYZER=: not running dialyzer on R14 +DIALYZER=: not running dialyzer on R14 or R15 endif .PHONY: all compile doc clean test dialyzer typer shell distclean pdf \ @@ -105,7 +105,7 @@ dialyzer: $(DEPS_PLT) typer: typer --plt $(DEPS_PLT) -r ./src -shell: get-deps compile +shell: deps compile # You often want *rebuilt* rebar tests to be available to the # shell you have to call eunit (to get the tests # rebuilt). However, eunit runs the tests, which probably |