diff options
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/Makefile.am | 12 | ||||
| -rw-r--r-- | bin/couchdb.tpl.in | 10 | ||||
| -rw-r--r-- | bin/couchjs.tpl.in | 2 |
3 files changed, 12 insertions, 12 deletions
diff --git a/bin/Makefile.am b/bin/Makefile.am index 92ab95cd..1777ce10 100644 --- a/bin/Makefile.am +++ b/bin/Makefile.am @@ -27,11 +27,11 @@ couchdb: couchdb.tpl -e "s|%ICU_CONFIG%|$(ICU_CONFIG)|g" \ -e "s|%AWK%|$(AWK)|g" \ -e "s|%bindir%|@bindir@|g" \ - -e "s|%erlangbindir%|@erlangbindir@|g" \ - -e "s|%erlanglibdir%|@erlanglibdir@|g" \ - -e "s|%pkgconfdir%|@pkgconfdir@|g" \ - -e "s|%pkgstatelogdir%|@pkgstatelogdir@|g" \ - -e "s|%pkgstatelibdir%|@pkgstatelibdir@|g" \ + -e "s|%localerlangbindir%|@localerlangbindir@|g" \ + -e "s|%localerlanglibdir%|@localerlanglibdir@|g" \ + -e "s|%localconfdir%|@localconfdir@|g" \ + -e "s|%localstatelogdir%|@localstatelogdir@|g" \ + -e "s|%localstatelibdir%|@localstatelibdir@|g" \ -e "s|%localstatedir%|@localstatedir@|g" \ -e "s|%bug_uri%|@bug_uri@|g" \ -e "s|%package_author_address%|@package_author_address@|g" \ @@ -43,7 +43,7 @@ couchdb: couchdb.tpl chmod +x $@ couchjs: couchjs.tpl - sed -e "s|%libbindir%|@libbindir@|g" \ + sed -e "s|%locallibbindir%|@locallibbindir@|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" \ diff --git a/bin/couchdb.tpl.in b/bin/couchdb.tpl.in index c55499c0..77409ae0 100644 --- a/bin/couchdb.tpl.in +++ b/bin/couchdb.tpl.in @@ -25,10 +25,10 @@ RECURSED_BOOLEAN=false RESPAWN_TIMEOUT=0 -LIB_DIRECTORY=%pkgstatelibdir% -LOG_DIRECTORY=%pkgstatelogdir% +LIB_DIRECTORY=%localstatelibdir% +LOG_DIRECTORY=%localstatelogdir% -INI_FILE=%pkgconfdir%/couch.ini +INI_FILE=%localconfdir%/couch.ini PID_FILE=%localstatedir%/run/couchdb.pid STDOUT_FILE=couchdb.stdout @@ -205,8 +205,8 @@ start_couchdb () { fi command="`%ICU_CONFIG% --invoke` \ %ERL% $interactive_option -smp auto -sasl errlog_type error \ - -pa %erlanglibdir%/couch-%version%/ebin \ - %erlanglibdir%/mochiweb-r76/ebin \ + -pa %localerlanglibdir%/couch-%version%/ebin \ + %localerlanglibdir%/mochiweb-r76/ebin \ -eval \"application:load(inets)\" \ -eval \"application:load(crypto)\" \ -eval \"application:load(couch)\" \ diff --git a/bin/couchjs.tpl.in b/bin/couchjs.tpl.in index 3e47d6b6..e01a2bb1 100644 --- a/bin/couchjs.tpl.in +++ b/bin/couchjs.tpl.in @@ -65,7 +65,7 @@ display_error () { } run_couchjs () { - exec %libbindir%/%couchjs_command_name% $@ + exec %locallibbindir%/%couchjs_command_name% $@ } parse_script_option_list () { |