diff options
| -rw-r--r-- | bin/couchdb.tpl.in | 2 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | etc/init/couchdb.tpl.in | 3 | ||||
| -rw-r--r-- | var/Makefile.am | 4 |
4 files changed, 4 insertions, 6 deletions
diff --git a/bin/couchdb.tpl.in b/bin/couchdb.tpl.in index f580f076..502d6b3f 100644 --- a/bin/couchdb.tpl.in +++ b/bin/couchdb.tpl.in @@ -27,7 +27,7 @@ RESPAWN_TIMEOUT=0 DEFAULT_INI_FILE=%localconfdir%/%defaultini% LOCAL_INI_FILE=%localconfdir%/%localini% -PID_FILE=%localstatedir%/run/couchdb.pid +PID_FILE=%localstatedir%/run/couchdb/couchdb.pid STDOUT_FILE=couchdb.stdout STDERR_FILE=couchdb.stderr diff --git a/configure.ac b/configure.ac index d160bc1d..0077e7d6 100644 --- a/configure.ac +++ b/configure.ac @@ -240,6 +240,7 @@ AC_SUBST([localdocdir], [${datadir}/doc/${package_identifier}]) AC_SUBST([locallibdir], [${libdir}/${package_identifier}]) AC_SUBST([localstatelibdir], [${localstatedir}/lib/${package_identifier}]) AC_SUBST([localstatelogdir], [${localstatedir}/log/${package_identifier}]) +AC_SUBST([localstaterundir], [${localstatedir}/run/${package_identifier}]) AC_SUBST([locallibbindir], [${locallibdir}/bin]) AC_SUBST([localerlangbindir], [${locallibdir}/erlang/bin]) AC_SUBST([localerlanglibdir], [${locallibdir}/erlang/lib]) diff --git a/etc/init/couchdb.tpl.in b/etc/init/couchdb.tpl.in index c8e4ae33..c6dca764 100644 --- a/etc/init/couchdb.tpl.in +++ b/etc/init/couchdb.tpl.in @@ -63,9 +63,6 @@ start_couchdb () { # Start Apache CouchDB as a background process. command="$COUCHDB -b" - if test -n "$COUCHDB_PID_FILE"; then - command="$command -p $COUCHDB_PID_FILE" - fi if test -n "$COUCHDB_STDOUT_FILE"; then command="$command -o $COUCHDB_STDOUT_FILE" fi diff --git a/var/Makefile.am b/var/Makefile.am index 803ddce8..a2672bf9 100644 --- a/var/Makefile.am +++ b/var/Makefile.am @@ -14,10 +14,10 @@ install-data-hook: if test ! "$(mkdir_p)" = ""; then \ $(mkdir_p) "$(DESTDIR)$(localstatelibdir)"; \ $(mkdir_p) "$(DESTDIR)$(localstatelogdir)"; \ - $(mkdir_p) "$(DESTDIR)$(localstatedir)/run"; \ + $(mkdir_p) "$(DESTDIR)$(localstaterundir)"; \ else \ echo "WARNING: You may have to create these directories by hand."; \ mkdir -p "$(DESTDIR)$(localstatelibdir)"; \ mkdir -p "$(DESTDIR)$(localstatelogdir)"; \ - mkdir -p "$(DESTDIR)$(localstatedir)/run"; \ + mkdir -p "$(DESTDIR)$(localstaterundir)"; \ fi |