[couchdb] branch master updated: Fix Windows build

[wo...@apache.org]

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

wohali 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 83f085d  Fix Windows build
     new 13a6e1f  Merge branch 'master' of https://github.com/apache/couchdb
83f085d is described below

commit 83f085dbf34b4d8d6e9dfc097910803a3f6e4daa
Author: Joan Touzet <wo...@apache.org>
AuthorDate: Sat Jul 8 02:30:39 2017 -0400

    Fix Windows build
---
 Makefile.win  | 1 +
 configure.ps1 | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Makefile.win b/Makefile.win
index e91b19f..faed38e 100644
--- a/Makefile.win
+++ b/Makefile.win
@@ -12,6 +12,7 @@
 
 include version.mk
 
+SHELL=cmd.exe
 REBAR?=$(shell where rebar.cmd)
 IN_RELEASE = $(shell if not exist .git echo true)
 ifeq ($(IN_RELEASE), true)
diff --git a/configure.ps1 b/configure.ps1
index 8420e1f..418cac3 100644
--- a/configure.ps1
+++ b/configure.ps1
@@ -84,7 +84,7 @@ Param(
 
     [string]$DocDir = "$DataRootDir\doc\apache-couchdb", # man documentation (default $DataRootDir\doc\apache-couchdb)
     [ValidateNotNullOrEmpty()]
-    [string]$HTMLDir = "$DocDir\html", # html documentation (default $DocDir\html)
+    [string]$HTMLDir = "$DocDir\html" # html documentation (default $DocDir\html)
 )
 
 

-- 
To stop receiving notification emails like this one, please contact
['"commits@couchdb.apache.org" <co...@couchdb.apache.org>'].