reworked the pid file

git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@761355 13f79535-47bb-0310-9956-ffa450edef68

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

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])

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

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