Permalink
Browse files

Port Noah's bugfixes to trunk.

git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@820162 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information...
1 parent 8bcfbdb commit 00964d0c2978b344c1d615ee5b1625eb04507c23 @davisp davisp committed Sep 30, 2009
Showing with 6 additions and 3 deletions.
  1. +2 −1 Makefile.am
  2. +1 −1 configure.ac
  3. +2 −0 license.skip
  4. +1 −1 src/Makefile.am
View
3 Makefile.am
@@ -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 @@ local-clean: maintainer-clean
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
View
2 configure.ac
@@ -150,7 +150,6 @@ AC_ARG_WITH([win32-icu-binaries], [AC_HELP_STRING([--with-win32-icu-binaries=PAT
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/couchdb.tpl])
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])
View
2 license.skip
@@ -50,6 +50,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/*
View
2 src/Makefile.am
@@ -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

0 comments on commit 00964d0

Please sign in to comment.