backported fixes for 0.11.x to 0.10.x
git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/0.10.x@932777 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/CHANGES b/CHANGES
index ff77535..67253e7 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,8 +6,12 @@
Replicator
-* Avoid leaking file descriptors on automatic replication restarts.
-* Close security vulnerability CVE-2010-0009.
+ * Avoid leaking file descriptors on automatic replication restarts.
+ * Close security vulnerability CVE-2010-0009.
+
+Build and System Integration:
+
+ * Fixed distribution preparation for building on Mac OS X.
Version 0.10.1
--------------
diff --git a/Makefile.am b/Makefile.am
index ae6ab9f..622db5d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -74,6 +74,10 @@
rm -f $(top_srcdir)/*.tar.gz.*
find $(top_srcdir) -name Makefile.in -exec rm {} \;
+dist-hook:
+ find $(top_srcdir) -type f -name "._*" -delete
+ find $(top_builddir) -type f -name "._*" -delete
+
distcheck-hook:
grep -rL 'http://www.apache.org/licenses/LICENSE-2.0' * \
| grep -vEf license.skip; \
diff --git a/etc/Makefile.am b/etc/Makefile.am
index 51a00d2..2b24db4 100644
--- a/etc/Makefile.am
+++ b/etc/Makefile.am
@@ -25,7 +25,7 @@
nobase_sysconf_DATA = $(default_sysconf_data) $(init_sysconf_data)
-EXTRA_DIST = $(init_sysconf_data)
+EXTRA_DIST = default/couchdb
CLEANFILES = $(init_DATA) $(default_sysconf_data) $(launchd_DATA)