tagging 0.11.0
git-svn-id: https://svn.apache.org/repos/asf/couchdb/tags/0.11.0@926707 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/CHANGES b/CHANGES
index 984aede..0465bb8 100644
--- a/CHANGES
+++ b/CHANGES
@@ -68,6 +68,7 @@
Build and System Integration:
* Updated and improved source documentation.
+ * Fixed distribution preparation for building on OS X.
* Added support for building a Windows installer as part of 'make dist'.
* Bug fix for building couch.app's module list.
* ETap tests are now run during make distcheck. This included a number of
diff --git a/Makefile.am b/Makefile.am
index 9c42b50..472b01c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -123,6 +123,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 1dc70c4..c166636 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
if WINDOWS
EXTRA_DIST += windows/setup-couchdb-@version@.exe.md5 windows/setup-couchdb-@version@.exe.sha
@@ -72,7 +72,7 @@
# README.txt has \n line endings in the repo and must have \r\n
# when installed as notepad is used to view it.
# Also: the targets below don't seem to update after an svn-up (which
-# changes the version string in the generated files) so we trick make
+# changes the version string in the generated files) so we trick make
# into always building it with the FORCE pattern...
windows/README.txt: windows/README.txt.tpl FORCE
sed -e "s|%package_name%|@package_name@|g" \
