You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ja...@apache.org on 2013/08/01 19:14:41 UTC
[2/2] git commit: updated refs/heads/1867-feature-plugins to 95377d9
install plugins into tmp/plugins when running on `./utils/run`
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/95377d9a
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/95377d9a
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/95377d9a
Branch: refs/heads/1867-feature-plugins
Commit: 95377d9a14535ff6f15fedf5f5e004c05af70e33
Parents: 4429c25
Author: Jan Lehnardt <ja...@apache.org>
Authored: Thu Aug 1 19:14:27 2013 +0200
Committer: Jan Lehnardt <ja...@apache.org>
Committed: Thu Aug 1 19:14:27 2013 +0200
----------------------------------------------------------------------
etc/couchdb/Makefile.am | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/95377d9a/etc/couchdb/Makefile.am
----------------------------------------------------------------------
diff --git a/etc/couchdb/Makefile.am b/etc/couchdb/Makefile.am
index 8d996f4..51b8fcb 100644
--- a/etc/couchdb/Makefile.am
+++ b/etc/couchdb/Makefile.am
@@ -44,6 +44,7 @@ default.ini: default.ini.tpl
-e "s|%localconfdir%|$(localconfdir)|g" \
-e "s|%localdatadir%|$(localdatadir)|g" \
-e "s|%localbuilddatadir%|$(localdatadir)|g" \
+ -e "s|%locallibdir%|$(locallibdir)|g" \
-e "s|%localstatelibdir%|$(localstatelibdir)|g" \
-e "s|%localstatelogdir%|$(localstatelogdir)|g" \
-e "s|%localstaterundir%|$(localstaterundir)|g" \
@@ -58,6 +59,7 @@ default_dev.ini: default.ini.tpl
sed -e "s|%bindir%|$(abs_top_builddir)/bin|g" \
-e "s|%localconfdir%|$(abs_top_builddir)/etc/couchdb|g" \
-e "s|%localdatadir%|$(abs_top_srcdir)/share|g" \
+ -e "s|%locallibdir%|$(abs_top_builddir)/tmp|g" \
-e "s|%localbuilddatadir%|$(abs_top_builddir)/share|g" \
-e "s|%localstatelibdir%|$(abs_top_builddir)/tmp/lib|g" \
-e "s|%localstatelogdir%|$(abs_top_builddir)/tmp/log|g" \