Return-Path: X-Original-To: apmail-couchdb-commits-archive@www.apache.org Delivered-To: apmail-couchdb-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id BCBDC172FD for ; Wed, 24 Jun 2015 21:33:11 +0000 (UTC) Received: (qmail 79157 invoked by uid 500); 24 Jun 2015 21:33:10 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 78852 invoked by uid 500); 24 Jun 2015 21:33:09 -0000 Mailing-List: contact commits-help@couchdb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@couchdb.apache.org Delivered-To: mailing list commits@couchdb.apache.org Received: (qmail 78259 invoked by uid 99); 24 Jun 2015 21:33:09 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 24 Jun 2015 21:33:09 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 8FF7CE3657; Wed, 24 Jun 2015 21:33:09 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jan@apache.org To: commits@couchdb.apache.org Date: Wed, 24 Jun 2015 21:33:22 -0000 Message-Id: <0fae14beb37a4ab390366f770a92b0ca@git.apache.org> In-Reply-To: <71c4ab559cc4460886836752f3cd37a9@git.apache.org> References: <71c4ab559cc4460886836752f3cd37a9@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [14/37] couchdb commit: updated refs/heads/master to 1ef7182 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 Authored: Wed Jun 3 21:56:19 2015 +0200 Committer: Jan Lehnardt 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