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 | |
| 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')
| -rw-r--r-- | bin/Makefile.am | 19 | ||||
| -rw-r--r-- | bin/couchdb.tpl.in | 8 |
2 files changed, 21 insertions, 6 deletions
diff --git a/bin/Makefile.am b/bin/Makefile.am index f0563f71..e03dfa0d 100644 --- a/bin/Makefile.am +++ b/bin/Makefile.am @@ -11,12 +11,13 @@ ## under the License. bin_SCRIPTS = couchdb couchjs +noinst_SCRIPTS = couchjs_dev if HELP2MAN dist_man1_MANS = couchdb.1 couchjs.1 endif -CLEANFILES = $(bin_SCRIPTS) $(dist_man1_MANS) +CLEANFILES = $(bin_SCRIPTS) $(dist_man1_MANS) $(noinst_SCRIPTS) transform = @program_transform_name@ couchdb_command_name = `echo couchdb | sed '$(transform)'` @@ -26,8 +27,11 @@ couchdb: couchdb.tpl sed -e "s|%ERL%|$(ERL)|g" \ -e "s|%ICU_CONFIG%|$(ICU_CONFIG)|g" \ -e "s|%bindir%|@bindir@|g" \ - -e "s|%localerlangbindir%|@localerlangbindir@|g" \ -e "s|%localerlanglibdir%|@localerlanglibdir@|g" \ + -e "s|%mochiwebebindir%|couch-@version@/ebin|g" \ + -e "s|%couchdbebindir%|mochiweb-r82/ebin|g" \ + -e "s|%defaultini%|default.ini|g" \ + -e "s|%localini%|local.ini|g" \ -e "s|%localconfdir%|@localconfdir@|g" \ -e "s|%localstatelogdir%|@localstatelogdir@|g" \ -e "s|%localstatelibdir%|@localstatelibdir@|g" \ @@ -52,6 +56,17 @@ couchjs: couchjs.tpl $@ < $< chmod +x $@ +couchjs_dev: couchjs.tpl + sed -e "s|%locallibbindir%|$(abs_top_srcdir)/src/couchdb|g" \ + -e "s|%bug_uri%|@bug_uri@|g" \ + -e "s|%package_author_address%|@package_author_address@|g" \ + -e "s|%package_author_name%|@package_author_name@|g" \ + -e "s|%package_name%|@package_name@|g" \ + -e "s|%version%|@version@|g" \ + -e "s|%couchjs_command_name%|$(couchjs_command_name)|g" > \ + $@ < $< + chmod +x $@ + HELP2MAN_OPTION=--no-info --help-option="-h" --version-option="-V" # XXX: Because the scripts are made at build time for the user we need to 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)\" \ |