summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoan Touzet <wohali@apache.org>2017-07-08 02:30:39 -0400
committerJoan Touzet <wohali@apache.org>2017-07-08 02:30:39 -0400
commit83f085dbf34b4d8d6e9dfc097910803a3f6e4daa (patch)
tree1dc18ddb1142a56bc5f0db8f43022192a9a42d1e
parent3e4da6085b9989aa0a1436b659d7267a3c3f1226 (diff)
downloadcouchdb-83f085dbf34b4d8d6e9dfc097910803a3f6e4daa.tar.gz
Fix Windows build
-rw-r--r--Makefile.win1
-rw-r--r--configure.ps12
2 files changed, 2 insertions, 1 deletions
diff --git a/Makefile.win b/Makefile.win
index e91b19f16..faed38e39 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 8420e1f58..418cac3d3 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)
)