couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject couchdb commit: updated refs/heads/master to 8b8e4fb
Date Mon, 16 Nov 2015 15:39:48 GMT
Repository: couchdb
Updated Branches:
  refs/heads/master ff8a67373 -> 8b8e4fb60


Do not try to install docs or fauxton when disabled in ./configure


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

Branch: refs/heads/master
Commit: 8b8e4fb603695e10b88f3eb0d9fe9f35bf8978d8
Parents: ff8a673
Author: Jan Lehnardt <jan@apache.org>
Authored: Mon Nov 16 16:33:25 2015 +0100
Committer: Jan Lehnardt <jan@apache.org>
Committed: Mon Nov 16 16:39:42 2015 +0100

----------------------------------------------------------------------
 Makefile | 4 ++++
 1 file changed, 4 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/8b8e4fb6/Makefile
----------------------------------------------------------------------
diff --git a/Makefile b/Makefile
index 3387232..ab44581 100644
--- a/Makefile
+++ b/Makefile
@@ -241,9 +241,12 @@ install: all
 	@mkdir -p $(DESTDIR)/$(sysconf_dir)/local.d
 	@cp rel/couchdb/etc/default.ini rel/couchdb/etc/local.ini $(DESTDIR)/$(sysconf_dir)
 
+ifeq ($(with_fauxton), 1)
 	@mkdir -p $(DESTDIR)/$(data_dir)
 	@cp -R share/server share/www $(DESTDIR)/$(data_dir)
+endif
 
+ifeq ($(with_docs), 1)
 	@mkdir -p $(DESTDIR)/$(doc_dir)
 	@mkdir -p $(DESTDIR)/$(html_dir)
 	@mkdir -p $(DESTDIR)/$(pdf_dir)
@@ -253,6 +256,7 @@ install: all
 	@cp share/docs/pdf/CouchDB.pdf $(DESTDIR)/$(pdf_dir)/CouchDB.pdf
 	@cp share/docs/info/CouchDB.info $(DESTDIR)/$(info_dir)/CouchDB.info
 	@cp share/docs/man/apachecouchdb.1 $(DESTDIR)/$(man_dir)/couchdb.1
+endif
 
 	@echo "...done"
 


Mime
View raw message