summaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorJan Lehnardt <jan@apache.org>2008-10-23 21:41:37 +0000
committerJan Lehnardt <jan@apache.org>2008-10-23 21:41:37 +0000
commitefe07f99d52d1c5979340e4f79a80abf19b1c710 (patch)
tree7b3ef0904cfaa3b16c4acde9c077ac13d38f5788 /etc
parentf98d83669bcea9f119e70457cfcc2d765f917857 (diff)
Add `make dev` target. Use `./utils/run` to launch CouchDB from the source tree and without `make install`. Useful for development. Patch my Hunter Morris, thanks! Closes COUCHDB-114.
git-svn-id: https://svn.apache.org/repos/asf/incubator/couchdb/trunk@707480 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'etc')
-rw-r--r--etc/couchdb/Makefile.am15
-rw-r--r--etc/couchdb/local_dev.ini26
2 files changed, 40 insertions, 1 deletions
diff --git a/etc/couchdb/Makefile.am b/etc/couchdb/Makefile.am
index baf588ea..2910fe2f 100644
--- a/etc/couchdb/Makefile.am
+++ b/etc/couchdb/Makefile.am
@@ -11,14 +11,17 @@
## under the License.
couchprivlibdir = $(localerlanglibdir)/couch-$(version)/priv/lib
+devcouchprivlibdir = $(abs_top_srcdir)/src/couchdb/.libs
localconf_DATA = default.ini
EXTRA_DIST = local.ini
+noinst_DATA = default_dev.ini
-CLEANFILES = $(localconf_DATA)
+CLEANFILES = $(localconf_DATA) $(noinst_DATA)
transform = @program_transform_name@
couchjs_command_name = `echo couchjs | sed '$(transform)'`
+couchjs_dev_command_name = `echo couchjs_dev | sed '$(transform)'`
default.ini: default.ini.tpl
sed -e "s|%bindir%|$(bindir)|g" \
@@ -30,6 +33,16 @@ default.ini: default.ini.tpl
-e "s|%couchjs_command_name%|$(couchjs_command_name)|g" \
< $< > $@
+default_dev.ini: default.ini.tpl
+ sed -e "s|%bindir%|$(abs_top_srcdir)/bin|g" \
+ -e "s|%localconfdir%|$(abs_top_srcdir)/etc/couchdb|g" \
+ -e "s|%localdatadir%|$(abs_top_srcdir)/share|g" \
+ -e "s|%localstatelibdir%|$(abs_top_srcdir)/tmp/lib|g" \
+ -e "s|%localstatelogdir%|$(abs_top_srcdir)/tmp/log|g" \
+ -e "s|%couchprivlibdir%|$(devcouchprivlibdir)|g" \
+ -e "s|%couchjs_command_name%|$(couchjs_dev_command_name)|g" \
+ < $< > $@
+
install-data-hook:
if test ! -f "$(DESTDIR)/$(localconfdir)/local.ini"; then \
cp local.ini "$(DESTDIR)/$(localconfdir)/local.ini"; \
diff --git a/etc/couchdb/local_dev.ini b/etc/couchdb/local_dev.ini
new file mode 100644
index 00000000..4081062b
--- /dev/null
+++ b/etc/couchdb/local_dev.ini
@@ -0,0 +1,26 @@
+; CouchDB Configuration Settings
+
+; Custom settings should be made in this file. They will override settings
+; in default.ini, but unlike changes made to default.ini, this file won't be
+; overwritten on server upgrade.
+
+[couchdb]
+;max_document_size = 4294967296 ; bytes
+
+[httpd]
+;port = 5984
+;bind_address = 127.0.0.1
+
+[log]
+;level = info
+
+[update_notification]
+;unique notifier name=/full/path/to/exe -with "cmd line arg"
+
+
+
+[test]
+foo = bar
+
+[test]
+foo = bar