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 A4BFF10CD4 for ; Thu, 3 Oct 2013 15:47:54 +0000 (UTC) Received: (qmail 30732 invoked by uid 500); 3 Oct 2013 15:47:27 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 29509 invoked by uid 500); 3 Oct 2013 15:47:06 -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 28846 invoked by uid 99); 3 Oct 2013 15:47:00 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 Oct 2013 15:47:00 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id DC57090E947; Thu, 3 Oct 2013 15:46:59 +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: Thu, 03 Oct 2013 15:47:03 -0000 Message-Id: <82b321e7450e4e8ea07742365b86c9bb@git.apache.org> In-Reply-To: <89db8fc13604415eafa0b3c075f2c4e5@git.apache.org> References: <89db8fc13604415eafa0b3c075f2c4e5@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [05/50] git commit: updated refs/heads/1894-feature-experimental-nodejs-couchjs to 532100c teach `couch-config` `--erl-bin` Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/c8ac6773 Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/c8ac6773 Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/c8ac6773 Branch: refs/heads/1894-feature-experimental-nodejs-couchjs Commit: c8ac6773916be2e0e52ee3c60484e4097efebb40 Parents: 98683d9 Author: Jan Lehnardt Authored: Thu Aug 1 18:06:28 2013 +0200 Committer: Jan Lehnardt Committed: Thu Oct 3 16:08:35 2013 +0200 ---------------------------------------------------------------------- bin/Makefile.am | 2 ++ bin/couch-config.tpl.in | 5 +++++ configure.ac | 1 + 3 files changed, 8 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb/blob/c8ac6773/bin/Makefile.am ---------------------------------------------------------------------- diff --git a/bin/Makefile.am b/bin/Makefile.am index 65f9ab5..5d722ac 100644 --- a/bin/Makefile.am +++ b/bin/Makefile.am @@ -96,6 +96,7 @@ couch-config: couch-config.tpl -e "s|%package_name%|@package_name@|g" \ -e "s|%version%|@version@|g" \ -e "s|%erlangversion%|@erlangversion@|g" \ + -e "s|%erlangbin%|@erlangbin@|g" \ -e "s|%couchdb_command_name%|$(couchdb_command_name)|g" > \ $@ < $< chmod +x $@ @@ -120,6 +121,7 @@ couch-config_dev: couch-config.tpl -e "s|%package_name%|@package_name@|g" \ -e "s|%version%|@version@|g" \ -e "s|%erlangversion%|@erlangversion@|g" \ + -e "s|%erlangbin%|@erlangbin@|g" \ -e "s|%couchdb_command_name%|$(abs_top_builddir)/utils/run|g" > \ $@ < $< chmod +x $@ http://git-wip-us.apache.org/repos/asf/couchdb/blob/c8ac6773/bin/couch-config.tpl.in ---------------------------------------------------------------------- diff --git a/bin/couch-config.tpl.in b/bin/couch-config.tpl.in index 7db9b2a..bd27d0e 100644 --- a/bin/couch-config.tpl.in +++ b/bin/couch-config.tpl.in @@ -23,6 +23,7 @@ confdir="%localconfdir%" urifile="%localstaterundir%/couch.uri" logdir="%localstatelogdir%" erlangversion="%erlangversion%" +erlangbin="%erlangbin%" version () { cat << EOF @@ -53,6 +54,7 @@ script. Options: --erl-libs-dir Erlang library directory + --erl-bin Erlang binary --config-dir configuration directory --db-dir database directory --view-dir view index directory @@ -86,6 +88,9 @@ do --erl-libs-dir) echo $erlanglibdir ;; + --erl-bin) + echo $erlangbin + ;; --config-dir) echo $confdir ;; http://git-wip-us.apache.org/repos/asf/couchdb/blob/c8ac6773/configure.ac ---------------------------------------------------------------------- diff --git a/configure.ac b/configure.ac index 9b980fb..a5c7f86 100644 --- a/configure.ac +++ b/configure.ac @@ -693,6 +693,7 @@ AC_SUBST([localstatelibdir], [${localstatedir}/lib/${package_identifier}]) AC_SUBST([localstatelogdir], [${localstatedir}/log/${package_identifier}]) AC_SUBST([localstaterundir], [${localstatedir}/run/${package_identifier}]) AC_SUBST([erlangversion], [${erlangversion}]) +AC_SUBST([erlangbin], [${ERL}]) # On Windows we install directly into our erlang distribution.