couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject [2/2] git commit: updated refs/heads/1867-feature-plugins to 373b4ee
Date Thu, 01 Aug 2013 16:07:43 GMT
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/373b4ee8
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/373b4ee8
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/373b4ee8

Branch: refs/heads/1867-feature-plugins
Commit: 373b4ee8b328a187808eb337ad4f0561bf50d773
Parents: 12ca531
Author: Jan Lehnardt <jan@apache.org>
Authored: Thu Aug 1 18:06:28 2013 +0200
Committer: Jan Lehnardt <jan@apache.org>
Committed: Thu Aug 1 18:06:28 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/373b4ee8/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/373b4ee8/bin/couch-config.tpl.in
----------------------------------------------------------------------
diff --git a/bin/couch-config.tpl.in b/bin/couch-config.tpl.in
index 50b5724..dee337d 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 dirrectory
   --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/373b4ee8/configure.ac
----------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index 8a75a78..6a553db 100644
--- a/configure.ac
+++ b/configure.ac
@@ -691,6 +691,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.


Mime
View raw message