[couchdb] branch master updated: Use devclean on elixir target for consistency of Makefile (#1785)

[eiri]

This is an automated email from the ASF dual-hosted git repository.

eiri pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/couchdb.git


The following commit(s) were added to refs/heads/master by this push:
     new 510f267  Use devclean on elixir target for consistency of Makefile 
(#1785)
510f267 is described below

commit 510f267406a81365831c9aa65247b2c5391a12a4
Author: Eric Avdey <e...@eiri.ca>
AuthorDate: Fri Nov 30 17:31:20 2018 -0400

    Use devclean on elixir target for consistency of Makefile (#1785)
    
    Use devclean on elixir target for consistency of Makefile
---
 Makefile     | 3 +--
 Makefile.win | 5 ++---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index c258b16..5cd852c 100644
--- a/Makefile
+++ b/Makefile
@@ -172,8 +172,7 @@ soak-eunit: couch
        while [ $$? -eq 0 ] ; do $(REBAR) -r eunit $(EUNIT_OPTS) ; done
 
 .PHONY: elixir
-elixir: elixir-check-formatted
-       @rm -rf dev/lib
+elixir: elixir-check-formatted devclean
        @dev/run -a adm:pass --no-eval test/elixir/run
 
 .PHONY: elixir-check-formatted
diff --git a/Makefile.win b/Makefile.win
index e57763b..eedf99b 100644
--- a/Makefile.win
+++ b/Makefile.win
@@ -144,8 +144,7 @@ just-eunit:
 
 
 .PHONY: elixir
-elixir: elixir-check-formatted
-       @del /s/q dev\lib 2> nul
+elixir: elixir-check-formatted devclean
        @dev\run -a adm:pass --no-eval test\elixir\run.cmd
 
 .PHONY: elixir-check-formatted
@@ -326,7 +325,7 @@ clean:
        -@del /f/q/s src\*.dll
        -@del /f/q src\couch\priv\*.exe
        -@del /f/q share\server\main.js share\server\main-coffee.js
-       -@rmdir /s/q tmp 
+       -@rmdir /s/q tmp
        -@rmdir /s/q dev\data
        -@rmdir /s/q dev\lib
        -@rmdir /s/q dev\logs