summaryrefslogtreecommitdiff
path: root/etc/couchdb
diff options
context:
space:
mode:
Diffstat (limited to 'etc/couchdb')
-rw-r--r--etc/couchdb/Makefile.am10
-rw-r--r--etc/couchdb/couch.ini.tpl.in8
-rw-r--r--etc/couchdb/couch_httpd.conf.tpl.in8
3 files changed, 13 insertions, 13 deletions
diff --git a/etc/couchdb/Makefile.am b/etc/couchdb/Makefile.am
index dc849354..d5356ceb 100644
--- a/etc/couchdb/Makefile.am
+++ b/etc/couchdb/Makefile.am
@@ -17,14 +17,14 @@ CLEANFILES = $(pkgconf_DATA)
transform = @program_transform_name@
couchjs_command_name = `echo couchjs | sed '$(transform)'`
-couchprivlibdir = $(erlanglibdir)/couch-$(version)/priv/lib
+couchprivlibdir = $(localerlanglibdir)/couch-$(version)/priv/lib
couch.ini: couch.ini.tpl
sed -e "s|%bindir%|$(bindir)|g" \
- -e "s|%pkgconfdir%|$(pkgconfdir)|g" \
- -e "s|%pkgdatadir%|$(pkgdatadir)|g" \
- -e "s|%pkgstatelibdir%|$(pkgstatelibdir)|g" \
- -e "s|%pkgstatelogdir%|$(pkgstatelogdir)|g" \
+ -e "s|%localconfdir%|$(localconfdir)|g" \
+ -e "s|%localdatadir%|$(localdatadir)|g" \
+ -e "s|%localstatelibdir%|$(localstatelibdir)|g" \
+ -e "s|%localstatelogdir%|$(localstatelogdir)|g" \
-e "s|%couchprivlibdir%|$(couchprivlibdir)|g" \
-e "s|%couchjs_command_name%|$(couchjs_command_name)|g" \
< $< > $@
diff --git a/etc/couchdb/couch.ini.tpl.in b/etc/couchdb/couch.ini.tpl.in
index 555ea3da..7e155fab 100644
--- a/etc/couchdb/couch.ini.tpl.in
+++ b/etc/couchdb/couch.ini.tpl.in
@@ -4,15 +4,15 @@
ConsoleStartupMsg=Apache CouchDB is starting.
-DbRootDir=%pkgstatelibdir%
+DbRootDir=%localstatelibdir%
Port=5984
BindAddress=127.0.0.1
-DocumentRoot=%pkgdatadir%/www
+DocumentRoot=%localdatadir%/www
-LogFile=%pkgstatelogdir%/couch.log
+LogFile=%localstatelogdir%/couch.log
UtilDriverDir=%couchprivlibdir%
@@ -20,4 +20,4 @@ LogLevel=info
[Couch Query Servers]
-javascript=%bindir%/%couchjs_command_name% %pkgdatadir%/server/main.js
+javascript=%bindir%/%couchjs_command_name% %localdatadir%/server/main.js
diff --git a/etc/couchdb/couch_httpd.conf.tpl.in b/etc/couchdb/couch_httpd.conf.tpl.in
index e4d27493..19d6d10c 100644
--- a/etc/couchdb/couch_httpd.conf.tpl.in
+++ b/etc/couchdb/couch_httpd.conf.tpl.in
@@ -5,7 +5,7 @@ Port 5984
ServerName localhost
SocketType ip_comm
Modules mod_couch mod_get mod_log
-ServerRoot %pkgconfdir%
-DocumentRoot %pkgdatadir%/www
-ErrorLog %pkgstatelogdir%/http_error.log
-TransferLog %pkgstatelogdir%/http_access.log
+ServerRoot %localconfdir%
+DocumentRoot %localdatadir%/www
+ErrorLog %localstatelogdir%/http_error.log
+TransferLog %localstatelogdir%/http_access.log