You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ns...@apache.org on 2009/04/14 18:45:53 UTC
svn commit: r764879 - in /couchdb/branches/0.9.x: ./ bin/couchdb.tpl.in
configure.ac etc/default/couchdb etc/init/couchdb.tpl.in var/Makefile.am
Author: nslater
Date: Tue Apr 14 16:45:53 2009
New Revision: 764879
URL: http://svn.apache.org/viewvc?rev=764879&view=rev
Log:
merged r761355 from trunk
Modified:
couchdb/branches/0.9.x/ (props changed)
couchdb/branches/0.9.x/bin/couchdb.tpl.in
couchdb/branches/0.9.x/configure.ac
couchdb/branches/0.9.x/etc/default/couchdb (props changed)
couchdb/branches/0.9.x/etc/init/couchdb.tpl.in
couchdb/branches/0.9.x/var/Makefile.am
Propchange: couchdb/branches/0.9.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 14 16:45:53 2009
@@ -1,3 +1,3 @@
/couchdb/branches/design_resources:751716-751803
/couchdb/branches/form:729440-730015
-/couchdb/trunk:758717,760442,760503,760532,760535,760537-760539,761343,761347-761348,761352-761353
+/couchdb/trunk:758717,760442,760503,760532,760535,760537-760539,761343,761347-761348,761352-761353,761355
Modified: couchdb/branches/0.9.x/bin/couchdb.tpl.in
URL: http://svn.apache.org/viewvc/couchdb/branches/0.9.x/bin/couchdb.tpl.in?rev=764879&r1=764878&r2=764879&view=diff
==============================================================================
--- couchdb/branches/0.9.x/bin/couchdb.tpl.in (original)
+++ couchdb/branches/0.9.x/bin/couchdb.tpl.in Tue Apr 14 16:45:53 2009
@@ -27,7 +27,7 @@
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
Modified: couchdb/branches/0.9.x/configure.ac
URL: http://svn.apache.org/viewvc/couchdb/branches/0.9.x/configure.ac?rev=764879&r1=764878&r2=764879&view=diff
==============================================================================
--- couchdb/branches/0.9.x/configure.ac (original)
+++ couchdb/branches/0.9.x/configure.ac Tue Apr 14 16:45:53 2009
@@ -240,6 +240,7 @@
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])
Propchange: couchdb/branches/0.9.x/etc/default/couchdb
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 14 16:45:53 2009
@@ -1,4 +1,4 @@
/couchdb/branches/design_resources/etc/default/couchdb:751716-751803
/couchdb/branches/form/etc/default/couchdb:729440-730015
-/couchdb/trunk/etc/default/couchdb:758717,760442,760503,760532,760535,760537-760539,761343,761347-761348,761352-761353
+/couchdb/trunk/etc/default/couchdb:758717,760442,760503,760532,760535,760537-760539,761343,761347-761348,761352-761353,761355
/incubator/couchdb/trunk/etc/default/couchdb:642419-694440
Modified: couchdb/branches/0.9.x/etc/init/couchdb.tpl.in
URL: http://svn.apache.org/viewvc/couchdb/branches/0.9.x/etc/init/couchdb.tpl.in?rev=764879&r1=764878&r2=764879&view=diff
==============================================================================
--- couchdb/branches/0.9.x/etc/init/couchdb.tpl.in (original)
+++ couchdb/branches/0.9.x/etc/init/couchdb.tpl.in Tue Apr 14 16:45:53 2009
@@ -63,9 +63,6 @@
# 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
Modified: couchdb/branches/0.9.x/var/Makefile.am
URL: http://svn.apache.org/viewvc/couchdb/branches/0.9.x/var/Makefile.am?rev=764879&r1=764878&r2=764879&view=diff
==============================================================================
--- couchdb/branches/0.9.x/var/Makefile.am (original)
+++ couchdb/branches/0.9.x/var/Makefile.am Tue Apr 14 16:45:53 2009
@@ -14,10 +14,10 @@
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