couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nsla...@apache.org
Subject svn commit: r791275 - in /couchdb/branches/0.9.x: ./ configure.ac etc/Makefile.am etc/default/couchdb
Date Sun, 05 Jul 2009 16:58:15 GMT
Author: nslater
Date: Sun Jul  5 16:58:15 2009
New Revision: 791275

URL: http://svn.apache.org/viewvc?rev=791275&view=rev
Log:
merged r791270 from trunk

Modified:
    couchdb/branches/0.9.x/   (props changed)
    couchdb/branches/0.9.x/configure.ac
    couchdb/branches/0.9.x/etc/Makefile.am
    couchdb/branches/0.9.x/etc/default/couchdb   (props changed)

Propchange: couchdb/branches/0.9.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jul  5 16:58:15 2009
@@ -1,3 +1,3 @@
 /couchdb/branches/design_resources:751716-751803
 /couchdb/branches/form:729440-730015
-/couchdb/trunk:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,763833,764257,764835,765364,765419-765420,765479,765819,766338,766340,766347,766353,766358,766373,766383,766390,766392,766399,766406-766407,766456,766467,766476,766493,766505-766506,766751,766767,767164,767175-767176,767190,767204,767206,767208,767362,767398,767506,767543,768573,769109,769127,769181,769211,769792,769804,770782,771418,771466-771467,771472,771474,771480,772406,772415,772978,773225,773260,773319,773387,773401,774045,774095,774101,774180-774181,774587,775507,775577,775634,775724,775796,776143,776685,778949,780197,780318,780326,780328,780338,780348,780350,782643,791269
+/couchdb/trunk:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,763833,764257,764835,765364,765419-765420,765479,765819,766338,766340,766347,766353,766358,766373,766383,766390,766392,766399,766406-766407,766456,766467,766476,766493,766505-766506,766751,766767,767164,767175-767176,767190,767204,767206,767208,767362,767398,767506,767543,768573,769109,769127,769181,769211,769792,769804,770782,771418,771466-771467,771472,771474,771480,772406,772415,772978,773225,773260,773319,773387,773401,774045,774095,774101,774180-774181,774587,775507,775577,775634,775724,775796,776143,776685,778949,780197,780318,780326,780328,780338,780348,780350,782643,791269-791270

Modified: couchdb/branches/0.9.x/configure.ac
URL: http://svn.apache.org/viewvc/couchdb/branches/0.9.x/configure.ac?rev=791275&r1=791274&r2=791275&view=diff
==============================================================================
--- couchdb/branches/0.9.x/configure.ac (original)
+++ couchdb/branches/0.9.x/configure.ac Sun Jul  5 16:58:15 2009
@@ -242,7 +242,6 @@
 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])
 
 # fix for older autotools that don't define "abs_top_YYY" by default

Modified: couchdb/branches/0.9.x/etc/Makefile.am
URL: http://svn.apache.org/viewvc/couchdb/branches/0.9.x/etc/Makefile.am?rev=791275&r1=791274&r2=791275&view=diff
==============================================================================
--- couchdb/branches/0.9.x/etc/Makefile.am (original)
+++ couchdb/branches/0.9.x/etc/Makefile.am Sun Jul  5 16:58:15 2009
@@ -43,7 +43,6 @@
 	sed -e "s|%configure_input%|$@. Generated from $< by configure.|" \
 	    -e "s|%bindir%|$(bindir)|" \
 	    -e "s|%sysconfdir%|$(sysconfdir)|" \
-	    -e "s|%localerlangbindir%|$(localerlangbindir)|" \
 	    -e "s|%localstaterundir%|$(localstaterundir)|" \
 	    -e "s|%couchdb_command_name%|$(couchdb_command_name)|" \
 	< $< > $@

Propchange: couchdb/branches/0.9.x/etc/default/couchdb
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jul  5 16:58:15 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,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,763833,764257,764835,765364,765419-765420,765479,765819,766338,766340,766347,766353,766358,766373,766383,766390,766392,766399,766406-766407,766456,766467,766476,766493,766505-766506,766751,766767,767164,767175-767176,767190,767204,767206,767208,767362,767398,767506,767543,768573,769109,769127,769181,769211,769792,769804,770782,771418,771466-771467,771472,771474,771480,772406,772415,772978,773225,773260,773319,773387,773401,774045,774095,774101,774180-774181,774587,775507,775577,775634,775724,775796,776143,776685,778949,780197,780318,780326,780328,780338,780348,780350,782643,791269
+/couchdb/trunk/etc/default/couchdb:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,763833,764257,764835,765364,765419-765420,765479,765819,766338,766340,766347,766353,766358,766373,766383,766390,766392,766399,766406-766407,766456,766467,766476,766493,766505-766506,766751,766767,767164,767175-767176,767190,767204,767206,767208,767362,767398,767506,767543,768573,769109,769127,769181,769211,769792,769804,770782,771418,771466-771467,771472,771474,771480,772406,772415,772978,773225,773260,773319,773387,773401,774045,774095,774101,774180-774181,774587,775507,775577,775634,775724,775796,776143,776685,778949,780197,780318,780326,780328,780338,780348,780350,782643,791269-791270
 /incubator/couchdb/trunk/etc/default/couchdb:642419-694440



Mime
View raw message