diff options
author | Jan Lehnardt <jan@apache.org> | 2008-10-23 21:41:37 +0000 |
---|---|---|
committer | Jan Lehnardt <jan@apache.org> | 2008-10-23 21:41:37 +0000 |
commit | efe07f99d52d1c5979340e4f79a80abf19b1c710 (patch) | |
tree | 7b3ef0904cfaa3b16c4acde9c077ac13d38f5788 /bin/couchdb.tpl.in | |
parent | f98d83669bcea9f119e70457cfcc2d765f917857 (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 'bin/couchdb.tpl.in')
-rw-r--r-- | bin/couchdb.tpl.in | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/bin/couchdb.tpl.in b/bin/couchdb.tpl.in index 5062fdc2..c769bd33 100644 --- a/bin/couchdb.tpl.in +++ b/bin/couchdb.tpl.in @@ -23,8 +23,8 @@ RECURSED_BOOLEAN=false RESPAWN_TIMEOUT=0 -DEFAULT_INI_FILE=%localconfdir%/default.ini -LOCAL_INI_FILE=%localconfdir%/local.ini +DEFAULT_INI_FILE=%localconfdir%/%defaultini% +LOCAL_INI_FILE=%localconfdir%/%localini% PID_FILE=%localstatedir%/run/couchdb.pid @@ -181,8 +181,8 @@ start_couchdb () { done command="`%ICU_CONFIG% --invoke` \ %ERL% $interactive_option -smp auto -sasl errlog_type error +K true \ - -pa %localerlanglibdir%/couch-%version%/ebin \ - %localerlanglibdir%/mochiweb-r82/ebin \ + -pa %localerlanglibdir%/%couchdbebindir% \ + %localerlanglibdir%/%mochiwebebindir% \ -eval \"application:load(inets)\" \ -eval \"application:load(crypto)\" \ -eval \"application:load(couch)\" \ |