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/09/30 05:11:04 UTC
svn commit: r820161 - in /couchdb/branches/0.10.x: Makefile.am configure.ac
license.skip src/Makefile.am
Author: nslater
Date: Wed Sep 30 03:11:03 2009
New Revision: 820161
URL: http://svn.apache.org/viewvc?rev=820161&view=rev
Log:
bugsquashing like a mofo, port this shit davisp
Modified:
couchdb/branches/0.10.x/Makefile.am
couchdb/branches/0.10.x/configure.ac
couchdb/branches/0.10.x/license.skip
couchdb/branches/0.10.x/src/Makefile.am
Modified: couchdb/branches/0.10.x/Makefile.am
URL: http://svn.apache.org/viewvc/couchdb/branches/0.10.x/Makefile.am?rev=820161&r1=820160&r2=820161&view=diff
==============================================================================
--- couchdb/branches/0.10.x/Makefile.am (original)
+++ couchdb/branches/0.10.x/Makefile.am Wed Sep 30 03:11:03 2009
@@ -10,7 +10,7 @@
## License for the specific language governing permissions and limitations under
## the License.
-SUBDIRS = bin etc src/couchdb src/erlang-oauth src/etap src/ibrowse src/mochiweb share test var utils
+SUBDIRS = bin etc src share test var utils
localdoc_DATA = AUTHORS.gz BUGS.gz CHANGES.gz NEWS.gz README.gz THANKS.gz
@@ -66,6 +66,7 @@
rm -f $(top_srcdir)/aclocal.m4
rm -f $(top_srcdir)/config.h.in
rm -f $(top_srcdir)/configure
+ rm -f $(top_srcdir)/test/etap/temp.*
rm -f $(top_srcdir)/*.tar.gz
rm -f $(top_srcdir)/*.tar.gz.*
rm -fr $(top_srcdir)/tmp
Modified: couchdb/branches/0.10.x/configure.ac
URL: http://svn.apache.org/viewvc/couchdb/branches/0.10.x/configure.ac?rev=820161&r1=820160&r2=820161&view=diff
==============================================================================
--- couchdb/branches/0.10.x/configure.ac (original)
+++ couchdb/branches/0.10.x/configure.ac Wed Sep 30 03:11:03 2009
@@ -150,7 +150,6 @@
ICU_LOCAL_BIN=
])
-
AC_SUBST(ICU_CONFIG)
AC_SUBST(ICU_LOCAL_CFLAGS)
AC_SUBST(ICU_LOCAL_LDFLAGS)
@@ -342,6 +341,7 @@
AC_CONFIG_FILES([etc/logrotate.d/Makefile])
AC_CONFIG_FILES([etc/Makefile])
AC_CONFIG_FILES([share/Makefile])
+AC_CONFIG_FILES([src/Makefile])
AC_CONFIG_FILES([src/couchdb/couch.app.tpl])
AC_CONFIG_FILES([src/couchdb/Makefile])
AC_CONFIG_FILES([src/couchdb/priv/Makefile])
Modified: couchdb/branches/0.10.x/license.skip
URL: http://svn.apache.org/viewvc/couchdb/branches/0.10.x/license.skip?rev=820161&r1=820160&r2=820161&view=diff
==============================================================================
--- couchdb/branches/0.10.x/license.skip (original)
+++ couchdb/branches/0.10.x/license.skip Wed Sep 30 03:11:03 2009
@@ -48,6 +48,8 @@
^share/www/script/json2.js
^share/www/script/sha1.js
^share/www/script/test/lorem*
+^src/Makefile
+^src/Makefile.in
^src/couchdb/*.beam
^src/couchdb/couch.app.tpl.in
^src/couchdb/.deps/*
Modified: couchdb/branches/0.10.x/src/Makefile.am
URL: http://svn.apache.org/viewvc/couchdb/branches/0.10.x/src/Makefile.am?rev=820161&r1=820160&r2=820161&view=diff
==============================================================================
--- couchdb/branches/0.10.x/src/Makefile.am (original)
+++ couchdb/branches/0.10.x/src/Makefile.am Wed Sep 30 03:11:03 2009
@@ -10,4 +10,4 @@
## License for the specific language governing permissions and limitations under
## the License.
-## This file intentionally left blank.
+SUBDIRS = couchdb erlang-oauth etap ibrowse mochiweb