couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From woh...@apache.org
Subject couchdb commit: updated refs/heads/master to 660c32f
Date Fri, 15 Jul 2016 22:47:15 GMT
Repository: couchdb
Updated Branches:
  refs/heads/master 33c8ca61b -> 660c32f12


Remove unbuilt doc targets from Win build


Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/660c32f1
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/660c32f1
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/660c32f1

Branch: refs/heads/master
Commit: 660c32f122a47b2a4b09ee0480a558d110d52073
Parents: 33c8ca6
Author: Joan Touzet <wohali@atypical.net>
Authored: Fri Jul 15 18:47:08 2016 -0400
Committer: Joan Touzet <wohali@atypical.net>
Committed: Fri Jul 15 18:47:08 2016 -0400

----------------------------------------------------------------------
 Makefile.win | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/660c32f1/Makefile.win
----------------------------------------------------------------------
diff --git a/Makefile.win b/Makefile.win
index bf41d57..6794bf9 100644
--- a/Makefile.win
+++ b/Makefile.win
@@ -76,8 +76,8 @@ fauxton: share\www
 .PHONY: check
 # target: check - Test everything
 check: all
-	@$(MAKE) eunit
-	@$(MAKE) javascript
+	@$(MAKE) -f Makefile.win eunit
+	@$(MAKE) -f Makefile.win javascript
 
 
 .PHONY: eunit
@@ -200,13 +200,13 @@ ifeq ($(IN_RELEASE), true)
 	-@mkdir rel\couchdb\share\www\docs
 	-@mkdir rel\couchdb\share\docs
 	@robocopy /E share\docs\html\* rel\couchdb\share\www\docs
-	@copy share\docs\pdf\CouchDB.pdf rel\couchdb\share\docs\CouchDB.pdf
+#	@copy share\docs\pdf\CouchDB.pdf rel\couchdb\share\docs\CouchDB.pdf
 	@copy share\docs\man\apachecouchdb.1 rel\couchdb\share\docs\couchdb.1
 	@copy share\docs\info\CouchDB.info rel\couchdb\share\docs\CouchDB.info
 else
 	-@mkdir rel\couchdb\share\docs
-	@robocopy /E src\docs\build\html\ rel\couchdb\share\www\docs
-	@copy src\docs\build\latex\CouchDB.pdf rel\couchdb\share\docs\CouchDB.pdf
+	@robocopy /E src\docs\build\html\* rel\couchdb\share\www\docs
+#	@copy src\docs\build\latex\CouchDB.pdf rel\couchdb\share\docs\CouchDB.pdf
 	@copy src\docs\build\man\apachecouchdb.1 rel\couchdb\share\docs\couchdb.1
 	@copy src\docs\build\texinfo\CouchDB.info rel\couchdb\share\docs\CouchDB.info
 endif


Mime
View raw message