summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Lehnardt <jan@apache.org>2013-08-01 19:14:27 +0200
committerJan Lehnardt <jan@apache.org>2013-10-03 16:08:36 +0200
commit86ab419267371a1eac8c54e0997723bc2f9fd621 (patch)
treeeb95f619ca2b4da978a044acada58ae5200f44df
parentef145a968248f2f9a272a1763053140b0560c1e7 (diff)
downloadcouchdb-86ab419267371a1eac8c54e0997723bc2f9fd621.tar.gz
install plugins into tmp/plugins when running on `./utils/run`
-rw-r--r--etc/couchdb/Makefile.am2
1 files changed, 2 insertions, 0 deletions
diff --git a/etc/couchdb/Makefile.am b/etc/couchdb/Makefile.am
index 8d996f4be..51b8fcb4a 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" \