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/02 19:40:55 UTC
svn commit: r761355 - in /couchdb/trunk: bin/couchdb.tpl.in configure.ac
etc/init/couchdb.tpl.in var/Makefile.am
Author: nslater
Date: Thu Apr 2 17:40:54 2009
New Revision: 761355
URL: http://svn.apache.org/viewvc?rev=761355&view=rev
Log:
reworked the pid file
Modified:
couchdb/trunk/bin/couchdb.tpl.in
couchdb/trunk/configure.ac
couchdb/trunk/etc/init/couchdb.tpl.in
couchdb/trunk/var/Makefile.am
Modified: couchdb/trunk/bin/couchdb.tpl.in
URL: http://svn.apache.org/viewvc/couchdb/trunk/bin/couchdb.tpl.in?rev=761355&r1=761354&r2=761355&view=diff
==============================================================================
--- couchdb/trunk/bin/couchdb.tpl.in (original)
+++ couchdb/trunk/bin/couchdb.tpl.in Thu Apr 2 17:40:54 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/trunk/configure.ac
URL: http://svn.apache.org/viewvc/couchdb/trunk/configure.ac?rev=761355&r1=761354&r2=761355&view=diff
==============================================================================
--- couchdb/trunk/configure.ac (original)
+++ couchdb/trunk/configure.ac Thu Apr 2 17:40:54 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])
Modified: couchdb/trunk/etc/init/couchdb.tpl.in
URL: http://svn.apache.org/viewvc/couchdb/trunk/etc/init/couchdb.tpl.in?rev=761355&r1=761354&r2=761355&view=diff
==============================================================================
--- couchdb/trunk/etc/init/couchdb.tpl.in (original)
+++ couchdb/trunk/etc/init/couchdb.tpl.in Thu Apr 2 17:40:54 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/trunk/var/Makefile.am
URL: http://svn.apache.org/viewvc/couchdb/trunk/var/Makefile.am?rev=761355&r1=761354&r2=761355&view=diff
==============================================================================
--- couchdb/trunk/var/Makefile.am (original)
+++ couchdb/trunk/var/Makefile.am Thu Apr 2 17:40:54 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
Re: SysV init problems, 0.9.1 release? (was Re: svn commit: r761355 - in /couchdb/trunk: bin/couchdb.tpl.in configure.ac etc/init/couchdb.tpl.in var/Makefile.am)
Posted by Jan Lehnardt <ja...@apache.org>.
On 5 Apr 2009, at 20:52, Brian Candler wrote:
> On Thu, Apr 02, 2009 at 06:46:36PM +0100, Noah Slater wrote:
>> I am surprised no one has raised this as a bug!
>
> Actually I did, a couple of weeks ago:
> https://issues.apache.org/jira/browse/COUCHDB-302
>
> It's a bit depressing to file things in JIRA that nobody reads :-(
Hey, it's a bit depressing to work harf on an open source project
and then get called out to not be working hard enough :) This
is mostly voluntary work here, it might take some time before
things get read.
Please keep filing the issue you find, it's a great help!
Cheers
Jan
--
Re: SysV init problems, 0.9.1 release? (was Re: svn commit:
r761355 - in /couchdb/trunk: bin/couchdb.tpl.in configure.ac
etc/init/couchdb.tpl.in var/Makefile.am)
Posted by Noah Slater <ns...@apache.org>.
On Sun, Apr 05, 2009 at 08:52:33PM +0100, Brian Candler wrote:
> It's a bit depressing to file things in JIRA that nobody reads :-(
That's a very unfair thing to say.
Perhaps you'd like your support contract money back? :)
--
Noah Slater, http://tumbolia.org/nslater
Re: SysV init problems, 0.9.1 release? (was Re: svn commit: r761355
- in /couchdb/trunk: bin/couchdb.tpl.in configure.ac etc/init/couchdb.tpl.in
var/Makefile.am)
Posted by Brian Candler <B....@pobox.com>.
On Thu, Apr 02, 2009 at 06:46:36PM +0100, Noah Slater wrote:
> I am surprised no one has raised this as a bug!
Actually I did, a couple of weeks ago:
https://issues.apache.org/jira/browse/COUCHDB-302
It's a bit depressing to file things in JIRA that nobody reads :-(
Regards,
Brian.
Re: SysV init problems, 0.9.1 release? (was Re: svn commit: r761355 -
in /couchdb/trunk: bin/couchdb.tpl.in configure.ac etc/init/couchdb.tpl.in
var/Makefile.am)
Posted by Jeff Hinrichs - DM&T <du...@gmail.com>.
On Thu, Apr 2, 2009 at 9:43 PM, Noah Slater <ns...@apache.org> wrote:
> On Fri, Apr 03, 2009 at 02:34:38AM +0200, Jan Lehnardt wrote:
> > +1 for the backport. And good find, I believe I stumbled over this
> > a few times and didn't think much of it and assumed an error on
> > my end.
>
> Essentially, it's a documentation bug. Kinda.
>
> I'm torn about doing a new release for it, really I am.
>
> Perhaps we should leave it a few weeks, see how we feel?
>
> --
> Noah Slater, http://tumbolia.org/nslater
>
This bit me a number of times already. I figured it was do to frequent
builds I was doing or something else. I would be +1 on putting it in a
0.9.1 but I would suggest holding off 2 weeks and incorporate any other
patches. I suspect that .9.x. is going to be popular with people interested
but waiting for a packaged release if package maintainers know that there
will be a 0.9.1 coming in shortly, they'll wait and first impressions of
couchdb will be improved over a wider scope.
However, I don't have to do the work of building the release, Noah is the
one doing the work.
-Jeff Hinrichs
Re: SysV init problems, 0.9.1 release? (was Re: svn commit:
r761355 - in /couchdb/trunk: bin/couchdb.tpl.in configure.ac
etc/init/couchdb.tpl.in var/Makefile.am)
Posted by Noah Slater <ns...@apache.org>.
On Fri, Apr 03, 2009 at 02:34:38AM +0200, Jan Lehnardt wrote:
> +1 for the backport. And good find, I believe I stumbled over this
> a few times and didn't think much of it and assumed an error on
> my end.
Essentially, it's a documentation bug. Kinda.
I'm torn about doing a new release for it, really I am.
Perhaps we should leave it a few weeks, see how we feel?
--
Noah Slater, http://tumbolia.org/nslater
Re: SysV init problems, 0.9.1 release? (was Re: svn commit: r761355 - in /couchdb/trunk: bin/couchdb.tpl.in configure.ac etc/init/couchdb.tpl.in var/Makefile.am)
Posted by Jan Lehnardt <ja...@apache.org>.
On 2 Apr 2009, at 19:46, Noah Slater wrote:
>
> I have back-ported this patch to my Debian package.
>
> So, the question here is... should this be back-ported to a 0.9.1
> release?
+1 for the backport. And good find, I believe I stumbled over this
a few times and didn't think much of it and assumed an error on
my end.
Cheers
Jan
--
>
> Best,
>
> On Thu, Apr 02, 2009 at 05:40:55PM -0000, nslater@apache.org wrote:
>> Author: nslater
>> Date: Thu Apr 2 17:40:54 2009
>> New Revision: 761355
>>
>> URL: http://svn.apache.org/viewvc?rev=761355&view=rev
>> Log:
>> reworked the pid file
>>
>> Modified:
>> couchdb/trunk/bin/couchdb.tpl.in
>> couchdb/trunk/configure.ac
>> couchdb/trunk/etc/init/couchdb.tpl.in
>> couchdb/trunk/var/Makefile.am
>>
>> Modified: couchdb/trunk/bin/couchdb.tpl.in
>> URL: http://svn.apache.org/viewvc/couchdb/trunk/bin/couchdb.tpl.in?rev=761355&r1=761354&r2=761355&view=diff
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> =====================================================================
>> --- couchdb/trunk/bin/couchdb.tpl.in (original)
>> +++ couchdb/trunk/bin/couchdb.tpl.in Thu Apr 2 17:40:54 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/trunk/configure.ac
>> URL: http://svn.apache.org/viewvc/couchdb/trunk/configure.ac?rev=761355&r1=761354&r2=761355&view=diff
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> =====================================================================
>> --- couchdb/trunk/configure.ac (original)
>> +++ couchdb/trunk/configure.ac Thu Apr 2 17:40:54 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])
>>
>> Modified: couchdb/trunk/etc/init/couchdb.tpl.in
>> URL: http://svn.apache.org/viewvc/couchdb/trunk/etc/init/couchdb.tpl.in?rev=761355&r1=761354&r2=761355&view=diff
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> =====================================================================
>> --- couchdb/trunk/etc/init/couchdb.tpl.in (original)
>> +++ couchdb/trunk/etc/init/couchdb.tpl.in Thu Apr 2 17:40:54 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/trunk/var/Makefile.am
>> URL: http://svn.apache.org/viewvc/couchdb/trunk/var/Makefile.am?rev=761355&r1=761354&r2=761355&view=diff
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> =====================================================================
>> --- couchdb/trunk/var/Makefile.am (original)
>> +++ couchdb/trunk/var/Makefile.am Thu Apr 2 17:40:54 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
>>
>>
>
> --
> Noah Slater, http://tumbolia.org/nslater
>
Re: SysV init problems, 0.9.1 release? (was Re: svn commit: r761355 -
in /couchdb/trunk: bin/couchdb.tpl.in configure.ac etc/init/couchdb.tpl.in
var/Makefile.am)
Posted by Zachary Zolton <za...@gmail.com>.
Yeah. I just put the 'touch' command into my EC2 build script, and
didn't think much on it. LOL
On Thu, Apr 2, 2009 at 12:46 PM, Noah Slater <ns...@apache.org> wrote:
> Hello,
>
> While packaging for Debian, I came across a worrying problem.
>
> The PID file for CouchDB was located at:
>
> /var/run/couchdb.pid
>
> Originally, the SysV init script took care of creating this and changing the
> ownership so that it could be written to by the couchdb process. At some point,
> this changing of ownership was removed.
>
> The first time you try to run CouchDB from the SysV init script, it will
> complain about not being able to write to the PID file and die. I am guessing
> the solution to this is to touch it as root, and then change the ownership. You
> only need to do this once, and CouchDB will work flawlessly after that,
> presuming you don't remove it again.
>
> I am surprised no one has raised this as a bug!
>
> Anyway, I've put in a fix to trunk which is to make the PID file sit inside a
> CouchDB specific directory. This should be owned by the couchdb user, and I have
> added instructions to the README. This essentially fixes the problem without
> having to add in any additional code to the SysV script.
>
> I have back-ported this patch to my Debian package.
>
> So, the question here is... should this be back-ported to a 0.9.1 release?
>
> Best,
>
> On Thu, Apr 02, 2009 at 05:40:55PM -0000, nslater@apache.org wrote:
>> Author: nslater
>> Date: Thu Apr 2 17:40:54 2009
>> New Revision: 761355
>>
>> URL: http://svn.apache.org/viewvc?rev=761355&view=rev
>> Log:
>> reworked the pid file
>>
>> Modified:
>> couchdb/trunk/bin/couchdb.tpl.in
>> couchdb/trunk/configure.ac
>> couchdb/trunk/etc/init/couchdb.tpl.in
>> couchdb/trunk/var/Makefile.am
>>
>> Modified: couchdb/trunk/bin/couchdb.tpl.in
>> URL: http://svn.apache.org/viewvc/couchdb/trunk/bin/couchdb.tpl.in?rev=761355&r1=761354&r2=761355&view=diff
>> ==============================================================================
>> --- couchdb/trunk/bin/couchdb.tpl.in (original)
>> +++ couchdb/trunk/bin/couchdb.tpl.in Thu Apr 2 17:40:54 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/trunk/configure.ac
>> URL: http://svn.apache.org/viewvc/couchdb/trunk/configure.ac?rev=761355&r1=761354&r2=761355&view=diff
>> ==============================================================================
>> --- couchdb/trunk/configure.ac (original)
>> +++ couchdb/trunk/configure.ac Thu Apr 2 17:40:54 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])
>>
>> Modified: couchdb/trunk/etc/init/couchdb.tpl.in
>> URL: http://svn.apache.org/viewvc/couchdb/trunk/etc/init/couchdb.tpl.in?rev=761355&r1=761354&r2=761355&view=diff
>> ==============================================================================
>> --- couchdb/trunk/etc/init/couchdb.tpl.in (original)
>> +++ couchdb/trunk/etc/init/couchdb.tpl.in Thu Apr 2 17:40:54 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/trunk/var/Makefile.am
>> URL: http://svn.apache.org/viewvc/couchdb/trunk/var/Makefile.am?rev=761355&r1=761354&r2=761355&view=diff
>> ==============================================================================
>> --- couchdb/trunk/var/Makefile.am (original)
>> +++ couchdb/trunk/var/Makefile.am Thu Apr 2 17:40:54 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
>>
>>
>
> --
> Noah Slater, http://tumbolia.org/nslater
>
SysV init problems, 0.9.1 release? (was Re: svn commit: r761355 -
in /couchdb/trunk: bin/couchdb.tpl.in configure.ac
etc/init/couchdb.tpl.in var/Makefile.am)
Posted by Noah Slater <ns...@apache.org>.
Hello,
While packaging for Debian, I came across a worrying problem.
The PID file for CouchDB was located at:
/var/run/couchdb.pid
Originally, the SysV init script took care of creating this and changing the
ownership so that it could be written to by the couchdb process. At some point,
this changing of ownership was removed.
The first time you try to run CouchDB from the SysV init script, it will
complain about not being able to write to the PID file and die. I am guessing
the solution to this is to touch it as root, and then change the ownership. You
only need to do this once, and CouchDB will work flawlessly after that,
presuming you don't remove it again.
I am surprised no one has raised this as a bug!
Anyway, I've put in a fix to trunk which is to make the PID file sit inside a
CouchDB specific directory. This should be owned by the couchdb user, and I have
added instructions to the README. This essentially fixes the problem without
having to add in any additional code to the SysV script.
I have back-ported this patch to my Debian package.
So, the question here is... should this be back-ported to a 0.9.1 release?
Best,
On Thu, Apr 02, 2009 at 05:40:55PM -0000, nslater@apache.org wrote:
> Author: nslater
> Date: Thu Apr 2 17:40:54 2009
> New Revision: 761355
>
> URL: http://svn.apache.org/viewvc?rev=761355&view=rev
> Log:
> reworked the pid file
>
> Modified:
> couchdb/trunk/bin/couchdb.tpl.in
> couchdb/trunk/configure.ac
> couchdb/trunk/etc/init/couchdb.tpl.in
> couchdb/trunk/var/Makefile.am
>
> Modified: couchdb/trunk/bin/couchdb.tpl.in
> URL: http://svn.apache.org/viewvc/couchdb/trunk/bin/couchdb.tpl.in?rev=761355&r1=761354&r2=761355&view=diff
> ==============================================================================
> --- couchdb/trunk/bin/couchdb.tpl.in (original)
> +++ couchdb/trunk/bin/couchdb.tpl.in Thu Apr 2 17:40:54 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/trunk/configure.ac
> URL: http://svn.apache.org/viewvc/couchdb/trunk/configure.ac?rev=761355&r1=761354&r2=761355&view=diff
> ==============================================================================
> --- couchdb/trunk/configure.ac (original)
> +++ couchdb/trunk/configure.ac Thu Apr 2 17:40:54 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])
>
> Modified: couchdb/trunk/etc/init/couchdb.tpl.in
> URL: http://svn.apache.org/viewvc/couchdb/trunk/etc/init/couchdb.tpl.in?rev=761355&r1=761354&r2=761355&view=diff
> ==============================================================================
> --- couchdb/trunk/etc/init/couchdb.tpl.in (original)
> +++ couchdb/trunk/etc/init/couchdb.tpl.in Thu Apr 2 17:40:54 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/trunk/var/Makefile.am
> URL: http://svn.apache.org/viewvc/couchdb/trunk/var/Makefile.am?rev=761355&r1=761354&r2=761355&view=diff
> ==============================================================================
> --- couchdb/trunk/var/Makefile.am (original)
> +++ couchdb/trunk/var/Makefile.am Thu Apr 2 17:40:54 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
>
>
--
Noah Slater, http://tumbolia.org/nslater