couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject [14/37] couchdb commit: updated refs/heads/master to 1ef7182
Date Wed, 24 Jun 2015 21:33:22 GMT
re-introduce DESTDIR


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

Branch: refs/heads/master
Commit: 3f30eeb9af93c0eecc487799e89f502fa032efc1
Parents: 9b2dfb4
Author: Jan Lehnardt <jan@apache.org>
Authored: Wed Jun 3 21:56:19 2015 +0200
Committer: Jan Lehnardt <jan@apache.org>
Committed: Wed Jun 24 23:06:56 2015 +0200

----------------------------------------------------------------------
 Makefile | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/3f30eeb9/Makefile
----------------------------------------------------------------------
diff --git a/Makefile b/Makefile
index 47e73a0..8815140 100644
--- a/Makefile
+++ b/Makefile
@@ -16,6 +16,8 @@ IN_RELEASE = $(shell if [ ! -d .git ]; then echo true; fi)
 COUCHDB_VERSION_SUFFIX = $(shell if [ -d .git ]; then echo '-`git rev-parse --short --verify
HEAD`'; fi)
 COUCHDB_VERSION = $(vsn_major).$(vsn_minor).$(vsn_patch)$(COUCHDB_VERSION_SUFFIX)
 
+DESTDIR=
+
 all: couch fauxton
 
 config.erl:
@@ -83,20 +85,22 @@ devclean:
 
 -include install.mk
 install: all
+	@echo "Installing CouchDB into $(DESTDIR)/$(install_dir)..." | sed -e 's,///,/,'
 	@rm -rf rel/couchdb
 	@rebar generate # make full erlang release
-	@mkdir -p $(install_dir)
-	@cp -R rel/couchdb/* $(install_dir)
-	@mkdir -p $(data_dir)
-	@chown $(user) $(data_dir)
-	@mkdir -p $(view_index_dir)
-	@chown $(user) $(view_index_dir)
-	@mkdir -p `dirname $(log_file)`
-	@touch $(log_file)
-	@chown $(user) $(log_file)
+	@mkdir -p $(DESTDIR)/$(install_dir)
+	@cp -R rel/couchdb/* $(DESTDIR)/$(install_dir)
+	@mkdir -p $(DESTDIR)/$(data_dir)
+	@chown $(user) $(DESTDIR)/$(data_dir)
+	@mkdir -p $(DESTDIR)/$(view_index_dir)
+	@chown $(user) $(DESTDIR)/$(view_index_dir)
+	@mkdir -p $(DESTDIR)/`dirname $(log_file)`
+	@touch $(DESTDIR)/$(log_file)
+	@chown $(user) $(DESTDIR)/$(log_file)
+	@echo "...done"
 
 uninstall:
-	@rm -rf $(install_dir)
+	@rm -rf $(DESTDIR)/$(install_dir)
 
 install.mk:
 # ignore install.mk missing if we are running


Mime
View raw message